diff --git a/third_party/nixpkgs/.editorconfig b/third_party/nixpkgs/.editorconfig
index 8d54e327b9..1d2259154e 100644
--- a/third_party/nixpkgs/.editorconfig
+++ b/third_party/nixpkgs/.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/third_party/nixpkgs/.git-blame-ignore-revs b/third_party/nixpkgs/.git-blame-ignore-revs
index f6ffeb9b12..d83dc1efe4 100644
--- a/third_party/nixpkgs/.git-blame-ignore-revs
+++ b/third_party/nixpkgs/.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/third_party/nixpkgs/.github/workflows/check-nix-format.yml b/third_party/nixpkgs/.github/workflows/check-nix-format.yml
index a3ffc40cc3..eed685946c 100644
--- a/third_party/nixpkgs/.github/workflows/check-nix-format.yml
+++ b/third_party/nixpkgs/.github/workflows/check-nix-format.yml
@@ -15,7 +15,7 @@ permissions:
 jobs:
   nixos:
     runs-on: ubuntu-latest
-    if: "github.repository_owner == 'NixOS' && !contains(github.event.pull_request.title, '[skip treewide]')"
+    if: "!contains(github.event.pull_request.title, '[skip treewide]')"
     steps:
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
         with:
@@ -76,7 +76,7 @@ jobs:
             if [[ -n "$source" ]] && ! nixfmt --check ${{ env.base }}/"$source" 2>/dev/null; then
               echo "Ignoring file $file because it's not formatted in the base commit"
             elif ! nixfmt --check "$dest"; then
-              unformattedFiles+=("$file")
+              unformattedFiles+=("$dest")
             fi
           done < <(git diff -z --name-status ${{ env.baseRev }} -- '*.nix')
 
diff --git a/third_party/nixpkgs/.github/workflows/check-nixf-tidy.yml b/third_party/nixpkgs/.github/workflows/check-nixf-tidy.yml
new file mode 100644
index 0000000000..5a8fdbc962
--- /dev/null
+++ b/third_party/nixpkgs/.github/workflows/check-nixf-tidy.yml
@@ -0,0 +1,128 @@
+name: Check changed Nix files with nixf-tidy (experimental)
+
+on:
+  pull_request_target:
+    types: [opened, synchronize, reopened, edited]
+permissions:
+  contents: read
+
+jobs:
+  nixos:
+    runs-on: ubuntu-latest
+    if: "!contains(github.event.pull_request.title, '[skip treewide]')"
+    steps:
+      - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
+        with:
+          # pull_request_target checks out the base branch by default
+          ref: refs/pull/${{ github.event.pull_request.number }}/merge
+          # Fetches the merge commit and its parents
+          fetch-depth: 2
+      - name: Checking out base branch
+        run: |
+          base=$(mktemp -d)
+          baseRev=$(git rev-parse HEAD^1)
+          git worktree add "$base" "$baseRev"
+          echo "baseRev=$baseRev" >> "$GITHUB_ENV"
+          echo "base=$base" >> "$GITHUB_ENV"
+      - name: Get Nixpkgs revision for nixf
+        run: |
+          # pin to a commit from nixpkgs-unstable to avoid e.g. building nixf
+          # from staging
+          # This should not be a URL, because it would allow PRs to run arbitrary code in CI!
+          rev=$(jq -r .rev ci/pinned-nixpkgs.json)
+          echo "url=https://github.com/NixOS/nixpkgs/archive/$rev.tar.gz" >> "$GITHUB_ENV"
+      - uses: cachix/install-nix-action@ba0dd844c9180cbf77aa72a116d6fbc515d0e87b # v27
+        with:
+          # explicitly enable sandbox
+          extra_nix_config: sandbox = true
+          nix_path: nixpkgs=${{ env.url }}
+      - name: Install nixf and jq
+        # provided jq is incompatible with our expression
+        run: "nix-env -f '<nixpkgs>' -iAP nixf jq"
+      - name: Check that Nix files pass nixf-tidy
+        run: |
+          # Filtering error messages we don't like
+          nixf_wrapper(){
+            nixf-tidy --variable-lookup < "$1" | jq -r '
+              [
+                "sema-escaping-with"
+              ]
+              as $ignored_errors|[.[]|select(.sname as $s|$ignored_errors|index($s)|not)]
+            '
+          }
+
+          failedFiles=()
+
+          # Don't report errors to file overview
+          # to avoid duplicates when editing title and description
+          if [[ "${{ github.event.action }}" == 'edited' ]] && [[ -z "${{ github.event.edited.changes.base }}" ]]; then
+            DONT_REPORT_ERROR=1
+          else
+            DONT_REPORT_ERROR=
+          fi
+          # TODO: Make this more parallel
+
+          # Loop through all Nix files touched by the PR
+          while readarray -d '' -n 2 entry && (( ${#entry[@]} != 0 )); do
+            type=${entry[0]}
+            file=${entry[1]}
+            case $type in
+              A*)
+                source=""
+                dest=$file
+                ;;
+              M*)
+                source=$file
+                dest=$file
+                ;;
+              C*|R*)
+                source=$file
+                read -r -d '' dest
+                ;;
+              *)
+                echo "Ignoring file $file with type $type"
+                continue
+            esac
+
+            if [[ -n "$source" ]] && [[ "$(nixf_wrapper ${{ env.base }}/"$source")" != '[]' ]] 2>/dev/null; then
+              echo "Ignoring file $file because it doesn't pass nixf-tidy in the base commit"
+              echo # insert blank line
+            else
+              nixf_report="$(nixf_wrapper "$dest")"
+              if [[ "$nixf_report" != '[]' ]]; then
+                echo "$dest doesn't pass nixf-tidy. Reported by nixf-tidy:"
+                errors=$(echo "$nixf_report" | jq -r --arg dest "$dest" '
+                  def getLCur: "line=" + (.line+1|tostring) + ",col=" + (.column|tostring);
+                  def getRCur: "endLine=" + (.line+1|tostring) + ",endColumn=" + (.column|tostring);
+                  def getRange: "file=\($dest)," + (.lCur|getLCur) + "," + (.rCur|getRCur);
+                  def getBody: . as $top|(.range|getRange) + ",title="+ .sname + "::" +
+                    (.message|sub("{}" ; ($top.args.[]|tostring)));
+                  def getNote: "\n::notice " + (.|getBody);
+                  def getMessage: "::error " + (.|getBody) + (if (.notes|length)>0 then
+                    ([.notes.[]|getNote]|add) else "" end);
+                  .[]|getMessage
+                ')
+                if [[ -z "$DONT_REPORT_ERROR" ]]; then
+                  echo "$errors"
+                else
+                  # just print in plain text
+                  echo "$errors" | sed 's/^:://'
+                  echo # add one empty line
+                fi
+                failedFiles+=("$dest")
+              fi
+            fi
+          done < <(git diff -z --name-status ${{ env.baseRev }} -- '*.nix')
+
+          if [[ -n "$DONT_REPORT_ERROR" ]]; then
+            echo "Edited the PR but didn't change the base branch, only the description/title."
+            echo "Not reporting errors again to avoid duplication."
+            echo # add one empty line
+          fi
+
+          if (( "${#failedFiles[@]}" > 0 )); then
+            echo "Some new/changed Nix files don't pass nixf-tidy."
+            echo "See ${{ github.event.pull_request.html_url }}/files for reported errors."
+            echo "If you believe this is a false positive, ping @Aleksanaa and @inclyc in this PR."
+            exit 1
+          fi
diff --git a/third_party/nixpkgs/doc/build-helpers/dev-shell-tools.chapter.md b/third_party/nixpkgs/doc/build-helpers/dev-shell-tools.chapter.md
index 21636df801..0168ea39f7 100644
--- a/third_party/nixpkgs/doc/build-helpers/dev-shell-tools.chapter.md
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/doc/build-helpers/testers.chapter.md b/third_party/nixpkgs/doc/build-helpers/testers.chapter.md
index a10e60de8c..ec659e75bd 100644
--- a/third_party/nixpkgs/doc/build-helpers/testers.chapter.md
+++ b/third_party/nixpkgs/doc/build-helpers/testers.chapter.md
@@ -116,6 +116,55 @@ It has two modes:
 
 : The `lychee` package to use.
 
+## `shellcheck` {#tester-shellcheck}
+
+Runs files through `shellcheck`, a static analysis tool for shell scripts.
+
+:::{.example #ex-shellcheck}
+# Run `testers.shellcheck`
+
+A single script
+
+```nix
+testers.shellcheck {
+  name = "shellcheck";
+  src = ./script.sh;
+}
+```
+
+Multiple files
+
+```nix
+let
+  inherit (lib) fileset;
+in
+testers.shellcheck {
+  name = "shellcheck";
+  src = fileset.toSource {
+    root = ./.;
+    fileset = fileset.unions [
+      ./lib.sh
+      ./nixbsd-activate
+    ];
+  };
+}
+```
+
+:::
+
+### Inputs {#tester-shellcheck-inputs}
+
+[`src` (path or string)]{#tester-shellcheck-param-src}
+
+: The path to the shell script(s) to check.
+  This can be a single file or a directory containing shell files.
+  All files in `src` will be checked, so you may want to provide `fileset`-based source instead of a whole directory.
+
+### Return value {#tester-shellcheck-return}
+
+A derivation that runs `shellcheck` on the given script(s).
+The build will fail if `shellcheck` finds any issues.
+
 ## `testVersion` {#tester-testVersion}
 
 Checks that the output from running a command contains the specified version string in it as a whole word.
diff --git a/third_party/nixpkgs/doc/doc-support/package.nix b/third_party/nixpkgs/doc/doc-support/package.nix
index 602cef5967..ca4694f3d1 100644
--- a/third_party/nixpkgs/doc/doc-support/package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/doc/interoperability.md b/third_party/nixpkgs/doc/interoperability.md
new file mode 100644
index 0000000000..21a88116d3
--- /dev/null
+++ b/third_party/nixpkgs/doc/interoperability.md
@@ -0,0 +1,5 @@
+# Interoperability Standards {#part-interoperability}
+
+```{=include=} chapters
+interoperability/cyclonedx.md
+```
diff --git a/third_party/nixpkgs/doc/interoperability/cyclonedx.md b/third_party/nixpkgs/doc/interoperability/cyclonedx.md
new file mode 100644
index 0000000000..7a3dea3dbc
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/doc/languages-frameworks/python.section.md b/third_party/nixpkgs/doc/languages-frameworks/python.section.md
index 519fd6fbf9..5a2e2de2ed 100644
--- a/third_party/nixpkgs/doc/languages-frameworks/python.section.md
+++ b/third_party/nixpkgs/doc/languages-frameworks/python.section.md
@@ -162,7 +162,8 @@ following are specific to `buildPythonPackage`:
 * `dontWrapPythonPrograms ? false`: Skip wrapping of Python programs.
 * `permitUserSite ? false`: Skip setting the `PYTHONNOUSERSITE` environment
   variable in wrapped programs.
-* `pyproject`: Whether the pyproject format should be used. When set to `true`,
+* `pyproject`: Whether the pyproject format should be used. As all other formats
+  are deprecated, you are recommended to set this to `true`. When you do so,
   `pypaBuildHook` will be used, and you can add the required build dependencies
   from `build-system.requires` to `build-system`. Note that the pyproject
   format falls back to using `setuptools`, so you can use `pyproject = true`
diff --git a/third_party/nixpkgs/doc/languages-frameworks/rust.section.md b/third_party/nixpkgs/doc/languages-frameworks/rust.section.md
index 48c32f324d..15f16879a5 100644
--- a/third_party/nixpkgs/doc/languages-frameworks/rust.section.md
+++ b/third_party/nixpkgs/doc/languages-frameworks/rust.section.md
@@ -41,16 +41,21 @@ rustPlatform.buildRustPackage rec {
     description = "Fast line-oriented regex search tool, similar to ag and ack";
     homepage = "https://github.com/BurntSushi/ripgrep";
     license = lib.licenses.unlicense;
-    maintainers = [];
+    maintainers = [ ];
   };
 }
 ```
 
-`buildRustPackage` requires either a `cargoHash` (preferred) or a
-`cargoSha256` attribute, computed over all crate sources of this package.
-`cargoHash` supports [SRI](https://www.w3.org/TR/SRI/) hashes and should be
-preferred over `cargoSha256` which was used for traditional Nix SHA-256 hashes.
-For example:
+`buildRustPackage` requires a `cargoHash` attribute, computed over all crate sources of this package.
+
+::: {.warning}
+`cargoSha256` is already deprecated, and is subject to removal in favor of
+`cargoHash` which supports [SRI](https://www.w3.org/TR/SRI/) hashes.
+
+If you are still using `cargoSha256`, you can simply replace it with
+`cargoHash` and recompute the hash, or convert the original sha256 to SRI
+hash using `nix-hash --to-sri --type sha256 "<original sha256>"`.
+:::
 
 ```nix
 {
@@ -58,7 +63,7 @@ For example:
 }
 ```
 
-Exception: If the application has cargo `git` dependencies, the `cargoHash`/`cargoSha256`
+Exception: If the application has cargo `git` dependencies, the `cargoHash`
 approach will not work, and you will need to copy the `Cargo.lock` file of the application
 to nixpkgs and continue with the next section for specifying the options of the `cargoLock`
 section.
@@ -76,14 +81,6 @@ then be taken from the failed build. A fake hash can be used for
 }
 ```
 
-For `cargoSha256` you can use:
-
-```nix
-{
-  cargoSha256 = lib.fakeSha256;
-}
-```
-
 Per the instructions in the [Cargo Book](https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html)
 best practices guide, Rust applications should always commit the `Cargo.lock`
 file in git to ensure a reproducible build. However, a few packages do not, and
@@ -98,7 +95,7 @@ directory into a tar.gz archive.
 The tarball with vendored dependencies contains a directory with the
 package's `name`, which is normally composed of `pname` and
 `version`. This means that the vendored dependencies hash
-(`cargoHash`/`cargoSha256`) is dependent on the package name and
+(`cargoHash`) is dependent on the package name and
 version. The `cargoDepsName` attribute can be used to use another name
 for the directory of vendored dependencies. For example, the hash can
 be made invariant to the version by setting `cargoDepsName` to
@@ -123,7 +120,7 @@ rustPlatform.buildRustPackage rec {
 
 ### Importing a `Cargo.lock` file {#importing-a-cargo.lock-file}
 
-Using a vendored hash (`cargoHash`/`cargoSha256`) is tedious when using
+Using a vendored hash (`cargoHash`) is tedious when using
 `buildRustPackage` within a project, since it requires that the hash
 is updated after every change to `Cargo.lock`. Therefore,
 `buildRustPackage` also supports vendoring dependencies directly from
@@ -645,6 +642,7 @@ builds the `retworkx` Python package. `fetchCargoTarball` and
 buildPythonPackage rec {
   pname = "retworkx";
   version = "0.6.0";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Qiskit";
@@ -659,8 +657,6 @@ buildPythonPackage rec {
     hash = "sha256-heOBK8qi2nuc/Ib+I/vLzZ1fUUD/G/KTw9d7M4Hz5O0=";
   };
 
-  format = "pyproject";
-
   nativeBuildInputs = with rustPlatform; [ cargoSetupHook maturinBuildHook ];
 
   # ...
diff --git a/third_party/nixpkgs/doc/manual.md.in b/third_party/nixpkgs/doc/manual.md.in
index 642247e166..e5f58a23a3 100644
--- a/third_party/nixpkgs/doc/manual.md.in
+++ b/third_party/nixpkgs/doc/manual.md.in
@@ -12,4 +12,5 @@ stdenv.md
 build-helpers.md
 development.md
 contributing.md
+interoperability.md
 ```
diff --git a/third_party/nixpkgs/lib/strings.nix b/third_party/nixpkgs/lib/strings.nix
index 49c625e232..aafbdffaa7 100644
--- a/third_party/nixpkgs/lib/strings.nix
+++ b/third_party/nixpkgs/lib/strings.nix
@@ -1,4 +1,6 @@
-/* String manipulation functions. */
+/**
+  String manipulation functions.
+*/
 { lib }:
 let
 
@@ -39,161 +41,371 @@ rec {
     unsafeDiscardStringContext
     ;
 
-  /* Concatenate a list of strings.
+  /**
+    Concatenate a list of strings.
 
-    Type: concatStrings :: [string] -> string
+    # Type
 
-     Example:
-       concatStrings ["foo" "bar"]
-       => "foobar"
+    ```
+    concatStrings :: [string] -> string
+    ```
+
+    # Examples
+    :::{.example}
+    ## `lib.strings.concatStrings` usage example
+
+    ```nix
+    concatStrings ["foo" "bar"]
+    => "foobar"
+    ```
+
+    :::
   */
   concatStrings = builtins.concatStringsSep "";
 
-  /* Map a function over a list and concatenate the resulting strings.
+  /**
+    Map a function over a list and concatenate the resulting strings.
 
-    Type: concatMapStrings :: (a -> string) -> [a] -> string
 
-     Example:
-       concatMapStrings (x: "a" + x) ["foo" "bar"]
-       => "afooabar"
+    # Inputs
+
+    `f`
+    : 1\. Function argument
+
+    `list`
+    : 2\. Function argument
+
+    # Type
+
+    ```
+    concatMapStrings :: (a -> string) -> [a] -> string
+    ```
+
+    # Examples
+    :::{.example}
+    ## `lib.strings.concatMapStrings` usage example
+
+    ```nix
+    concatMapStrings (x: "a" + x) ["foo" "bar"]
+    => "afooabar"
+    ```
+
+    :::
   */
   concatMapStrings = f: list: concatStrings (map f list);
 
-  /* Like `concatMapStrings` except that the f functions also gets the
-     position as a parameter.
+  /**
+    Like `concatMapStrings` except that the f functions also gets the
+    position as a parameter.
 
-     Type: concatImapStrings :: (int -> a -> string) -> [a] -> string
 
-     Example:
-       concatImapStrings (pos: x: "${toString pos}-${x}") ["foo" "bar"]
-       => "1-foo2-bar"
+    # Inputs
+
+    `f`
+    : 1\. Function argument
+
+    `list`
+    : 2\. Function argument
+
+    # Type
+
+    ```
+    concatImapStrings :: (int -> a -> string) -> [a] -> string
+    ```
+
+    # Examples
+    :::{.example}
+    ## `lib.strings.concatImapStrings` usage example
+
+    ```nix
+    concatImapStrings (pos: x: "${toString pos}-${x}") ["foo" "bar"]
+    => "1-foo2-bar"
+    ```
+
+    :::
   */
   concatImapStrings = f: list: concatStrings (lib.imap1 f list);
 
-  /* Place an element between each element of a list
+  /**
+    Place an element between each element of a list
 
-     Type: intersperse :: a -> [a] -> [a]
 
-     Example:
-       intersperse "/" ["usr" "local" "bin"]
-       => ["usr" "/" "local" "/" "bin"].
+    # Inputs
+
+    `separator`
+    : Separator to add between elements
+
+    `list`
+    : Input list
+
+    # Type
+
+    ```
+    intersperse :: a -> [a] -> [a]
+    ```
+
+    # Examples
+    :::{.example}
+    ## `lib.strings.intersperse` usage example
+
+    ```nix
+    intersperse "/" ["usr" "local" "bin"]
+    => ["usr" "/" "local" "/" "bin"].
+    ```
+
+    :::
   */
   intersperse =
-    # Separator to add between elements
     separator:
-    # Input list
     list:
     if list == [] || length list == 1
     then list
     else tail (lib.concatMap (x: [separator x]) list);
 
-  /* Concatenate a list of strings with a separator between each element
+  /**
+    Concatenate a list of strings with a separator between each element
 
-     Type: concatStringsSep :: string -> [string] -> string
+    # Inputs
 
-     Example:
-        concatStringsSep "/" ["usr" "local" "bin"]
-        => "usr/local/bin"
+    `sep`
+    : Separator to add between elements
+
+    `list`
+    : List of input strings
+
+    # Type
+
+    ```
+    concatStringsSep :: string -> [string] -> string
+    ```
+
+    # Examples
+    :::{.example}
+    ## `lib.strings.concatStringsSep` usage example
+
+    ```nix
+    concatStringsSep "/" ["usr" "local" "bin"]
+    => "usr/local/bin"
+    ```
+
+    :::
   */
   concatStringsSep = builtins.concatStringsSep;
 
-  /* Maps a function over a list of strings and then concatenates the
-     result with the specified separator interspersed between
-     elements.
+  /**
+    Maps a function over a list of strings and then concatenates the
+    result with the specified separator interspersed between
+    elements.
 
-     Type: concatMapStringsSep :: string -> (a -> string) -> [a] -> string
 
-     Example:
-        concatMapStringsSep "-" (x: toUpper x)  ["foo" "bar" "baz"]
-        => "FOO-BAR-BAZ"
+    # Inputs
+
+    `sep`
+    : Separator to add between elements
+
+    `f`
+    : Function to map over the list
+
+    `list`
+    : List of input strings
+
+    # Type
+
+    ```
+    concatMapStringsSep :: string -> (a -> string) -> [a] -> string
+    ```
+
+    # Examples
+    :::{.example}
+    ## `lib.strings.concatMapStringsSep` usage example
+
+    ```nix
+    concatMapStringsSep "-" (x: toUpper x)  ["foo" "bar" "baz"]
+    => "FOO-BAR-BAZ"
+    ```
+
+    :::
   */
   concatMapStringsSep =
-    # Separator to add between elements
     sep:
-    # Function to map over the list
     f:
-    # List of input strings
     list: concatStringsSep sep (map f list);
 
-  /* Same as `concatMapStringsSep`, but the mapping function
-     additionally receives the position of its argument.
+  /**
+    Same as `concatMapStringsSep`, but the mapping function
+    additionally receives the position of its argument.
 
-     Type: concatIMapStringsSep :: string -> (int -> a -> string) -> [a] -> string
 
-     Example:
-       concatImapStringsSep "-" (pos: x: toString (x / pos)) [ 6 6 6 ]
-       => "6-3-2"
+    # Inputs
+
+    `sep`
+    : Separator to add between elements
+
+    `f`
+    : Function that receives elements and their positions
+
+    `list`
+    : List of input strings
+
+    # Type
+
+    ```
+    concatIMapStringsSep :: string -> (int -> a -> string) -> [a] -> string
+    ```
+
+    # Examples
+    :::{.example}
+    ## `lib.strings.concatImapStringsSep` usage example
+
+    ```nix
+    concatImapStringsSep "-" (pos: x: toString (x / pos)) [ 6 6 6 ]
+    => "6-3-2"
+    ```
+
+    :::
   */
   concatImapStringsSep =
-    # Separator to add between elements
     sep:
-    # Function that receives elements and their positions
     f:
-    # List of input strings
     list: concatStringsSep sep (lib.imap1 f list);
 
-  /* Concatenate a list of strings, adding a newline at the end of each one.
-     Defined as `concatMapStrings (s: s + "\n")`.
+  /**
+    Concatenate a list of strings, adding a newline at the end of each one.
+    Defined as `concatMapStrings (s: s + "\n")`.
 
-     Type: concatLines :: [string] -> string
+    # Inputs
 
-     Example:
-       concatLines [ "foo" "bar" ]
-       => "foo\nbar\n"
+    `list`
+    : List of strings. Any element that is not a string will be implicitly converted to a string.
+
+    # Type
+
+    ```
+    concatLines :: [string] -> string
+    ```
+
+    # Examples
+    :::{.example}
+    ## `lib.strings.concatLines` usage example
+
+    ```nix
+    concatLines [ "foo" "bar" ]
+    => "foo\nbar\n"
+    ```
+
+    :::
   */
   concatLines = concatMapStrings (s: s + "\n");
 
-  /*
-    Replicate a string n times,
+  /**
+    Repeat a string `n` times,
     and concatenate the parts into a new string.
 
-    Type: replicate :: int -> string -> string
 
-    Example:
-      replicate 3 "v"
-      => "vvv"
-      replicate 5 "hello"
-      => "hellohellohellohellohello"
+    # Inputs
+
+    `n`
+    : 1\. Function argument
+
+    `s`
+    : 2\. Function argument
+
+    # Type
+
+    ```
+    replicate :: int -> string -> string
+    ```
+
+    # Examples
+    :::{.example}
+    ## `lib.strings.replicate` usage example
+
+    ```nix
+    replicate 3 "v"
+    => "vvv"
+    replicate 5 "hello"
+    => "hellohellohellohellohello"
+    ```
+
+    :::
   */
   replicate = n: s: concatStrings (lib.lists.replicate n s);
 
-  /*
-    Remove leading and trailing whitespace from a string.
+  /**
+    Remove leading and trailing whitespace from a string `s`.
 
     Whitespace is defined as any of the following characters:
       " ", "\t" "\r" "\n"
 
-    Type: trim :: string -> string
+    # Inputs
 
-    Example:
-      trim "   hello, world!   "
-      => "hello, world!"
+    `s`
+    : The string to trim
+
+    # Type
+
+    ```
+    trim :: string -> string
+    ```
+
+    # Examples
+    :::{.example}
+    ## `lib.strings.trim` usage example
+
+    ```nix
+    trim "   hello, world!   "
+    => "hello, world!"
+    ```
+
+    :::
   */
   trim = trimWith {
     start = true;
     end = true;
   };
 
-  /*
-    Remove leading and/or trailing whitespace from a string.
+  /**
+    Remove leading and/or trailing whitespace from a string `s`.
+
     To remove both leading and trailing whitespace, you can also use [`trim`](#function-library-lib.strings.trim)
 
     Whitespace is defined as any of the following characters:
       " ", "\t" "\r" "\n"
 
-    Type: trimWith :: { start ? false, end ? false } -> string -> string
+    # Inputs
 
-    Example:
-      trimWith { start = true; } "   hello, world!   "}
-      => "hello, world!   "
-      trimWith { end = true; } "   hello, world!   "}
-      => "   hello, world!"
+    `config` (Attribute set)
+    : `start`
+      : Whether to trim leading whitespace (`false` by default)
+
+    : `end`
+      : Whether to trim trailing whitespace (`false` by default)
+
+    `s`
+    : The string to trim
+
+    # Type
+
+    ```
+    trimWith :: { start :: Bool; end :: Bool } -> String -> String
+    ```
+
+    # Examples
+    :::{.example}
+    ## `lib.strings.trimWith` usage example
+
+    ```nix
+    trimWith { start = true; } "   hello, world!   "}
+    => "hello, world!   "
+
+    trimWith { end = true; } "   hello, world!   "}
+    => "   hello, world!"
+    ```
+    :::
   */
   trimWith =
     {
-      # Trim leading whitespace (`false` by default)
       start ? false,
-      # Trim trailing whitespace (`false` by default)
       end ? false,
     }:
     s:
@@ -220,83 +432,198 @@ rec {
     in
       optionalString (res != null) (head res);
 
-  /* Construct a Unix-style, colon-separated search path consisting of
-     the given `subDir` appended to each of the given paths.
+  /**
+    Construct a Unix-style, colon-separated search path consisting of
+    the given `subDir` appended to each of the given paths.
 
-     Type: makeSearchPath :: string -> [string] -> string
+    # Inputs
 
-     Example:
-       makeSearchPath "bin" ["/root" "/usr" "/usr/local"]
-       => "/root/bin:/usr/bin:/usr/local/bin"
-       makeSearchPath "bin" [""]
-       => "/bin"
+    `subDir`
+    : Directory name to append
+
+    `paths`
+    : List of base paths
+
+    # Type
+
+    ```
+    makeSearchPath :: string -> [string] -> string
+    ```
+
+    # Examples
+    :::{.example}
+    ## `lib.strings.makeSearchPath` usage example
+
+    ```nix
+    makeSearchPath "bin" ["/root" "/usr" "/usr/local"]
+    => "/root/bin:/usr/bin:/usr/local/bin"
+    makeSearchPath "bin" [""]
+    => "/bin"
+    ```
+
+    :::
   */
   makeSearchPath =
-    # Directory name to append
     subDir:
-    # List of base paths
     paths:
     concatStringsSep ":" (map (path: path + "/" + subDir) (filter (x: x != null) paths));
 
-  /* Construct a Unix-style search path by appending the given
-     `subDir` to the specified `output` of each of the packages. If no
-     output by the given name is found, fallback to `.out` and then to
-     the default.
+  /**
+    Construct a Unix-style search path by appending the given
+    `subDir` to the specified `output` of each of the packages.
 
-     Type: string -> string -> [package] -> string
+    If no output by the given name is found, fallback to `.out` and then to
+    the default.
 
-     Example:
-       makeSearchPathOutput "dev" "bin" [ pkgs.openssl pkgs.zlib ]
-       => "/nix/store/9rz8gxhzf8sw4kf2j2f1grr49w8zx5vj-openssl-1.0.1r-dev/bin:/nix/store/wwh7mhwh269sfjkm6k5665b5kgp7jrk2-zlib-1.2.8/bin"
+
+    # Inputs
+
+    `output`
+    : Package output to use
+
+    `subDir`
+    : Directory name to append
+
+    `pkgs`
+    : List of packages
+
+    # Type
+
+    ```
+    makeSearchPathOutput :: string -> string -> [package] -> string
+    ```
+
+    # Examples
+    :::{.example}
+    ## `lib.strings.makeSearchPathOutput` usage example
+
+    ```nix
+    makeSearchPathOutput "dev" "bin" [ pkgs.openssl pkgs.zlib ]
+    => "/nix/store/9rz8gxhzf8sw4kf2j2f1grr49w8zx5vj-openssl-1.0.1r-dev/bin:/nix/store/wwh7mhwh269sfjkm6k5665b5kgp7jrk2-zlib-1.2.8/bin"
+    ```
+
+    :::
   */
   makeSearchPathOutput =
-    # Package output to use
     output:
-    # Directory name to append
     subDir:
-    # List of packages
     pkgs: makeSearchPath subDir (map (lib.getOutput output) pkgs);
 
-  /* Construct a library search path (such as RPATH) containing the
-     libraries for a set of packages
+  /**
+    Construct a library search path (such as RPATH) containing the
+    libraries for a set of packages
 
-     Example:
-       makeLibraryPath [ "/usr" "/usr/local" ]
-       => "/usr/lib:/usr/local/lib"
-       pkgs = import <nixpkgs> { }
-       makeLibraryPath [ pkgs.openssl pkgs.zlib ]
-       => "/nix/store/9rz8gxhzf8sw4kf2j2f1grr49w8zx5vj-openssl-1.0.1r/lib:/nix/store/wwh7mhwh269sfjkm6k5665b5kgp7jrk2-zlib-1.2.8/lib"
+    # Inputs
+
+    `packages`
+    : List of packages
+
+    # Type
+
+    ```
+    makeLibraryPath :: [package] -> string
+    ```
+
+    # Examples
+    :::{.example}
+    ## `lib.strings.makeLibraryPath` usage example
+
+    ```nix
+    makeLibraryPath [ "/usr" "/usr/local" ]
+    => "/usr/lib:/usr/local/lib"
+    pkgs = import <nixpkgs> { }
+    makeLibraryPath [ pkgs.openssl pkgs.zlib ]
+    => "/nix/store/9rz8gxhzf8sw4kf2j2f1grr49w8zx5vj-openssl-1.0.1r/lib:/nix/store/wwh7mhwh269sfjkm6k5665b5kgp7jrk2-zlib-1.2.8/lib"
+    ```
+
+    :::
   */
   makeLibraryPath = makeSearchPathOutput "lib" "lib";
 
-  /* Construct an include search path (such as C_INCLUDE_PATH) containing the
-     header files for a set of packages or paths.
+  /**
+    Construct an include search path (such as C_INCLUDE_PATH) containing the
+    header files for a set of packages or paths.
 
-     Example:
-       makeIncludePath [ "/usr" "/usr/local" ]
-       => "/usr/include:/usr/local/include"
-       pkgs = import <nixpkgs> { }
-       makeIncludePath [ pkgs.openssl pkgs.zlib ]
-       => "/nix/store/9rz8gxhzf8sw4kf2j2f1grr49w8zx5vj-openssl-1.0.1r-dev/include:/nix/store/wwh7mhwh269sfjkm6k5665b5kgp7jrk2-zlib-1.2.8-dev/include"
+    # Inputs
+
+    `packages`
+    : List of packages
+
+    # Type
+
+    ```
+    makeIncludePath :: [package] -> string
+    ```
+
+    # Examples
+    :::{.example}
+    ## `lib.strings.makeIncludePath` usage example
+
+    ```nix
+    makeIncludePath [ "/usr" "/usr/local" ]
+    => "/usr/include:/usr/local/include"
+    pkgs = import <nixpkgs> { }
+    makeIncludePath [ pkgs.openssl pkgs.zlib ]
+    => "/nix/store/9rz8gxhzf8sw4kf2j2f1grr49w8zx5vj-openssl-1.0.1r-dev/include:/nix/store/wwh7mhwh269sfjkm6k5665b5kgp7jrk2-zlib-1.2.8-dev/include"
+    ```
+
+    :::
   */
   makeIncludePath = makeSearchPathOutput "dev" "include";
 
-  /* Construct a binary search path (such as $PATH) containing the
-     binaries for a set of packages.
+  /**
+    Construct a binary search path (such as $PATH) containing the
+    binaries for a set of packages.
 
-     Example:
-       makeBinPath ["/root" "/usr" "/usr/local"]
-       => "/root/bin:/usr/bin:/usr/local/bin"
+    # Inputs
+
+    `packages`
+    : List of packages
+
+    # Type
+
+    ```
+    makeBinPath :: [package] -> string
+    ```
+
+    # Examples
+    :::{.example}
+    ## `lib.strings.makeBinPath` usage example
+
+    ```nix
+    makeBinPath ["/root" "/usr" "/usr/local"]
+    => "/root/bin:/usr/bin:/usr/local/bin"
+    ```
+
+    :::
   */
   makeBinPath = makeSearchPathOutput "bin" "bin";
 
-  /* Normalize path, removing extraneous /s
+  /**
+    Normalize path, removing extraneous /s
 
-     Type: normalizePath :: string -> string
 
-     Example:
-       normalizePath "/a//b///c/"
-       => "/a/b/c/"
+    # Inputs
+
+    `s`
+    : 1\. Function argument
+
+    # Type
+
+    ```
+    normalizePath :: string -> string
+    ```
+
+    # Examples
+    :::{.example}
+    ## `lib.strings.normalizePath` usage example
+
+    ```nix
+    normalizePath "/a//b///c/"
+    => "/a/b/c/"
+    ```
+
+    :::
   */
   normalizePath = s:
     warnIf
@@ -313,37 +640,75 @@ rec {
           (stringToCharacters s)
       );
 
-  /* Depending on the boolean `cond', return either the given string
-     or the empty string. Useful to concatenate against a bigger string.
+  /**
+    Depending on the boolean `cond', return either the given string
+    or the empty string. Useful to concatenate against a bigger string.
 
-     Type: optionalString :: bool -> string -> string
 
-     Example:
-       optionalString true "some-string"
-       => "some-string"
-       optionalString false "some-string"
-       => ""
+    # Inputs
+
+    `cond`
+    : Condition
+
+    `string`
+    : String to return if condition is true
+
+    # Type
+
+    ```
+    optionalString :: bool -> string -> string
+    ```
+
+    # Examples
+    :::{.example}
+    ## `lib.strings.optionalString` usage example
+
+    ```nix
+    optionalString true "some-string"
+    => "some-string"
+    optionalString false "some-string"
+    => ""
+    ```
+
+    :::
   */
   optionalString =
-    # Condition
     cond:
-    # String to return if condition is true
     string: if cond then string else "";
 
-  /* Determine whether a string has given prefix.
+  /**
+    Determine whether a string has given prefix.
 
-     Type: hasPrefix :: string -> string -> bool
 
-     Example:
-       hasPrefix "foo" "foobar"
-       => true
-       hasPrefix "foo" "barfoo"
-       => false
+    # Inputs
+
+    `pref`
+    : Prefix to check for
+
+    `str`
+    : Input string
+
+    # Type
+
+    ```
+    hasPrefix :: string -> string -> bool
+    ```
+
+    # Examples
+    :::{.example}
+    ## `lib.strings.hasPrefix` usage example
+
+    ```nix
+    hasPrefix "foo" "foobar"
+    => true
+    hasPrefix "foo" "barfoo"
+    => false
+    ```
+
+    :::
   */
   hasPrefix =
-    # Prefix to check for
     pref:
-    # Input string
     str:
     # Before 23.05, paths would be copied to the store before converting them
     # to strings and comparing. This was surprising and confusing.
@@ -357,20 +722,39 @@ rec {
             You might want to use `lib.path.hasPrefix` instead, which correctly supports paths.''
       (substring 0 (stringLength pref) str == pref);
 
-  /* Determine whether a string has given suffix.
+  /**
+    Determine whether a string has given suffix.
 
-     Type: hasSuffix :: string -> string -> bool
 
-     Example:
-       hasSuffix "foo" "foobar"
-       => false
-       hasSuffix "foo" "barfoo"
-       => true
+    # Inputs
+
+    `suffix`
+    : Suffix to check for
+
+    `content`
+    : Input string
+
+    # Type
+
+    ```
+    hasSuffix :: string -> string -> bool
+    ```
+
+    # Examples
+    :::{.example}
+    ## `lib.strings.hasSuffix` usage example
+
+    ```nix
+    hasSuffix "foo" "foobar"
+    => false
+    hasSuffix "foo" "barfoo"
+    => true
+    ```
+
+    :::
   */
   hasSuffix =
-    # Suffix to check for
     suffix:
-    # Input string
     content:
     let
       lenContent = stringLength content;
@@ -390,19 +774,40 @@ rec {
         && substring (lenContent - lenSuffix) lenContent content == suffix
       );
 
-  /* Determine whether a string contains the given infix
+  /**
+    Determine whether a string contains the given infix
 
-    Type: hasInfix :: string -> string -> bool
 
-    Example:
-      hasInfix "bc" "abcd"
-      => true
-      hasInfix "ab" "abcd"
-      => true
-      hasInfix "cd" "abcd"
-      => true
-      hasInfix "foo" "abcd"
-      => false
+    # Inputs
+
+    `infix`
+    : 1\. Function argument
+
+    `content`
+    : 2\. Function argument
+
+    # Type
+
+    ```
+    hasInfix :: string -> string -> bool
+    ```
+
+    # Examples
+    :::{.example}
+    ## `lib.strings.hasInfix` usage example
+
+    ```nix
+    hasInfix "bc" "abcd"
+    => true
+    hasInfix "ab" "abcd"
+    => true
+    hasInfix "cd" "abcd"
+    => true
+    hasInfix "foo" "abcd"
+    => false
+    ```
+
+    :::
   */
   hasInfix = infix: content:
     # Before 23.05, paths would be copied to the store before converting them
@@ -416,35 +821,74 @@ rec {
             This behavior is deprecated and will throw an error in the future.''
       (builtins.match ".*${escapeRegex infix}.*" "${content}" != null);
 
-  /* Convert a string to a list of characters (i.e. singleton strings).
-     This allows you to, e.g., map a function over each character.  However,
-     note that this will likely be horribly inefficient; Nix is not a
-     general purpose programming language. Complex string manipulations
-     should, if appropriate, be done in a derivation.
-     Also note that Nix treats strings as a list of bytes and thus doesn't
-     handle unicode.
+  /**
+    Convert a string `s` to a list of characters (i.e. singleton strings).
+    This allows you to, e.g., map a function over each character.  However,
+    note that this will likely be horribly inefficient; Nix is not a
+    general purpose programming language. Complex string manipulations
+    should, if appropriate, be done in a derivation.
+    Also note that Nix treats strings as a list of bytes and thus doesn't
+    handle unicode.
 
-     Type: stringToCharacters :: string -> [string]
 
-     Example:
-       stringToCharacters ""
-       => [ ]
-       stringToCharacters "abc"
-       => [ "a" "b" "c" ]
-       stringToCharacters "🦄"
-       => [ "�" "�" "�" "�" ]
+    # Inputs
+
+    `s`
+    : 1\. Function argument
+
+    # Type
+
+    ```
+    stringToCharacters :: string -> [string]
+    ```
+
+    # Examples
+    :::{.example}
+    ## `lib.strings.stringToCharacters` usage example
+
+    ```nix
+    stringToCharacters ""
+    => [ ]
+    stringToCharacters "abc"
+    => [ "a" "b" "c" ]
+    stringToCharacters "🦄"
+    => [ "�" "�" "�" "�" ]
+    ```
+
+    :::
   */
   stringToCharacters = s:
     genList (p: substring p 1 s) (stringLength s);
 
-  /* Manipulate a string character by character and replace them by
-     strings before concatenating the results.
+  /**
+    Manipulate a string character by character and replace them by
+    strings before concatenating the results.
 
-     Type: stringAsChars :: (string -> string) -> string -> string
 
-     Example:
-       stringAsChars (x: if x == "a" then "i" else x) "nax"
-       => "nix"
+    # Inputs
+
+    `f`
+    : Function to map over each individual character
+
+    `s`
+    : Input string
+
+    # Type
+
+    ```
+    stringAsChars :: (string -> string) -> string -> string
+    ```
+
+    # Examples
+    :::{.example}
+    ## `lib.strings.stringAsChars` usage example
+
+    ```nix
+    stringAsChars (x: if x == "a" then "i" else x) "nax"
+    => "nix"
+    ```
+
+    :::
   */
   stringAsChars =
     # Function to map over each individual character
@@ -454,51 +898,126 @@ rec {
       map f (stringToCharacters s)
     );
 
-  /* Convert char to ascii value, must be in printable range
+  /**
+    Convert char to ascii value, must be in printable range
 
-     Type: charToInt :: string -> int
 
-     Example:
-       charToInt "A"
-       => 65
-       charToInt "("
-       => 40
+    # Inputs
 
+    `c`
+    : 1\. Function argument
+
+    # Type
+
+    ```
+    charToInt :: string -> int
+    ```
+
+    # Examples
+    :::{.example}
+    ## `lib.strings.charToInt` usage example
+
+    ```nix
+    charToInt "A"
+    => 65
+    charToInt "("
+    => 40
+    ```
+
+    :::
   */
   charToInt = c: builtins.getAttr c asciiTable;
 
-  /* Escape occurrence of the elements of `list` in `string` by
-     prefixing it with a backslash.
+  /**
+    Escape occurrence of the elements of `list` in `string` by
+    prefixing it with a backslash.
 
-     Type: escape :: [string] -> string -> string
 
-     Example:
-       escape ["(" ")"] "(foo)"
-       => "\\(foo\\)"
+    # Inputs
+
+    `list`
+    : 1\. Function argument
+
+    `string`
+    : 2\. Function argument
+
+    # Type
+
+    ```
+    escape :: [string] -> string -> string
+    ```
+
+    # Examples
+    :::{.example}
+    ## `lib.strings.escape` usage example
+
+    ```nix
+    escape ["(" ")"] "(foo)"
+    => "\\(foo\\)"
+    ```
+
+    :::
   */
   escape = list: replaceStrings list (map (c: "\\${c}") list);
 
-  /* Escape occurrence of the element of `list` in `string` by
-     converting to its ASCII value and prefixing it with \\x.
-     Only works for printable ascii characters.
+  /**
+    Escape occurrence of the element of `list` in `string` by
+    converting to its ASCII value and prefixing it with \\x.
+    Only works for printable ascii characters.
 
-     Type: escapeC = [string] -> string -> string
 
-     Example:
-       escapeC [" "] "foo bar"
-       => "foo\\x20bar"
+    # Inputs
 
+    `list`
+    : 1\. Function argument
+
+    `string`
+    : 2\. Function argument
+
+    # Type
+
+    ```
+    escapeC = [string] -> string -> string
+    ```
+
+    # Examples
+    :::{.example}
+    ## `lib.strings.escapeC` usage example
+
+    ```nix
+    escapeC [" "] "foo bar"
+    => "foo\\x20bar"
+    ```
+
+    :::
   */
   escapeC = list: replaceStrings list (map (c: "\\x${ toLower (lib.toHexString (charToInt c))}") list);
 
-  /* Escape the string so it can be safely placed inside a URL
-     query.
+  /**
+    Escape the `string` so it can be safely placed inside a URL
+    query.
 
-     Type: escapeURL :: string -> string
+    # Inputs
 
-     Example:
-       escapeURL "foo/bar baz"
-       => "foo%2Fbar%20baz"
+    `string`
+    : 1\. Function argument
+
+    # Type
+
+    ```
+    escapeURL :: string -> string
+    ```
+
+    # Examples
+    :::{.example}
+    ## `lib.strings.escapeURL` usage example
+
+    ```nix
+    escapeURL "foo/bar baz"
+    => "foo%2Fbar%20baz"
+    ```
+
+    :::
   */
   escapeURL = let
     unreserved = [ "A" "B" "C" "D" "E" "F" "G" "H" "I" "J" "K" "L" "M" "N" "O" "P" "Q" "R" "S" "T" "U" "V" "W" "X" "Y" "Z" "a" "b" "c" "d" "e" "f" "g" "h" "i" "j" "k" "l" "m" "n" "o" "p" "q" "r" "s" "t" "u" "v" "w" "x" "y" "z" "0" "1" "2" "3" "4" "5" "6" "7" "8" "9" "-" "_" "." "~" ];
@@ -506,55 +1025,129 @@ rec {
   in
     replaceStrings (builtins.attrNames toEscape) (lib.mapAttrsToList (_: c: "%${fixedWidthString 2 "0" (lib.toHexString c)}") toEscape);
 
-  /* Quote string to be used safely within the Bourne shell.
+  /**
+    Quote `string` to be used safely within the Bourne shell.
 
-     Type: escapeShellArg :: string -> string
 
-     Example:
-       escapeShellArg "esc'ape\nme"
-       => "'esc'\\''ape\nme'"
+    # Inputs
+
+    `string`
+    : 1\. Function argument
+
+    # Type
+
+    ```
+    escapeShellArg :: string -> string
+    ```
+
+    # Examples
+    :::{.example}
+    ## `lib.strings.escapeShellArg` usage example
+
+    ```nix
+    escapeShellArg "esc'ape\nme"
+    => "'esc'\\''ape\nme'"
+    ```
+
+    :::
   */
   escapeShellArg = arg: "'${replaceStrings ["'"] ["'\\''"] (toString arg)}'";
 
-  /* Quote all arguments to be safely passed to the Bourne shell.
+  /**
+    Quote all arguments to be safely passed to the Bourne shell.
 
-     Type: escapeShellArgs :: [string] -> string
+    # Inputs
 
-     Example:
-       escapeShellArgs ["one" "two three" "four'five"]
-       => "'one' 'two three' 'four'\\''five'"
+    `args`
+    : 1\. Function argument
+
+    # Type
+
+    ```
+    escapeShellArgs :: [string] -> string
+    ```
+
+    # Examples
+    :::{.example}
+    ## `lib.strings.escapeShellArgs` usage example
+
+    ```nix
+    escapeShellArgs ["one" "two three" "four'five"]
+    => "'one' 'two three' 'four'\\''five'"
+    ```
+
+    :::
   */
   escapeShellArgs = concatMapStringsSep " " escapeShellArg;
 
-  /* Test whether the given name is a valid POSIX shell variable name.
+  /**
+    Test whether the given `name` is a valid POSIX shell variable name.
 
-     Type: string -> bool
 
-     Example:
-       isValidPosixName "foo_bar000"
-       => true
-       isValidPosixName "0-bad.jpg"
-       => false
+    # Inputs
+
+    `name`
+    : 1\. Function argument
+
+    # Type
+
+    ```
+    string -> bool
+    ```
+
+    # Examples
+    :::{.example}
+    ## `lib.strings.isValidPosixName` usage example
+
+    ```nix
+    isValidPosixName "foo_bar000"
+    => true
+    isValidPosixName "0-bad.jpg"
+    => false
+    ```
+
+    :::
   */
   isValidPosixName = name: match "[a-zA-Z_][a-zA-Z0-9_]*" name != null;
 
-  /* Translate a Nix value into a shell variable declaration, with proper escaping.
+  /**
+    Translate a Nix value into a shell variable declaration, with proper escaping.
 
-     The value can be a string (mapped to a regular variable), a list of strings
-     (mapped to a Bash-style array) or an attribute set of strings (mapped to a
-     Bash-style associative array). Note that "string" includes string-coercible
-     values like paths or derivations.
+    The value can be a string (mapped to a regular variable), a list of strings
+    (mapped to a Bash-style array) or an attribute set of strings (mapped to a
+    Bash-style associative array). Note that "string" includes string-coercible
+    values like paths or derivations.
 
-     Strings are translated into POSIX sh-compatible code; lists and attribute sets
-     assume a shell that understands Bash syntax (e.g. Bash or ZSH).
+    Strings are translated into POSIX sh-compatible code; lists and attribute sets
+    assume a shell that understands Bash syntax (e.g. Bash or ZSH).
 
-     Type: string -> (string | listOf string | attrsOf string) -> string
 
-     Example:
-       ''
-         ${toShellVar "foo" "some string"}
-         [[ "$foo" == "some string" ]]
-       ''
+    # Inputs
+
+    `name`
+    : 1\. Function argument
+
+    `value`
+    : 2\. Function argument
+
+    # Type
+
+    ```
+    string -> ( string | [string] | { ${name} :: string; } ) -> string
+    ```
+
+    # Examples
+    :::{.example}
+    ## `lib.strings.toShellVar` usage example
+
+    ```nix
+    ''
+      ${toShellVar "foo" "some string"}
+      [[ "$foo" == "some string" ]]
+    ''
+    ```
+
+    :::
   */
   toShellVar = name: value:
     lib.throwIfNot (isValidPosixName name) "toShellVar: ${name} is not a valid shell variable name" (
@@ -570,65 +1163,154 @@ rec {
       "${name}=${escapeShellArg value}"
     );
 
-  /* Translate an attribute set into corresponding shell variable declarations
-     using `toShellVar`.
+  /**
+    Translate an attribute set `vars` into corresponding shell variable declarations
+    using `toShellVar`.
 
-     Type: attrsOf (string | listOf string | attrsOf string) -> string
 
-     Example:
-       let
-         foo = "value";
-         bar = foo;
-       in ''
-         ${toShellVars { inherit foo bar; }}
-         [[ "$foo" == "$bar" ]]
-       ''
+    # Inputs
+
+    `vars`
+    : 1\. Function argument
+
+    # Type
+
+    ```
+    toShellVars :: {
+      ${name} :: string | [ string ] | { ${key} :: string; };
+    } -> string
+    ```
+
+    # Examples
+    :::{.example}
+    ## `lib.strings.toShellVars` usage example
+
+    ```nix
+    let
+      foo = "value";
+      bar = foo;
+    in ''
+      ${toShellVars { inherit foo bar; }}
+      [[ "$foo" == "$bar" ]]
+    ''
+    ```
+
+    :::
   */
   toShellVars = vars: concatStringsSep "\n" (lib.mapAttrsToList toShellVar vars);
 
-  /* Turn a string into a Nix expression representing that string
+  /**
+    Turn a string `s` into a Nix expression representing that string
 
-     Type: string -> string
+    # Inputs
 
-     Example:
-       escapeNixString "hello\${}\n"
-       => "\"hello\\\${}\\n\""
+    `s`
+    : 1\. Function argument
+
+    # Type
+
+    ```
+    escapeNixString :: string -> string
+    ```
+
+    # Examples
+    :::{.example}
+    ## `lib.strings.escapeNixString` usage example
+
+    ```nix
+    escapeNixString "hello\${}\n"
+    => "\"hello\\\${}\\n\""
+    ```
+
+    :::
   */
   escapeNixString = s: escape ["$"] (toJSON s);
 
-  /* Turn a string into an exact regular expression
+  /**
+    Turn a string `s` into an exact regular expression
 
-     Type: string -> string
+    # Inputs
 
-     Example:
-       escapeRegex "[^a-z]*"
-       => "\\[\\^a-z]\\*"
+    `s`
+    : 1\. Function argument
+
+    # Type
+
+    ```
+    escapeRegex :: string -> string
+    ```
+
+    # Examples
+    :::{.example}
+    ## `lib.strings.escapeRegex` usage example
+
+    ```nix
+    escapeRegex "[^a-z]*"
+    => "\\[\\^a-z]\\*"
+    ```
+
+    :::
   */
   escapeRegex = escape (stringToCharacters "\\[{()^$?*+|.");
 
-  /* Quotes a string if it can't be used as an identifier directly.
+  /**
+    Quotes a string `s` if it can't be used as an identifier directly.
 
-     Type: string -> string
 
-     Example:
-       escapeNixIdentifier "hello"
-       => "hello"
-       escapeNixIdentifier "0abc"
-       => "\"0abc\""
+    # Inputs
+
+    `s`
+    : 1\. Function argument
+
+    # Type
+
+    ```
+    escapeNixIdentifier :: string -> string
+    ```
+
+    # Examples
+    :::{.example}
+    ## `lib.strings.escapeNixIdentifier` usage example
+
+    ```nix
+    escapeNixIdentifier "hello"
+    => "hello"
+    escapeNixIdentifier "0abc"
+    => "\"0abc\""
+    ```
+
+    :::
   */
   escapeNixIdentifier = s:
     # Regex from https://github.com/NixOS/nix/blob/d048577909e383439c2549e849c5c2f2016c997e/src/libexpr/lexer.l#L91
     if match "[a-zA-Z_][a-zA-Z0-9_'-]*" s != null
     then s else escapeNixString s;
 
-  /* Escapes a string such that it is safe to include verbatim in an XML
-     document.
+  /**
+    Escapes a string `s` such that it is safe to include verbatim in an XML
+    document.
 
-     Type: string -> string
+    # Inputs
 
-     Example:
-       escapeXML ''"test" 'test' < & >''
-       => "&quot;test&quot; &apos;test&apos; &lt; &amp; &gt;"
+    `s`
+    : 1\. Function argument
+
+    # Type
+
+    ```
+    escapeXML :: string -> string
+    ```
+
+    # Examples
+    :::{.example}
+    ## `lib.strings.escapeXML` usage example
+
+    ```nix
+    escapeXML ''"test" 'test' < & >''
+    => "&quot;test&quot; &apos;test&apos; &lt; &amp; &gt;"
+    ```
+
+    :::
   */
   escapeXML = builtins.replaceStrings
     ["\"" "'" "<" ">" "&"]
@@ -641,49 +1323,144 @@ rec {
   lowerChars = stringToCharacters "abcdefghijklmnopqrstuvwxyz";
   upperChars = stringToCharacters "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
 
-  /* Converts an ASCII string to lower-case.
+  /**
+    Converts an ASCII string `s` to lower-case.
 
-     Type: toLower :: string -> string
+    # Inputs
 
-     Example:
-       toLower "HOME"
-       => "home"
+    `s`
+    : The string to convert to lower-case.
+
+    # Type
+
+    ```
+    toLower :: string -> string
+    ```
+
+    # Examples
+    :::{.example}
+    ## `lib.strings.toLower` usage example
+
+    ```nix
+    toLower "HOME"
+    => "home"
+    ```
+
+    :::
   */
   toLower = replaceStrings upperChars lowerChars;
 
-  /* Converts an ASCII string to upper-case.
+  /**
+    Converts an ASCII string `s` to upper-case.
 
-     Type: toUpper :: string -> string
+    # Inputs
 
-     Example:
-       toUpper "home"
-       => "HOME"
+    `s`
+    : The string to convert to upper-case.
+
+
+    # Type
+
+    ```
+    toUpper :: string -> string
+    ```
+
+    # Examples
+    :::{.example}
+    ## `lib.strings.toUpper` usage example
+
+    ```nix
+    toUpper "home"
+    => "HOME"
+    ```
+
+    :::
   */
   toUpper = replaceStrings lowerChars upperChars;
 
-  /* Appends string context from another string.  This is an implementation
-     detail of Nix and should be used carefully.
+  /**
+    Appends string context from string like object `src` to `target`.
 
-     Strings in Nix carry an invisible `context` which is a list of strings
-     representing store paths.  If the string is later used in a derivation
-     attribute, the derivation will properly populate the inputDrvs and
-     inputSrcs.
+    :::{.warning}
+    This is an implementation
+    detail of Nix and should be used carefully.
+    :::
 
-     Example:
-       pkgs = import <nixpkgs> { };
-       addContextFrom pkgs.coreutils "bar"
-       => "bar"
+    Strings in Nix carry an invisible `context` which is a list of strings
+    representing store paths. If the string is later used in a derivation
+    attribute, the derivation will properly populate the inputDrvs and
+    inputSrcs.
+
+
+    # Inputs
+
+    `src`
+    : The string to take the context from. If the argument is not a string,
+      it will be implicitly converted to a string.
+
+    `target`
+    : The string to append the context to. If the argument is not a string,
+      it will be implicitly converted to a string.
+
+    # Type
+
+    ```
+    addContextFrom :: string -> string -> string
+    ```
+
+    # Examples
+    :::{.example}
+    ## `lib.strings.addContextFrom` usage example
+
+    ```nix
+    pkgs = import <nixpkgs> { };
+    addContextFrom pkgs.coreutils "bar"
+    => "bar"
+    ```
+
+    The context can be displayed using the `toString` function:
+
+    ```nix
+    nix-repl> builtins.getContext (lib.strings.addContextFrom pkgs.coreutils "bar")
+    {
+      "/nix/store/m1s1d2dk2dqqlw3j90jl3cjy2cykbdxz-coreutils-9.5.drv" = { ... };
+    }
+    ```
+
+    :::
   */
-  addContextFrom = a: b: substring 0 0 a + b;
+  addContextFrom = src: target: substring 0 0 src + target;
 
-  /* Cut a string with a separator and produces a list of strings which
-     were separated by this separator.
+  /**
+    Cut a string with a separator and produces a list of strings which
+    were separated by this separator.
 
-     Example:
-       splitString "." "foo.bar.baz"
-       => [ "foo" "bar" "baz" ]
-       splitString "/" "/usr/local/bin"
-       => [ "" "usr" "local" "bin" ]
+    # Inputs
+
+    `sep`
+    : 1\. Function argument
+
+    `s`
+    : 2\. Function argument
+
+    # Type
+
+    ```
+    splitString :: string -> string -> [string]
+    ```
+
+    # Examples
+    :::{.example}
+    ## `lib.strings.splitString` usage example
+
+    ```nix
+    splitString "." "foo.bar.baz"
+    => [ "foo" "bar" "baz" ]
+    splitString "/" "/usr/local/bin"
+    => [ "" "usr" "local" "bin" ]
+    ```
+
+    :::
   */
   splitString = sep: s:
     let
@@ -691,20 +1468,39 @@ rec {
     in
       map (addContextFrom s) splits;
 
-  /* Return a string without the specified prefix, if the prefix matches.
 
-     Type: string -> string -> string
+  /**
+    Return a string without the specified prefix, if the prefix matches.
 
-     Example:
-       removePrefix "foo." "foo.bar.baz"
-       => "bar.baz"
-       removePrefix "xxx" "foo.bar.baz"
-       => "foo.bar.baz"
+    # Inputs
+
+    `prefix`
+    : Prefix to remove if it matches
+
+    `str`
+    : Input string
+
+    # Type
+
+    ```
+    removePrefix :: string -> string -> string
+    ```
+
+    # Examples
+    :::{.example}
+    ## `lib.strings.removePrefix` usage example
+
+    ```nix
+    removePrefix "foo." "foo.bar.baz"
+    => "bar.baz"
+    removePrefix "xxx" "foo.bar.baz"
+    => "foo.bar.baz"
+    ```
+
+    :::
   */
   removePrefix =
-    # Prefix to remove if it matches
     prefix:
-    # Input string
     str:
     # Before 23.05, paths would be copied to the store before converting them
     # to strings and comparing. This was surprising and confusing.
@@ -724,20 +1520,39 @@ rec {
       else
         str);
 
-  /* Return a string without the specified suffix, if the suffix matches.
+  /**
+    Return a string without the specified suffix, if the suffix matches.
 
-     Type: string -> string -> string
 
-     Example:
-       removeSuffix "front" "homefront"
-       => "home"
-       removeSuffix "xxx" "homefront"
-       => "homefront"
+    # Inputs
+
+    `suffix`
+    : Suffix to remove if it matches
+
+    `str`
+    : Input string
+
+    # Type
+
+    ```
+    removeSuffix :: string -> string -> string
+    ```
+
+    # Examples
+    :::{.example}
+    ## `lib.strings.removeSuffix` usage example
+
+    ```nix
+    removeSuffix "front" "homefront"
+    => "home"
+    removeSuffix "xxx" "homefront"
+    => "homefront"
+    ```
+
+    :::
   */
   removeSuffix =
-    # Suffix to remove if it matches
     suffix:
-    # Input string
     str:
     # Before 23.05, paths would be copied to the store before converting them
     # to strings and comparing. This was surprising and confusing.
@@ -757,37 +1572,103 @@ rec {
       else
         str);
 
-  /* Return true if string v1 denotes a version older than v2.
+  /**
+    Return true if string `v1` denotes a version older than `v2`.
 
-     Example:
-       versionOlder "1.1" "1.2"
-       => true
-       versionOlder "1.1" "1.1"
-       => false
+
+    # Inputs
+
+    `v1`
+    : 1\. Function argument
+
+    `v2`
+    : 2\. Function argument
+
+    # Type
+
+    ```
+    versionOlder :: String -> String -> Bool
+    ```
+
+    # Examples
+    :::{.example}
+    ## `lib.strings.versionOlder` usage example
+
+    ```nix
+    versionOlder "1.1" "1.2"
+    => true
+    versionOlder "1.1" "1.1"
+    => false
+    ```
+
+    :::
   */
   versionOlder = v1: v2: compareVersions v2 v1 == 1;
 
-  /* Return true if string v1 denotes a version equal to or newer than v2.
+  /**
+    Return true if string v1 denotes a version equal to or newer than v2.
 
-     Example:
-       versionAtLeast "1.1" "1.0"
-       => true
-       versionAtLeast "1.1" "1.1"
-       => true
-       versionAtLeast "1.1" "1.2"
-       => false
+
+    # Inputs
+
+    `v1`
+    : 1\. Function argument
+
+    `v2`
+    : 2\. Function argument
+
+    # Type
+
+    ```
+    versionAtLeast :: String -> String -> Bool
+    ```
+
+    # Examples
+    :::{.example}
+    ## `lib.strings.versionAtLeast` usage example
+
+    ```nix
+    versionAtLeast "1.1" "1.0"
+    => true
+    versionAtLeast "1.1" "1.1"
+    => true
+    versionAtLeast "1.1" "1.2"
+    => false
+    ```
+
+    :::
   */
   versionAtLeast = v1: v2: !versionOlder v1 v2;
 
-  /* This function takes an argument that's either a derivation or a
-     derivation's "name" attribute and extracts the name part from that
-     argument.
+  /**
+    This function takes an argument `x` that's either a derivation or a
+    derivation's "name" attribute and extracts the name part from that
+    argument.
 
-     Example:
-       getName "youtube-dl-2016.01.01"
-       => "youtube-dl"
-       getName pkgs.youtube-dl
-       => "youtube-dl"
+    # Inputs
+
+    `x`
+    : 1\. Function argument
+
+    # Type
+
+    ```
+    getName :: String | Derivation -> String
+    ```
+
+
+    # Examples
+    :::{.example}
+    ## `lib.strings.getName` usage example
+
+    ```nix
+    getName "youtube-dl-2016.01.01"
+    => "youtube-dl"
+    getName pkgs.youtube-dl
+    => "youtube-dl"
+    ```
+
+    :::
   */
   getName = let
     parse = drv: (parseDrvName drv).name;
@@ -796,15 +1677,35 @@ rec {
     then parse x
     else x.pname or (parse x.name);
 
-  /* This function takes an argument that's either a derivation or a
-     derivation's "name" attribute and extracts the version part from that
-     argument.
+  /**
+    This function takes an argument `x` that's either a derivation or a
+    derivation's "name" attribute and extracts the version part from that
+    argument.
 
-     Example:
-       getVersion "youtube-dl-2016.01.01"
-       => "2016.01.01"
-       getVersion pkgs.youtube-dl
-       => "2016.01.01"
+
+    # Inputs
+
+    `x`
+    : 1\. Function argument
+
+    # Type
+
+    ```
+    getVersion :: String | Derivation -> String
+    ```
+
+    # Examples
+    :::{.example}
+    ## `lib.strings.getVersion` usage example
+
+    ```nix
+    getVersion "youtube-dl-2016.01.01"
+    => "2016.01.01"
+    getVersion pkgs.youtube-dl
+    => "2016.01.01"
+    ```
+
+    :::
   */
   getVersion = let
     parse = drv: (parseDrvName drv).version;
@@ -813,14 +1714,38 @@ rec {
     then parse x
     else x.version or (parse x.name);
 
-  /* Extract name with version from URL. Ask for separator which is
-     supposed to start extension.
+  /**
+    Extract name and version from a URL as shown in the examples.
 
-     Example:
-       nameFromURL "https://nixos.org/releases/nix/nix-1.7/nix-1.7-x86_64-linux.tar.bz2" "-"
-       => "nix"
-       nameFromURL "https://nixos.org/releases/nix/nix-1.7/nix-1.7-x86_64-linux.tar.bz2" "_"
-       => "nix-1.7-x86"
+    Separator `sep` is used to determine the end of the extension.
+
+
+    # Inputs
+
+    `url`
+    : 1\. Function argument
+
+    `sep`
+    : 2\. Function argument
+
+    # Type
+
+    ```
+    nameFromURL :: String -> String
+    ```
+
+    # Examples
+    :::{.example}
+    ## `lib.strings.nameFromURL` usage example
+
+    ```nix
+    nameFromURL "https://nixos.org/releases/nix/nix-1.7/nix-1.7-x86_64-linux.tar.bz2" "-"
+    => "nix"
+    nameFromURL "https://nixos.org/releases/nix/nix-1.7/nix-1.7-x86_64-linux.tar.bz2" "_"
+    => "nix-1.7-x86"
+    ```
+
+    :::
   */
   nameFromURL = url: sep:
     let
@@ -829,21 +1754,40 @@ rec {
       name = head (splitString sep filename);
     in assert name != filename; name;
 
-  /* Create a "-D<feature>:<type>=<value>" string that can be passed to typical
-     CMake invocations.
+  /**
+    Create a `"-D<feature>:<type>=<value>"` string that can be passed to typical
+    CMake invocations.
 
-    Type: cmakeOptionType :: string -> string -> string -> string
+    # Inputs
 
-     @param feature The feature to be set
-     @param type The type of the feature to be set, as described in
-                 https://cmake.org/cmake/help/latest/command/set.html
-                 the possible values (case insensitive) are:
-                 BOOL FILEPATH PATH STRING INTERNAL
-     @param value The desired value
+    `feature`
+    : The feature to be set
 
-     Example:
-       cmakeOptionType "string" "ENGINE" "sdl2"
-       => "-DENGINE:STRING=sdl2"
+    `type`
+    : The type of the feature to be set, as described in
+      https://cmake.org/cmake/help/latest/command/set.html
+      the possible values (case insensitive) are:
+      BOOL FILEPATH PATH STRING INTERNAL
+
+    `value`
+    : The desired value
+
+    # Type
+
+    ```
+    cmakeOptionType :: string -> string -> string -> string
+    ```
+
+    # Examples
+    :::{.example}
+    ## `lib.strings.cmakeOptionType` usage example
+
+    ```nix
+    cmakeOptionType "string" "ENGINE" "sdl2"
+    => "-DENGINE:STRING=sdl2"
+    ```
+
+    :::
   */
   cmakeOptionType = let
     types = [ "BOOL" "FILEPATH" "PATH" "STRING" "INTERNAL" ];
@@ -853,158 +1797,373 @@ rec {
     assert (isString value);
     "-D${feature}:${toUpper type}=${value}";
 
-  /* Create a -D<condition>={TRUE,FALSE} string that can be passed to typical
-     CMake invocations.
+  /**
+    Create a -D<condition>={TRUE,FALSE} string that can be passed to typical
+    CMake invocations.
 
-    Type: cmakeBool :: string -> bool -> string
 
-     @param condition The condition to be made true or false
-     @param flag The controlling flag of the condition
+    # Inputs
 
-     Example:
-       cmakeBool "ENABLE_STATIC_LIBS" false
-       => "-DENABLESTATIC_LIBS:BOOL=FALSE"
+    `condition`
+    : The condition to be made true or false
+
+    `flag`
+    : The controlling flag of the condition
+
+    # Type
+
+    ```
+    cmakeBool :: string -> bool -> string
+    ```
+
+    # Examples
+    :::{.example}
+    ## `lib.strings.cmakeBool` usage example
+
+    ```nix
+    cmakeBool "ENABLE_STATIC_LIBS" false
+    => "-DENABLESTATIC_LIBS:BOOL=FALSE"
+    ```
+
+    :::
   */
   cmakeBool = condition: flag:
     assert (lib.isString condition);
     assert (lib.isBool flag);
     cmakeOptionType "bool" condition (lib.toUpper (lib.boolToString flag));
 
-  /* Create a -D<feature>:STRING=<value> string that can be passed to typical
-     CMake invocations.
-     This is the most typical usage, so it deserves a special case.
+  /**
+    Create a -D<feature>:STRING=<value> string that can be passed to typical
+    CMake invocations.
+    This is the most typical usage, so it deserves a special case.
 
-    Type: cmakeFeature :: string -> string -> string
 
-     @param condition The condition to be made true or false
-     @param flag The controlling flag of the condition
+    # Inputs
 
-     Example:
-       cmakeFeature "MODULES" "badblock"
-       => "-DMODULES:STRING=badblock"
+    `feature`
+    : The feature to be set
+
+    `value`
+    : The desired value
+
+
+    # Type
+
+    ```
+    cmakeFeature :: string -> string -> string
+    ```
+
+    # Examples
+    :::{.example}
+    ## `lib.strings.cmakeFeature` usage example
+
+    ```nix
+    cmakeFeature "MODULES" "badblock"
+    => "-DMODULES:STRING=badblock"
+    ```
+
+    :::
   */
   cmakeFeature = feature: value:
     assert (lib.isString feature);
     assert (lib.isString value);
     cmakeOptionType "string" feature value;
 
-  /* Create a -D<feature>=<value> string that can be passed to typical Meson
-     invocations.
+  /**
+    Create a -D<feature>=<value> string that can be passed to typical Meson
+    invocations.
 
-    Type: mesonOption :: string -> string -> string
 
-     @param feature The feature to be set
-     @param value The desired value
+    # Inputs
 
-     Example:
-       mesonOption "engine" "opengl"
-       => "-Dengine=opengl"
+    `feature`
+    : The feature to be set
+
+    `value`
+    : The desired value
+
+    # Type
+
+    ```
+    mesonOption :: string -> string -> string
+    ```
+
+    # Examples
+    :::{.example}
+    ## `lib.strings.mesonOption` usage example
+
+    ```nix
+    mesonOption "engine" "opengl"
+    => "-Dengine=opengl"
+    ```
+
+    :::
   */
   mesonOption = feature: value:
     assert (lib.isString feature);
     assert (lib.isString value);
     "-D${feature}=${value}";
 
-  /* Create a -D<condition>={true,false} string that can be passed to typical
-     Meson invocations.
+  /**
+    Create a -D<condition>={true,false} string that can be passed to typical
+    Meson invocations.
 
-    Type: mesonBool :: string -> bool -> string
 
-     @param condition The condition to be made true or false
-     @param flag The controlling flag of the condition
+    # Inputs
 
-     Example:
-       mesonBool "hardened" true
-       => "-Dhardened=true"
-       mesonBool "static" false
-       => "-Dstatic=false"
+    `condition`
+    : The condition to be made true or false
+
+    `flag`
+    : The controlling flag of the condition
+
+    # Type
+
+    ```
+    mesonBool :: string -> bool -> string
+    ```
+
+    # Examples
+    :::{.example}
+    ## `lib.strings.mesonBool` usage example
+
+    ```nix
+    mesonBool "hardened" true
+    => "-Dhardened=true"
+    mesonBool "static" false
+    => "-Dstatic=false"
+    ```
+
+    :::
   */
   mesonBool = condition: flag:
     assert (lib.isString condition);
     assert (lib.isBool flag);
     mesonOption condition (lib.boolToString flag);
 
-  /* Create a -D<feature>={enabled,disabled} string that can be passed to
-     typical Meson invocations.
+  /**
+    Create a -D<feature>={enabled,disabled} string that can be passed to
+    typical Meson invocations.
 
-    Type: mesonEnable :: string -> bool -> string
 
-     @param feature The feature to be enabled or disabled
-     @param flag The controlling flag
+    # Inputs
 
-     Example:
-       mesonEnable "docs" true
-       => "-Ddocs=enabled"
-       mesonEnable "savage" false
-       => "-Dsavage=disabled"
+    `feature`
+    : The feature to be enabled or disabled
+
+    `flag`
+    : The controlling flag
+
+    # Type
+
+    ```
+    mesonEnable :: string -> bool -> string
+    ```
+
+    # Examples
+    :::{.example}
+    ## `lib.strings.mesonEnable` usage example
+
+    ```nix
+    mesonEnable "docs" true
+    => "-Ddocs=enabled"
+    mesonEnable "savage" false
+    => "-Dsavage=disabled"
+    ```
+
+    :::
   */
   mesonEnable = feature: flag:
     assert (lib.isString feature);
     assert (lib.isBool flag);
     mesonOption feature (if flag then "enabled" else "disabled");
 
-  /* Create an --{enable,disable}-<feature> string that can be passed to
-     standard GNU Autoconf scripts.
+  /**
+    Create an --{enable,disable}-<feature> string that can be passed to
+    standard GNU Autoconf scripts.
 
-     Example:
-       enableFeature true "shared"
-       => "--enable-shared"
-       enableFeature false "shared"
-       => "--disable-shared"
+
+    # Inputs
+
+    `flag`
+    : 1\. Function argument
+
+    `feature`
+    : 2\. Function argument
+
+    # Type
+
+    ```
+    enableFeature :: bool -> string -> string
+    ```
+
+    # Examples
+    :::{.example}
+    ## `lib.strings.enableFeature` usage example
+
+    ```nix
+    enableFeature true "shared"
+    => "--enable-shared"
+    enableFeature false "shared"
+    => "--disable-shared"
+    ```
+
+    :::
   */
   enableFeature = flag: feature:
     assert lib.isBool flag;
     assert lib.isString feature; # e.g. passing openssl instead of "openssl"
     "--${if flag then "enable" else "disable"}-${feature}";
 
-  /* Create an --{enable-<feature>=<value>,disable-<feature>} string that can be passed to
-     standard GNU Autoconf scripts.
+  /**
+    Create an --{enable-<feature>=<value>,disable-<feature>} string that can be passed to
+    standard GNU Autoconf scripts.
 
-     Example:
-       enableFeatureAs true "shared" "foo"
-       => "--enable-shared=foo"
-       enableFeatureAs false "shared" (throw "ignored")
-       => "--disable-shared"
+
+    # Inputs
+
+    `flag`
+    : 1\. Function argument
+
+    `feature`
+    : 2\. Function argument
+
+    `value`
+    : 3\. Function argument
+
+    # Type
+
+    ```
+    enableFeatureAs :: bool -> string -> string -> string
+    ```
+
+    # Examples
+    :::{.example}
+    ## `lib.strings.enableFeatureAs` usage example
+
+    ```nix
+    enableFeatureAs true "shared" "foo"
+    => "--enable-shared=foo"
+    enableFeatureAs false "shared" (throw "ignored")
+    => "--disable-shared"
+    ```
+
+    :::
   */
   enableFeatureAs = flag: feature: value:
     enableFeature flag feature + optionalString flag "=${value}";
 
-  /* Create an --{with,without}-<feature> string that can be passed to
-     standard GNU Autoconf scripts.
+  /**
+    Create an --{with,without}-<feature> string that can be passed to
+    standard GNU Autoconf scripts.
 
-     Example:
-       withFeature true "shared"
-       => "--with-shared"
-       withFeature false "shared"
-       => "--without-shared"
+
+    # Inputs
+
+    `flag`
+    : 1\. Function argument
+
+    `feature`
+    : 2\. Function argument
+
+
+    # Type
+
+    ```
+    withFeature :: bool -> string -> string
+    ```
+
+    # Examples
+    :::{.example}
+    ## `lib.strings.withFeature` usage example
+
+    ```nix
+    withFeature true "shared"
+    => "--with-shared"
+    withFeature false "shared"
+    => "--without-shared"
+    ```
+
+    :::
   */
   withFeature = flag: feature:
     assert isString feature; # e.g. passing openssl instead of "openssl"
     "--${if flag then "with" else "without"}-${feature}";
 
-  /* Create an --{with-<feature>=<value>,without-<feature>} string that can be passed to
-     standard GNU Autoconf scripts.
+  /**
+    Create an --{with-<feature>=<value>,without-<feature>} string that can be passed to
+    standard GNU Autoconf scripts.
 
-     Example:
-       withFeatureAs true "shared" "foo"
-       => "--with-shared=foo"
-       withFeatureAs false "shared" (throw "ignored")
-       => "--without-shared"
+
+    # Inputs
+
+    `flag`
+    : 1\. Function argument
+
+    `feature`
+    : 2\. Function argument
+
+    `value`
+    : 3\. Function argument
+
+    # Type
+
+    ```
+    withFeatureAs :: bool -> string -> string -> string
+    ```
+
+
+    # Examples
+    :::{.example}
+    ## `lib.strings.withFeatureAs` usage example
+
+    ```nix
+    withFeatureAs true "shared" "foo"
+    => "--with-shared=foo"
+    withFeatureAs false "shared" (throw "ignored")
+    => "--without-shared"
+    ```
+
+    :::
   */
   withFeatureAs = flag: feature: value:
     withFeature flag feature + optionalString flag "=${value}";
 
-  /* Create a fixed width string with additional prefix to match
-     required width.
+  /**
+    Create a fixed width string with additional prefix to match
+    required width.
 
-     This function will fail if the input string is longer than the
-     requested length.
+    This function will fail if the input string is longer than the
+    requested length.
 
-     Type: fixedWidthString :: int -> string -> string -> string
 
-     Example:
-       fixedWidthString 5 "0" (toString 15)
-       => "00015"
+    # Inputs
+
+    `width`
+    : 1\. Function argument
+
+    `filler`
+    : 2\. Function argument
+
+    `str`
+    : 3\. Function argument
+
+    # Type
+
+    ```
+    fixedWidthString :: int -> string -> string -> string
+    ```
+
+    # Examples
+    :::{.example}
+    ## `lib.strings.fixedWidthString` usage example
+
+    ```nix
+    fixedWidthString 5 "0" (toString 15)
+    => "00015"
+    ```
+
+    :::
   */
   fixedWidthString = width: filler: str:
     let
@@ -1017,23 +2176,67 @@ rec {
             toString strw})";
       if strw == width then str else filler + fixedWidthString reqWidth filler str;
 
-  /* Format a number adding leading zeroes up to fixed width.
+  /**
+    Format a number adding leading zeroes up to fixed width.
 
-     Example:
-       fixedWidthNumber 5 15
-       => "00015"
+
+    # Inputs
+
+    `width`
+    : 1\. Function argument
+
+    `n`
+    : 2\. Function argument
+
+    # Type
+
+    ```
+    fixedWidthNumber :: int -> int -> string
+    ```
+
+    # Examples
+    :::{.example}
+    ## `lib.strings.fixedWidthNumber` usage example
+
+    ```nix
+    fixedWidthNumber 5 15
+    => "00015"
+    ```
+
+    :::
   */
   fixedWidthNumber = width: n: fixedWidthString width "0" (toString n);
 
-  /* Convert a float to a string, but emit a warning when precision is lost
-     during the conversion
+  /**
+    Convert a float to a string, but emit a warning when precision is lost
+    during the conversion
 
-     Example:
-       floatToString 0.000001
-       => "0.000001"
-       floatToString 0.0000001
-       => trace: warning: Imprecise conversion from float to string 0.000000
-          "0.000000"
+
+    # Inputs
+
+    `float`
+    : 1\. Function argument
+
+
+    # Type
+
+    ```
+    floatToString :: float -> string
+    ```
+
+    # Examples
+    :::{.example}
+    ## `lib.strings.floatToString` usage example
+
+    ```nix
+    floatToString 0.000001
+    => "0.000001"
+    floatToString 0.0000001
+    => trace: warning: Imprecise conversion from float to string 0.000000
+       "0.000000"
+    ```
+
+    :::
   */
   floatToString = float: let
     result = toString float;
@@ -1041,16 +2244,45 @@ rec {
   in lib.warnIf (!precise) "Imprecise conversion from float to string ${result}"
     result;
 
-  /* Soft-deprecated function. While the original implementation is available as
-     isConvertibleWithToString, consider using isStringLike instead, if suitable. */
+  /**
+    Check whether a value `val` can be coerced to a string.
+
+    :::{.warning}
+    Soft-deprecated function. While the original implementation is available as
+    `isConvertibleWithToString`, consider using `isStringLike` instead, if suitable.
+    :::
+
+    # Inputs
+
+    `val`
+    : 1\. Function argument
+
+    # Type
+
+    ```
+    isCoercibleToString :: a -> bool
+    ```
+  */
   isCoercibleToString = lib.warnIf (lib.isInOldestRelease 2305)
     "lib.strings.isCoercibleToString is deprecated in favor of either isStringLike or isConvertibleWithToString. Only use the latter if it needs to return true for null, numbers, booleans and list of similarly coercibles."
     isConvertibleWithToString;
 
-  /* Check whether a list or other value can be passed to toString.
+  /**
+    Check whether a list or other value `x` can be passed to toString.
 
-     Many types of value are coercible to string this way, including int, float,
-     null, bool, list of similarly coercible values.
+    Many types of value are coercible to string this way, including `int`, `float`,
+    `null`, `bool`, `list` of similarly coercible values.
+
+    # Inputs
+
+    `val`
+    : 1\. Function argument
+
+    # Type
+
+    ```
+    isConvertibleWithToString :: a -> bool
+    ```
   */
   isConvertibleWithToString = let
     types = [ "null" "int" "float" "bool" ];
@@ -1059,29 +2291,62 @@ rec {
     elem (typeOf x) types ||
     (isList x && lib.all isConvertibleWithToString x);
 
-  /* Check whether a value can be coerced to a string.
-     The value must be a string, path, or attribute set.
+  /**
+    Check whether a value can be coerced to a string.
+    The value must be a string, path, or attribute set.
 
-     String-like values can be used without explicit conversion in
-     string interpolations and in most functions that expect a string.
-   */
+    String-like values can be used without explicit conversion in
+    string interpolations and in most functions that expect a string.
+
+
+    # Inputs
+
+    `x`
+    : 1\. Function argument
+
+    # Type
+
+    ```
+    isStringLike :: a -> bool
+    ```
+  */
   isStringLike = x:
     isString x ||
     isPath x ||
     x ? outPath ||
     x ? __toString;
 
-  /* Check whether a value is a store path.
+  /**
+    Check whether a value `x` is a store path.
 
-     Example:
-       isStorePath "/nix/store/d945ibfx9x185xf04b890y4f9g3cbb63-python-2.7.11/bin/python"
-       => false
-       isStorePath "/nix/store/d945ibfx9x185xf04b890y4f9g3cbb63-python-2.7.11"
-       => true
-       isStorePath pkgs.python
-       => true
-       isStorePath [] || isStorePath 42 || isStorePath {} || …
-       => false
+
+    # Inputs
+
+    `x`
+    : 1\. Function argument
+
+    # Type
+
+    ```
+    isStorePath :: a -> bool
+    ```
+
+    # Examples
+    :::{.example}
+    ## `lib.strings.isStorePath` usage example
+
+    ```nix
+    isStorePath "/nix/store/d945ibfx9x185xf04b890y4f9g3cbb63-python-2.7.11/bin/python"
+    => false
+    isStorePath "/nix/store/d945ibfx9x185xf04b890y4f9g3cbb63-python-2.7.11"
+    => true
+    isStorePath pkgs.python
+    => true
+    isStorePath [] || isStorePath 42 || isStorePath {} || …
+    => false
+    ```
+
+    :::
   */
   isStorePath = x:
     if isStringLike x then
@@ -1091,27 +2356,43 @@ rec {
     else
       false;
 
-  /* Parse a string as an int. Does not support parsing of integers with preceding zero due to
-  ambiguity between zero-padded and octal numbers. See toIntBase10.
+  /**
+    Parse a string as an int. Does not support parsing of integers with preceding zero due to
+    ambiguity between zero-padded and octal numbers. See toIntBase10.
 
-     Type: string -> int
+    # Inputs
 
-     Example:
+    `str`
+    : A string to be interpreted as an int.
 
-       toInt "1337"
-       => 1337
+    # Type
 
-       toInt "-4"
-       => -4
+    ```
+    toInt :: string -> int
+    ```
 
-       toInt " 123 "
-       => 123
+    # Examples
+    :::{.example}
+    ## `lib.strings.toInt` usage example
 
-       toInt "00024"
-       => error: Ambiguity in interpretation of 00024 between octal and zero padded integer.
+    ```nix
+    toInt "1337"
+    => 1337
 
-       toInt "3.14"
-       => error: floating point JSON numbers are not supported
+    toInt "-4"
+    => -4
+
+    toInt " 123 "
+    => 123
+
+    toInt "00024"
+    => error: Ambiguity in interpretation of 00024 between octal and zero padded integer.
+
+    toInt "3.14"
+    => error: floating point JSON numbers are not supported
+    ```
+
+    :::
   */
   toInt =
     let
@@ -1146,25 +2427,42 @@ rec {
       else parsedInput;
 
 
-  /* Parse a string as a base 10 int. This supports parsing of zero-padded integers.
+  /**
+    Parse a string as a base 10 int. This supports parsing of zero-padded integers.
 
-     Type: string -> int
+    # Inputs
 
-     Example:
-       toIntBase10 "1337"
-       => 1337
+    `str`
+    : A string to be interpreted as an int.
 
-       toIntBase10 "-4"
-       => -4
+    # Type
 
-       toIntBase10 " 123 "
-       => 123
+    ```
+    toIntBase10 :: string -> int
+    ```
 
-       toIntBase10 "00024"
-       => 24
+    # Examples
+    :::{.example}
+    ## `lib.strings.toIntBase10` usage example
 
-       toIntBase10 "3.14"
-       => error: floating point JSON numbers are not supported
+    ```nix
+    toIntBase10 "1337"
+    => 1337
+
+    toIntBase10 "-4"
+    => -4
+
+    toIntBase10 " 123 "
+    => 123
+
+    toIntBase10 "00024"
+    => 24
+
+    toIntBase10 "3.14"
+    => error: floating point JSON numbers are not supported
+    ```
+
+    :::
   */
   toIntBase10 =
     let
@@ -1199,20 +2497,48 @@ rec {
       # Return result.
       else parsedInput;
 
-  /* Read a list of paths from `file`, relative to the `rootPath`.
-     Lines beginning with `#` are treated as comments and ignored.
-     Whitespace is significant.
+  /**
+    Read a list of paths from `file`, relative to the `rootPath`.
+    Lines beginning with `#` are treated as comments and ignored.
+    Whitespace is significant.
 
-     NOTE: This function is not performant and should be avoided.
+    :::{.warning}
+    This function is deprecated and should be avoided.
+    :::
 
-     Example:
-       readPathsFromFile /prefix
-         ./pkgs/development/libraries/qt-5/5.4/qtbase/series
-       => [ "/prefix/dlopen-resolv.patch" "/prefix/tzdir.patch"
-            "/prefix/dlopen-libXcursor.patch" "/prefix/dlopen-openssl.patch"
-            "/prefix/dlopen-dbus.patch" "/prefix/xdg-config-dirs.patch"
-            "/prefix/nix-profiles-library-paths.patch"
-            "/prefix/compose-search-path.patch" ]
+    :::{.note}
+    This function is not performant and should be avoided.
+    :::
+
+    # Inputs
+
+    `rootPath`
+    : 1\. Function argument
+
+    `file`
+    : 2\. Function argument
+
+    # Type
+
+    ```
+    readPathsFromFile :: string -> string -> [string]
+    ```
+
+    # Examples
+    :::{.example}
+    ## `lib.strings.readPathsFromFile` usage example
+
+    ```nix
+    readPathsFromFile /prefix
+      ./pkgs/development/libraries/qt-5/5.4/qtbase/series
+    => [ "/prefix/dlopen-resolv.patch" "/prefix/tzdir.patch"
+         "/prefix/dlopen-libXcursor.patch" "/prefix/dlopen-openssl.patch"
+         "/prefix/dlopen-dbus.patch" "/prefix/xdg-config-dirs.patch"
+         "/prefix/nix-profiles-library-paths.patch"
+         "/prefix/compose-search-path.patch" ]
+    ```
+
+    :::
   */
   readPathsFromFile = lib.warn "lib.readPathsFromFile is deprecated, use a list instead."
     (rootPath: file:
@@ -1224,30 +2550,65 @@ rec {
       in
         absolutePaths);
 
-  /* Read the contents of a file removing the trailing \n
+  /**
+    Read the contents of a file removing the trailing \n
 
-     Type: fileContents :: path -> string
 
-     Example:
-       $ echo "1.0" > ./version
+    # Inputs
 
-       fileContents ./version
-       => "1.0"
+    `file`
+    : 1\. Function argument
+
+    # Type
+
+    ```
+    fileContents :: path -> string
+    ```
+
+    # Examples
+    :::{.example}
+    ## `lib.strings.fileContents` usage example
+
+    ```nix
+    $ echo "1.0" > ./version
+
+    fileContents ./version
+    => "1.0"
+    ```
+
+    :::
   */
   fileContents = file: removeSuffix "\n" (readFile file);
 
 
-  /* Creates a valid derivation name from a potentially invalid one.
+  /**
+    Creates a valid derivation name from a potentially invalid one.
 
-     Type: sanitizeDerivationName :: String -> String
+    # Inputs
 
-     Example:
-       sanitizeDerivationName "../hello.bar # foo"
-       => "-hello.bar-foo"
-       sanitizeDerivationName ""
-       => "unknown"
-       sanitizeDerivationName pkgs.hello
-       => "-nix-store-2g75chlbpxlrqn15zlby2dfh8hr9qwbk-hello-2.10"
+    `string`
+    : 1\. Function argument
+
+    # Type
+
+    ```
+    sanitizeDerivationName :: String -> String
+    ```
+
+    # Examples
+    :::{.example}
+    ## `lib.strings.sanitizeDerivationName` usage example
+
+    ```nix
+    sanitizeDerivationName "../hello.bar # foo"
+    => "-hello.bar-foo"
+    sanitizeDerivationName ""
+    => "unknown"
+    sanitizeDerivationName pkgs.hello
+    => "-nix-store-2g75chlbpxlrqn15zlby2dfh8hr9qwbk-hello-2.10"
+    ```
+
+    :::
   */
   sanitizeDerivationName =
   let okRegex = match "[[:alnum:]+_?=-][[:alnum:]+._?=-]*";
@@ -1274,19 +2635,41 @@ rec {
     (x: if stringLength x == 0 then "unknown" else x)
   ];
 
-  /* Computes the Levenshtein distance between two strings.
-     Complexity O(n*m) where n and m are the lengths of the strings.
-     Algorithm adjusted from https://stackoverflow.com/a/9750974/6605742
+  /**
+    Computes the Levenshtein distance between two strings `a` and `b`.
 
-     Type: levenshtein :: string -> string -> int
+    Complexity O(n*m) where n and m are the lengths of the strings.
+    Algorithm adjusted from https://stackoverflow.com/a/9750974/6605742
 
-     Example:
-       levenshtein "foo" "foo"
-       => 0
-       levenshtein "book" "hook"
-       => 1
-       levenshtein "hello" "Heyo"
-       => 3
+
+    # Inputs
+
+    `a`
+    : 1\. Function argument
+
+    `b`
+    : 2\. Function argument
+
+    # Type
+
+    ```
+    levenshtein :: string -> string -> int
+    ```
+
+    # Examples
+    :::{.example}
+    ## `lib.strings.levenshtein` usage example
+
+    ```nix
+    levenshtein "foo" "foo"
+    => 0
+    levenshtein "book" "hook"
+    => 1
+    levenshtein "hello" "Heyo"
+    => 3
+    ```
+
+    :::
   */
   levenshtein = a: b: let
     # Two dimensional array with dimensions (stringLength a + 1, stringLength b + 1)
@@ -1307,7 +2690,23 @@ rec {
         ( d (i - 1) (j - 1) + c );
   in d (stringLength a) (stringLength b);
 
-  /* Returns the length of the prefix common to both strings.
+  /**
+    Returns the length of the prefix that appears in both strings `a` and `b`.
+
+
+    # Inputs
+
+    `a`
+    : 1\. Function argument
+
+    `b`
+    : 2\. Function argument
+
+    # Type
+
+    ```
+    commonPrefixLength :: string -> string -> int
+    ```
   */
   commonPrefixLength = a: b:
     let
@@ -1315,7 +2714,23 @@ rec {
       go = i: if i >= m then m else if substring i 1 a == substring i 1 b then go (i + 1) else i;
     in go 0;
 
-  /* Returns the length of the suffix common to both strings.
+  /**
+    Returns the length of the suffix common to both strings `a` and `b`.
+
+
+    # Inputs
+
+    `a`
+    : 1\. Function argument
+
+    `b`
+    : 2\. Function argument
+
+    # Type
+
+    ```
+    commonSuffixLength :: string -> string -> int
+    ```
   */
   commonSuffixLength = a: b:
     let
@@ -1323,23 +2738,46 @@ rec {
       go = i: if i >= m then m else if substring (stringLength a - i - 1) 1 a == substring (stringLength b - i - 1) 1 b then go (i + 1) else i;
     in go 0;
 
-  /* Returns whether the levenshtein distance between two strings is at most some value
-     Complexity is O(min(n,m)) for k <= 2 and O(n*m) otherwise
+  /**
+    Returns whether the levenshtein distance between two strings `a` and `b` is at most some value `k`.
 
-     Type: levenshteinAtMost :: int -> string -> string -> bool
+    Complexity is O(min(n,m)) for k <= 2 and O(n*m) otherwise
 
-     Example:
-       levenshteinAtMost 0 "foo" "foo"
-       => true
-       levenshteinAtMost 1 "foo" "boa"
-       => false
-       levenshteinAtMost 2 "foo" "boa"
-       => true
-       levenshteinAtMost 2 "This is a sentence" "this is a sentense."
-       => false
-       levenshteinAtMost 3 "This is a sentence" "this is a sentense."
-       => true
+    # Inputs
 
+    `k`
+    : Distance threshold
+
+    `a`
+    : String `a`
+
+    `b`
+    : String `b`
+
+    # Type
+
+    ```
+    levenshteinAtMost :: int -> string -> string -> bool
+    ```
+
+    # Examples
+    :::{.example}
+    ## `lib.strings.levenshteinAtMost` usage example
+
+    ```nix
+    levenshteinAtMost 0 "foo" "foo"
+    => true
+    levenshteinAtMost 1 "foo" "boa"
+    => false
+    levenshteinAtMost 2 "foo" "boa"
+    => true
+    levenshteinAtMost 2 "This is a sentence" "this is a sentense."
+    => false
+    levenshteinAtMost 3 "This is a sentence" "this is a sentense."
+    => true
+    ```
+
+    :::
   */
   levenshteinAtMost = let
     infixDifferAtMost1 = x: y: stringLength x <= 1 && stringLength y <= 1;
diff --git a/third_party/nixpkgs/maintainers/maintainer-list.nix b/third_party/nixpkgs/maintainers/maintainer-list.nix
index 864367a224..6e84577fa0 100644
--- a/third_party/nixpkgs/maintainers/maintainer-list.nix
+++ b/third_party/nixpkgs/maintainers/maintainer-list.nix
@@ -822,6 +822,12 @@
     githubId = 20405311;
     name = "Aksh Gupta";
   };
+  akssri = {
+    email = "akssri@vakra.xyz";
+    github = "akssri";
+    githubId = 108771991;
+    name = "Akṣaya Śrīnivāsan";
+  };
   aktaboot = {
     email = "akhtaboo@protonmail.com";
     github = "aktaboot";
@@ -2369,6 +2375,13 @@
     githubId = 164148;
     name = "Ben Darwin";
   };
+  bchmnn = {
+    email = "jacob.bachmann@posteo.de";
+    matrix = "@trilloyd:matrix.tu-berlin.de";
+    github = "bchmnn";
+    githubId = 34620799;
+    name = "Jacob Bachmann";
+  };
   bdd = {
     email = "bdd@mindcast.org";
     github = "bdd";
@@ -4680,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";
@@ -4762,6 +4780,12 @@
     githubId = 41747605;
     keys = [ { fingerprint = "6130 3BBA D7D1 BF74 EFA4  4E3B E7FE 2087 E438 0E64"; } ];
   };
+  definfo = {
+    name = "Adrien SUN";
+    email = "hjsdbb1@gmail.com";
+    github = "definfo";
+    githubId = 66514911;
+  };
   deifactor = {
     name = "Ash Zahlen";
     email = "ext0l@riseup.net";
@@ -7353,7 +7377,7 @@
   };
   getpsyched = {
     name = "Priyanshu Tripathi";
-    email = "priyanshu@getpsyched.dev";
+    email = "nixos@getpsyched.dev";
     matrix = "@getpsyched:matrix.org";
     github = "getpsyched";
     githubId = 43472218;
@@ -14907,6 +14931,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";
@@ -15036,6 +15066,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";
@@ -15940,6 +15976,12 @@
     githubId = 34967;
     name = "Julius de Bruijn";
   };
+  pinage404 = {
+    email = "pinage404+nixpkgs@gmail.com";
+    github = "pinage404";
+    githubId = 6325757;
+    name = "pinage404";
+  };
   pineapplehunter = {
     email = "peshogo+nixpkgs@gmail.com";
     github = "pineapplehunter";
@@ -20101,6 +20143,12 @@
     githubId = 29044;
     name = "Jacek Galowicz";
   };
+  tfkhdyt = {
+    email = "tfkhdyt@proton.me";
+    name = "Taufik Hidayat";
+    github = "tfkhdyt";
+    githubId = 47195537;
+  };
   tfmoraes = {
     name = "Thiago Franco de Moraes";
     github = "tfmoraes";
@@ -20241,6 +20289,13 @@
     githubId = 71843723;
     keys = [ { fingerprint = "EEFB CC3A C529 CFD1 943D  A75C BDD5 7BE9 9D55 5965"; } ];
   };
+  thepuzzlemaker = {
+    name = "ThePuzzlemaker";
+    email = "tpzker@thepuzzlemaker.info";
+    github = "ThePuzzlemaker";
+    githubId = 12666617;
+    keys = [ { fingerprint = "7095 C20A 9224 3DB6 5177  07B0 968C D9D7 1C9F BB6C"; } ];
+  };
   therealansh = {
     email = "tyagiansh23@gmail.com";
     github = "therealansh";
@@ -21559,6 +21614,12 @@
     githubId = 70410;
     name = "Rahul Gopinath";
   };
+  vsharathchandra = {
+    email = "chandrasharath.v@gmail.com";
+    github = "vsharathchandra";
+    githubId = 12689380;
+    name = "sharath chandra";
+  };
   vskilet = {
     email = "victor@sene.ovh";
     github = "Vskilet";
diff --git a/third_party/nixpkgs/maintainers/scripts/convert-to-import-cargo-lock/shell.nix b/third_party/nixpkgs/maintainers/scripts/convert-to-import-cargo-lock/shell.nix
index 8e913fdcd8..fc2e234830 100644
--- a/third_party/nixpkgs/maintainers/scripts/convert-to-import-cargo-lock/shell.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/maintainers/scripts/luarocks-packages.csv b/third_party/nixpkgs/maintainers/scripts/luarocks-packages.csv
index 7359e4451c..1530cd809f 100644
--- a/third_party/nixpkgs/maintainers/scripts/luarocks-packages.csv
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/maintainers/team-list.nix b/third_party/nixpkgs/maintainers/team-list.nix
index 5497412aa2..7ed0329620 100644
--- a/third_party/nixpkgs/maintainers/team-list.nix
+++ b/third_party/nixpkgs/maintainers/team-list.nix
@@ -749,7 +749,10 @@ with lib.maintainers;
   };
 
   openstack = {
-    members = [ SuperSandro2000 ];
+    members = [
+      SuperSandro2000
+      anthonyroussel
+    ];
     scope = "Maintain the ecosystem around OpenStack";
     shortName = "OpenStack";
   };
@@ -1016,10 +1019,7 @@ with lib.maintainers;
   };
 
   zig = {
-    members = [
-      AndersonTorres
-      figsoda
-    ];
+    members = [ figsoda ];
     scope = "Maintain the Zig compiler toolchain and nixpkgs integration.";
     shortName = "Zig";
     enableFeatureFreezePing = true;
diff --git a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2411.section.md b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2411.section.md
index 4aaec64064..3ad57cbe3f 100644
--- a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2411.section.md
+++ b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2411.section.md
@@ -16,6 +16,8 @@
 - `hardware.display` is a new module implementing workarounds for misbehaving monitors
   through setting up custom EDID files and forcing kernel/framebuffer modes.
 
+- NixOS now has support for *automatic boot assessment* (see [here](https://systemd.io/AUTOMATIC_BOOT_ASSESSMENT/)) for detailed description of the feature) for `systemd-boot` users. Available as [boot.loader.systemd-boot.bootCounting](#opt-boot.loader.systemd-boot.bootCounting.enable).
+
 ## New Services {#sec-release-24.11-new-services}
 
 - [FlareSolverr](https://github.com/FlareSolverr/FlareSolverr), proxy server to bypass Cloudflare protection. Available as [services.flaresolverr](#opt-services.flaresolverr.enable) service.
@@ -105,7 +107,7 @@
   The option `services.fgciwrap` now takes an attribute set of the
   configuration of each individual instance.
   This requires migrating any previous configuration keys from
-  `services.fcgiwrap.*` to `services.fcgiwrap.some-instance.*`.
+  `services.fcgiwrap.*` to `services.fcgiwrap.instances.some-instance.*`.
   The ownership and mode of the UNIX sockets created by this service are now
   configurable and private by default.
   Processes also now run as a dynamically allocated user by default instead of
@@ -138,6 +140,8 @@
   Refer to upstream [upgrade instructions](https://goteleport.com/docs/management/operations/upgrading/)
   and [release notes for v16](https://goteleport.com/docs/changelog/#1600-061324).
 
+- `tests.overriding` has its `passthru.tests` restructured as an attribute set instead of a list, making individual tests accessible by their names.
+
 - `vaultwarden` lost the capability to bind to privileged ports. If you rely on
    this behavior, override the systemd unit to allow `CAP_NET_BIND_SERVICE` in
    your local configuration.
@@ -227,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.
 
@@ -250,6 +256,9 @@
 - The `services.mxisd` module has been removed as both [mxisd](https://github.com/kamax-matrix/mxisd) and [ma1sd](https://github.com/ma1uta/ma1sd) are not maintained any longer.
   Consequently the package `pkgs.ma1sd` has also been removed.
 
+- `ffmpeg_5` has been removed. Please use the unversioned `ffmpeg`,
+  pin a newer version, or if necessary pin `ffmpeg_4` for compatibility.
+
 ## Other Notable Changes {#sec-release-24.11-notable-changes}
 
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
@@ -258,6 +267,11 @@
 
 - The `stackclashprotection` hardening flag has been added, though disabled by default.
 
+- `cargoSha256` in `rustPlatform.buildRustPackage` has been deprecated in favor
+  of `cargoHash` which supports SRI hashes. See
+  [buildRustPackage: Compiling Rust applications with Cargo](https://nixos.org/manual/nixpkgs/unstable/#compiling-rust-applications-with-cargo)
+  for more information.
+
 - `hareHook` has been added as the language framework for Hare. From now on, it,
   not the `hare` package, should be added to `nativeBuildInputs` when building
   Hare programs.
@@ -285,12 +299,16 @@
   - Nemo is now built with gtk-layer-shell support, note that for now it will be expected to see nemo-desktop
     listed as a regular entry in Cinnamon Wayland session's window list applet.
 
+- `restic` module now has an option for inhibiting system sleep while backups are running, defaulting to off (not inhibiting sleep), available as [`services.restic.backups.<name>.inhibitsSleep`](#opt-services.restic.backups._name_.inhibitsSleep).
+
 - Support for *runner registration tokens* has been [deprecated](https://gitlab.com/gitlab-org/gitlab/-/issues/380872)
   in `gitlab-runner` 15.6 and is expected to be removed in `gitlab-runner` 18.0. Configuration of existing runners
   should be changed to using *runner authentication tokens* by configuring
   {option}`services.gitlab-runner.services.<name>.authenticationTokenConfigFile` instead of the former
   {option}`services.gitlab-runner.services.<name>.registrationConfigFile` option.
 
+- `iproute2` now has libbpf support.
+
 - `nix.channel.enable = false` no longer implies `nix.settings.nix-path = []`.
   Since Nix 2.13, a `nix-path` set in `nix.conf` cannot be overriden by the `NIX_PATH` configuration variable.
 
diff --git a/third_party/nixpkgs/nixos/lib/systemd-lib.nix b/third_party/nixpkgs/nixos/lib/systemd-lib.nix
index dac5cc7b70..f75a52a95a 100644
--- a/third_party/nixpkgs/nixos/lib/systemd-lib.nix
+++ b/third_party/nixpkgs/nixos/lib/systemd-lib.nix
@@ -169,6 +169,10 @@ in rec {
     optional (attr ? ${name} && !isInt attr.${name})
       "Systemd ${group} field `${name}' is not an integer";
 
+  assertRemoved = name: see: group: attr:
+    optional (attr ? ${name})
+      "Systemd ${group} field `${name}' has been removed. See ${see}";
+
   checkUnitConfig = group: checks: attrs: let
     # We're applied at the top-level type (attrsOf unitOption), so the actual
     # unit options might contain attributes from mkOverride and mkIf that we need to
diff --git a/third_party/nixpkgs/nixos/lib/systemd-types.nix b/third_party/nixpkgs/nixos/lib/systemd-types.nix
index f3bc8e06d9..65ddb24586 100644
--- a/third_party/nixpkgs/nixos/lib/systemd-types.nix
+++ b/third_party/nixpkgs/nixos/lib/systemd-types.nix
@@ -45,12 +45,61 @@ let
 
   inherit (lib.types)
     attrsOf
+    coercedTo
+    enum
     lines
     listOf
     nullOr
+    oneOf
+    package
     path
+    singleLineStr
     submodule
     ;
+
+  initrdStorePathModule = { config, ... }: {
+    options = {
+      enable = (mkEnableOption "copying of this file and symlinking it") // { default = true; };
+
+      target = mkOption {
+        type = nullOr path;
+        description = ''
+          Path of the symlink.
+        '';
+        default = null;
+      };
+
+      source = mkOption {
+        type = path;
+        description = "Path of the source file.";
+      };
+
+      dlopen = {
+        usePriority = mkOption {
+          type = enum [ "required" "recommended" "suggested" ];
+          default = "recommended";
+          description = ''
+            Priority of dlopen ELF notes to include. "required" is
+            minimal, "recommended" includes "required", and
+            "suggested" includes "recommended".
+
+            See: https://systemd.io/ELF_DLOPEN_METADATA/
+          '';
+        };
+
+        features = mkOption {
+          type = listOf singleLineStr;
+          default = [ ];
+          description = ''
+            Features to enable via dlopen ELF notes. These will be in
+            addition to anything included via 'usePriority',
+            regardless of their priority.
+          '';
+        };
+      };
+    };
+  };
+
 in
 
 {
@@ -86,31 +135,23 @@ in
   automounts = listOf (submodule [ stage2AutomountOptions unitConfig automountConfig ]);
   initrdAutomounts = attrsOf (submodule [ stage1AutomountOptions unitConfig automountConfig ]);
 
+  initrdStorePath = listOf (coercedTo
+    (oneOf [ singleLineStr package ])
+    (source: { inherit source; })
+    (submodule initrdStorePathModule));
+
   initrdContents = attrsOf (submodule ({ config, options, name, ... }: {
+    imports = [ initrdStorePathModule ];
     options = {
-      enable = (mkEnableOption "copying of this file and symlinking it") // { default = true; };
-
-      target = mkOption {
-        type = path;
-        description = ''
-          Path of the symlink.
-        '';
-        default = name;
-      };
-
       text = mkOption {
         default = null;
         type = nullOr lines;
         description = "Text of the file.";
       };
-
-      source = mkOption {
-        type = path;
-        description = "Path of the source file.";
-      };
     };
 
     config = {
+      target = mkDefault name;
       source = mkIf (config.text != null) (
         let name' = "initrd-" + baseNameOf name;
         in mkDerivedConfig options.text (pkgs.writeText name')
diff --git a/third_party/nixpkgs/nixos/lib/test-driver/shell.nix b/third_party/nixpkgs/nixos/lib/test-driver/shell.nix
index 367bbad556..8879b1a0dc 100644
--- a/third_party/nixpkgs/nixos/lib/test-driver/shell.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/maintainers/scripts/azure-new/shell.nix b/third_party/nixpkgs/nixos/maintainers/scripts/azure-new/shell.nix
index 592f1bf905..9bc79cc69d 100644
--- a/third_party/nixpkgs/nixos/maintainers/scripts/azure-new/shell.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/modules/config/nix-channel.nix b/third_party/nixpkgs/nixos/modules/config/nix-channel.nix
index 3cdd1d1b63..2703a60f85 100644
--- a/third_party/nixpkgs/nixos/modules/config/nix-channel.nix
+++ b/third_party/nixpkgs/nixos/modules/config/nix-channel.nix
@@ -12,6 +12,7 @@ let
     mkDefault
     mkIf
     mkOption
+    stringAfter
     types
     ;
 
@@ -97,5 +98,8 @@ in
     systemd.tmpfiles.rules = lib.mkIf cfg.channel.enable [
       ''f /root/.nix-channels - - - - ${config.system.defaultChannel} nixos\n''
     ];
+
+    system.activationScripts.no-nix-channel = mkIf (!cfg.channel.enable)
+      (stringAfter [ "etc" "users" ] (builtins.readFile ./nix-channel/activation-check.sh));
   };
 }
diff --git a/third_party/nixpkgs/nixos/modules/config/nix-channel/activation-check.sh b/third_party/nixpkgs/nixos/modules/config/nix-channel/activation-check.sh
new file mode 100644
index 0000000000..42b1b712d7
--- /dev/null
+++ b/third_party/nixpkgs/nixos/modules/config/nix-channel/activation-check.sh
@@ -0,0 +1,21 @@
+# shellcheck shell=bash
+
+explainChannelWarning=0
+if [[ -e "/root/.nix-defexpr/channels" ]]; then
+    warn '/root/.nix-defexpr/channels exists, but channels have been disabled.'
+    explainChannelWarning=1
+fi
+if [[ -e "/nix/var/nix/profiles/per-user/root/channels" ]]; then
+    warn "/nix/var/nix/profiles/per-user/root/channels exists, but channels have been disabled."
+    explainChannelWarning=1
+fi
+while IFS=: read -r _ _ _ _ _ home _ ; do
+    if [[ -n  "$home" && -e "$home/.nix-defexpr/channels" ]]; then
+        warn "$home/.nix-defexpr/channels exists, but channels have been disabled." 1>&2
+        explainChannelWarning=1
+    fi
+done < <(getent passwd)
+if [[ $explainChannelWarning -eq 1 ]]; then
+    echo "Due to https://github.com/NixOS/nix/issues/9574, Nix may still use these channels when NIX_PATH is unset." 1>&2
+    echo "Delete the above directory or directories to prevent this." 1>&2
+fi
diff --git a/third_party/nixpkgs/nixos/modules/config/nix-channel/test.nix b/third_party/nixpkgs/nixos/modules/config/nix-channel/test.nix
new file mode 100644
index 0000000000..4b00cf9db3
--- /dev/null
+++ b/third_party/nixpkgs/nixos/modules/config/nix-channel/test.nix
@@ -0,0 +1,19 @@
+# Run:
+#   nix-build -A nixosTests.nix-channel
+{ lib, testers }:
+let
+  inherit (lib) fileset;
+
+  runShellcheck = testers.shellcheck {
+    src = fileset.toSource {
+      root = ./.;
+      fileset = fileset.unions [
+        ./activation-check.sh
+      ];
+    };
+  };
+
+in
+lib.recurseIntoAttrs {
+  inherit runShellcheck;
+}
diff --git a/third_party/nixpkgs/nixos/modules/config/no-x-libs.nix b/third_party/nixpkgs/nixos/modules/config/no-x-libs.nix
index 930e57dbde..2448d08a23 100644
--- a/third_party/nixpkgs/nixos/modules/config/no-x-libs.nix
+++ b/third_party/nixpkgs/nixos/modules/config/no-x-libs.nix
@@ -33,7 +33,6 @@ with lib;
       fastfetch = super.fastfetch.override { vulkanSupport = false; waylandSupport = false; x11Support = false; };
       ffmpeg = super.ffmpeg.override { ffmpegVariant = "headless"; };
       ffmpeg_4 = super.ffmpeg_4.override { ffmpegVariant = "headless"; };
-      ffmpeg_5 = super.ffmpeg_5.override { ffmpegVariant = "headless"; };
       ffmpeg_6 = super.ffmpeg_6.override { ffmpegVariant = "headless"; };
       ffmpeg_7 = super.ffmpeg_7.override { ffmpegVariant = "headless"; };
       # dep of graphviz, libXpm is optional for Xpm support
diff --git a/third_party/nixpkgs/nixos/modules/hardware/ckb-next.nix b/third_party/nixpkgs/nixos/modules/hardware/ckb-next.nix
index 65e73833a7..1fb97c16d7 100644
--- a/third_party/nixpkgs/nixos/modules/hardware/ckb-next.nix
+++ b/third_party/nixpkgs/nixos/modules/hardware/ckb-next.nix
@@ -41,6 +41,6 @@ in
     };
 
     meta = {
-      maintainers = with lib.maintainers; [ ];
+      maintainers = [ ];
     };
   }
diff --git a/third_party/nixpkgs/nixos/modules/hardware/raid/hpsa.nix b/third_party/nixpkgs/nixos/modules/hardware/raid/hpsa.nix
index 120348a74b..873a2db380 100644
--- a/third_party/nixpkgs/nixos/modules/hardware/raid/hpsa.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/modules/hardware/video/nvidia.nix b/third_party/nixpkgs/nixos/modules/hardware/video/nvidia.nix
index 1aa79166de..d09e71422b 100644
--- a/third_party/nixpkgs/nixos/modules/hardware/video/nvidia.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/modules/module-list.nix b/third_party/nixpkgs/nixos/modules/module-list.nix
index f97a6b4751..e48a836a6a 100644
--- a/third_party/nixpkgs/nixos/modules/module-list.nix
+++ b/third_party/nixpkgs/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
@@ -356,6 +357,7 @@
   ./security/systemd-confinement.nix
   ./security/tpm2.nix
   ./security/wrappers/default.nix
+  ./services/accessibility/speechd.nix
   ./services/admin/docuum.nix
   ./services/admin/meshcentral.nix
   ./services/admin/oxidized.nix
@@ -414,6 +416,7 @@
   ./services/blockchain/ethereum/geth.nix
   ./services/blockchain/ethereum/lighthouse.nix
   ./services/cluster/corosync/default.nix
+  ./services/cluster/druid/default.nix
   ./services/cluster/hadoop/default.nix
   ./services/cluster/k3s/default.nix
   ./services/cluster/kubernetes/addon-manager.nix
@@ -1242,6 +1245,7 @@
   ./services/networking/websockify.nix
   ./services/networking/wg-access-server.nix
   ./services/networking/wg-netmanager.nix
+  ./services/networking/wvdial.nix
   ./services/networking/webhook.nix
   ./services/networking/wg-quick.nix
   ./services/networking/wgautomesh.nix
diff --git a/third_party/nixpkgs/nixos/modules/profiles/installation-device.nix b/third_party/nixpkgs/nixos/modules/profiles/installation-device.nix
index 0b10c04141..913b6fc204 100644
--- a/third_party/nixpkgs/nixos/modules/profiles/installation-device.nix
+++ b/third_party/nixpkgs/nixos/modules/profiles/installation-device.nix
@@ -126,5 +126,15 @@ with lib;
 
     # allow nix-copy to live system
     nix.settings.trusted-users = [ "root" "nixos" ];
+
+    # Install less voices for speechd to save some space
+    services.speechd.package = pkgs.speechd.override {
+      mbrola = pkgs.mbrola.override {
+        mbrola-voices = pkgs.mbrola-voices.override {
+          # only ship with one voice per language
+          languages = [ "*1" ];
+        };
+      };
+    };
   };
 }
diff --git a/third_party/nixpkgs/nixos/modules/programs/direnv.nix b/third_party/nixpkgs/nixos/modules/programs/direnv.nix
index 6061de58eb..f127e959ef 100644
--- a/third_party/nixpkgs/nixos/modules/programs/direnv.nix
+++ b/third_party/nixpkgs/nixos/modules/programs/direnv.nix
@@ -3,9 +3,18 @@
   config,
   pkgs,
   ...
-}: let
+}:
+let
   cfg = config.programs.direnv;
-in {
+  enabledOption =
+    x:
+    lib.mkEnableOption x
+    // {
+      default = true;
+      example = false;
+    };
+in
+{
   options.programs.direnv = {
 
     enable = lib.mkEnableOption ''
@@ -14,7 +23,17 @@ in {
       integration. Note that you need to logout and login for this change to apply
     '';
 
-    package = lib.mkPackageOption pkgs "direnv" {};
+    package = lib.mkPackageOption pkgs "direnv" { };
+
+    enableBashIntegration = enabledOption ''
+      Bash integration
+    '';
+    enableZshIntegration = enabledOption ''
+      Zsh integration
+    '';
+    enableFishIntegration = enabledOption ''
+      Fish integration
+    '';
 
     direnvrcExtra = lib.mkOption {
       type = lib.types.lines;
@@ -32,22 +51,14 @@ in {
       the hiding of direnv logging
     '';
 
-    loadInNixShell =
-      lib.mkEnableOption ''
-        loading direnv in `nix-shell` `nix shell` or `nix develop`
-      ''
-      // {
-        default = true;
-      };
+    loadInNixShell = enabledOption ''
+      loading direnv in `nix-shell` `nix shell` or `nix develop`
+    '';
 
     nix-direnv = {
-      enable =
-        (lib.mkEnableOption ''
-          a faster, persistent implementation of use_nix and use_flake, to replace the built-in one
-        '')
-        // {
-          default = true;
-        };
+      enable = enabledOption ''
+        a faster, persistent implementation of use_nix and use_flake, to replace the builtin one
+      '';
 
       package = lib.mkOption {
         default = pkgs.nix-direnv.override { nix = config.nix.package; };
@@ -60,14 +71,10 @@ in {
     };
   };
 
-  imports = [
-    (lib.mkRemovedOptionModule ["programs" "direnv" "persistDerivations"] "persistDerivations was removed as it is no longer necessary")
-  ];
-
   config = lib.mkIf cfg.enable {
 
     programs = {
-      zsh.interactiveShellInit = ''
+      zsh.interactiveShellInit = lib.mkIf cfg.enableZshIntegration ''
         if ${lib.boolToString cfg.loadInNixShell} || printenv PATH | grep -vqc '/nix/store'; then
          eval "$(${lib.getExe cfg.package} hook zsh)"
         fi
@@ -75,13 +82,13 @@ in {
 
       #$NIX_GCROOT for "nix develop" https://github.com/NixOS/nix/blob/6db66ebfc55769edd0c6bc70fcbd76246d4d26e0/src/nix/develop.cc#L530
       #$IN_NIX_SHELL for "nix-shell"
-      bash.interactiveShellInit = ''
+      bash.interactiveShellInit = lib.mkIf cfg.enableBashIntegration ''
         if ${lib.boolToString cfg.loadInNixShell} || [ -z "$IN_NIX_SHELL$NIX_GCROOT$(printenv PATH | grep '/nix/store')" ] ; then
          eval "$(${lib.getExe cfg.package} hook bash)"
         fi
       '';
 
-      fish.interactiveShellInit = ''
+      fish.interactiveShellInit = lib.mkIf cfg.enableFishIntegration ''
         if ${lib.boolToString cfg.loadInNixShell};
         or printenv PATH | grep -vqc '/nix/store';
          ${lib.getExe cfg.package} hook fish | source
@@ -90,18 +97,17 @@ in {
     };
 
     environment = {
-      systemPackages =
-        if cfg.loadInNixShell then [cfg.package]
-        else [
-          #direnv has a fish library which sources direnv for some reason
-          (cfg.package.overrideAttrs (old: {
-            installPhase =
-              (old.installPhase or "")
-              + ''
-                rm -rf $out/share/fish
-              '';
-          }))
-        ];
+      systemPackages = [
+        # direnv has a fish library which automatically sources direnv for some reason
+        # I don't see any harm in doing this if we're sourcing it with fish.interactiveShellInit
+        (pkgs.symlinkJoin {
+          inherit (cfg.package) name;
+          paths = [ cfg.package ];
+          postBuild = ''
+            rm -rf $out/share/fish
+          '';
+        })
+      ];
 
       variables = {
         DIRENV_CONFIG = "/etc/direnv";
@@ -141,4 +147,5 @@ in {
       };
     };
   };
+  meta.maintainers = with lib.maintainers; [ gerg-l ];
 }
diff --git a/third_party/nixpkgs/nixos/modules/programs/dmrconfig.nix b/third_party/nixpkgs/nixos/modules/programs/dmrconfig.nix
index 0078ca19f4..e213676509 100644
--- a/third_party/nixpkgs/nixos/modules/programs/dmrconfig.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/modules/programs/nix-required-mounts.nix b/third_party/nixpkgs/nixos/modules/programs/nix-required-mounts.nix
index 5d25958a76..5064d6aaf5 100644
--- a/third_party/nixpkgs/nixos/modules/programs/nix-required-mounts.nix
+++ b/third_party/nixpkgs/nixos/modules/programs/nix-required-mounts.nix
@@ -47,7 +47,7 @@ let
     );
 
   driverPaths = [
-    pkgs.addOpenGLRunpath.driverLink
+    pkgs.addDriverRunpath.driverLink
 
     # mesa:
     config.hardware.opengl.package
@@ -84,7 +84,7 @@ in
           {
             opengl.paths = config.hardware.opengl.extraPackages ++ [
               config.hardware.opengl.package
-              pkgs.addOpenGLRunpath.driverLink
+              pkgs.addDriverRunpath.driverLink
               "/dev/dri"
             ];
           }
diff --git a/third_party/nixpkgs/nixos/modules/programs/wayland/miracle-wm.nix b/third_party/nixpkgs/nixos/modules/programs/wayland/miracle-wm.nix
new file mode 100644
index 0000000000..a4c843523d
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/modules/programs/wayland/wayfire.nix b/third_party/nixpkgs/nixos/modules/programs/wayland/wayfire.nix
index 7acc5b2739..1c3950bff4 100644
--- a/third_party/nixpkgs/nixos/modules/programs/wayland/wayfire.nix
+++ b/third_party/nixpkgs/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.
       '';
     };
-  };
-
-  config = let
-    finalPackage = pkgs.wayfire-with-plugins.override {
-      wayfire = cfg.package;
-      plugins = cfg.plugins;
-    };
-  in
-  lib.mkIf cfg.enable {
-    environment.systemPackages = [
-      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" ];
+    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 (
+      lib.mkMerge [
+        {
+          environment.systemPackages = [ 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"
+            ];
+          };
+        }
+        (import ./wayland-session.nix {
+          inherit lib pkgs;
+          enableXWayland = cfg.xwayland.enable;
+        })
+      ]
+    );
 }
diff --git a/third_party/nixpkgs/nixos/modules/security/pam.nix b/third_party/nixpkgs/nixos/modules/security/pam.nix
index 672c86c5b0..b44daa5281 100644
--- a/third_party/nixpkgs/nixos/modules/security/pam.nix
+++ b/third_party/nixpkgs/nixos/modules/security/pam.nix
@@ -99,6 +99,7 @@ let
     }));
   };
 
+  package = config.security.pam.package;
   parentConfig = config;
 
   pamOpts = { config, name, ... }: let cfg = config; in let config = parentConfig; in {
@@ -648,16 +649,16 @@ let
           # The required pam_unix.so module has to come after all the sufficient modules
           # because otherwise, the account lookup will fail if the user does not exist
           # locally, for example with MySQL- or LDAP-auth.
-          { name = "unix"; control = "required"; modulePath = "pam_unix.so"; }
+          { name = "unix"; control = "required"; modulePath = "${package}/lib/security/pam_unix.so"; }
         ];
 
         auth = autoOrderRules ([
           { name = "oslogin_login"; enable = cfg.googleOsLoginAuthentication; control = "[success=done perm_denied=die default=ignore]"; modulePath = "${pkgs.google-guest-oslogin}/lib/security/pam_oslogin_login.so"; }
-          { name = "rootok"; enable = cfg.rootOK; control = "sufficient"; modulePath = "pam_rootok.so"; }
-          { name = "wheel"; enable = cfg.requireWheel; control = "required"; modulePath = "pam_wheel.so"; settings = {
+          { name = "rootok"; enable = cfg.rootOK; control = "sufficient"; modulePath = "${package}/lib/security/pam_rootok.so"; }
+          { name = "wheel"; enable = cfg.requireWheel; control = "required"; modulePath = "${package}/lib/security/pam_wheel.so"; settings = {
             use_uid = true;
           }; }
-          { name = "faillock"; enable = cfg.logFailures; control = "required"; modulePath = "pam_faillock.so"; }
+          { name = "faillock"; enable = cfg.logFailures; control = "required"; modulePath = "${package}/lib/security/pam_faillock.so"; }
           { name = "mysql"; enable = cfg.mysqlAuth; control = "sufficient"; modulePath = "${pkgs.pam_mysql}/lib/security/pam_mysql.so"; settings = {
             config_file = "/etc/security/pam_mysql.conf";
           }; }
@@ -710,7 +711,7 @@ let
               || cfg.zfs))
             [
               { name = "systemd_home-early"; enable = config.services.homed.enable; control = "optional"; modulePath = "${config.systemd.package}/lib/security/pam_systemd_home.so"; }
-              { name = "unix-early"; enable = cfg.unixAuth; control = "optional"; modulePath = "pam_unix.so"; settings = {
+              { name = "unix-early"; enable = cfg.unixAuth; control = "optional"; modulePath = "${package}/lib/security/pam_unix.so"; settings = {
                 nullok = cfg.allowNullPassword;
                 inherit (cfg) nodelay;
                 likeauth = true;
@@ -731,7 +732,7 @@ let
               { name = "gnupg"; enable = cfg.gnupg.enable; control = "optional"; modulePath = "${pkgs.pam_gnupg}/lib/security/pam_gnupg.so"; settings = {
                 store-only = cfg.gnupg.storeOnly;
               }; }
-              { name = "faildelay"; enable = cfg.failDelay.enable; control = "optional"; modulePath = "${pkgs.pam}/lib/security/pam_faildelay.so"; settings = {
+              { name = "faildelay"; enable = cfg.failDelay.enable; control = "optional"; modulePath = "${package}/lib/security/pam_faildelay.so"; settings = {
                 inherit (cfg.failDelay) delay;
               }; }
               { name = "google_authenticator"; enable = cfg.googleAuthenticator.enable; control = "required"; modulePath = "${pkgs.google-authenticator}/lib/security/pam_google_authenticator.so"; settings = {
@@ -740,7 +741,7 @@ let
               { name = "duo"; enable = cfg.duoSecurity.enable; control = "required"; modulePath = "${pkgs.duo-unix}/lib/security/pam_duo.so"; }
             ]) ++ [
           { name = "systemd_home"; enable = config.services.homed.enable; control = "sufficient"; modulePath = "${config.systemd.package}/lib/security/pam_systemd_home.so"; }
-          { name = "unix"; enable = cfg.unixAuth; control = "sufficient"; modulePath = "pam_unix.so"; settings = {
+          { name = "unix"; enable = cfg.unixAuth; control = "sufficient"; modulePath = "${package}/lib/security/pam_unix.so"; settings = {
             nullok = cfg.allowNullPassword;
             inherit (cfg) nodelay;
             likeauth = true;
@@ -768,12 +769,12 @@ let
             action = "store";
             use_first_pass = true;
           }; }
-          { name = "deny"; control = "required"; modulePath = "pam_deny.so"; }
+          { name = "deny"; control = "required"; modulePath = "${package}/lib/security/pam_deny.so"; }
         ]);
 
         password = autoOrderRules [
           { name = "systemd_home"; enable = config.services.homed.enable; control = "sufficient"; modulePath = "${config.systemd.package}/lib/security/pam_systemd_home.so"; }
-          { name = "unix"; control = "sufficient"; modulePath = "pam_unix.so"; settings = {
+          { name = "unix"; control = "sufficient"; modulePath = "${package}/lib/security/pam_unix.so"; settings = {
             nullok = true;
             yescrypt = true;
           }; }
@@ -798,24 +799,24 @@ let
         ];
 
         session = autoOrderRules [
-          { name = "env"; enable = cfg.setEnvironment; control = "required"; modulePath = "pam_env.so"; settings = {
+          { name = "env"; enable = cfg.setEnvironment; control = "required"; modulePath = "${package}/lib/security/pam_env.so"; settings = {
             conffile = "/etc/pam/environment";
             readenv = 0;
           }; }
-          { name = "unix"; control = "required"; modulePath = "pam_unix.so"; }
-          { name = "loginuid"; enable = cfg.setLoginUid; control = if config.boot.isContainer then "optional" else "required"; modulePath = "pam_loginuid.so"; }
-          { name = "tty_audit"; enable = cfg.ttyAudit.enable; control = "required"; modulePath = "${pkgs.pam}/lib/security/pam_tty_audit.so"; settings = {
+          { name = "unix"; control = "required"; modulePath = "${package}/lib/security/pam_unix.so"; }
+          { name = "loginuid"; enable = cfg.setLoginUid; control = if config.boot.isContainer then "optional" else "required"; modulePath = "${package}/lib/security/pam_loginuid.so"; }
+          { name = "tty_audit"; enable = cfg.ttyAudit.enable; control = "required"; modulePath = "${package}/lib/security/pam_tty_audit.so"; settings = {
             open_only = cfg.ttyAudit.openOnly;
             enable = cfg.ttyAudit.enablePattern;
             disable = cfg.ttyAudit.disablePattern;
           }; }
           { name = "systemd_home"; enable = config.services.homed.enable; control = "required"; modulePath = "${config.systemd.package}/lib/security/pam_systemd_home.so"; }
-          { name = "mkhomedir"; enable = cfg.makeHomeDir; control = "required"; modulePath = "${pkgs.pam}/lib/security/pam_mkhomedir.so"; settings = {
+          { name = "mkhomedir"; enable = cfg.makeHomeDir; control = "required"; modulePath = "${package}/lib/security/pam_mkhomedir.so"; settings = {
             silent = true;
             skel = config.security.pam.makeHomeDir.skelDirectory;
             inherit (config.security.pam.makeHomeDir) umask;
           }; }
-          { name = "lastlog"; enable = cfg.updateWtmp; control = "required"; modulePath = "${pkgs.pam}/lib/security/pam_lastlog.so"; settings = {
+          { name = "lastlog"; enable = cfg.updateWtmp; control = "required"; modulePath = "${package}/lib/security/pam_lastlog.so"; settings = {
             silent = true;
           }; }
           { name = "ecryptfs"; enable = config.security.pam.enableEcryptfs; control = "optional"; modulePath = "${pkgs.ecryptfs}/lib/security/pam_ecryptfs.so"; }
@@ -823,11 +824,11 @@ let
           # Skips the pam_fscrypt module for systemd-user sessions which do not have a password
           # anyways.
           # See also https://github.com/google/fscrypt/issues/95
-          { name = "fscrypt-skip-systemd"; enable = config.security.pam.enableFscrypt; control = "[success=1 default=ignore]"; modulePath = "pam_succeed_if.so"; args = [
+          { name = "fscrypt-skip-systemd"; enable = config.security.pam.enableFscrypt; control = "[success=1 default=ignore]"; modulePath = "${package}/lib/security/pam_succeed_if.so"; args = [
             "service" "=" "systemd-user"
           ]; }
           { name = "fscrypt"; enable = config.security.pam.enableFscrypt; control = "optional"; modulePath = "${pkgs.fscrypt-experimental}/lib/security/pam_fscrypt.so"; }
-          { name = "zfs_key-skip-systemd"; enable = cfg.zfs; control = "[success=1 default=ignore]"; modulePath = "pam_succeed_if.so"; args = [
+          { name = "zfs_key-skip-systemd"; enable = cfg.zfs; control = "[success=1 default=ignore]"; modulePath = "${package}/lib/security/pam_succeed_if.so"; args = [
             "service" "=" "systemd-user"
           ]; }
           { name = "zfs_key"; enable = cfg.zfs; control = "optional"; modulePath = "${config.boot.zfs.package}/lib/security/pam_zfs_key.so"; settings = {
@@ -846,14 +847,14 @@ let
           { name = "krb5"; enable = config.security.pam.krb5.enable; control = "optional"; modulePath = "${pam_krb5}/lib/security/pam_krb5.so"; }
           { name = "otpw"; enable = cfg.otpwAuth; control = "optional"; modulePath = "${pkgs.otpw}/lib/security/pam_otpw.so"; }
           { name = "systemd"; enable = cfg.startSession; control = "optional"; modulePath = "${config.systemd.package}/lib/security/pam_systemd.so"; }
-          { name = "xauth"; enable = cfg.forwardXAuth; control = "optional"; modulePath = "pam_xauth.so"; settings = {
+          { name = "xauth"; enable = cfg.forwardXAuth; control = "optional"; modulePath = "${package}/lib/security/pam_xauth.so"; settings = {
             xauthpath = "${pkgs.xorg.xauth}/bin/xauth";
             systemuser = 99;
           }; }
-          { name = "limits"; enable = cfg.limits != []; control = "required"; modulePath = "${pkgs.pam}/lib/security/pam_limits.so"; settings = {
+          { name = "limits"; enable = cfg.limits != []; control = "required"; modulePath = "${package}/lib/security/pam_limits.so"; settings = {
             conf = "${makeLimitsConf cfg.limits}";
           }; }
-          { name = "motd"; enable = cfg.showMotd && (config.users.motd != null || config.users.motdFile != null); control = "optional"; modulePath = "${pkgs.pam}/lib/security/pam_motd.so"; settings = {
+          { name = "motd"; enable = cfg.showMotd && (config.users.motd != null || config.users.motdFile != null); control = "optional"; modulePath = "${package}/lib/security/pam_motd.so"; settings = {
             inherit motd;
           }; }
           { name = "apparmor"; enable = cfg.enableAppArmor && config.security.apparmor.enable; control = "optional"; modulePath = "${pkgs.apparmor-pam}/lib/security/pam_apparmor.so"; settings = {
@@ -967,6 +968,8 @@ in
 
   options = {
 
+    security.pam.package = mkPackageOption pkgs "pam" { };
+
     security.pam.loginLimits = mkOption {
       default = [];
       type = limitsType;
@@ -1515,7 +1518,7 @@ in
 
     environment.systemPackages =
       # Include the PAM modules in the system path mostly for the manpages.
-      [ pkgs.pam ]
+      [ package ]
       ++ optional config.users.ldap.enable pam_ldap
       ++ optional config.services.kanidm.enablePam config.services.kanidm.package
       ++ optional config.services.sssd.enable pkgs.sssd
@@ -1533,7 +1536,7 @@ in
         setuid = true;
         owner = "root";
         group = "root";
-        source = "${pkgs.pam}/bin/unix_chkpwd";
+        source = "${package}/bin/unix_chkpwd";
       };
     };
 
@@ -1574,11 +1577,6 @@ in
       lib.concatMapStrings
         (name: "r ${config.environment.etc."pam.d/${name}".source},\n")
         (attrNames config.security.pam.services) +
-      ''
-      mr ${getLib pkgs.pam}/lib/security/pam_filter/*,
-      mr ${getLib pkgs.pam}/lib/security/pam_*.so,
-      r ${getLib pkgs.pam}/lib/security/,
-      '' +
       (with lib; pipe config.security.pam.services [
         attrValues
         (catAttrs "rules")
@@ -1586,6 +1584,12 @@ in
         (concatMap attrValues)
         (filter (rule: rule.enable))
         (catAttrs "modulePath")
+        # TODO(@uninsane): replace this warning + filter with just an assertion
+        (map (modulePath: lib.warnIfNot
+          (hasPrefix "/" modulePath)
+          ''non-absolute PAM modulePath "${modulePath}" is unsupported by apparmor and will be treated as an error by future versions of nixpkgs; see <https://github.com/NixOS/nixpkgs/pull/314791>''
+          modulePath
+        ))
         (filter (hasPrefix "/"))
         unique
         (map (module: "mr ${module},"))
diff --git a/third_party/nixpkgs/nixos/modules/services/accessibility/speechd.nix b/third_party/nixpkgs/nixos/modules/services/accessibility/speechd.nix
new file mode 100644
index 0000000000..165be86346
--- /dev/null
+++ b/third_party/nixpkgs/nixos/modules/services/accessibility/speechd.nix
@@ -0,0 +1,32 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+let
+  cfg = config.services.speechd;
+  inherit (lib)
+    getExe
+    mkEnableOption
+    mkIf
+    mkPackageOption
+    ;
+in
+{
+  options.services.speechd = {
+    # FIXME: figure out how to deprecate this EXTREMELY CAREFULLY
+    # default guessed conservatively in ../misc/graphical-desktop.nix
+    enable = mkEnableOption "speech-dispatcher speech synthesizer daemon";
+    package = mkPackageOption pkgs "speechd" { };
+  };
+
+  # FIXME: speechd 0.12 (or whatever the next version is)
+  # will support socket activation, so switch to that once it's out.
+  config = mkIf cfg.enable {
+    environment = {
+      systemPackages = [ cfg.package ];
+      sessionVariables.SPEECHD_CMD = getExe cfg.package;
+    };
+  };
+}
diff --git a/third_party/nixpkgs/nixos/modules/services/audio/jmusicbot.nix b/third_party/nixpkgs/nixos/modules/services/audio/jmusicbot.nix
index 5507f48590..d1317facf2 100644
--- a/third_party/nixpkgs/nixos/modules/services/audio/jmusicbot.nix
+++ b/third_party/nixpkgs/nixos/modules/services/audio/jmusicbot.nix
@@ -40,5 +40,5 @@ in
     };
   };
 
-  meta.maintainers = with maintainers; [ ];
+  meta.maintainers = [ ];
 }
diff --git a/third_party/nixpkgs/nixos/modules/services/backup/mysql-backup.nix b/third_party/nixpkgs/nixos/modules/services/backup/mysql-backup.nix
index 00381be4b7..e3fa7f4584 100644
--- a/third_party/nixpkgs/nixos/modules/services/backup/mysql-backup.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/modules/services/backup/restic-rest-server.nix b/third_party/nixpkgs/nixos/modules/services/backup/restic-rest-server.nix
index 935907643b..eb7b578003 100644
--- a/third_party/nixpkgs/nixos/modules/services/backup/restic-rest-server.nix
+++ b/third_party/nixpkgs/nixos/modules/services/backup/restic-rest-server.nix
@@ -15,7 +15,7 @@ in
       default = "8000";
       example = "127.0.0.1:8080";
       type = types.str;
-      description = "Listen on a specific IP address and port.";
+      description = "Listen on a specific IP address and port or unix socket.";
     };
 
     dataDir = mkOption {
diff --git a/third_party/nixpkgs/nixos/modules/services/backup/restic.nix b/third_party/nixpkgs/nixos/modules/services/backup/restic.nix
index 187c70df35..a9330e5d43 100644
--- a/third_party/nixpkgs/nixos/modules/services/backup/restic.nix
+++ b/third_party/nixpkgs/nixos/modules/services/backup/restic.nix
@@ -83,6 +83,15 @@ in
           '';
         };
 
+        inhibitsSleep = mkOption {
+          default = false;
+          type = types.bool;
+          example = true;
+          description = ''
+            Prevents the system from sleeping while backing up.
+          '';
+        };
+
         repository = mkOption {
           type = with types; nullOr str;
           default = null;
@@ -299,7 +308,14 @@ in
         (name: backup:
           let
             extraOptions = concatMapStrings (arg: " -o ${arg}") backup.extraOptions;
-            resticCmd = "${backup.package}/bin/restic${extraOptions}";
+            inhibitCmd = concatStringsSep " " [
+              "${pkgs.systemd}/bin/systemd-inhibit"
+              "--mode='block'"
+              "--who='restic'"
+              "--what='sleep'"
+              "--why=${escapeShellArg "Scheduled backup ${name}"} "
+            ];
+            resticCmd = "${optionalString backup.inhibitsSleep inhibitCmd}${backup.package}/bin/restic${extraOptions}";
             excludeFlags = optional (backup.exclude != []) "--exclude-file=${pkgs.writeText "exclude-patterns" (concatStringsSep "\n" backup.exclude)}";
             filesFromTmpFile = "/run/restic-backups-${name}/includes";
             doBackup = (backup.dynamicFilesFrom != null) || (backup.paths != null && backup.paths != []);
diff --git a/third_party/nixpkgs/nixos/modules/services/cluster/druid/default.nix b/third_party/nixpkgs/nixos/modules/services/cluster/druid/default.nix
new file mode 100644
index 0000000000..f28e5c9027
--- /dev/null
+++ b/third_party/nixpkgs/nixos/modules/services/cluster/druid/default.nix
@@ -0,0 +1,296 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+let
+  cfg = config.services.druid;
+  inherit (lib)
+    concatStrings
+    concatStringsSep
+    mapAttrsToList
+    concatMap
+    attrByPath
+    mkIf
+    mkMerge
+    mkEnableOption
+    mkOption
+    types
+    mkPackageOption
+    ;
+
+  druidServiceOption = serviceName: {
+    enable = mkEnableOption serviceName;
+
+    restartIfChanged = mkOption {
+      type = types.bool;
+      description = ''
+        Automatically restart the service on config change.
+        This can be set to false to defer restarts on clusters running critical applications.
+        Please consider the security implications of inadvertently running an older version,
+        and the possibility of unexpected behavior caused by inconsistent versions across a cluster when disabling this option.
+      '';
+      default = false;
+    };
+
+    config = mkOption {
+      default = { };
+      type = types.attrsOf types.anything;
+      description = ''
+        (key=value) Configuration to be written to runtime.properties of the druid ${serviceName}
+        <https://druid.apache.org/docs/latest/configuration/index.html>
+      '';
+      example = {
+        "druid.plainTextPort" = "8082";
+        "druid.service" = "servicename";
+      };
+    };
+
+    jdk = mkPackageOption pkgs "JDK" { default = [ "jdk17_headless" ]; };
+
+    jvmArgs = mkOption {
+      type = types.str;
+      default = "";
+      description = "Arguments to pass to the JVM";
+    };
+
+    openFirewall = mkOption {
+      type = types.bool;
+      default = false;
+      description = "Open firewall ports for ${serviceName}.";
+    };
+
+    internalConfig = mkOption {
+      default = { };
+      type = types.attrsOf types.anything;
+      internal = true;
+      description = "Internal Option to add to runtime.properties for ${serviceName}.";
+    };
+  };
+
+  druidServiceConfig =
+    {
+      name,
+      serviceOptions ? cfg."${name}",
+      allowedTCPPorts ? [ ],
+      tmpDirs ? [ ],
+      extraConfig ? { },
+    }:
+    (mkIf serviceOptions.enable (mkMerge [
+      {
+        systemd = {
+          services."druid-${name}" = {
+            after = [ "network.target" ];
+
+            description = "Druid ${name}";
+
+            wantedBy = [ "multi-user.target" ];
+
+            inherit (serviceOptions) restartIfChanged;
+
+            path = [
+              cfg.package
+              serviceOptions.jdk
+            ];
+
+            script =
+              let
+                cfgFile =
+                  fileName: properties:
+                  pkgs.writeTextDir fileName (
+                    concatStringsSep "\n" (mapAttrsToList (n: v: "${n}=${toString v}") properties)
+                  );
+
+                commonConfigFile = cfgFile "common.runtime.properties" cfg.commonConfig;
+
+                configFile = cfgFile "runtime.properties" (serviceOptions.config // serviceOptions.internalConfig);
+
+                extraClassPath = concatStrings (map (path: ":" + path) cfg.extraClassPaths);
+
+                extraConfDir = concatStrings (map (dir: ":" + dir + "/*") cfg.extraConfDirs);
+              in
+              ''
+                run-java -Dlog4j.configurationFile=file:${cfg.log4j} \
+                  -Ddruid.extensions.directory=${cfg.package}/extensions \
+                  -Ddruid.extensions.hadoopDependenciesDir=${cfg.package}/hadoop-dependencies \
+                  -classpath  ${commonConfigFile}:${configFile}:${cfg.package}/lib/\*${extraClassPath}${extraConfDir} \
+                  ${serviceOptions.jvmArgs} \
+                  org.apache.druid.cli.Main server ${name}
+              '';
+
+            serviceConfig = {
+              User = "druid";
+              SyslogIdentifier = "druid-${name}";
+              Restart = "always";
+            };
+          };
+
+          tmpfiles.rules = concatMap (x: [ "d ${x} 0755 druid druid" ]) (cfg.commonTmpDirs ++ tmpDirs);
+        };
+        networking.firewall.allowedTCPPorts = mkIf (attrByPath [
+          "openFirewall"
+        ] false serviceOptions) allowedTCPPorts;
+
+        users = {
+          users.druid = {
+            description = "Druid user";
+            group = "druid";
+            isNormalUser = true;
+          };
+          groups.druid = { };
+        };
+      }
+      extraConfig
+    ]));
+in
+{
+  options.services.druid = {
+    package = mkPackageOption pkgs "apache-druid" { default = [ "druid" ]; };
+
+    commonConfig = mkOption {
+      default = { };
+
+      type = types.attrsOf types.anything;
+
+      description = "(key=value) Configuration to be written to common.runtime.properties";
+
+      example = {
+        "druid.zk.service.host" = "localhost:2181";
+        "druid.metadata.storage.type" = "mysql";
+        "druid.metadata.storage.connector.connectURI" = "jdbc:mysql://localhost:3306/druid";
+        "druid.extensions.loadList" = ''[ "mysql-metadata-storage" ]'';
+      };
+    };
+
+    commonTmpDirs = mkOption {
+      default = [ "/var/log/druid/requests" ];
+      type = types.listOf types.str;
+      description = "Common List of directories used by druid processes";
+    };
+
+    log4j = mkOption {
+      type = types.path;
+      description = "Log4j Configuration for the druid process";
+    };
+
+    extraClassPaths = mkOption {
+      default = [ ];
+      type = types.listOf types.str;
+      description = "Extra classpath to include in the jvm";
+    };
+
+    extraConfDirs = mkOption {
+      default = [ ];
+      type = types.listOf types.path;
+      description = "Extra Conf Dirs to include in the jvm";
+    };
+
+    overlord = druidServiceOption "Druid Overlord";
+
+    coordinator = druidServiceOption "Druid Coordinator";
+
+    broker = druidServiceOption "Druid Broker";
+
+    historical = (druidServiceOption "Druid Historical") // {
+      segmentLocations = mkOption {
+
+        default = null;
+
+        description = "Locations where the historical will store its data.";
+
+        type =
+          with types;
+          nullOr (
+            listOf (submodule {
+              options = {
+                path = mkOption {
+                  type = path;
+                  description = "the path to store the segments";
+                };
+
+                maxSize = mkOption {
+                  type = str;
+                  description = "Max size the druid historical can occupy";
+                };
+
+                freeSpacePercent = mkOption {
+                  type = float;
+                  default = 1.0;
+                  description = "Druid Historical will fail to write if it exceeds this value";
+                };
+              };
+            })
+          );
+
+      };
+    };
+
+    middleManager = druidServiceOption "Druid middleManager";
+    router = druidServiceOption "Druid Router";
+  };
+  config = mkMerge [
+    (druidServiceConfig rec {
+      name = "overlord";
+      allowedTCPPorts = [ (attrByPath [ "druid.plaintextPort" ] 8090 cfg."${name}".config) ];
+    })
+
+    (druidServiceConfig rec {
+      name = "coordinator";
+      allowedTCPPorts = [ (attrByPath [ "druid.plaintextPort" ] 8081 cfg."${name}".config) ];
+    })
+
+    (druidServiceConfig rec {
+      name = "broker";
+
+      tmpDirs = [ (attrByPath [ "druid.lookup.snapshotWorkingDir" ] "" cfg."${name}".config) ];
+
+      allowedTCPPorts = [ (attrByPath [ "druid.plaintextPort" ] 8082 cfg."${name}".config) ];
+    })
+
+    (druidServiceConfig rec {
+      name = "historical";
+
+      tmpDirs = [
+        (attrByPath [ "druid.lookup.snapshotWorkingDir" ] "" cfg."${name}".config)
+      ] ++ (map (x: x.path) cfg."${name}".segmentLocations);
+
+      allowedTCPPorts = [ (attrByPath [ "druid.plaintextPort" ] 8083 cfg."${name}".config) ];
+
+      extraConfig.services.druid.historical.internalConfig."druid.segmentCache.locations" = builtins.toJSON cfg.historical.segmentLocations;
+    })
+
+    (druidServiceConfig rec {
+      name = "middleManager";
+
+      tmpDirs = [
+        "/var/log/druid/indexer"
+      ] ++ [ (attrByPath [ "druid.indexer.task.baseTaskDir" ] "" cfg."${name}".config) ];
+
+      allowedTCPPorts = [ (attrByPath [ "druid.plaintextPort" ] 8091 cfg."${name}".config) ];
+
+      extraConfig = {
+        services.druid.middleManager.internalConfig = {
+          "druid.indexer.runner.javaCommand" = "${cfg.middleManager.jdk}/bin/java";
+          "druid.indexer.runner.javaOpts" =
+            (attrByPath [ "druid.indexer.runner.javaOpts" ] "" cfg.middleManager.config)
+            + " -Dlog4j.configurationFile=file:${cfg.log4j}";
+        };
+
+        networking.firewall.allowedTCPPortRanges = mkIf cfg.middleManager.openFirewall [
+          {
+            from = attrByPath [ "druid.indexer.runner.startPort" ] 8100 cfg.middleManager.config;
+            to = attrByPath [ "druid.indexer.runner.endPort" ] 65535 cfg.middleManager.config;
+          }
+        ];
+      };
+    })
+
+    (druidServiceConfig rec {
+      name = "router";
+
+      allowedTCPPorts = [ (attrByPath [ "druid.plaintextPort" ] 8888 cfg."${name}".config) ];
+    })
+  ];
+
+}
diff --git a/third_party/nixpkgs/nixos/modules/services/games/archisteamfarm.nix b/third_party/nixpkgs/nixos/modules/services/games/archisteamfarm.nix
index 7062332db3..6303291759 100644
--- a/third_party/nixpkgs/nixos/modules/services/games/archisteamfarm.nix
+++ b/third_party/nixpkgs/nixos/modules/services/games/archisteamfarm.nix
@@ -164,11 +164,8 @@ in
   };
 
   config = lib.mkIf cfg.enable {
-    services.archisteamfarm = {
-      # TODO: drop with 24.11
-      dataDir = lib.mkIf (lib.versionAtLeast config.system.stateVersion "24.05") (lib.mkDefault "/var/lib/asf");
-      settings.IPC = lib.mkIf (!cfg.web-ui.enable) false;
-    };
+    # TODO: drop with 24.11
+    services.archisteamfarm.dataDir = lib.mkIf (lib.versionAtLeast config.system.stateVersion "24.05") (lib.mkDefault "/var/lib/asf");
 
     users = {
       users.archisteamfarm = {
diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/openrgb.nix b/third_party/nixpkgs/nixos/modules/services/hardware/openrgb.nix
index 1f7e4ffb92..4dc521aa97 100644
--- a/third_party/nixpkgs/nixos/modules/services/hardware/openrgb.nix
+++ b/third_party/nixpkgs/nixos/modules/services/hardware/openrgb.nix
@@ -51,5 +51,5 @@ in {
     };
   };
 
-  meta.maintainers = with lib.maintainers; [ ];
+  meta.maintainers = [ ];
 }
diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/udev.nix b/third_party/nixpkgs/nixos/modules/services/hardware/udev.nix
index 69fd0dc45f..67956fdd6c 100644
--- a/third_party/nixpkgs/nixos/modules/services/hardware/udev.nix
+++ b/third_party/nixpkgs/nixos/modules/services/hardware/udev.nix
@@ -29,9 +29,6 @@ let
   };
 
   nixosRules = ''
-    # Miscellaneous devices.
-    KERNEL=="kvm",                  MODE="0666"
-
     # Needed for gpm.
     SUBSYSTEM=="input", KERNEL=="mice", TAG+="systemd"
   '';
diff --git a/third_party/nixpkgs/nixos/modules/services/misc/fstrim.nix b/third_party/nixpkgs/nixos/modules/services/misc/fstrim.nix
index d2dda2636e..10dced2c4e 100644
--- a/third_party/nixpkgs/nixos/modules/services/misc/fstrim.nix
+++ b/third_party/nixpkgs/nixos/modules/services/misc/fstrim.nix
@@ -41,5 +41,5 @@ in {
 
   };
 
-  meta.maintainers = with maintainers; [ ];
+  meta.maintainers = [ ];
 }
diff --git a/third_party/nixpkgs/nixos/modules/services/misc/gitweb.nix b/third_party/nixpkgs/nixos/modules/services/misc/gitweb.nix
index ec08ab51a4..8f4869ce5d 100644
--- a/third_party/nixpkgs/nixos/modules/services/misc/gitweb.nix
+++ b/third_party/nixpkgs/nixos/modules/services/misc/gitweb.nix
@@ -55,6 +55,6 @@ in
 
   };
 
-  meta.maintainers = with maintainers; [ ];
+  meta.maintainers = [ ];
 
 }
diff --git a/third_party/nixpkgs/nixos/modules/services/misc/graphical-desktop.nix b/third_party/nixpkgs/nixos/modules/services/misc/graphical-desktop.nix
index c8fe0d921c..246310195e 100644
--- a/third_party/nixpkgs/nixos/modules/services/misc/graphical-desktop.nix
+++ b/third_party/nixpkgs/nixos/modules/services/misc/graphical-desktop.nix
@@ -42,6 +42,8 @@ in
 
     programs.gnupg.agent.pinentryPackage = lib.mkOverride 1100 pkgs.pinentry-gnome3;
 
+    services.speechd.enable = lib.mkDefault true;
+
     systemd.defaultUnit = lib.mkIf (xcfg.autorun || dmcfg.enable) "graphical.target";
 
     xdg = {
diff --git a/third_party/nixpkgs/nixos/modules/services/misc/mame.nix b/third_party/nixpkgs/nixos/modules/services/misc/mame.nix
index 6c7f08d48b..38b4dd290e 100644
--- a/third_party/nixpkgs/nixos/modules/services/misc/mame.nix
+++ b/third_party/nixpkgs/nixos/modules/services/misc/mame.nix
@@ -65,5 +65,5 @@ in
     };
   };
 
-  meta.maintainers = with lib.maintainers; [ ];
+  meta.maintainers = [ ];
 }
diff --git a/third_party/nixpkgs/nixos/modules/services/misc/ollama.nix b/third_party/nixpkgs/nixos/modules/services/misc/ollama.nix
index 06c4869ec7..f8dbfe9c56 100644
--- a/third_party/nixpkgs/nixos/modules/services/misc/ollama.nix
+++ b/third_party/nixpkgs/nixos/modules/services/misc/ollama.nix
@@ -215,6 +215,7 @@ in
             # https://docs.nvidia.com/dgx/pdf/dgx-os-5-user-guide.pdf
             "char-nvidiactl"
             "char-nvidia-caps"
+            "char-nvidia-frontend"
             "char-nvidia-uvm"
             # ROCm
             "char-drm"
diff --git a/third_party/nixpkgs/nixos/modules/services/misc/private-gpt.nix b/third_party/nixpkgs/nixos/modules/services/misc/private-gpt.nix
index ad9b6f5ffa..7bd2e492f5 100644
--- a/third_party/nixpkgs/nixos/modules/services/misc/private-gpt.nix
+++ b/third_party/nixpkgs/nixos/modules/services/misc/private-gpt.nix
@@ -117,5 +117,5 @@ in
     };
   };
 
-  meta.maintainers = with lib.maintainers; [ ];
+  meta.maintainers = [ ];
 }
diff --git a/third_party/nixpkgs/nixos/modules/services/misc/radicle.nix b/third_party/nixpkgs/nixos/modules/services/misc/radicle.nix
index 7d7804c6ea..3a393bf0f1 100644
--- a/third_party/nixpkgs/nixos/modules/services/misc/radicle.nix
+++ b/third_party/nixpkgs/nixos/modules/services/misc/radicle.nix
@@ -119,7 +119,8 @@ in
       enable = mkEnableOption "Radicle Seed Node";
       package = mkPackageOption pkgs "radicle-node" { };
       privateKeyFile = mkOption {
-        type = types.path;
+        # Note that a key encrypted by systemd-creds is not a path but a str.
+        type = with types; either path str;
         description = ''
           Absolute file path to an SSH private key,
           usually generated by `rad auth`.
diff --git a/third_party/nixpkgs/nixos/modules/services/misc/rkvm.nix b/third_party/nixpkgs/nixos/modules/services/misc/rkvm.nix
index b149c3d397..ac74725363 100644
--- a/third_party/nixpkgs/nixos/modules/services/misc/rkvm.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/modules/services/misc/zoneminder.nix b/third_party/nixpkgs/nixos/modules/services/misc/zoneminder.nix
index 8db63d5386..5b0b1448f6 100644
--- a/third_party/nixpkgs/nixos/modules/services/misc/zoneminder.nix
+++ b/third_party/nixpkgs/nixos/modules/services/misc/zoneminder.nix
@@ -202,10 +202,11 @@ in {
     ];
 
     services = {
-      fcgiwrap.zoneminder = lib.mkIf useNginx {
+      fcgiwrap.instances.zoneminder = lib.mkIf useNginx {
         process.prefork = cfg.cameras;
         process.user = user;
         process.group = group;
+        socket = { inherit (config.services.nginx) user group; };
       };
 
       mysql = lib.mkIf cfg.database.createLocally {
@@ -255,7 +256,7 @@ in {
                   fastcgi_param HTTP_PROXY "";
                   fastcgi_intercept_errors on;
 
-                  fastcgi_pass unix:${config.services.fcgiwrap.zoneminder.socket.address};
+                  fastcgi_pass unix:${config.services.fcgiwrap.instances.zoneminder.socket.address};
                 }
 
                 location /cache/ {
@@ -372,5 +373,5 @@ in {
     };
   };
 
-  meta.maintainers = with lib.maintainers; [ ];
+  meta.maintainers = [ ];
 }
diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/smartctl.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/smartctl.nix
index 8aadd87abb..e3dcc6126f 100644
--- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/smartctl.nix
+++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/smartctl.nix
@@ -2,20 +2,23 @@
 
 let
   cfg = config.services.prometheus.exporters.smartctl;
+
   inherit (lib) mkOption types literalExpression;
+
   args = lib.escapeShellArgs ([
     "--web.listen-address=${cfg.listenAddress}:${toString cfg.port}"
-    "--smartctl.path=${pkgs.smartmontools}/bin/smartctl"
     "--smartctl.interval=${cfg.maxInterval}"
   ] ++ map (device: "--smartctl.device=${device}") cfg.devices
   ++ cfg.extraFlags);
-in {
+
+in
+{
   port = 9633;
 
   extraOpts = {
     devices = mkOption {
       type = types.listOf types.str;
-      default = [];
+      default = [ ];
       example = literalExpression ''
         [ "/dev/sda", "/dev/nvme0n1" ];
       '';
@@ -24,6 +27,7 @@ in {
         all disks if none given.
       '';
     };
+
     maxInterval = mkOption {
       type = types.str;
       default = "60s";
@@ -50,9 +54,7 @@ in {
         "block-sd rw"
         "char-nvme rw"
       ];
-      ExecStart = ''
-        ${pkgs.prometheus-smartctl-exporter}/bin/smartctl_exporter ${args}
-      '';
+      ExecStart = "${pkgs.prometheus-smartctl-exporter}/bin/smartctl_exporter ${args}";
       PrivateDevices = lib.mkForce false;
       ProtectProc = "invisible";
       ProcSubset = "pid";
diff --git a/third_party/nixpkgs/nixos/modules/services/networking/bee.nix b/third_party/nixpkgs/nixos/modules/services/networking/bee.nix
index 72483c41d0..83ce522ba6 100644
--- a/third_party/nixpkgs/nixos/modules/services/networking/bee.nix
+++ b/third_party/nixpkgs/nixos/modules/services/networking/bee.nix
@@ -8,7 +8,7 @@ let
 in {
   meta = {
     # doc = ./bee.xml;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 
   ### interface
diff --git a/third_party/nixpkgs/nixos/modules/services/networking/cgit.nix b/third_party/nixpkgs/nixos/modules/services/networking/cgit.nix
index de8128ed5a..cdd316dd99 100644
--- a/third_party/nixpkgs/nixos/modules/services/networking/cgit.nix
+++ b/third_party/nixpkgs/nixos/modules/services/networking/cgit.nix
@@ -32,7 +32,7 @@ let
       fastcgi_split_path_info ^(${regexLocation cfg})(/.+)$;
       fastcgi_param PATH_INFO $fastcgi_path_info;
     ''
-    }fastcgi_pass unix:${config.services.fcgiwrap."cgit-${name}".socket.address};
+    }fastcgi_pass unix:${config.services.fcgiwrap.instances."cgit-${name}".socket.address};
   '';
 
   cgitrcLine = name: value: "${name}=${
@@ -171,7 +171,7 @@ in
       groups.${cfg.group} = { };
     }));
 
-    services.fcgiwrap = flip mapAttrs' cfgs (name: cfg:
+    services.fcgiwrap.instances = flip mapAttrs' cfgs (name: cfg:
       nameValuePair "cgit-${name}" {
         process = { inherit (cfg) user group; };
         socket = { inherit (config.services.nginx) user group; };
diff --git a/third_party/nixpkgs/nixos/modules/services/networking/eternal-terminal.nix b/third_party/nixpkgs/nixos/modules/services/networking/eternal-terminal.nix
index f4456f4d99..d26e26d0c1 100644
--- a/third_party/nixpkgs/nixos/modules/services/networking/eternal-terminal.nix
+++ b/third_party/nixpkgs/nixos/modules/services/networking/eternal-terminal.nix
@@ -90,6 +90,6 @@ in
   };
 
   meta = {
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/third_party/nixpkgs/nixos/modules/services/networking/firefox-syncserver.nix b/third_party/nixpkgs/nixos/modules/services/networking/firefox-syncserver.nix
index 674a424fb0..2f706c3bc3 100644
--- a/third_party/nixpkgs/nixos/modules/services/networking/firefox-syncserver.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/modules/services/networking/hans.nix b/third_party/nixpkgs/nixos/modules/services/networking/hans.nix
index 00d276bcdf..0d0e2c340e 100644
--- a/third_party/nixpkgs/nixos/modules/services/networking/hans.nix
+++ b/third_party/nixpkgs/nixos/modules/services/networking/hans.nix
@@ -141,5 +141,5 @@ in
     };
   };
 
-  meta.maintainers = with maintainers; [ ];
+  meta.maintainers = [ ];
 }
diff --git a/third_party/nixpkgs/nixos/modules/services/networking/i2pd.nix b/third_party/nixpkgs/nixos/modules/services/networking/i2pd.nix
index aa059b1b7c..2bb9df15de 100644
--- a/third_party/nixpkgs/nixos/modules/services/networking/i2pd.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/modules/services/networking/mosquitto.nix b/third_party/nixpkgs/nixos/modules/services/networking/mosquitto.nix
index 7baaf93a1b..1137c61df9 100644
--- a/third_party/nixpkgs/nixos/modules/services/networking/mosquitto.nix
+++ b/third_party/nixpkgs/nixos/modules/services/networking/mosquitto.nix
@@ -721,7 +721,7 @@ in
   };
 
   meta = {
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
     doc = ./mosquitto.md;
   };
 }
diff --git a/third_party/nixpkgs/nixos/modules/services/networking/nar-serve.nix b/third_party/nixpkgs/nixos/modules/services/networking/nar-serve.nix
index b2082032ad..5a5cefe86d 100644
--- a/third_party/nixpkgs/nixos/modules/services/networking/nar-serve.nix
+++ b/third_party/nixpkgs/nixos/modules/services/networking/nar-serve.nix
@@ -12,6 +12,8 @@ in
     services.nar-serve = {
       enable = mkEnableOption "serving NAR file contents via HTTP";
 
+      package = mkPackageOption pkgs "nar-serve" { };
+
       port = mkOption {
         type = types.port;
         default = 8383;
@@ -32,6 +34,17 @@ in
           - gs:// for binary caches stored in Google Cloud Storage
         '';
       };
+
+      domain = mkOption {
+        type = types.str;
+        default = "";
+        description = ''
+          When set, enables the feature of serving <nar-hash>.<domain>
+          on top of <domain>/nix/store/<nar-hash>-<pname>.
+
+          Useful to preview static websites where paths are absolute.
+        '';
+      };
     };
   };
 
@@ -47,7 +60,7 @@ in
       serviceConfig = {
         Restart = "always";
         RestartSec = "5s";
-        ExecStart = "${pkgs.nar-serve}/bin/nar-serve";
+        ExecStart = lib.getExe cfg.package;
         DynamicUser = true;
       };
     };
diff --git a/third_party/nixpkgs/nixos/modules/services/networking/pppd.nix b/third_party/nixpkgs/nixos/modules/services/networking/pppd.nix
index 8310b119b5..3642a4b15a 100644
--- a/third_party/nixpkgs/nixos/modules/services/networking/pppd.nix
+++ b/third_party/nixpkgs/nixos/modules/services/networking/pppd.nix
@@ -7,7 +7,7 @@ let
 in
 {
   meta = {
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 
   options = {
diff --git a/third_party/nixpkgs/nixos/modules/services/networking/resilio.nix b/third_party/nixpkgs/nixos/modules/services/networking/resilio.nix
index c788069fba..02773d78b1 100644
--- a/third_party/nixpkgs/nixos/modules/services/networking/resilio.nix
+++ b/third_party/nixpkgs/nixos/modules/services/networking/resilio.nix
@@ -291,5 +291,5 @@ in
     };
   };
 
-  meta.maintainers = with maintainers; [ ];
+  meta.maintainers = [ ];
 }
diff --git a/third_party/nixpkgs/nixos/modules/services/networking/smokeping.nix b/third_party/nixpkgs/nixos/modules/services/networking/smokeping.nix
index a07cde847c..2e572a3d07 100644
--- a/third_party/nixpkgs/nixos/modules/services/networking/smokeping.nix
+++ b/third_party/nixpkgs/nixos/modules/services/networking/smokeping.nix
@@ -337,7 +337,7 @@ in
     };
 
     # use nginx to serve the smokeping web service
-    services.fcgiwrap.smokeping = mkIf cfg.webService {
+    services.fcgiwrap.instances.smokeping = mkIf cfg.webService {
       process.user = cfg.user;
       process.group = cfg.user;
       socket = { inherit (config.services.nginx) user group; };
@@ -353,7 +353,7 @@ in
         locations."/smokeping.fcgi" = {
           extraConfig = ''
             include ${config.services.nginx.package}/conf/fastcgi_params;
-            fastcgi_pass unix:${config.services.fcgiwrap.smokeping.socket.address};
+            fastcgi_pass unix:${config.services.fcgiwrap.instances.smokeping.socket.address};
             fastcgi_param SCRIPT_FILENAME ${smokepingHome}/smokeping.fcgi;
             fastcgi_param DOCUMENT_ROOT ${smokepingHome};
           '';
diff --git a/third_party/nixpkgs/nixos/modules/services/networking/wvdial.nix b/third_party/nixpkgs/nixos/modules/services/networking/wvdial.nix
new file mode 100644
index 0000000000..8e06d64940
--- /dev/null
+++ b/third_party/nixpkgs/nixos/modules/services/networking/wvdial.nix
@@ -0,0 +1,47 @@
+# Global configuration for wvdial.
+
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+let
+  cfg = config.environment.wvdial;
+in
+{
+  options = {
+    environment.wvdial = {
+      dialerDefaults = lib.mkOption {
+        default = "";
+        type = lib.types.str;
+        example = ''Init1 = AT+CGDCONT=1,"IP","internet.t-mobile"'';
+        description = ''
+          Contents of the "Dialer Defaults" section of
+          <filename>/etc/wvdial.conf</filename>.
+        '';
+      };
+      pppDefaults = lib.mkOption {
+        default = ''
+          noipdefault
+          usepeerdns
+          defaultroute
+          persist
+          noauth
+        '';
+        type = lib.types.str;
+        description = "Default ppp settings for wvdial.";
+      };
+    };
+  };
+
+  config = lib.mkIf (cfg.dialerDefaults != "") {
+    environment.etc."wvdial.conf".source = pkgs.writeText "wvdial.conf" ''
+      [Dialer Defaults]
+      PPPD PATH = ${pkgs.ppp}/sbin/pppd
+      ${config.environment.wvdial.dialerDefaults}
+    '';
+    environment.etc."ppp/peers/wvdial".source = pkgs.writeText "wvdial" cfg.pppDefaults;
+  };
+}
diff --git a/third_party/nixpkgs/nixos/modules/services/security/hologram-agent.nix b/third_party/nixpkgs/nixos/modules/services/security/hologram-agent.nix
index e29267e500..a2cf9611d6 100644
--- a/third_party/nixpkgs/nixos/modules/services/security/hologram-agent.nix
+++ b/third_party/nixpkgs/nixos/modules/services/security/hologram-agent.nix
@@ -54,5 +54,5 @@ in {
 
   };
 
-  meta.maintainers = with lib.maintainers; [ ];
+  meta.maintainers = [ ];
 }
diff --git a/third_party/nixpkgs/nixos/modules/services/security/shibboleth-sp.nix b/third_party/nixpkgs/nixos/modules/services/security/shibboleth-sp.nix
index c6d260b902..0a85173501 100644
--- a/third_party/nixpkgs/nixos/modules/services/security/shibboleth-sp.nix
+++ b/third_party/nixpkgs/nixos/modules/services/security/shibboleth-sp.nix
@@ -70,5 +70,5 @@ in {
     };
   };
 
-  meta.maintainers = with lib.maintainers; [ ];
+  meta.maintainers = [ ];
 }
diff --git a/third_party/nixpkgs/nixos/modules/services/security/step-ca.nix b/third_party/nixpkgs/nixos/modules/services/security/step-ca.nix
index 43bc402e78..70651e995d 100644
--- a/third_party/nixpkgs/nixos/modules/services/security/step-ca.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/modules/services/video/frigate.nix b/third_party/nixpkgs/nixos/modules/services/video/frigate.nix
index c3ec4a3c76..5fa67b5ca2 100644
--- a/third_party/nixpkgs/nixos/modules/services/video/frigate.nix
+++ b/third_party/nixpkgs/nixos/modules/services/video/frigate.nix
@@ -403,7 +403,7 @@ in
       path = with pkgs; [
         # unfree:
         # config.boot.kernelPackages.nvidiaPackages.latest.bin
-        ffmpeg_5-headless
+        ffmpeg-headless
         libva-utils
         procps
         radeontop
diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/akkoma.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/akkoma.nix
index 8ba3c7eaa1..17c221778d 100644
--- a/third_party/nixpkgs/nixos/modules/services/web-apps/akkoma.nix
+++ b/third_party/nixpkgs/nixos/modules/services/web-apps/akkoma.nix
@@ -452,9 +452,9 @@ in {
 
       extraPackages = mkOption {
         type = with types; listOf package;
-        default = with pkgs; [ exiftool ffmpeg_5-headless graphicsmagick-imagemagick-compat ];
-        defaultText = literalExpression "with pkgs; [ exiftool graphicsmagick-imagemagick-compat ffmpeg_5-headless ]";
-        example = literalExpression "with pkgs; [ exiftool imagemagick ffmpeg_5-full ]";
+        default = with pkgs; [ exiftool ffmpeg-headless graphicsmagick-imagemagick-compat ];
+        defaultText = literalExpression "with pkgs; [ exiftool ffmpeg-headless graphicsmagick-imagemagick-compat ]";
+        example = literalExpression "with pkgs; [ exiftool ffmpeg-full imagemagick ]";
         description = ''
           List of extra packages to include in the executable search path of the service unit.
           These are needed by various configurable components such as:
diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/gotify-server.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/gotify-server.nix
index b700fd14ee..5f5a9f9f86 100644
--- a/third_party/nixpkgs/nixos/modules/services/web-apps/gotify-server.nix
+++ b/third_party/nixpkgs/nixos/modules/services/web-apps/gotify-server.nix
@@ -1,49 +1,90 @@
-{ pkgs, lib, config, ... }:
-
-with lib;
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}:
 
 let
   cfg = config.services.gotify;
-in {
-  options = {
-    services.gotify = {
-      enable = mkEnableOption "Gotify webserver";
+in
+{
+  imports = [
+    (lib.mkRenamedOptionModule
+      [
+        "services"
+        "gotify"
+        "port"
+      ]
+      [
+        "services"
+        "gotify"
+        "environment"
+        "GOTIFY_SERVER_PORT"
+      ]
+    )
+  ];
 
-      port = mkOption {
-        type = types.port;
-        description = ''
-          Port the server listens to.
-        '';
-      };
+  options.services.gotify = {
+    enable = lib.mkEnableOption "Gotify webserver";
 
-      stateDirectoryName = mkOption {
-        type = types.str;
-        default = "gotify-server";
-        description = ''
-          The name of the directory below {file}`/var/lib` where
-          gotify stores its runtime data.
-        '';
+    package = lib.mkPackageOption pkgs "gotify-server" { };
+
+    environment = lib.mkOption {
+      type = lib.types.attrsOf (
+        lib.types.oneOf [
+          lib.types.str
+          lib.types.int
+        ]
+      );
+      default = { };
+      example = {
+        GOTIFY_SERVER_PORT = 8080;
+        GOTIFY_DATABASE_DIALECT = "sqlite3";
       };
+      description = ''
+        Config environment variables for the gotify-server.
+        See https://gotify.net/docs/config for more details.
+      '';
+    };
+
+    environmentFiles = lib.mkOption {
+      type = lib.types.listOf lib.types.path;
+      default = [ ];
+      description = ''
+        Files containing additional config environment variables for gotify-server.
+        Secrets should be set in environmentFiles instead of environment.
+      '';
+    };
+
+    stateDirectoryName = lib.mkOption {
+      type = lib.types.str;
+      default = "gotify-server";
+      description = ''
+        The name of the directory below {file}`/var/lib` where
+        gotify stores its runtime data.
+      '';
     };
   };
 
-  config = mkIf cfg.enable {
+  config = lib.mkIf cfg.enable {
     systemd.services.gotify-server = {
       wantedBy = [ "multi-user.target" ];
       after = [ "network.target" ];
       description = "Simple server for sending and receiving messages";
 
-      environment = {
-        GOTIFY_SERVER_PORT = toString cfg.port;
-      };
+      environment = lib.mapAttrs (_: toString) cfg.environment;
 
       serviceConfig = {
         WorkingDirectory = "/var/lib/${cfg.stateDirectoryName}";
         StateDirectory = cfg.stateDirectoryName;
+        EnvironmentFile = cfg.environmentFiles;
         Restart = "always";
-        DynamicUser = "yes";
-        ExecStart = "${pkgs.gotify-server}/bin/server";
+        DynamicUser = true;
+        ExecStart = lib.getExe cfg.package;
       };
     };
   };
+
+  meta.maintainers = with lib.maintainers; [ DCsunset ];
 }
diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/fcgiwrap.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/fcgiwrap.nix
index 29ddd39942..36a327b9ab 100644
--- a/third_party/nixpkgs/nixos/modules/services/web-servers/fcgiwrap.nix
+++ b/third_party/nixpkgs/nixos/modules/services/web-servers/fcgiwrap.nix
@@ -3,12 +3,26 @@
 with lib;
 
 let
-  forEachInstance = f: flip mapAttrs' config.services.fcgiwrap (name: cfg:
-    nameValuePair "fcgiwrap-${name}" (f cfg)
+  forEachInstance = f: flip mapAttrs' config.services.fcgiwrap.instances (
+    name: cfg: nameValuePair "fcgiwrap-${name}" (f cfg)
   );
 
 in {
-  options.services.fcgiwrap = mkOption {
+  imports = forEach [
+    "enable"
+    "user"
+    "group"
+    "socketType"
+    "socketAddress"
+    "preforkProcesses"
+  ] (attr: mkRemovedOptionModule [ "services" "fcgiwrap" attr ] ''
+      The global shared fcgiwrap instance is no longer supported due to
+      security issues.
+      Isolated instances should instead be configured through
+      `services.fcgiwrap.instances.*'.
+  '');
+
+  options.services.fcgiwrap.instances = mkOption {
     description = "Configuration for fcgiwrap instances.";
     default = { };
     type = types.attrsOf (types.submodule ({ config, ... }: { options = {
@@ -54,7 +68,6 @@ in {
         default = null;
         description = ''
           User to be set as owner of the UNIX socket.
-          Defaults to the process running user.
         '';
       };
 
@@ -63,7 +76,6 @@ in {
         default = null;
         description = ''
           Group to be set as owner of the UNIX socket.
-          Defaults to the process running group.
         '';
       };
 
@@ -83,6 +95,14 @@ in {
 
   config = {
     assertions = concatLists (mapAttrsToList (name: cfg: [
+      {
+        assertion = cfg.socket.type == "unix" -> cfg.socket.user != null;
+        message = "Socket owner is required for the UNIX socket type.";
+      }
+      {
+        assertion = cfg.socket.type == "unix" -> cfg.socket.group != null;
+        message = "Socket owner is required for the UNIX socket type.";
+      }
       {
         assertion = cfg.socket.user != null -> cfg.socket.type == "unix";
         message = "Socket owner can only be set for the UNIX socket type.";
@@ -95,7 +115,7 @@ in {
         assertion = cfg.socket.mode != null -> cfg.socket.type == "unix";
         message = "Socket mode can only be set for the UNIX socket type.";
       }
-    ]) config.services.fcgiwrap);
+    ]) config.services.fcgiwrap.instances);
 
     systemd.services = forEachInstance (cfg: {
       after = [ "nss-user-lookup.target" ];
diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/gitweb.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/gitweb.nix
index 9242c1adbd..81f794bf9b 100644
--- a/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/gitweb.nix
+++ b/third_party/nixpkgs/nixos/modules/services/web-servers/nginx/gitweb.nix
@@ -89,6 +89,6 @@ in
 
   };
 
-  meta.maintainers = with maintainers; [ ];
+  meta.maintainers = [ ];
 
 }
diff --git a/third_party/nixpkgs/nixos/modules/system/activation/activation-script.nix b/third_party/nixpkgs/nixos/modules/system/activation/activation-script.nix
index fc29aa3cb2..195ad31b1e 100644
--- a/third_party/nixpkgs/nixos/modules/system/activation/activation-script.nix
+++ b/third_party/nixpkgs/nixos/modules/system/activation/activation-script.nix
@@ -33,6 +33,8 @@ let
     ''
       #!${pkgs.runtimeShell}
 
+      source ${./lib/lib.sh}
+
       systemConfig='@out@'
 
       export PATH=/empty
diff --git a/third_party/nixpkgs/nixos/modules/system/activation/lib/lib.sh b/third_party/nixpkgs/nixos/modules/system/activation/lib/lib.sh
new file mode 100644
index 0000000000..5ecf94e816
--- /dev/null
+++ b/third_party/nixpkgs/nixos/modules/system/activation/lib/lib.sh
@@ -0,0 +1,5 @@
+# shellcheck shell=bash
+
+warn() {
+    printf "\033[1;35mwarning:\033[0m %s\n" "$*" >&2
+}
diff --git a/third_party/nixpkgs/nixos/modules/system/activation/lib/test.nix b/third_party/nixpkgs/nixos/modules/system/activation/lib/test.nix
new file mode 100644
index 0000000000..39886d3051
--- /dev/null
+++ b/third_party/nixpkgs/nixos/modules/system/activation/lib/test.nix
@@ -0,0 +1,36 @@
+# Run:
+#   nix-build -A nixosTests.activation-lib
+{ lib, stdenv, testers }:
+let
+  inherit (lib) fileset;
+
+  runTests = stdenv.mkDerivation {
+    name = "tests-activation-lib";
+    src = fileset.toSource {
+      root = ./.;
+      fileset = fileset.unions [
+        ./lib.sh
+        ./test.sh
+      ];
+    };
+    buildPhase = ":";
+    doCheck = true;
+    postUnpack = ''
+      patchShebangs --build .
+    '';
+    checkPhase = ''
+      ./test.sh
+    '';
+    installPhase = ''
+      touch $out
+    '';
+  };
+
+  runShellcheck = testers.shellcheck {
+    src = runTests.src;
+  };
+
+in
+lib.recurseIntoAttrs {
+  inherit runTests runShellcheck;
+}
diff --git a/third_party/nixpkgs/nixos/modules/system/activation/lib/test.sh b/third_party/nixpkgs/nixos/modules/system/activation/lib/test.sh
new file mode 100755
index 0000000000..9b146383ad
--- /dev/null
+++ b/third_party/nixpkgs/nixos/modules/system/activation/lib/test.sh
@@ -0,0 +1,34 @@
+#!/usr/bin/env bash
+
+# Run:
+#   ./test.sh
+# or:
+#   nix-build -A nixosTests.activation-lib
+
+cd "$(dirname "${BASH_SOURCE[0]}")"
+set -euo pipefail
+
+# report failure
+onerr() {
+  set +e
+  # find failed statement
+  echo "call trace:"
+  local i=0
+  while t="$(caller $i)"; do
+    line="${t%% *}"
+    file="${t##* }"
+    echo "  $file:$line" >&2
+    ((i++))
+  done
+  # red
+  printf "\033[1;31mtest failed\033[0m\n" >&2
+  exit 1
+}
+trap onerr ERR
+
+source ./lib.sh
+
+(warn hi, this works >/dev/null) 2>&1 | grep -E $'.*warning:.* hi, this works' >/dev/null
+
+# green
+printf "\033[1;32mok\033[0m\n"
diff --git a/third_party/nixpkgs/nixos/modules/system/boot/loader/systemd-boot/boot-counting.md b/third_party/nixpkgs/nixos/modules/system/boot/loader/systemd-boot/boot-counting.md
new file mode 100644
index 0000000000..743584b525
--- /dev/null
+++ b/third_party/nixpkgs/nixos/modules/system/boot/loader/systemd-boot/boot-counting.md
@@ -0,0 +1,38 @@
+# Automatic boot assessment with systemd-boot {#sec-automatic-boot-assessment}
+
+## Overview {#sec-automatic-boot-assessment-overview}
+
+Automatic boot assessment (or boot-counting) is a feature of `systemd-boot` that allows for automatically detecting invalid boot entries.
+When the feature is active, each boot entry has an associated counter with a user defined number of trials. Whenever `systemd-boot` boots an entry, its counter is decreased by one, ultimately being marked as *bad* if the counter ever reaches zero. However, if an entry is successfully booted, systemd will permanently mark it as *good* and remove the counter altogether. Whenever an entry is marked as *bad*, it is sorted last in the `systemd-boot` menu.
+A complete explanation of how that feature works can be found [here](https://systemd.io/AUTOMATIC_BOOT_ASSESSMENT/).
+
+## Enabling the feature {#sec-automatic-boot-assessment-enable}
+
+The feature can be enabled by toogling the [boot.loader.systemd-boot.bootCounting](#opt-boot.loader.systemd-boot.bootCounting.enable) option.
+
+## The boot-complete.target unit {#sec-automatic-boot-assessment-boot-complete-target}
+
+A *successful boot* for an entry is defined in terms of the `boot-complete.target` synchronisation point. It is up to the user to schedule all necessary units for the machine to be considered successfully booted before that synchronisation point.
+For example, if you are running `docker` on a machine and you want to be sure that a *good* entry is an entry where docker is started successfully.
+A configuration for that NixOS machine could look like that:
+
+```
+boot.loader.systemd-boot.bootCounting.enable = true;
+services.docker.enable = true;
+
+systemd.services.docker = {
+  before = [ "boot-complete.target" ];
+  wantedBy = [ "boot-complete.target" ];
+  unitConfig.FailureAction = "reboot";
+};
+```
+
+The systemd service type must be of type `notify` or `oneshot` for systemd to dectect the startup error properly.
+
+## Interaction with specialisations {#sec-automatic-boot-assessment-specialisations}
+
+When the boot-counting feature is enabled, `systemd-boot` will still try the boot entries in the same order as they are displayed in the boot menu. This means that the specialisations of a given generation will be tried directly after that generation, but that behavior is customizable with the [boot.loader.systemd-boot.sortKey](#opt-boot.loader.systemd-boot.sortKey) option.
+
+## Limitations {#sec-automatic-boot-assessment-limitations}
+
+This feature has to be used wisely to not risk any data integrity issues. Rollbacking into past generations can sometimes be dangerous, for example if some of the services may have undefined behaviors in the presence of unrecognized data migrations from future versions of themselves.
diff --git a/third_party/nixpkgs/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py b/third_party/nixpkgs/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py
index 0d8763e971..87ea569bdb 100644
--- a/third_party/nixpkgs/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py
+++ b/third_party/nixpkgs/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py
@@ -12,8 +12,9 @@ import subprocess
 import sys
 import warnings
 import json
-from typing import NamedTuple, Any
+from typing import NamedTuple, Any, Type
 from dataclasses import dataclass
+from pathlib import Path
 
 # These values will be replaced with actual values during the package build
 EFI_SYS_MOUNT_POINT = "@efiSysMountPoint@"
@@ -32,6 +33,8 @@ CAN_TOUCH_EFI_VARIABLES = "@canTouchEfiVariables@"
 GRACEFUL = "@graceful@"
 COPY_EXTRA_FILES = "@copyExtraFiles@"
 CHECK_MOUNTPOINTS = "@checkMountpoints@"
+BOOT_COUNTING_TRIES = "@bootCountingTries@"
+BOOT_COUNTING = "@bootCounting@" == "True"
 
 @dataclass
 class BootSpec:
@@ -46,6 +49,104 @@ class BootSpec:
     sortKey: str  # noqa: N815
     initrdSecrets: str | None = None  # noqa: N815
 
+@dataclass
+class Entry:
+    profile: str | None
+    generation_number: int
+    specialisation: str | None
+
+    @classmethod
+    def from_path(cls: Type["Entry"], path: Path) -> "Entry":
+        filename = path.name
+        # Matching nixos-$profile-generation-*.conf
+        rex_profile = re.compile(r"^nixos-(.*)-generation-.*\.conf$")
+        # Matching nixos*-generation-$number*.conf
+        rex_generation = re.compile(r"^nixos.*-generation-([0-9]+).*\.conf$")
+        # Matching nixos*-generation-$number-specialisation-$specialisation_name*.conf
+        rex_specialisation = re.compile(r"^nixos.*-generation-([0-9]+)-specialisation-([a-zA-Z0-9]+).*\.conf$")
+        profile = rex_profile.sub(r"\1", filename) if rex_profile.match(filename) else None
+        specialisation = rex_specialisation.sub(r"\2", filename) if rex_specialisation.match(filename) else None
+        try:
+            generation_number = int(rex_generation.sub(r"\1", filename))
+        except ValueError:
+            raise
+        return cls(profile, generation_number, specialisation)
+
+@dataclass
+class DiskEntry:
+    entry: Entry
+    default: bool
+    counters: str | None
+    title: str | None
+    description: str | None
+    kernel: str
+    initrd: str
+    kernel_params: str | None
+    machine_id: str | None
+    sort_key: str
+
+    @classmethod
+    def from_path(cls: Type["DiskEntry"], path: Path) -> "DiskEntry":
+        entry = Entry.from_path(path)
+        data = path.read_text().splitlines()
+        if '' in data:
+            data.remove('')
+        entry_map = dict(lines.split(' ', 1) for lines in data)
+        assert "linux" in entry_map
+        assert "initrd" in entry_map
+        filename = path.name
+        # Matching nixos*-generation-*$counters.conf
+        rex_counters = re.compile(r"^nixos.*-generation-.*(\+\d(-\d)?)\.conf$")
+        counters = rex_counters.sub(r"\1", filename) if rex_counters.match(filename) else None
+        disk_entry = cls(
+            entry=entry,
+            default=(entry_map.get("sort-key") == "default"),
+            counters=counters,
+            title=entry_map.get("title"),
+            description=entry_map.get("version"),
+            kernel=entry_map["linux"],
+            initrd=entry_map["initrd"],
+            kernel_params=entry_map.get("options"),
+            machine_id=entry_map.get("machine-id"),
+            sort_key=entry_map.get("sort_key", "nixos"))
+        return disk_entry
+
+    def write(self, sorted_first: str) -> None:
+        # Compute a sort-key sorted before sorted_first
+        # This will compute something like: nixos -> nixor-default to make sure we come before other nixos entries,
+        # while allowing users users can pre-pend their own entries before.
+        default_sort_key = sorted_first[:-1] + chr(ord(sorted_first[-1])-1) + "-default"
+        tmp_path = self.path.with_suffix(".tmp")
+        with tmp_path.open('w') as f:
+            # We use "sort-key" to sort the default generation first.
+            # The "default" string is sorted before "non-default" (alphabetically)
+            boot_entry = [
+                f"title {self.title}" if self.title is not None else None,
+                f"version {self.description}" if self.description is not None else None,
+                f"linux {self.kernel}",
+                f"initrd  {self.initrd}",
+                f"options {self.kernel_params}" if self.kernel_params is not None else None,
+                f"machine-id {self.machine_id}" if self.machine_id is not None else None,
+                f"sort-key {default_sort_key if self.default else self.sort_key}"
+            ]
+
+            f.write("\n".join(filter(None, boot_entry)))
+            f.flush()
+            os.fsync(f.fileno())
+        tmp_path.rename(self.path)
+
+
+    @property
+    def path(self) -> Path:
+        pieces = [
+            "nixos",
+            self.entry.profile or None,
+            "generation",
+            str(self.entry.generation_number),
+            f"specialisation-{self.entry.specialisation}" if self.entry.specialisation else None,
+        ]
+        prefix = "-".join(p for p in pieces if p)
+        return Path(f"{BOOT_MOUNT_POINT}/loader/entries/{prefix}{self.counters if self.counters else ''}.conf")
 
 libc = ctypes.CDLL("libc.so.6")
 
@@ -78,30 +179,14 @@ def system_dir(profile: str | None, generation: int, specialisation: str | None)
     else:
         return d
 
-BOOT_ENTRY = """title {title}
-sort-key {sort_key}
-version Generation {generation} {description}
-linux {kernel}
-initrd {initrd}
-options {kernel_params}
-"""
-
-def generation_conf_filename(profile: str | None, generation: int, specialisation: str | None) -> str:
-    pieces = [
-        "nixos",
-        profile or None,
-        "generation",
-        str(generation),
-        f"specialisation-{specialisation}" if specialisation else None,
-    ]
-    return "-".join(p for p in pieces if p) + ".conf"
-
-
-def write_loader_conf(profile: str | None, generation: int, specialisation: str | None) -> None:
-    with open(f"{LOADER_CONF}.tmp", 'w') as f:
+def write_loader_conf(profile: str | None) -> None:
+    with open(f"{EFI_SYS_MOUNT_POINT}/loader/loader.conf.tmp", 'w') as f:
         if TIMEOUT != "":
             f.write(f"timeout {TIMEOUT}\n")
-        f.write("default %s\n" % generation_conf_filename(profile, generation, specialisation))
+        if profile:
+            f.write("default nixos-%s-generation-*\n" % profile)
+        else:
+            f.write("default nixos-generation-*\n")
         if not EDITOR:
             f.write("editor 0\n")
         f.write(f"console-mode {CONSOLE_MODE}\n")
@@ -109,6 +194,19 @@ def write_loader_conf(profile: str | None, generation: int, specialisation: str
         os.fsync(f.fileno())
     os.rename(f"{LOADER_CONF}.tmp", LOADER_CONF)
 
+def scan_entries() -> list[DiskEntry]:
+    """
+    Scan all entries in $ESP/loader/entries/*
+    Does not support Type 2 entries as we do not support them for now.
+    Returns a generator of Entry.
+    """
+    entries = []
+    for path in Path(f"{EFI_SYS_MOUNT_POINT}/loader/entries/").glob("nixos*-generation-[1-9]*.conf"):
+        try:
+            entries.append(DiskEntry.from_path(path))
+        except ValueError:
+            continue
+    return entries
 
 def get_bootspec(profile: str | None, generation: int) -> BootSpec:
     system_directory = system_dir(profile, generation, None)
@@ -151,8 +249,14 @@ def copy_from_file(file: str, dry_run: bool = False) -> str:
         copy_if_not_exists(store_file_path, f"{BOOT_MOUNT_POINT}{efi_file_path}")
     return efi_file_path
 
-def write_entry(profile: str | None, generation: int, specialisation: str | None,
-                machine_id: str, bootspec: BootSpec, current: bool) -> None:
+def write_entry(profile: str | None,
+                generation: int,
+                specialisation: str | None,
+                machine_id: str,
+                bootspec: BootSpec,
+                entries: list[DiskEntry],
+                sorted_first: str,
+                current: bool) -> None:
     if specialisation:
         bootspec = bootspec.specialisations[specialisation]
     kernel = copy_from_file(bootspec.kernel)
@@ -175,29 +279,32 @@ def write_entry(profile: str | None, generation: int, specialisation: str | None
                   f'for "{title} - Configuration {generation}", an older generation', file=sys.stderr)
             print("note: this is normal after having removed "
                   "or renamed a file in `boot.initrd.secrets`", file=sys.stderr)
-    entry_file = f"{BOOT_MOUNT_POINT}/loader/entries/%s" % (
-        generation_conf_filename(profile, generation, specialisation))
-    tmp_path = "%s.tmp" % (entry_file)
     kernel_params = "init=%s " % bootspec.init
-
     kernel_params = kernel_params + " ".join(bootspec.kernelParams)
     build_time = int(os.path.getctime(system_dir(profile, generation, specialisation)))
     build_date = datetime.datetime.fromtimestamp(build_time).strftime('%F')
+    counters = f"+{BOOT_COUNTING_TRIES}" if BOOT_COUNTING else ""
+    entry = Entry(profile, generation, specialisation)
+    # We check if the entry we are writing is already on disk
+    # and we update its "default entry" status
+    for entry_on_disk in entries:
+        if entry == entry_on_disk.entry:
+            entry_on_disk.default = current
+            entry_on_disk.write(sorted_first)
+            return
 
-    with open(tmp_path, 'w') as f:
-        f.write(BOOT_ENTRY.format(title=title,
-                    sort_key=bootspec.sortKey,
-                    generation=generation,
-                    kernel=kernel,
-                    initrd=initrd,
-                    kernel_params=kernel_params,
-                    description=f"{bootspec.label}, built on {build_date}"))
-        if machine_id is not None:
-            f.write("machine-id %s\n" % machine_id)
-        f.flush()
-        os.fsync(f.fileno())
-    os.rename(tmp_path, entry_file)
-
+    DiskEntry(
+        entry=entry,
+        title=title,
+        kernel=kernel,
+        initrd=initrd,
+        counters=counters,
+        kernel_params=kernel_params,
+        machine_id=machine_id,
+        description=f"Generation {generation} {bootspec.label}, built on {build_date}",
+        sort_key=bootspec.sortKey,
+        default=current
+    ).write(sorted_first)
 
 def get_generations(profile: str | None = None) -> list[SystemIdentifier]:
     gen_list = run(
@@ -225,30 +332,19 @@ def get_generations(profile: str | None = None) -> list[SystemIdentifier]:
     return configurations[-configurationLimit:]
 
 
-def remove_old_entries(gens: list[SystemIdentifier]) -> None:
-    rex_profile = re.compile(r"^" + re.escape(BOOT_MOUNT_POINT) + r"/loader/entries/nixos-(.*)-generation-.*\.conf$")
-    rex_generation = re.compile(r"^" + re.escape(BOOT_MOUNT_POINT) + r"/loader/entries/nixos.*-generation-([0-9]+)(-specialisation-.*)?\.conf$")
+def remove_old_entries(gens: list[SystemIdentifier], disk_entries: list[DiskEntry]) -> None:
     known_paths = []
     for gen in gens:
         bootspec = get_bootspec(gen.profile, gen.generation)
         known_paths.append(copy_from_file(bootspec.kernel, True))
         known_paths.append(copy_from_file(bootspec.initrd, True))
-    for path in glob.iglob(f"{BOOT_MOUNT_POINT}/loader/entries/nixos*-generation-[1-9]*.conf"):
-        if rex_profile.match(path):
-            prof = rex_profile.sub(r"\1", path)
-        else:
-            prof = None
-        try:
-            gen_number = int(rex_generation.sub(r"\1", path))
-        except ValueError:
-            continue
-        if (prof, gen_number, None) not in gens:
-            os.unlink(path)
-    for path in glob.iglob(f"{BOOT_MOUNT_POINT}/{NIXOS_DIR}/*"):
+    for disk_entry in disk_entries:
+        if (disk_entry.entry.profile, disk_entry.entry.generation_number, None) not in gens:
+            os.unlink(disk_entry.path)
+    for path in glob.iglob(f"{EFI_SYS_MOUNT_POINT}/efi/nixos/*"):
         if path not in known_paths and not os.path.isdir(path):
             os.unlink(path)
 
-
 def cleanup_esp() -> None:
     for path in glob.iglob(f"{EFI_SYS_MOUNT_POINT}/loader/entries/nixos*"):
         os.unlink(path)
@@ -267,7 +363,7 @@ def get_profiles() -> list[str]:
 def install_bootloader(args: argparse.Namespace) -> None:
     try:
         with open("/etc/machine-id") as machine_file:
-            machine_id = machine_file.readlines()[0]
+            machine_id = machine_file.readlines()[0].strip()
     except IOError as e:
         if e.errno != errno.ENOENT:
             raise
@@ -351,18 +447,32 @@ def install_bootloader(args: argparse.Namespace) -> None:
     gens = get_generations()
     for profile in get_profiles():
         gens += get_generations(profile)
-
-    remove_old_entries(gens)
+    entries = scan_entries()
+    remove_old_entries(gens, entries)
+    # Compute the sort-key that will be sorted first.
+    sorted_first = ""
+    for gen in gens:
+        try:
+            bootspec = get_bootspec(gen.profile, gen.generation)
+            if bootspec.sortKey < sorted_first or sorted_first == "":
+                sorted_first = bootspec.sortKey
+        except OSError as e:
+            # See https://github.com/NixOS/nixpkgs/issues/114552
+            if e.errno == errno.EINVAL:
+                profile = f"profile '{gen.profile}'" if gen.profile else "default profile"
+                print("ignoring {} in the list of boot entries because of the following error:\n{}".format(profile, e), file=sys.stderr)
+            else:
+                raise e
 
     for gen in gens:
         try:
             bootspec = get_bootspec(gen.profile, gen.generation)
             is_default = os.path.dirname(bootspec.init) == args.default_config
-            write_entry(*gen, machine_id, bootspec, current=is_default)
+            write_entry(*gen, machine_id, bootspec, entries, sorted_first, current=is_default)
             for specialisation in bootspec.specialisations.keys():
-                write_entry(gen.profile, gen.generation, specialisation, machine_id, bootspec, current=is_default)
+                write_entry(gen.profile, gen.generation, specialisation, machine_id, bootspec, entries, sorted_first, current=(is_default and bootspec.specialisations[specialisation].sortKey == bootspec.sortKey))
             if is_default:
-                write_loader_conf(*gen)
+                write_loader_conf(gen.profile)
         except OSError as e:
             # See https://github.com/NixOS/nixpkgs/issues/114552
             if e.errno == errno.EINVAL:
diff --git a/third_party/nixpkgs/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix b/third_party/nixpkgs/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix
index 0a27237e18..b1b2b02e6d 100644
--- a/third_party/nixpkgs/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix
+++ b/third_party/nixpkgs/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix
@@ -80,6 +80,8 @@ let
         ${pkgs.coreutils}/bin/install -D $empty_file "${bootMountPoint}/${nixosDir}/.extra-files/loader/entries/"${escapeShellArg n}
       '') cfg.extraEntries)}
     '';
+    bootCountingTries = cfg.bootCounting.tries;
+    bootCounting = if cfg.bootCounting.enable then "True" else "False";
   };
 
   finalSystemdBootBuilder = pkgs.writeScript "install-systemd-boot.sh" ''
@@ -89,7 +91,10 @@ let
   '';
 in {
 
-  meta.maintainers = with lib.maintainers; [ julienmalka ];
+  meta = {
+    maintainers = with lib.maintainers; [ julienmalka ];
+    doc = ./boot-counting.md;
+  };
 
   imports =
     [ (mkRenamedOptionModule [ "boot" "loader" "gummiboot" "enable" ] [ "boot" "loader" "systemd-boot" "enable" ])
@@ -319,6 +324,15 @@ in {
       '';
     };
 
+    bootCounting = {
+      enable = mkEnableOption "automatic boot assessment";
+      tries = mkOption {
+        default = 3;
+        type = types.int;
+        description = "number of tries each entry should start with";
+      };
+    };
+
   };
 
   config = mkIf cfg.enable {
diff --git a/third_party/nixpkgs/nixos/modules/system/boot/networkd.nix b/third_party/nixpkgs/nixos/modules/system/boot/networkd.nix
index 8ecc6cfe8b..2ee9c72148 100644
--- a/third_party/nixpkgs/nixos/modules/system/boot/networkd.nix
+++ b/third_party/nixpkgs/nixos/modules/system/boot/networkd.nix
@@ -18,12 +18,16 @@ let
           "ManageForeignRoutes"
           "RouteTable"
           "IPv6PrivacyExtensions"
+          "IPv4Forwarding"
+          "IPv6Forwarding"
         ])
         (assertValueOneOf "SpeedMeter" boolValues)
         (assertInt "SpeedMeterIntervalSec")
         (assertValueOneOf "ManageForeignRoutingPolicyRules" boolValues)
         (assertValueOneOf "ManageForeignRoutes" boolValues)
         (assertValueOneOf "IPv6PrivacyExtensions" (boolValues ++ ["prefer-public" "kernel"]))
+        (assertValueOneOf "IPv4Forwarding" boolValues)
+        (assertValueOneOf "IPv6Forwarding" boolValues)
       ];
 
       sectionDHCPv4 = checkUnitConfig "DHCPv4" [
@@ -652,6 +656,8 @@ let
           "DNSDefaultRoute"
           "NTP"
           "IPForward"
+          "IPv4Forwarding"
+          "IPv6Forwarding"
           "IPMasquerade"
           "IPv6PrivacyExtensions"
           "IPv6AcceptRA"
@@ -700,7 +706,9 @@ let
         (assertValueOneOf "LLDP" (boolValues ++ ["routers-only"]))
         (assertValueOneOf "EmitLLDP" (boolValues ++ ["nearest-bridge" "non-tpmr-bridge" "customer-bridge"]))
         (assertValueOneOf "DNSDefaultRoute" boolValues)
-        (assertValueOneOf "IPForward" (boolValues ++ ["ipv4" "ipv6"]))
+        (assertRemoved "IPForward" "IPv4Forwarding and IPv6Forwarding in systemd.network(5) and networkd.conf(5)")
+        (assertValueOneOf "IPv4Forwarding" boolValues)
+        (assertValueOneOf "IPv6Forwarding" boolValues)
         (assertValueOneOf "IPMasquerade" (boolValues ++ ["ipv4" "ipv6" "both"]))
         (assertValueOneOf "IPv6PrivacyExtensions" (boolValues ++ ["prefer-public" "kernel"]))
         (assertValueOneOf "IPv6AcceptRA" boolValues)
@@ -2835,6 +2843,7 @@ let
         "systemd-networkd-wait-online.service"
         "systemd-networkd.service"
         "systemd-networkd.socket"
+        "systemd-networkd-persistent-storage.service"
       ];
 
       environment.etc."systemd/networkd.conf" = renderConfig cfg.config;
diff --git a/third_party/nixpkgs/nixos/modules/system/boot/plymouth.nix b/third_party/nixpkgs/nixos/modules/system/boot/plymouth.nix
index 4fed6335f7..68c3286b22 100644
--- a/third_party/nixpkgs/nixos/modules/system/boot/plymouth.nix
+++ b/third_party/nixpkgs/nixos/modules/system/boot/plymouth.nix
@@ -219,7 +219,7 @@ in
         # Fonts
         "/etc/plymouth/fonts".source = pkgs.runCommand "plymouth-initrd-fonts" {} ''
           mkdir -p $out
-          cp ${cfg.font} $out
+          cp ${escapeShellArg cfg.font} $out
         '';
         "/etc/fonts/fonts.conf".text = ''
           <?xml version="1.0"?>
diff --git a/third_party/nixpkgs/nixos/modules/system/boot/stage-1.nix b/third_party/nixpkgs/nixos/modules/system/boot/stage-1.nix
index ae05bc5ae8..082380216d 100644
--- a/third_party/nixpkgs/nixos/modules/system/boot/stage-1.nix
+++ b/third_party/nixpkgs/nixos/modules/system/boot/stage-1.nix
@@ -131,6 +131,7 @@ let
 
       # Copy udev.
       copy_bin_and_libs ${udev}/bin/udevadm
+      cp ${lib.getLib udev.kmod}/lib/libkmod.so* $out/lib
       copy_bin_and_libs ${udev}/lib/systemd/systemd-sysctl
       for BIN in ${udev}/lib/udev/*_id; do
         copy_bin_and_libs $BIN
diff --git a/third_party/nixpkgs/nixos/modules/system/boot/systemd.nix b/third_party/nixpkgs/nixos/modules/system/boot/systemd.nix
index 76a6751b05..63b6a4dbf1 100644
--- a/third_party/nixpkgs/nixos/modules/system/boot/systemd.nix
+++ b/third_party/nixpkgs/nixos/modules/system/boot/systemd.nix
@@ -37,6 +37,8 @@ let
       "cryptsetup.target"
       "cryptsetup-pre.target"
       "remote-cryptsetup.target"
+    ] ++ optionals cfg.package.withTpm2Tss [
+      "tpm2.target"
     ] ++ [
       "sigpwr.target"
       "timers.target"
@@ -105,6 +107,10 @@ let
       "systemd-rfkill.service"
       "systemd-rfkill.socket"
 
+      # Boot counting
+      "boot-complete.target"
+    ] ++ lib.optional config.boot.loader.systemd-boot.bootCounting.enable "systemd-bless-boot.service" ++ [
+
       # Hibernate / suspend.
       "hibernate.target"
       "suspend.target"
@@ -112,6 +118,7 @@ let
       "sleep.target"
       "hybrid-sleep.target"
       "systemd-hibernate.service"
+      "systemd-hibernate-clear.service"
       "systemd-hybrid-sleep.service"
       "systemd-suspend.service"
       "systemd-suspend-then-hibernate.service"
@@ -136,6 +143,16 @@ let
       "systemd-ask-password-wall.path"
       "systemd-ask-password-wall.service"
 
+      # Varlink APIs
+      "systemd-bootctl@.service"
+      "systemd-bootctl.socket"
+      "systemd-creds@.service"
+      "systemd-creds.socket"
+    ] ++ lib.optional cfg.package.withTpm2Tss [
+      "systemd-pcrlock@.service"
+      "systemd-pcrlock.socket"
+    ] ++ [
+
       # Slices / containers.
       "slices.target"
     ] ++ optionals cfg.package.withImportd [
@@ -158,6 +175,7 @@ let
     ] ++ optionals cfg.package.withHostnamed [
       "dbus-org.freedesktop.hostname1.service"
       "systemd-hostnamed.service"
+      "systemd-hostnamed.socket"
     ] ++ optionals cfg.package.withPortabled [
       "dbus-org.freedesktop.portable1.service"
       "systemd-portabled.service"
diff --git a/third_party/nixpkgs/nixos/modules/system/boot/systemd/initrd.nix b/third_party/nixpkgs/nixos/modules/system/boot/systemd/initrd.nix
index 6107a2594b..f2ffb92097 100644
--- a/third_party/nixpkgs/nixos/modules/system/boot/systemd/initrd.nix
+++ b/third_party/nixpkgs/nixos/modules/system/boot/systemd/initrd.nix
@@ -70,6 +70,7 @@ let
     "systemd-tmpfiles-setup-dev.service"
     "systemd-tmpfiles-setup.service"
     "timers.target"
+    "tpm2.target"
     "umount.target"
     "systemd-bsod.service"
   ] ++ cfg.additionalUpstreamUnits;
@@ -111,8 +112,7 @@ let
     inherit (config.boot.initrd) compressor compressorArgs prepend;
     inherit (cfg) strip;
 
-    contents = map (path: { object = path; symlink = ""; }) (subtractLists cfg.suppressedStorePaths cfg.storePaths)
-      ++ mapAttrsToList (_: v: { object = v.source; symlink = v.target; }) (filterAttrs (_: v: v.enable) cfg.contents);
+    contents = lib.filter ({ source, ... }: !lib.elem source cfg.suppressedStorePaths) cfg.storePaths;
   };
 
 in {
@@ -171,7 +171,7 @@ in {
       description = ''
         Store paths to copy into the initrd as well.
       '';
-      type = with types; listOf (oneOf [ singleLineStr package ]);
+      type = utils.systemdUtils.types.initrdStorePath;
       default = [];
     };
 
@@ -344,7 +344,8 @@ in {
     };
 
     enableTpm2 = mkOption {
-      default = true;
+      default = cfg.package.withTpm2Tss;
+      defaultText = "boot.initrd.systemd.package.withTpm2Tss";
       type = types.bool;
       description = ''
         Whether to enable TPM2 support in the initrd.
@@ -460,6 +461,7 @@ in {
         "${cfg.package}/lib/systemd/systemd-sulogin-shell"
         "${cfg.package}/lib/systemd/systemd-sysctl"
         "${cfg.package}/lib/systemd/systemd-bsod"
+        "${cfg.package}/lib/systemd/systemd-sysroot-fstab-check"
 
         # generators
         "${cfg.package}/lib/systemd/system-generators/systemd-debug-generator"
@@ -486,7 +488,8 @@ in {
         # fido2 support
         "${cfg.package}/lib/cryptsetup/libcryptsetup-token-systemd-fido2.so"
         "${pkgs.libfido2}/lib/libfido2.so.1"
-      ] ++ jobScripts;
+      ] ++ jobScripts
+      ++ map (c: builtins.removeAttrs c ["text"]) (builtins.attrValues cfg.contents);
 
       targets.initrd.aliases = ["default.target"];
       units =
diff --git a/third_party/nixpkgs/nixos/modules/system/boot/systemd/journald.nix b/third_party/nixpkgs/nixos/modules/system/boot/systemd/journald.nix
index 586de87dbc..180a5cf6c3 100644
--- a/third_party/nixpkgs/nixos/modules/system/boot/systemd/journald.nix
+++ b/third_party/nixpkgs/nixos/modules/system/boot/systemd/journald.nix
@@ -96,6 +96,7 @@ in {
       "systemd-journald@.service"
       "systemd-journal-flush.service"
       "systemd-journal-catalog-update.service"
+      "systemd-journald-sync@.service"
       ] ++ (optional (!config.boot.isContainer) "systemd-journald-audit.socket") ++ [
       "systemd-journald-dev-log.socket"
       "syslog.socket"
diff --git a/third_party/nixpkgs/nixos/modules/system/boot/systemd/shutdown.nix b/third_party/nixpkgs/nixos/modules/system/boot/systemd/shutdown.nix
index 5c2525a57b..48477954e2 100644
--- a/third_party/nixpkgs/nixos/modules/system/boot/systemd/shutdown.nix
+++ b/third_party/nixpkgs/nixos/modules/system/boot/systemd/shutdown.nix
@@ -2,10 +2,7 @@
 
   cfg = config.systemd.shutdownRamfs;
 
-  ramfsContents = let
-    storePaths = map (p: "${p}\n") cfg.storePaths;
-    contents = lib.mapAttrsToList (_: v: "${v.source}\n${v.target}") (lib.filterAttrs (_: v: v.enable) cfg.contents);
-  in pkgs.writeText "shutdown-ramfs-contents" (lib.concatStringsSep "\n" (storePaths ++ contents));
+  ramfsContents = pkgs.writeText "shutdown-ramfs-contents.json" (builtins.toJSON cfg.storePaths);
 
 in {
   options.systemd.shutdownRamfs = {
@@ -24,7 +21,7 @@ in {
       description = ''
         Store paths to copy into the shutdown ramfs as well.
       '';
-      type = lib.types.listOf lib.types.singleLineStr;
+      type = utils.systemdUtils.types.initrdStorePath;
       default = [];
     };
   };
@@ -35,7 +32,8 @@ in {
       "/etc/initrd-release".source = config.environment.etc.os-release.source;
       "/etc/os-release".source = config.environment.etc.os-release.source;
     };
-    systemd.shutdownRamfs.storePaths = [pkgs.runtimeShell "${pkgs.coreutils}/bin"];
+    systemd.shutdownRamfs.storePaths = [pkgs.runtimeShell "${pkgs.coreutils}/bin"]
+      ++ map (c: builtins.removeAttrs c ["text"]) (builtins.attrValues cfg.contents);
 
     systemd.mounts = [{
       what = "tmpfs";
diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/docker.nix b/third_party/nixpkgs/nixos/modules/virtualisation/docker.nix
index 8a0894ed85..5ffec126d8 100644
--- a/third_party/nixpkgs/nixos/modules/virtualisation/docker.nix
+++ b/third_party/nixpkgs/nixos/modules/virtualisation/docker.nix
@@ -69,7 +69,7 @@ in
         type = types.bool;
         default = false;
         description = ''
-          **Deprecated**, please use virtualisation.containers.cdi.dynamic.nvidia.enable instead.
+          **Deprecated**, please use hardware.nvidia-container-toolkit.enable instead.
 
           Enable nvidia-docker wrapper, supporting NVIDIA GPUs inside docker containers.
         '';
@@ -186,7 +186,7 @@ in
       # wrappers.
       warnings = lib.optionals (cfg.enableNvidia && (lib.strings.versionAtLeast cfg.package.version "25")) [
         ''
-          You have set virtualisation.docker.enableNvidia. This option is deprecated, please set virtualisation.containers.cdi.dynamic.nvidia.enable instead.
+          You have set virtualisation.docker.enableNvidia. This option is deprecated, please set hardware.nvidia-container-toolkit.enable instead.
         ''
       ];
 
diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/ec2-data.nix b/third_party/nixpkgs/nixos/modules/virtualisation/ec2-data.nix
index 3414c5a1fc..0b9d098dba 100644
--- a/third_party/nixpkgs/nixos/modules/virtualisation/ec2-data.nix
+++ b/third_party/nixpkgs/nixos/modules/virtualisation/ec2-data.nix
@@ -79,7 +79,7 @@ with lib;
             # ec2-get-console-output.
             echo "-----BEGIN SSH HOST KEY FINGERPRINTS-----" > /dev/console
             for i in /etc/ssh/ssh_host_*_key.pub; do
-                ${config.programs.ssh.package}/bin/ssh-keygen -l -f $i > /dev/console
+                ${config.programs.ssh.package}/bin/ssh-keygen -l -f $i || true > /dev/console
             done
             echo "-----END SSH HOST KEY FINGERPRINTS-----" > /dev/console
           '';
diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/podman/default.nix b/third_party/nixpkgs/nixos/modules/virtualisation/podman/default.nix
index deb0b4d2c5..d0f4ac7f66 100644
--- a/third_party/nixpkgs/nixos/modules/virtualisation/podman/default.nix
+++ b/third_party/nixpkgs/nixos/modules/virtualisation/podman/default.nix
@@ -82,7 +82,7 @@ in
       type = types.bool;
       default = false;
       description = ''
-        **Deprecated**, please use virtualisation.containers.cdi.dynamic.nvidia.enable instead.
+        **Deprecated**, please use hardware.nvidia-container-toolkit.enable instead.
 
         Enable use of NVidia GPUs from within podman containers.
       '';
diff --git a/third_party/nixpkgs/nixos/tests/all-tests.nix b/third_party/nixpkgs/nixos/tests/all-tests.nix
index f485b6a778..f6392be294 100644
--- a/third_party/nixpkgs/nixos/tests/all-tests.nix
+++ b/third_party/nixpkgs/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 {};
@@ -275,6 +276,7 @@ in {
   dovecot = handleTest ./dovecot.nix {};
   drawterm = discoverTests (import ./drawterm.nix);
   drbd = handleTest ./drbd.nix {};
+  druid = handleTestOn [ "x86_64-linux" ] ./druid {};
   dublin-traceroute = handleTest ./dublin-traceroute.nix {};
   earlyoom = handleTestOn ["x86_64-linux"] ./earlyoom.nix {};
   early-mount-options = handleTest ./early-mount-options.nix {};
@@ -300,6 +302,7 @@ in {
   esphome = handleTest ./esphome.nix {};
   etc = pkgs.callPackage ../modules/system/etc/test.nix { inherit evalMinimalConfig; };
   activation = pkgs.callPackage ../modules/system/activation/test.nix { };
+  activation-lib = pkgs.callPackage ../modules/system/activation/lib/test.nix { };
   activation-var = runTest ./activation/var.nix;
   activation-nix-channel = runTest ./activation/nix-channel.nix;
   activation-etc-overlay-mutable = runTest ./activation/etc-overlay-mutable.nix;
@@ -576,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 {};
@@ -623,6 +627,7 @@ in {
   nbd = handleTest ./nbd.nix {};
   ncdns = handleTest ./ncdns.nix {};
   ndppd = handleTest ./ndppd.nix {};
+  nix-channel = pkgs.callPackage ../modules/config/nix-channel/test.nix { };
   nebula = handleTest ./nebula.nix {};
   netbird = handleTest ./netbird.nix {};
   nimdow = handleTest ./nimdow.nix {};
diff --git a/third_party/nixpkgs/nixos/tests/armagetronad.nix b/third_party/nixpkgs/nixos/tests/armagetronad.nix
index ca93ce8fb6..b657893fc9 100644
--- a/third_party/nixpkgs/nixos/tests/armagetronad.nix
+++ b/third_party/nixpkgs/nixos/tests/armagetronad.nix
@@ -13,7 +13,7 @@ let
 
     { imports = [ ./common/user-account.nix ./common/x11.nix ];
       hardware.graphics.enable = true;
-      virtualisation.memorySize = 256;
+      virtualisation.memorySize = 384;
       environment = {
         systemPackages = [ pkgs.armagetronad ];
         variables.XAUTHORITY = "/home/${user}/.Xauthority";
@@ -208,7 +208,7 @@ makeTest {
         barrier.wait()
 
       # Get to the Server Bookmarks screen on both clients. This takes a while so do it asynchronously.
-      barrier = threading.Barrier(3, timeout=120)
+      barrier = threading.Barrier(len(clients) + 1, timeout=240)
       for client in clients:
         threading.Thread(target=client_setup, args=(client, servers, barrier)).start()
       barrier.wait()
diff --git a/third_party/nixpkgs/nixos/tests/crabfit.nix b/third_party/nixpkgs/nixos/tests/crabfit.nix
index 0daf47d52f..eb38a0ae0c 100644
--- a/third_party/nixpkgs/nixos/tests/crabfit.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/tests/docker-tools-nix-shell.nix b/third_party/nixpkgs/nixos/tests/docker-tools-nix-shell.nix
new file mode 100644
index 0000000000..c2ae2124e0
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/tests/docker-tools.nix b/third_party/nixpkgs/nixos/tests/docker-tools.nix
index 8c315ee731..41bd4a6215 100644
--- a/third_party/nixpkgs/nixos/tests/docker-tools.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/tests/druid/default.nix b/third_party/nixpkgs/nixos/tests/druid/default.nix
new file mode 100644
index 0000000000..d4b7c9bffa
--- /dev/null
+++ b/third_party/nixpkgs/nixos/tests/druid/default.nix
@@ -0,0 +1,289 @@
+{ pkgs, ... }:
+let
+  inherit (pkgs) lib;
+  commonConfig = {
+    "druid.zk.service.host" = "zk1:2181";
+    "druid.extensions.loadList" = ''[ "druid-histogram", "druid-datasketches",  "mysql-metadata-storage", "druid-avro-extensions", "druid-parquet-extensions", "druid-lookups-cached-global", "druid-hdfs-storage","druid-kafka-indexing-service","druid-basic-security","druid-kinesis-indexing-service"]'';
+    "druid.startup.logging.logProperties" = "true";
+    "druid.metadata.storage.connector.connectURI" = "jdbc:mysql://mysql:3306/druid";
+    "druid.metadata.storage.connector.user" = "druid";
+    "druid.metadata.storage.connector.password" = "druid";
+    "druid.request.logging.type" = "file";
+    "druid.request.logging.dir" = "/var/log/druid/requests";
+    "druid.javascript.enabled" = "true";
+    "druid.sql.enable" = "true";
+    "druid.metadata.storage.type" = "mysql";
+    "druid.storage.type" = "hdfs";
+    "druid.storage.storageDirectory" = "/druid-deepstore";
+  };
+  log4jConfig = ''
+    <?xml version="1.0" encoding="UTF-8" ?>
+    <Configuration status="WARN">
+     <Appenders>
+        <Console name="Console" target="SYSTEM_OUT">
+          <PatternLayout pattern="%d{ISO8601} %p [%t] %c - %m%n"/>
+        </Console>
+      </Appenders>
+      <Loggers>
+        <Root level="error">
+          <AppenderRef ref="Console"/>
+        </Root>
+      </Loggers>
+    </Configuration>
+  '';
+  log4j = pkgs.writeText "log4j2.xml" log4jConfig;
+  coreSite = {
+    "fs.defaultFS" = "hdfs://namenode:8020";
+  };
+  tests = {
+    default = testsForPackage {
+      druidPackage = pkgs.druid;
+      hadoopPackage = pkgs.hadoop_3_2;
+    };
+  };
+  testsForPackage =
+    args:
+    lib.recurseIntoAttrs {
+      druidCluster = testDruidCluster args;
+      passthru.override = args': testsForPackage (args // args');
+    };
+  testDruidCluster =
+    { druidPackage, hadoopPackage, ... }:
+    pkgs.testers.nixosTest {
+      name = "druid-hdfs";
+      nodes = {
+        zk1 =
+          { ... }:
+          {
+            services.zookeeper.enable = true;
+            networking.firewall.allowedTCPPorts = [ 2181 ];
+          };
+        namenode =
+          { ... }:
+          {
+            services.hadoop = {
+              package = hadoopPackage;
+              hdfs = {
+                namenode = {
+                  enable = true;
+                  openFirewall = true;
+                  formatOnInit = true;
+                };
+              };
+              inherit coreSite;
+            };
+          };
+        datanode =
+          { ... }:
+          {
+            services.hadoop = {
+              package = hadoopPackage;
+              hdfs.datanode = {
+                enable = true;
+                openFirewall = true;
+              };
+              inherit coreSite;
+            };
+          };
+        mm =
+          { ... }:
+          {
+            virtualisation.memorySize = 1024;
+            services.druid = {
+              inherit commonConfig log4j;
+              package = druidPackage;
+              extraClassPaths = [ "/etc/hadoop-conf" ];
+              middleManager = {
+                config = {
+                  "druid.indexer.task.baseTaskDir" = "/tmp/druid/persistent/task";
+                  "druid.worker.capacity" = 1;
+                  "druid.indexer.logs.type" = "file";
+                  "druid.indexer.logs.directory" = "/var/log/druid/indexer";
+                  "druid.indexer.runner.startPort" = 8100;
+                  "druid.indexer.runner.endPort" = 8101;
+                };
+                enable = true;
+                openFirewall = true;
+              };
+            };
+            services.hadoop = {
+              gatewayRole.enable = true;
+              package = hadoopPackage;
+              inherit coreSite;
+            };
+          };
+        overlord =
+          { ... }:
+          {
+            services.druid = {
+              inherit commonConfig log4j;
+              package = druidPackage;
+              extraClassPaths = [ "/etc/hadoop-conf" ];
+              overlord = {
+                config = {
+                  "druid.indexer.runner.type" = "remote";
+                  "druid.indexer.storage.type" = "metadata";
+                };
+                enable = true;
+                openFirewall = true;
+              };
+            };
+            services.hadoop = {
+              gatewayRole.enable = true;
+              package = hadoopPackage;
+              inherit coreSite;
+            };
+          };
+        broker =
+          { ... }:
+          {
+            services.druid = {
+              package = druidPackage;
+              inherit commonConfig log4j;
+              extraClassPaths = [ "/etc/hadoop-conf" ];
+              broker = {
+                config = {
+                  "druid.plaintextPort" = 8082;
+                  "druid.broker.http.numConnections" = "2";
+                  "druid.server.http.numThreads" = "2";
+                  "druid.processing.buffer.sizeBytes" = "100";
+                  "druid.processing.numThreads" = "1";
+                  "druid.processing.numMergeBuffers" = "1";
+                  "druid.broker.cache.unCacheable" = ''["groupBy"]'';
+                  "druid.lookup.snapshotWorkingDir" = "/opt/broker/lookups";
+                };
+                enable = true;
+                openFirewall = true;
+              };
+            };
+            services.hadoop = {
+              gatewayRole.enable = true;
+              package = hadoopPackage;
+              inherit coreSite;
+            };
+
+          };
+        historical =
+          { ... }:
+          {
+            services.druid = {
+              package = druidPackage;
+              inherit commonConfig log4j;
+              extraClassPaths = [ "/etc/hadoop-conf" ];
+              historical = {
+                config = {
+                  "maxSize" = 200000000;
+                  "druid.lookup.snapshotWorkingDir" = "/opt/historical/lookups";
+                };
+                segmentLocations = [
+                  {
+                    "path" = "/tmp/1";
+                    "maxSize" = "100000000";
+                  }
+                  {
+                    "path" = "/tmp/2";
+                    "maxSize" = "100000000";
+                  }
+                ];
+                enable = true;
+                openFirewall = true;
+              };
+            };
+            services.hadoop = {
+              gatewayRole.enable = true;
+              package = hadoopPackage;
+              inherit coreSite;
+            };
+
+          };
+        coordinator =
+          { ... }:
+          {
+            services.druid = {
+              package = druidPackage;
+              inherit commonConfig log4j;
+              extraClassPaths = [ "/etc/hadoop-conf" ];
+              coordinator = {
+                config = {
+                  "druid.plaintextPort" = 9091;
+                  "druid.service" = "coordinator";
+                  "druid.coordinator.startDelay" = "PT10S";
+                  "druid.coordinator.period" = "PT10S";
+                  "druid.manager.config.pollDuration" = "PT10S";
+                  "druid.manager.segments.pollDuration" = "PT10S";
+                  "druid.manager.rules.pollDuration" = "PT10S";
+                };
+                enable = true;
+                openFirewall = true;
+              };
+            };
+            services.hadoop = {
+              gatewayRole.enable = true;
+              package = hadoopPackage;
+              inherit coreSite;
+            };
+
+          };
+
+        mysql =
+          { ... }:
+          {
+            services.mysql = {
+              enable = true;
+              package = pkgs.mariadb;
+              initialDatabases = [ { name = "druid"; } ];
+              initialScript = pkgs.writeText "mysql-init.sql" ''
+                CREATE USER 'druid'@'%' IDENTIFIED BY 'druid';
+                GRANT ALL PRIVILEGES ON druid.* TO 'druid'@'%';
+              '';
+            };
+            networking.firewall.allowedTCPPorts = [ 3306 ];
+          };
+
+      };
+      testScript = ''
+        start_all()
+        namenode.wait_for_unit("hdfs-namenode")
+        namenode.wait_for_unit("network.target")
+        namenode.wait_for_open_port(8020)
+        namenode.succeed("ss -tulpne | systemd-cat")
+        namenode.succeed("cat /etc/hadoop*/hdfs-site.xml | systemd-cat")
+        namenode.wait_for_open_port(9870)
+        datanode.wait_for_unit("hdfs-datanode")
+        datanode.wait_for_unit("network.target")
+
+        mm.succeed("mkdir -p /quickstart/")
+        mm.succeed("cp -r ${pkgs.druid}/quickstart/* /quickstart/")
+        mm.succeed("touch /quickstart/tutorial/wikiticker-2015-09-12-sampled.json")
+        mm.succeed("zcat /quickstart/tutorial/wikiticker-2015-09-12-sampled.json.gz | head -n 10 > /quickstart/tutorial/wikiticker-2015-09-12-sampled.json || true")
+        mm.succeed("rm /quickstart/tutorial/wikiticker-2015-09-12-sampled.json.gz && gzip /quickstart/tutorial/wikiticker-2015-09-12-sampled.json")
+
+        namenode.succeed("sudo -u hdfs hdfs dfs -mkdir /druid-deepstore")
+        namenode.succeed("HADOOP_USER_NAME=druid sudo -u hdfs hdfs dfs -chown druid:hadoop /druid-deepstore")
+
+
+        ### Druid tests
+        coordinator.wait_for_unit("druid-coordinator")
+        overlord.wait_for_unit("druid-overlord")
+        historical.wait_for_unit("druid-historical")
+        mm.wait_for_unit("druid-middleManager")
+
+        coordinator.wait_for_open_port(9091)
+        overlord.wait_for_open_port(8090)
+        historical.wait_for_open_port(8083)
+        mm.wait_for_open_port(8091)
+
+        broker.wait_for_unit("network.target")
+        broker.wait_for_open_port(8082)
+
+        broker.succeed("curl -X 'POST' -H 'Content-Type:application/json' -d @${pkgs.druid}/quickstart/tutorial/wikipedia-index.json http://coordinator:9091/druid/indexer/v1/task")
+        broker.wait_until_succeeds("curl http://coordinator:9091/druid/coordinator/v1/metadata/datasources | grep  'wikipedia'")
+
+        broker.wait_until_succeeds("curl http://localhost:8082/druid/v2/datasources/ | grep wikipedia")
+        broker.succeed("curl -X 'POST' -H 'Content-Type:application/json' -d @${pkgs.druid}/quickstart/tutorial/wikipedia-top-pages.json http://localhost:8082/druid/v2/")
+
+      '';
+
+    };
+in
+tests
diff --git a/third_party/nixpkgs/nixos/tests/gitolite-fcgiwrap.nix b/third_party/nixpkgs/nixos/tests/gitolite-fcgiwrap.nix
index 6e8dae6f72..43d65faebb 100644
--- a/third_party/nixpkgs/nixos/tests/gitolite-fcgiwrap.nix
+++ b/third_party/nixpkgs/nixos/tests/gitolite-fcgiwrap.nix
@@ -24,7 +24,7 @@ import ./make-test-python.nix (
               {
                 networking.firewall.allowedTCPPorts = [ 80 ];
 
-                services.fcgiwrap.gitolite = {
+                services.fcgiwrap.instances.gitolite = {
                   process.user = "gitolite";
                   process.group = "gitolite";
                   socket = { inherit (config.services.nginx) user group; };
@@ -64,7 +64,7 @@ import ./make-test-python.nix (
                     fastcgi_param SCRIPT_FILENAME ${pkgs.gitolite}/bin/gitolite-shell;
 
                     # use Unix domain socket or inet socket
-                    fastcgi_pass unix:${config.services.fcgiwrap.gitolite.socket.address};
+                    fastcgi_pass unix:${config.services.fcgiwrap.instances.gitolite.socket.address};
                   '';
                 };
 
diff --git a/third_party/nixpkgs/nixos/tests/gotify-server.nix b/third_party/nixpkgs/nixos/tests/gotify-server.nix
index c8d7fa172a..495b1c8e34 100644
--- a/third_party/nixpkgs/nixos/tests/gotify-server.nix
+++ b/third_party/nixpkgs/nixos/tests/gotify-server.nix
@@ -9,7 +9,9 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : {
 
     services.gotify = {
       enable = true;
-      port = 3000;
+      environment = {
+        GOTIFY_SERVER_PORT = 3000;
+      };
     };
   };
 
diff --git a/third_party/nixpkgs/nixos/tests/graylog.nix b/third_party/nixpkgs/nixos/tests/graylog.nix
index 9d19dcf028..b52c2976a7 100644
--- a/third_party/nixpkgs/nixos/tests/graylog.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/tests/installer.nix b/third_party/nixpkgs/nixos/tests/installer.nix
index 49c50a6f5a..d57866c9f5 100644
--- a/third_party/nixpkgs/nixos/tests/installer.nix
+++ b/third_party/nixpkgs/nixos/tests/installer.nix
@@ -463,7 +463,32 @@ let
         """)
 
       with subtest("Switch to flake based config"):
-        target.succeed("nixos-rebuild switch --flake /root/my-config#xyz")
+        target.succeed("nixos-rebuild switch --flake /root/my-config#xyz 2>&1 | tee activation-log >&2")
+
+        target.succeed("""
+          cat -n activation-log >&2
+        """)
+
+        target.succeed("""
+          grep -F '/root/.nix-defexpr/channels exists, but channels have been disabled.' activation-log
+        """)
+        target.succeed("""
+          grep -F '/nix/var/nix/profiles/per-user/root/channels exists, but channels have been disabled.' activation-log
+        """)
+        target.succeed("""
+          grep -F '/root/.nix-defexpr/channels exists, but channels have been disabled.' activation-log
+        """)
+        target.succeed("""
+          grep -F 'Due to https://github.com/NixOS/nix/issues/9574, Nix may still use these channels when NIX_PATH is unset.' activation-log
+        """)
+        target.succeed("rm activation-log")
+
+        # Perform the suggested cleanups we've just seen in the log
+        # TODO after https://github.com/NixOS/nix/issues/9574: don't remove them yet
+        target.succeed("""
+          rm -rf /root/.nix-defexpr/channels /nix/var/nix/profiles/per-user/root/channels /root/.nix-defexpr/channels
+        """)
+
 
       target.shutdown()
 
@@ -474,10 +499,20 @@ let
 
       # Note that the channel profile is still present on disk, but configured
       # not to be used.
-      with subtest("builtins.nixPath is now empty"):
-        target.succeed("""
-          [[ "[ ]" == "$(nix-instantiate builtins.nixPath --eval --expr)" ]]
-        """)
+      # TODO after issue https://github.com/NixOS/nix/issues/9574: re-enable this assertion
+      # I believe what happens is
+      #   - because of the issue, we've removed the `nix-path =` line from nix.conf
+      #   - the "backdoor" shell is not a proper session and does not have `NIX_PATH=""` set
+      #   - seeing no nix path settings at all, Nix loads its hardcoded default value,
+      #     which is unfortunately non-empty
+      # Or maybe it's the new default NIX_PATH?? :(
+      # with subtest("builtins.nixPath is now empty"):
+      #   target.succeed("""
+      #     (
+      #       set -x;
+      #       [[ "[ ]" == "$(nix-instantiate builtins.nixPath --eval --expr)" ]];
+      #     )
+      #   """)
 
       with subtest("<nixpkgs> does not resolve"):
         target.succeed("""
@@ -491,12 +526,16 @@ let
         target.succeed("""
           (
             exec 1>&2
-            rm -v /root/.nix-channels
+            rm -vf /root/.nix-channels
             rm -vrf ~/.nix-defexpr
             rm -vrf /nix/var/nix/profiles/per-user/root/channels*
           )
         """)
-        target.succeed("nixos-rebuild switch --flake /root/my-config#xyz")
+        target.succeed("nixos-rebuild switch --flake /root/my-config#xyz | tee activation-log >&2")
+        target.succeed("cat -n activation-log >&2")
+        target.succeed("! grep -F '/root/.nix-defexpr/channels' activation-log")
+        target.succeed("! grep -F 'but channels have been disabled' activation-log")
+        target.succeed("! grep -F 'https://github.com/NixOS/nix/issues/9574' activation-log")
 
       target.shutdown()
     '';
diff --git a/third_party/nixpkgs/nixos/tests/miracle-wm.nix b/third_party/nixpkgs/nixos/tests/miracle-wm.nix
new file mode 100644
index 0000000000..2bb62222b2
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/tests/networking-proxy.nix b/third_party/nixpkgs/nixos/tests/networking-proxy.nix
index 330bac2588..72f33c78bd 100644
--- a/third_party/nixpkgs/nixos/tests/networking-proxy.nix
+++ b/third_party/nixpkgs/nixos/tests/networking-proxy.nix
@@ -12,7 +12,7 @@ let default-config = {
 in import ./make-test-python.nix ({ pkgs, ...} : {
   name = "networking-proxy";
   meta = with pkgs.lib.maintainers; {
-    maintainers = [  ];
+    maintainers = [ ];
   };
 
   nodes = {
diff --git a/third_party/nixpkgs/nixos/tests/networking/networkmanager.nix b/third_party/nixpkgs/nixos/tests/networking/networkmanager.nix
index c8c44f9320..bd989408df 100644
--- a/third_party/nixpkgs/nixos/tests/networking/networkmanager.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/tests/restic.nix b/third_party/nixpkgs/nixos/tests/restic.nix
index 4111720cf6..878523ca71 100644
--- a/third_party/nixpkgs/nixos/tests/restic.nix
+++ b/third_party/nixpkgs/nixos/tests/restic.nix
@@ -4,6 +4,7 @@ import ./make-test-python.nix (
   let
     remoteRepository = "/root/restic-backup";
     remoteFromFileRepository = "/root/restic-backup-from-file";
+    remoteInhibitTestRepository = "/root/restic-backup-inhibit-test";
     remoteNoInitRepository = "/root/restic-backup-no-init";
     rcloneRepository = "rclone:local:/root/restic-rclone-backup";
 
@@ -66,6 +67,12 @@ import ./make-test-python.nix (
                 find /opt -mindepth 1 -maxdepth 1 ! -name a_dir # all files in /opt except for a_dir
               '';
             };
+            inhibit-test = {
+              inherit passwordFile paths exclude pruneOpts;
+              repository = remoteInhibitTestRepository;
+              initialize = true;
+              inhibitsSleep = true;
+            };
             remote-noinit-backup = {
               inherit passwordFile exclude pruneOpts paths;
               initialize = false;
@@ -190,6 +197,13 @@ import ./make-test-python.nix (
           'restic-remotebackup snapshots --json | ${pkgs.jq}/bin/jq "length | . == 1"',
 
       )
+
+      # test that the inhibit option is working
+      server.systemctl("start --no-block restic-backups-inhibit-test.service")
+      server.wait_until_succeeds(
+          "systemd-inhibit --no-legend --no-pager | grep -q restic",
+          5
+      )
     '';
   }
 )
diff --git a/third_party/nixpkgs/nixos/tests/rosenpass.nix b/third_party/nixpkgs/nixos/tests/rosenpass.nix
index 8765fd201c..5ef6e55f53 100644
--- a/third_party/nixpkgs/nixos/tests/rosenpass.nix
+++ b/third_party/nixpkgs/nixos/tests/rosenpass.nix
@@ -44,7 +44,8 @@ in
           enable = true;
           networks."rosenpass" = {
             matchConfig.Name = deviceName;
-            networkConfig.IPForward = true;
+            networkConfig.IPv4Forwarding = true;
+            networkConfig.IPv6Forwarding = true;
             address = [ "${peer.ip}/64" ];
           };
 
diff --git a/third_party/nixpkgs/nixos/tests/sogo.nix b/third_party/nixpkgs/nixos/tests/sogo.nix
index e9059a2ab7..84d219659b 100644
--- a/third_party/nixpkgs/nixos/tests/sogo.nix
+++ b/third_party/nixpkgs/nixos/tests/sogo.nix
@@ -1,7 +1,7 @@
 import ./make-test-python.nix ({ pkgs, ... }: {
   name = "sogo";
   meta = with pkgs.lib.maintainers; {
-    maintainers = [];
+    maintainers = [ ];
   };
 
   nodes = {
diff --git a/third_party/nixpkgs/nixos/tests/soju.nix b/third_party/nixpkgs/nixos/tests/soju.nix
index 32d1daf43d..f13c447fb5 100644
--- a/third_party/nixpkgs/nixos/tests/soju.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/tests/systemd-boot.nix b/third_party/nixpkgs/nixos/tests/systemd-boot.nix
index a7b220d111..93efd128bf 100644
--- a/third_party/nixpkgs/nixos/tests/systemd-boot.nix
+++ b/third_party/nixpkgs/nixos/tests/systemd-boot.nix
@@ -13,6 +13,8 @@ let
     boot.loader.systemd-boot.enable = true;
     boot.loader.efi.canTouchEfiVariables = true;
     environment.systemPackages = [ pkgs.efibootmgr ];
+    # Needed for machine-id to be persisted between reboots
+    environment.etc."machine-id".text = "00000000000000000000000000000000";
   };
 
   commonXbootldr = { config, lib, pkgs, ... }:
@@ -81,7 +83,7 @@ let
     os.environ['NIX_DISK_IMAGE'] = tmp_disk_image.name
   '';
 in
-{
+rec {
   basic = makeTest {
     name = "systemd-boot";
     meta.maintainers = with pkgs.lib.maintainers; [ danielfullmer julienmalka ];
@@ -93,7 +95,8 @@ in
       machine.wait_for_unit("multi-user.target")
 
       machine.succeed("test -e /boot/loader/entries/nixos-generation-1.conf")
-      machine.succeed("grep 'sort-key nixos' /boot/loader/entries/nixos-generation-1.conf")
+      # our sort-key will uses r to sort before nixos
+      machine.succeed("grep 'sort-key nixor-default' /boot/loader/entries/nixos-generation-1.conf")
 
       # Ensure we actually booted using systemd-boot
       # Magic number is the vendor UUID used by systemd-boot.
@@ -232,8 +235,10 @@ in
       """
       )
 
-      output = machine.succeed("/run/current-system/bin/switch-to-configuration boot")
+      output = machine.succeed("/run/current-system/bin/switch-to-configuration boot 2>&1")
       assert "updating systemd-boot from 000.0-1-notnixos to " in output, "Couldn't find systemd-boot update message"
+      assert 'to "/boot/EFI/systemd/systemd-bootx64.efi"' in output, "systemd-boot not copied to to /boot/EFI/systemd/systemd-bootx64.efi"
+      assert 'to "/boot/EFI/BOOT/BOOTX64.EFI"' in output, "systemd-boot not copied to to /boot/EFI/BOOT/BOOTX64.EFI"
     '';
   };
 
@@ -399,15 +404,15 @@ in
     '';
   };
 
-  garbage-collect-entry = makeTest {
-    name = "systemd-boot-garbage-collect-entry";
+  garbage-collect-entry = { withBootCounting ? false, ... }: makeTest {
+    name = "systemd-boot-garbage-collect-entry" + optionalString withBootCounting "-with-boot-counting";
     meta.maintainers = with pkgs.lib.maintainers; [ julienmalka ];
 
     nodes = {
       inherit common;
       machine = { pkgs, nodes, ... }: {
         imports = [ common ];
-
+        boot.loader.systemd-boot.bootCounting.enable = withBootCounting;
         # These are configs for different nodes, but we'll use them here in `machine`
         system.extraDependencies = [
           nodes.common.system.build.toplevel
@@ -422,8 +427,12 @@ in
       ''
         machine.succeed("nix-env -p /nix/var/nix/profiles/system --set ${baseSystem}")
         machine.succeed("nix-env -p /nix/var/nix/profiles/system --delete-generations 1")
+        # At this point generation 1 has already been marked as good so we reintroduce counters artificially
+        ${optionalString withBootCounting ''
+        machine.succeed("mv /boot/loader/entries/nixos-generation-1.conf /boot/loader/entries/nixos-generation-1+3.conf")
+        ''}
         machine.succeed("${baseSystem}/bin/switch-to-configuration boot")
-        machine.fail("test -e /boot/loader/entries/nixos-generation-1.conf")
+        machine.fail("test -e /boot/loader/entries/nixos-generation-1*")
         machine.succeed("test -e /boot/loader/entries/nixos-generation-2.conf")
       '';
   };
@@ -443,4 +452,138 @@ in
         machine.wait_for_unit("multi-user.target")
       '';
     };
+
+  # Check that we are booting the default entry and not the generation with largest version number
+  defaultEntry = { withBootCounting ? false, ... }: makeTest {
+    name = "systemd-boot-default-entry" + optionalString withBootCounting "-with-boot-counting";
+    meta.maintainers = with pkgs.lib.maintainers; [ julienmalka ];
+
+    nodes = {
+      machine = { pkgs, lib, nodes, ... }: {
+        imports = [ common ];
+        system.extraDependencies = [ nodes.other_machine.system.build.toplevel ];
+        boot.loader.systemd-boot.bootCounting.enable = withBootCounting;
+      };
+
+      other_machine = { pkgs, lib, ... }: {
+        imports = [ common ];
+        boot.loader.systemd-boot.bootCounting.enable = withBootCounting;
+        environment.systemPackages = [ pkgs.hello ];
+      };
+    };
+    testScript = { nodes, ... }:
+      let
+        orig = nodes.machine.system.build.toplevel;
+        other = nodes.other_machine.system.build.toplevel;
+      in
+      ''
+        orig = "${orig}"
+        other = "${other}"
+
+        def check_current_system(system_path):
+            machine.succeed(f'test $(readlink -f /run/current-system) = "{system_path}"')
+
+        check_current_system(orig)
+
+        # Switch to other configuration
+        machine.succeed("nix-env -p /nix/var/nix/profiles/system --set ${other}")
+        machine.succeed(f"{other}/bin/switch-to-configuration boot")
+        # Rollback, default entry is now generation 1
+        machine.succeed("nix-env -p /nix/var/nix/profiles/system --rollback")
+        machine.succeed(f"{orig}/bin/switch-to-configuration boot")
+        machine.shutdown()
+        machine.start()
+        machine.wait_for_unit("multi-user.target")
+        # Check that we booted generation 1 (default)
+        # even though generation 2 comes first in alphabetical order
+        check_current_system(orig)
+      '';
+  };
+
+
+  bootCounting =
+    let
+      baseConfig = { pkgs, lib, ... }: {
+        imports = [ common ];
+        boot.loader.systemd-boot.bootCounting.enable = true;
+        boot.loader.systemd-boot.bootCounting.trials = 2;
+      };
+    in
+    makeTest {
+      name = "systemd-boot-counting";
+      meta.maintainers = with pkgs.lib.maintainers; [ julienmalka ];
+
+      nodes = {
+        machine = { pkgs, lib, nodes, ... }: {
+          imports = [ baseConfig ];
+          system.extraDependencies = [ nodes.bad_machine.system.build.toplevel ];
+        };
+
+        bad_machine = { pkgs, lib, ... }: {
+          imports = [ baseConfig ];
+
+          systemd.services."failing" = {
+            script = "exit 1";
+            requiredBy = [ "boot-complete.target" ];
+            before = [ "boot-complete.target" ];
+            serviceConfig.Type = "oneshot";
+          };
+        };
+      };
+      testScript = { nodes, ... }:
+        let
+          orig = nodes.machine.system.build.toplevel;
+          bad = nodes.bad_machine.system.build.toplevel;
+        in
+        ''
+          orig = "${orig}"
+          bad = "${bad}"
+
+          def check_current_system(system_path):
+              machine.succeed(f'test $(readlink -f /run/current-system) = "{system_path}"')
+
+          # Ensure we booted using an entry with counters enabled
+          machine.succeed(
+              "test -e /sys/firmware/efi/efivars/LoaderBootCountPath-4a67b082-0a4c-41cf-b6c7-440b29bb8c4f"
+          )
+
+          # systemd-bless-boot should have already removed the "+2" suffix from the boot entry
+          machine.wait_for_unit("systemd-bless-boot.service")
+          machine.succeed("test -e /boot/loader/entries/nixos-generation-1.conf")
+          check_current_system(orig)
+
+          # Switch to bad configuration
+          machine.succeed("nix-env -p /nix/var/nix/profiles/system --set ${bad}")
+          machine.succeed(f"{bad}/bin/switch-to-configuration boot")
+
+          # Ensure new bootloader entry has initialized counter
+          machine.succeed("test -e /boot/loader/entries/nixos-generation-1.conf")
+          machine.succeed("test -e /boot/loader/entries/nixos-generation-2+2.conf")
+          machine.shutdown()
+
+          machine.start()
+          machine.wait_for_unit("multi-user.target")
+          check_current_system(bad)
+          machine.succeed("test -e /boot/loader/entries/nixos-generation-1.conf")
+          machine.succeed("test -e /boot/loader/entries/nixos-generation-2+1-1.conf")
+          machine.shutdown()
+
+          machine.start()
+          machine.wait_for_unit("multi-user.target")
+          check_current_system(bad)
+          machine.succeed("test -e /boot/loader/entries/nixos-generation-1.conf")
+          machine.succeed("test -e /boot/loader/entries/nixos-generation-2+0-2.conf")
+          machine.shutdown()
+
+          # Should boot back into original configuration
+          machine.start()
+          check_current_system(orig)
+          machine.wait_for_unit("multi-user.target")
+          machine.succeed("test -e /boot/loader/entries/nixos-generation-1.conf")
+          machine.succeed("test -e /boot/loader/entries/nixos-generation-2+0-2.conf")
+          machine.shutdown()
+        '';
+    };
+  defaultEntryWithBootCounting = defaultEntry { withBootCounting = true; };
+  garbageCollectEntryWithBootCounting = garbage-collect-entry { withBootCounting = true; };
 }
diff --git a/third_party/nixpkgs/nixos/tests/systemd-networkd-dhcpserver-static-leases.nix b/third_party/nixpkgs/nixos/tests/systemd-networkd-dhcpserver-static-leases.nix
index fda9f35cbe..8c0ebeee97 100644
--- a/third_party/nixpkgs/nixos/tests/systemd-networkd-dhcpserver-static-leases.nix
+++ b/third_party/nixpkgs/nixos/tests/systemd-networkd-dhcpserver-static-leases.nix
@@ -24,8 +24,6 @@ import ./make-test-python.nix ({ lib, ... }: {
           "01-eth1" = {
             name = "eth1";
             networkConfig = {
-              # IPForward prevents dynamic address configuration
-              IPForward = true;
               DHCPServer = true;
               Address = "10.0.0.1/24";
             };
diff --git a/third_party/nixpkgs/nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix b/third_party/nixpkgs/nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix
index 338b12093b..2ea6d0effd 100644
--- a/third_party/nixpkgs/nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix
+++ b/third_party/nixpkgs/nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix
@@ -40,7 +40,8 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
             address = [
               "2001:DB8::1/64"
             ];
-            networkConfig.IPForward = true;
+            networkConfig.IPv4Forwarding = true;
+            networkConfig.IPv6Forwarding = true;
           };
         };
       };
diff --git a/third_party/nixpkgs/nixos/tests/systemd-networkd-vrf.nix b/third_party/nixpkgs/nixos/tests/systemd-networkd-vrf.nix
index 4f2a45577c..a7875bb177 100644
--- a/third_party/nixpkgs/nixos/tests/systemd-networkd-vrf.nix
+++ b/third_party/nixpkgs/nixos/tests/systemd-networkd-vrf.nix
@@ -16,7 +16,8 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: let
         linkConfig.RequiredForOnline = "no";
         networkConfig = {
           Address = "192.168.${toString vlan}.${toString id}/24";
-          IPForward = "yes";
+          IPv4Forwarding = "yes";
+          IPv6Forwarding = "yes";
         };
       };
     };
@@ -57,14 +58,16 @@ in {
 
         networks."10-vrf1" = {
           matchConfig.Name = "vrf1";
-          networkConfig.IPForward = "yes";
+          networkConfig.IPv4Forwarding = "yes";
+          networkConfig.IPv6Forwarding = "yes";
           routes = [
             { Destination = "192.168.1.2"; Metric = 100; }
           ];
         };
         networks."10-vrf2" = {
           matchConfig.Name = "vrf2";
-          networkConfig.IPForward = "yes";
+          networkConfig.IPv4Forwarding = "yes";
+          networkConfig.IPv6Forwarding = "yes";
           routes = [
             { Destination = "192.168.2.3"; Metric = 100; }
           ];
@@ -76,7 +79,8 @@ in {
           networkConfig = {
             VRF = "vrf1";
             Address = "192.168.1.1/24";
-            IPForward = "yes";
+            IPv4Forwarding = "yes";
+            IPv6Forwarding = "yes";
           };
         };
         networks."10-eth2" = {
@@ -85,7 +89,8 @@ in {
           networkConfig = {
             VRF = "vrf2";
             Address = "192.168.2.1/24";
-            IPForward = "yes";
+            IPv4Forwarding = "yes";
+            IPv6Forwarding = "yes";
           };
         };
       };
diff --git a/third_party/nixpkgs/nixos/tests/systemd.nix b/third_party/nixpkgs/nixos/tests/systemd.nix
index 4b087d403f..3430eb9398 100644
--- a/third_party/nixpkgs/nixos/tests/systemd.nix
+++ b/third_party/nixpkgs/nixos/tests/systemd.nix
@@ -204,8 +204,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
         assert "0B read, 0B written" not in output
 
     with subtest("systemd per-unit accounting works"):
-        assert "IP traffic received: 84B" in output_ping
-        assert "IP traffic sent: 84B" in output_ping
+        assert "IP traffic received: 84B sent: 84B" in output_ping
 
     with subtest("systemd environment is properly set"):
         machine.systemctl("daemon-reexec")  # Rewrites /proc/1/environ
diff --git a/third_party/nixpkgs/nixos/tests/vector/syslog-quickwit.nix b/third_party/nixpkgs/nixos/tests/vector/syslog-quickwit.nix
index 89c46d42ee..cb6e04e00e 100644
--- a/third_party/nixpkgs/nixos/tests/vector/syslog-quickwit.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/nixos/tests/vscode-remote-ssh.nix b/third_party/nixpkgs/nixos/tests/vscode-remote-ssh.nix
index 6b5294e154..2b2630ef87 100644
--- a/third_party/nixpkgs/nixos/tests/vscode-remote-ssh.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/accessibility/dasher/default.nix b/third_party/nixpkgs/pkgs/applications/accessibility/dasher/default.nix
index 6e602dc35c..13dee55628 100644
--- a/third_party/nixpkgs/pkgs/applications/accessibility/dasher/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/accessibility/dasher/default.nix
@@ -15,7 +15,7 @@
 , libxslt
 , libxml2
 , speechSupport ? true
-, speechd
+, speechd-minimal
 }:
 
 stdenv.mkDerivation {
@@ -56,7 +56,7 @@ stdenv.mkDerivation {
     # at-spi2 needs dbus to be recognized by pkg-config
     at-spi2-core
     dbus
-  ] ++ lib.optional speechSupport speechd;
+  ] ++ lib.optional speechSupport speechd-minimal;
 
   enableParallelBuilding = true;
 
diff --git a/third_party/nixpkgs/pkgs/applications/audio/ashuffle/default.nix b/third_party/nixpkgs/pkgs/applications/audio/ashuffle/default.nix
index 475ecd26e7..8318a4936e 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/ashuffle/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/audio/aumix/default.nix b/third_party/nixpkgs/pkgs/applications/audio/aumix/default.nix
index 6127cb7e69..ef0560fdc2 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/aumix/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix b/third_party/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix
index 92ee1de47e..4aab7dface 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/bitwig-studio/bitwig-studio5.nix
@@ -19,7 +19,9 @@
 , pango
 , pipewire
 , pulseaudio
+, vulkan-loader
 , wrapGAppsHook3
+, xcb-imdkit
 , xdg-utils
 , xorg
 , zlib
@@ -27,11 +29,11 @@
 
 stdenv.mkDerivation rec {
   pname = "bitwig-studio";
-  version = "5.1.9";
+  version = "5.2";
 
   src = fetchurl {
     url = "https://www.bitwig.com/dl/Bitwig%20Studio/${version}/installer_linux/";
-    hash = "sha256-J5kLqXCMnGb0ZMhES6PQIPjN51ptlBGj4Fy8qSzJ6Qg=";
+    hash = "sha256:0cnjwgjbpyrb4pd0841zbhy84ps7gkmq3j148ga826nrxnw082pi";
   };
 
   nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook3 ];
@@ -66,6 +68,8 @@ stdenv.mkDerivation rec {
     pipewire
     pulseaudio
     stdenv.cc.cc.lib
+    vulkan-loader
+    xcb-imdkit
     xcbutil
     xcbutilwm
     zlib
@@ -78,6 +82,11 @@ stdenv.mkDerivation rec {
     cp -r opt/bitwig-studio $out/libexec
     ln -s $out/libexec/bitwig-studio $out/bin/bitwig-studio
     cp -r usr/share $out/share
+
+    # Bitwig includes a copy of libxcb-imdkit.
+    # Removing it will force it to use our version.
+    rm $out/libexec/lib/bitwig-studio/libxcb-imdkit.so.1
+
     substitute usr/share/applications/com.bitwig.BitwigStudio.desktop \
       $out/share/applications/com.bitwig.BitwigStudio.desktop \
       --replace /usr/bin/bitwig-studio $out/bin/bitwig-studio
diff --git a/third_party/nixpkgs/pkgs/applications/audio/dexed/default.nix b/third_party/nixpkgs/pkgs/applications/audio/dexed/default.nix
index 9bb3937cc0..46cdb937f7 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/dexed/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/dexed/default.nix
@@ -34,7 +34,6 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     # needs special setup on Linux, dunno if it can work on Darwin
-    # https://github.com/NixOS/nixpkgs/issues/19098
     sed -i -e '/juce::juce_recommended_lto_flags/d' Source/CMakeLists.txt
   '';
 
diff --git a/third_party/nixpkgs/pkgs/applications/audio/fire/default.nix b/third_party/nixpkgs/pkgs/applications/audio/fire/default.nix
index 0d4691b9e4..5b71667a2a 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/fire/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/fire/default.nix
@@ -49,7 +49,6 @@ stdenv.mkDerivation rec {
   postPatch = ''
     # 1. Remove hardcoded LTO flags: needs extra setup on Linux,
     #    possibly broken on Darwin
-    #    https://github.com/NixOS/nixpkgs/issues/19098
     # 2. Disable automatic copying of built plugins during buildPhase, it defaults
     #    into user home and we want to have building & installing separated.
     sed -i \
diff --git a/third_party/nixpkgs/pkgs/applications/audio/gmpc/default.nix b/third_party/nixpkgs/pkgs/applications/audio/gmpc/default.nix
index 3bd6f31381..e3f5f4580d 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/gmpc/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/gmpc/default.nix
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
     homepage = "https://gmpclient.org";
     description = "GTK2 frontend for Music Player Daemon";
     license = licenses.gpl2;
-    maintainers = [];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/third_party/nixpkgs/pkgs/applications/audio/in-formant/default.nix b/third_party/nixpkgs/pkgs/applications/audio/in-formant/default.nix
index 357560b178..1f33323736 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/in-formant/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/audio/jacktrip/default.nix b/third_party/nixpkgs/pkgs/applications/audio/jacktrip/default.nix
index afa5f592bf..e54828e3cd 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/jacktrip/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/jacktrip/default.nix
@@ -11,7 +11,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2.3.0";
+  version = "2.3.1";
   pname = "jacktrip";
 
   src = fetchFromGitHub {
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     repo = "jacktrip";
     rev = "v${version}";
     fetchSubmodules = true;
-    hash = "sha256-MUP+8Hjrj95D5SONIEsweB5j+kgEhLEWTKWBlEWLt94=";
+    hash = "sha256-p5NXGmWIzi8M177bPzMKfXMmyMgS1qZuWHdCtBBLeDA=";
   };
 
   preConfigure = ''
diff --git a/third_party/nixpkgs/pkgs/applications/audio/jamesdsp/default.nix b/third_party/nixpkgs/pkgs/applications/audio/jamesdsp/default.nix
index 4f9b5c68c8..11fb94dc08 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/jamesdsp/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/jamesdsp/default.nix
@@ -11,6 +11,7 @@
 , qmake
 , qtbase
 , qtsvg
+, qtwayland
 , stdenv
 , usePipewire ? true
 , usePulseaudio ? false
@@ -43,6 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
     libarchive
     qtbase
     qtsvg
+    qtwayland
   ] ++ lib.optionals usePipewire [
     pipewire
   ] ++ lib.optionals usePulseaudio [
diff --git a/third_party/nixpkgs/pkgs/applications/audio/jmusicbot/default.nix b/third_party/nixpkgs/pkgs/applications/audio/jmusicbot/default.nix
index a03fc7aed2..7f4d727595 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/jmusicbot/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/audio/librespot/default.nix b/third_party/nixpkgs/pkgs/applications/audio/librespot/default.nix
index dc60185fc0..46ece80638 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/librespot/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/librespot/default.nix
@@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-DtF6asSlLdC2m/0JTBo4YUx9HgsojpfiqVdqaIwniKA=";
   };
 
-  cargoSha256 = "sha256-tbDlWP0sUIa0W9HhdYNOvo9cGeqFemclhA7quh7f/Rw=";
+  cargoHash = "sha256-tbDlWP0sUIa0W9HhdYNOvo9cGeqFemclhA7quh7f/Rw=";
 
   nativeBuildInputs = [ pkg-config makeWrapper ] ++ lib.optionals stdenv.isDarwin [
     rustPlatform.bindgenHook
diff --git a/third_party/nixpkgs/pkgs/applications/audio/lingot/default.nix b/third_party/nixpkgs/pkgs/applications/audio/lingot/default.nix
index 4cc31ae421..b024b42a6f 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/lingot/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/lingot/default.nix
@@ -46,6 +46,6 @@ stdenv.mkDerivation rec {
     homepage = "https://www.nongnu.org/lingot/";
     license = lib.licenses.gpl2Plus;
     platforms = with lib.platforms; linux;
-    maintainers = with lib.maintainers; [ viric ];
+    maintainers = [ ];
   };
 }
diff --git a/third_party/nixpkgs/pkgs/applications/audio/mbrola/default.nix b/third_party/nixpkgs/pkgs/applications/audio/mbrola/default.nix
index 6cc20269dc..888ae82cdb 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/mbrola/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/mbrola/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchFromGitHub, runCommandLocal }:
+{ stdenv, lib, fetchFromGitHub, runCommandLocal, mbrola-voices }:
 
 let
   pname = "mbrola";
@@ -12,20 +12,6 @@ let
     homepage = "https://github.com/numediart/MBROLA";
   };
 
-  # Very big (0.65 G) so kept as a fixed-output derivation to limit "duplicates".
-  voices = fetchFromGitHub {
-    owner = "numediart";
-    repo = "MBROLA-voices";
-    rev = "fe05a0ccef6a941207fd6aaad0b31294a1f93a51";  # using latest commit
-    sha256 = "1w0y2xjp9rndwdjagp2wxh656mdm3d6w9cs411g27rjyfy1205a0";
-
-    name = "${pname}-voices-${version}";
-    meta = meta // {
-      description = "Speech synthesizer based on the concatenation of diphones (voice files)";
-      homepage = "https://github.com/numediart/MBROLA-voices";
-    };
-  };
-
   bin = stdenv.mkDerivation {
     pname = "${pname}-bin";
     inherit version;
@@ -60,7 +46,7 @@ in
     }
     ''
       mkdir -p "$out/share/mbrola"
-      ln -s '${voices}/data' "$out/share/mbrola/voices"
+      ln -s '${mbrola-voices}/data' "$out/share/mbrola/voices"
       ln -s '${bin}/bin' "$out/"
     ''
 
diff --git a/third_party/nixpkgs/pkgs/applications/audio/mbrola/voices.nix b/third_party/nixpkgs/pkgs/applications/audio/mbrola/voices.nix
new file mode 100644
index 0000000000..4244a9b62a
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/audio/mbrola/voices.nix
@@ -0,0 +1,51 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  unstableGitUpdater,
+  mbrola,
+  languages ? [ ],
+}:
+
+let
+  src = fetchFromGitHub {
+    owner = "numediart";
+    repo = "MBROLA-voices";
+    rev = "fe05a0ccef6a941207fd6aaad0b31294a1f93a51";
+    hash = "sha256-QBUggnde5iNeCESzxE0btVVTDOxc3Kdk483mdGUXHvA=";
+  };
+
+  meta = {
+    description = "Speech synthesizer based on the concatenation of diphones (voice files)";
+    homepage = "https://github.com/numediart/MBROLA-voices";
+    license = mbrola.meta.license;
+  };
+in
+
+if (languages == [ ]) then
+  src // { inherit meta; }
+else
+  stdenv.mkDerivation {
+    pname = "mbrola-voices";
+    version = "0-unstable-2020-03-30";
+
+    inherit src;
+
+    postPatch = ''
+      shopt -s extglob
+      pushd data
+      rm -rfv !(${lib.concatStringsSep "|" languages})
+      popd
+    '';
+
+    installPhase = ''
+      runHook preInstall
+
+      mkdir $out
+      cp -R data $out/
+
+      runHook postInstall
+    '';
+
+    inherit meta;
+  }
diff --git a/third_party/nixpkgs/pkgs/applications/audio/mikmod/default.nix b/third_party/nixpkgs/pkgs/applications/audio/mikmod/default.nix
index abe8ac01cc..7cc6bb6227 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/mikmod/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/audio/mmtc/default.nix b/third_party/nixpkgs/pkgs/applications/audio/mmtc/default.nix
index 8227d12bbc..384bd44929 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/mmtc/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/mmtc/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-gs6uytX4rm2JrJ4UbtHJDg+b+Z1ZjcsuUR0b13jQIy4=";
   };
 
-  cargoSha256 = "sha256-7zV/AsSZHk99ROC1301nkwJ22dvh4afeCI//G1zWHu8=";
+  cargoHash = "sha256-7zV/AsSZHk99ROC1301nkwJ22dvh4afeCI//G1zWHu8=";
 
   nativeBuildInputs = [ installShellFiles ];
 
diff --git a/third_party/nixpkgs/pkgs/applications/audio/mopidy/moped.nix b/third_party/nixpkgs/pkgs/applications/audio/mopidy/moped.nix
index 3e4e728c3c..afefc0f0d9 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/mopidy/moped.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/mopidy/moped.nix
@@ -20,7 +20,7 @@ pythonPackages.buildPythonApplication rec {
     homepage = "https://github.com/martijnboland/moped";
     description = "Web client for Mopidy";
     license = licenses.mit;
-    maintainers = [];
+    maintainers = [ ];
     hydraPlatforms = [];
   };
 }
diff --git a/third_party/nixpkgs/pkgs/applications/audio/mopidy/muse.nix b/third_party/nixpkgs/pkgs/applications/audio/mopidy/muse.nix
index 5b33771ff3..f98d1ca458 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/mopidy/muse.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/audio/mopidy/musicbox-webclient.nix b/third_party/nixpkgs/pkgs/applications/audio/mopidy/musicbox-webclient.nix
index 902d209f02..105fcff2ac 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/mopidy/musicbox-webclient.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/audio/mopidy/notify.nix b/third_party/nixpkgs/pkgs/applications/audio/mopidy/notify.nix
index aeeedb23a0..f52ed61911 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/mopidy/notify.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/audio/mopidy/tunein.nix b/third_party/nixpkgs/pkgs/applications/audio/mopidy/tunein.nix
index 537baa3de0..b306ae91f1 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/mopidy/tunein.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/audio/mopidy/youtube.nix b/third_party/nixpkgs/pkgs/applications/audio/mopidy/youtube.nix
index 33cf382ada..cd57667b42 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/mopidy/youtube.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/audio/open-stage-control/default.nix b/third_party/nixpkgs/pkgs/applications/audio/open-stage-control/default.nix
index c188465f52..504351a1a4 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/open-stage-control/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/audio/openutau/default.nix b/third_party/nixpkgs/pkgs/applications/audio/openutau/default.nix
index 289991a944..2be3275935 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/openutau/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/audio/opus-tools/default.nix b/third_party/nixpkgs/pkgs/applications/audio/opus-tools/default.nix
index 6c602ef1d0..53233995ac 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/opus-tools/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/audio/pavucontrol/default.nix b/third_party/nixpkgs/pkgs/applications/audio/pavucontrol/default.nix
index f6b8d20f91..027d3880bd 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/pavucontrol/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/audio/pmidi/default.nix b/third_party/nixpkgs/pkgs/applications/audio/pmidi/default.nix
index 29215aa061..f2e2310bd4 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/pmidi/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/audio/projectm/default.nix b/third_party/nixpkgs/pkgs/applications/audio/projectm/default.nix
index 6ca8d55bb2..f7ca3d3779 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/projectm/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/audio/pulseeffects-legacy/default.nix b/third_party/nixpkgs/pkgs/applications/audio/pulseeffects-legacy/default.nix
index 1fb71e05d2..6daaf094b3 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/pulseeffects-legacy/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/pulseeffects-legacy/default.nix
@@ -99,17 +99,12 @@ in stdenv.mkDerivation rec {
     )
   '';
 
-  # Meson is no longer able to pick up Boost automatically.
-  # https://github.com/NixOS/nixpkgs/issues/86131
-  BOOST_INCLUDEDIR = "${lib.getDev boost}/include";
-  BOOST_LIBRARYDIR = "${lib.getLib boost}/lib";
-
   meta = with lib; {
     description = "Limiter, compressor, reverberation, equalizer and auto volume effects for Pulseaudio applications";
     mainProgram = "pulseeffects";
     homepage = "https://github.com/wwmm/pulseeffects";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/third_party/nixpkgs/pkgs/applications/audio/pwvucontrol/Cargo.lock b/third_party/nixpkgs/pkgs/applications/audio/pwvucontrol/Cargo.lock
index c07b918906..d3df103dee 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/pwvucontrol/Cargo.lock
+++ b/third_party/nixpkgs/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 = "anyhow"
-version = "1.0.77"
+name = "annotate-snippets"
+version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9d19de80eff169429ac1e9f48fffb163916b448a44e8e046186232046d9e1f9"
+checksum = "ccaf7e9dfbb6ab22c82e473cd1a8a7bd313c19a5b7e40970f3d89ef5a5c9e81e"
+dependencies = [
+ "unicode-width",
+ "yansi-term",
+]
+
+[[package]]
+name = "anyhow"
+version = "1.0.86"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+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 = "lazy_static"
-version = "1.4.0"
+name = "itertools"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "lazy_static"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+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"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
 
 [[package]]
 name = "memoffset"
-version = "0.7.1"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5de893c32cde5f383baa4c04c5d6dbdd735cfd4a794b0debdb2bb1b421da5ff4"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "memoffset"
-version = "0.9.0"
-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"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69d3587f8a9e599cc7ec2c00e331f71c4e69a5f9a4b8a6efd5b07466b9736f9a"
+checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
 
 [[package]]
 name = "proc-macro-crate"
-version = "1.3.1"
+version = "3.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"
+checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284"
 dependencies = [
- "once_cell",
- "toml_edit 0.19.15",
-]
-
-[[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"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
-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"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.43"
-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 = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36"
+checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
+
+[[package]]
+name = "unicode-width"
+version = "0.1.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+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"
@@ -1218,10 +1172,92 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
-name = "winnow"
-version = "0.5.31"
+name = "windows-sys"
+version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97a4882e6b134d6c28953a387571f1acdd3496830d5e36c5e3a1075580ea641c"
+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.6.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+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/third_party/nixpkgs/pkgs/applications/audio/pwvucontrol/default.nix b/third_party/nixpkgs/pkgs/applications/audio/pwvucontrol/default.nix
index f6733b1e4f..2726f1bedc 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/pwvucontrol/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/audio/radiotray-ng/default.nix b/third_party/nixpkgs/pkgs/applications/audio/radiotray-ng/default.nix
index c583f08d02..ee994b56ef 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/radiotray-ng/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/audio/reaper/default.nix b/third_party/nixpkgs/pkgs/applications/audio/reaper/default.nix
index 65bc615d2c..96e849b406 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/reaper/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/reaper/default.nix
@@ -28,13 +28,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "reaper";
-  version = "7.18";
+  version = "7.19";
 
   src = fetchurl {
     url = url_for_platform version stdenv.hostPlatform.qemuArch;
-    hash = if stdenv.isDarwin then "sha256-ETvWq+71G4v25F/iUjP7NWJ0QkPMKn7akfBOA7EKzKg=" else {
-      x86_64-linux = "sha256-kddqIKgTTImbDIFtPqV/6YsnfNYsDPLhcelJIBC4R8s=";
-      aarch64-linux = "sha256-PNFSifZwH+VzfljyrlQZKZ+NEiiINXnVecOXgn1gY/Q=";
+    hash = if stdenv.isDarwin then "sha256-uxrLtq7rTmsgYHeE1yizHsnuijiL17RkbeBJPRUqRnw=" else {
+      x86_64-linux = "sha256-f38WtxmIbkZpi0P8Cn5jEU7aP2AzEvbnalBg9N/rbMY=";
+      aarch64-linux = "sha256-WTXF/l7Z33LKzjrTQ8YesgJUBVtKUTDkjfO8curuL2o=";
     }.${stdenv.hostPlatform.system};
   };
 
diff --git a/third_party/nixpkgs/pkgs/applications/audio/rhvoice/default.nix b/third_party/nixpkgs/pkgs/applications/audio/rhvoice/default.nix
index 16614d0e32..d7676ca22d 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/rhvoice/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/rhvoice/default.nix
@@ -7,7 +7,7 @@
 , glibmm
 , libpulseaudio
 , libao
-, speechd
+, speechd-minimal
 }:
 
 stdenv.mkDerivation rec {
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
     glibmm
     libpulseaudio
     libao
-    speechd
+    speechd-minimal
   ];
 
   meta = {
diff --git a/third_party/nixpkgs/pkgs/applications/audio/snd/default.nix b/third_party/nixpkgs/pkgs/applications/audio/snd/default.nix
index 1cd653df3a..ad935b09ed 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/snd/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/audio/sonobus/default.nix b/third_party/nixpkgs/pkgs/applications/audio/sonobus/default.nix
index 959c7a9d06..fc0c597736 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/sonobus/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/sonobus/default.nix
@@ -61,7 +61,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   postPatch = lib.optionalString (stdenv.isLinux) ''
     # needs special setup on Linux, dunno if it can work on Darwin
-    # https://github.com/NixOS/nixpkgs/issues/19098
     # Also, I get issues with linking without that, not sure why
     sed -i -e '/juce::juce_recommended_lto_flags/d' CMakeLists.txt
     patchShebangs linux/install.sh
diff --git a/third_party/nixpkgs/pkgs/applications/audio/tenacity/default.nix b/third_party/nixpkgs/pkgs/applications/audio/tenacity/default.nix
index c5606677fd..160a032fd6 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/tenacity/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/tenacity/default.nix
@@ -29,7 +29,7 @@
 , expat
 , libid3tag
 , libopus
-, ffmpeg_5
+, ffmpeg
 , soundtouch
 , pcre
 , portaudio
@@ -104,7 +104,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     alsa-lib
     expat
-    ffmpeg_5
+    ffmpeg
     file
     flac
     glib
diff --git a/third_party/nixpkgs/pkgs/applications/audio/touchosc/default.nix b/third_party/nixpkgs/pkgs/applications/audio/touchosc/default.nix
index f44904badf..9e83c0472f 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/touchosc/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/audio/zynaddsubfx/default.nix b/third_party/nixpkgs/pkgs/applications/audio/zynaddsubfx/default.nix
index 3352135d28..728b8dea24 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/zynaddsubfx/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/audio/zynaddsubfx/default.nix
@@ -2,6 +2,7 @@
 , stdenv
 , fetchFromGitHub
 , callPackage
+, fetchpatch
 
   # Required build tools
 , cmake
@@ -69,9 +70,16 @@ in stdenv.mkDerivation rec {
 
   outputs = [ "out" "doc" ];
 
+  patches = [
+    # Hardcode system installed banks & presets
+    (fetchpatch {
+      url = "https://patch-diff.githubusercontent.com/raw/zynaddsubfx/zynaddsubfx/pull/295.patch";
+      hash = "sha256-UN62i9/JBs7uWTmHDKk3lkAxUXsVmIs6+6avOcL1NBg=";
+    })
+  ];
+
   postPatch = ''
     patchShebangs rtosc/test/test-port-checker.rb src/Tests/check-ports.rb
-    substituteInPlace src/Misc/Config.cpp --replace /usr $out
   '';
 
   nativeBuildInputs = [ cmake makeWrapper pkg-config ];
@@ -87,7 +95,11 @@ in stdenv.mkDerivation rec {
     ++ lib.optionals (guiModule == "ntk") [ ntk cairo libXpm ]
     ++ lib.optionals (guiModule == "zest") [ libGL libX11 ];
 
-  cmakeFlags = [ "-DGuiModule=${guiModule}" ]
+  cmakeFlags =
+    [
+      "-DGuiModule=${guiModule}"
+      "-DZYN_DATADIR=${placeholder "out"}/share/zynaddsubfx"
+    ]
     # OSS library is included in glibc.
     # Must explicitly disable if support is not wanted.
     ++ lib.optional (!ossSupport) "-DOssEnable=OFF"
diff --git a/third_party/nixpkgs/pkgs/applications/backup/restic-integrity/default.nix b/third_party/nixpkgs/pkgs/applications/backup/restic-integrity/default.nix
index c34b1a1940..ac0c5b99d1 100644
--- a/third_party/nixpkgs/pkgs/applications/backup/restic-integrity/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/backup/restic-integrity/default.nix
@@ -5,23 +5,23 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "restic-integrity";
-  version = "1.2.2";
+  version = "1.3.0";
 
   src = fetchFromGitea {
     domain = "git.nwex.de";
     owner = "networkException";
     repo = "restic-integrity";
     rev = version;
-    hash = "sha256-QiISJCxxJH8wQeH/klB48POn6W9juQmIMCLGzGSyl6w=";
+    hash = "sha256-mryHePqfEawW/vLgxfm+eh4oSbcALhxvRid4kF9klTs=";
   };
 
-  cargoHash = "sha256-GxehJjDd0AHbEc8kPWyLXAOPbrPCT59LddAL1ydnT5g=";
+  cargoHash = "sha256-0BvB1ijsppblEC2PNLfVt+sgM4wTdSLZ/RoDH4JrQy4=";
 
   meta = with lib; {
     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 = with maintainers; [ networkexception ];
     mainProgram = "restic-integrity";
   };
 }
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/clightning/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/clightning/default.nix
index 2d1efc3e88..ac9595ce41 100644
--- a/third_party/nixpkgs/pkgs/applications/blockchains/clightning/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/blockchains/clightning/default.nix
@@ -1,5 +1,6 @@
 { lib
 , stdenv
+, cctools
 , darwin
 , fetchurl
 , autoconf
@@ -30,11 +31,11 @@ stdenv.mkDerivation rec {
     hash = "sha256-FD7JFM80wrruqBWjYnJHZh2f2GZJ6XDQmUQ0XetnWBg=";
   };
 
-  # when building on darwin we need dawin.cctools to provide the correct libtool
+  # when building on darwin we need cctools to provide the correct libtool
   # as libwally-core detects the host as darwin and tries to add the -static
   # option to libtool, also we have to add the modified gsed package.
   nativeBuildInputs = [ autoconf autogen automake gettext libtool lowdown protobuf py3 unzip which ]
-    ++ lib.optionals stdenv.isDarwin [ darwin.cctools darwin.autoSignDarwinBinariesHook ];
+    ++ lib.optionals stdenv.isDarwin [ cctools darwin.autoSignDarwinBinariesHook ];
 
   buildInputs = [ gmp libsodium sqlite zlib jq ];
 
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/dcrctl/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/dcrctl/default.nix
index c388bd75f7..eb8f53d1cd 100644
--- a/third_party/nixpkgs/pkgs/applications/blockchains/dcrctl/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/blockchains/miniscript/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/miniscript/default.nix
index 84b1b55f66..8a842d507b 100644
--- a/third_party/nixpkgs/pkgs/applications/blockchains/miniscript/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/blockchains/miniscript/default.nix
@@ -18,12 +18,8 @@ stdenv.mkDerivation rec {
     postPatch = lib.optionalString stdenv.isDarwin ''
     # Replace hardcoded g++ with c++ so clang can be used
     # on darwin
-    #
-    # lto must be disabled on darwin as well due to
-    # https://github.com/NixOS/nixpkgs/issues/19098
     substituteInPlace Makefile \
-        --replace-fail 'g++' 'c++' \
-        --replace-fail '-flto' ""
+        --replace-fail 'g++' 'c++'
   '';
 
   installPhase = ''
diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/namecoin/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/namecoin/default.nix
index 89fa92a316..42f4be7a22 100644
--- a/third_party/nixpkgs/pkgs/applications/blockchains/namecoin/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/blockchains/wownero/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/wownero/default.nix
index 82b6d12153..836532c00b 100644
--- a/third_party/nixpkgs/pkgs/applications/blockchains/wownero/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/display-managers/greetd/tuigreet.nix b/third_party/nixpkgs/pkgs/applications/display-managers/greetd/tuigreet.nix
index e963a409ad..11ca43c614 100644
--- a/third_party/nixpkgs/pkgs/applications/display-managers/greetd/tuigreet.nix
+++ b/third_party/nixpkgs/pkgs/applications/display-managers/greetd/tuigreet.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-e0YtpakEaaWdgu+bMr2VFoUc6+SUMFk4hYtSyk5aApY=";
   };
 
-  cargoSha256 = "sha256-RkJjAmZ++4nc/lLh8g0LxGq2DjZGxQEjFOl8Yzx116A=";
+  cargoHash = "sha256-RkJjAmZ++4nc/lLh8g0LxGq2DjZGxQEjFOl8Yzx116A=";
 
   meta = {
     description = "Graphical console greeter for greetd";
diff --git a/third_party/nixpkgs/pkgs/applications/editors/bviplus/default.nix b/third_party/nixpkgs/pkgs/applications/editors/bviplus/default.nix
index ddf37bb69f..ebc3c24651 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/bviplus/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/editors/ed/default.nix b/third_party/nixpkgs/pkgs/applications/editors/ed/default.nix
deleted file mode 100644
index c1f99de710..0000000000
--- a/third_party/nixpkgs/pkgs/applications/editors/ed/default.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ lib, pkgs }:
-
-lib.makeScope pkgs.newScope (self:
-  let
-    inherit (self) callPackage;
-  in {
-    sources = import ./sources.nix {
-      inherit lib;
-      inherit (pkgs) fetchurl;
-    };
-
-    ed = callPackage (self.sources.ed) { };
-    edUnstable = callPackage (self.sources.edUnstable) { };
-  })
diff --git a/third_party/nixpkgs/pkgs/applications/editors/ed/generic.nix b/third_party/nixpkgs/pkgs/applications/editors/ed/generic.nix
deleted file mode 100644
index 70ffdb4c4a..0000000000
--- a/third_party/nixpkgs/pkgs/applications/editors/ed/generic.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ pname
-, version
-, src
-, patches ? [ ]
-, meta
-}:
-
-# Note: this package is used for bootstrapping fetchurl, and thus cannot use
-# fetchpatch! All mutable patches (generated by GitHub or cgit) that are needed
-# here should be included directly in Nixpkgs as files.
-
-{ lib
-, stdenv
-, fetchurl
-, lzip
-, runtimeShellPackage
-}:
-
-stdenv.mkDerivation {
-  inherit pname version src patches;
-
-  nativeBuildInputs = [ lzip ];
-  buildInputs = [ runtimeShellPackage ];
-
-  configureFlags = [
-    "CC=${stdenv.cc.targetPrefix}cc"
-  ];
-
-  doCheck = true;
-
-  inherit meta;
-}
diff --git a/third_party/nixpkgs/pkgs/applications/editors/ed/sources.nix b/third_party/nixpkgs/pkgs/applications/editors/ed/sources.nix
deleted file mode 100644
index 6601876c88..0000000000
--- a/third_party/nixpkgs/pkgs/applications/editors/ed/sources.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{ lib
-, fetchurl
-}:
-
-let
-  meta = {
-    description = "GNU implementation of the standard Unix editor";
-    longDescription = ''
-      GNU ed is a line-oriented text editor. It is used to create, display,
-      modify and otherwise manipulate text files, both interactively and via
-      shell scripts. A restricted version of ed, red, can only edit files in the
-      current directory and cannot execute shell commands. Ed is the 'standard'
-      text editor in the sense that it is the original editor for Unix, and thus
-      widely available. For most purposes, however, it is superseded by
-      full-screen editors such as GNU Emacs or GNU Moe.
-    '';
-    license = lib.licenses.gpl3Plus;
-    homepage = "https://www.gnu.org/software/ed/";
-    maintainers = with lib.maintainers; [ AndersonTorres ];
-    platforms = lib.platforms.unix;
-  };
-in
-{
-  ed = let
-    pname = "ed";
-    version = "1.20.2";
-    src = fetchurl {
-      url = "mirror://gnu/ed/ed-${version}.tar.lz";
-      hash = "sha256-Zf7HMY9IwsoX8zSsD0cD3v5iA3uxPMI5IN4He1+iRSM=";
-    };
-  in import ./generic.nix {
-    inherit pname version src meta;
-  };
-
-  edUnstable = let
-    pname = "ed";
-    version = "1.20-pre2";
-    src = fetchurl {
-      url = "http://download.savannah.gnu.org/releases/ed/ed-${version}.tar.lz";
-      hash = "sha256-bHTDeMhVNNo3qqDNoBNaBA+DHDa4WJpfQNcTvAUPgsY=";
-    };
-  in import ./generic.nix {
-    inherit pname version src meta;
-  };
-}
diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/build-support/generic.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/build-support/generic.nix
index 7ad77bf278..727b1f03ca 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/emacs/build-support/generic.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/build-support/generic.nix
@@ -31,6 +31,8 @@ in
 , propagatedUserEnvPkgs ? []
 , postInstall ? ""
 , meta ? {}
+, turnCompilationWarningToError ? false
+, ignoreCompilationError ? true
 , ...
 }@args:
 
@@ -77,6 +79,8 @@ stdenv.mkDerivation (finalAttrs: ({
 
   addEmacsNativeLoadPath = true;
 
+  inherit turnCompilationWarningToError ignoreCompilationError;
+
   postInstall = ''
     # Besides adding the output directory to the native load path, make sure
     # the current package's elisp files are in the load path, otherwise
@@ -86,8 +90,13 @@ stdenv.mkDerivation (finalAttrs: ({
     addEmacsVars "$out"
 
     find $out/share/emacs -type f -name '*.el' -print0 \
-      | xargs -0 -I {} -n 1 -P $NIX_BUILD_CORES sh -c \
-          "emacs --batch --eval '(setq large-file-warning-threshold nil)' -f batch-native-compile {} || true"
+      | xargs --verbose -0 -I {} -n 1 -P $NIX_BUILD_CORES sh -c \
+          "emacs \
+             --batch \
+             --eval '(setq large-file-warning-threshold nil)' \
+             --eval '(setq byte-compile-error-on-warn ${if finalAttrs.turnCompilationWarningToError then "t" else "nil"})' \
+             -f batch-native-compile {} \
+           || exit ${if finalAttrs.ignoreCompilationError then "0" else "\\$?"}"
   '' + postInstall;
 }
 
diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix
index 1ba0ea1519..acfafcacbe 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix
@@ -1,7597 +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.20240328.110921";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/activities-0.8pre0.20240328.110921.tar";
-          sha256 = "0b8g9zb0x0hx0fgkrvn0lr7sxakrm931m1mrdzxrg779h8h24025";
-        };
-        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.20240307.233340";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/aircon-theme-0.0.6.0.20240307.233340.tar";
-          sha256 = "0wlnk169zkb3l7aw8536p6dvlf7qzqdcf0jbmn92w75hy8k7jwjk";
-        };
-        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.20240323.191212";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/async-1.9.8.0.20240323.191212.tar";
-          sha256 = "0ji1ai2zx8wly0b0f670v0wij57hrclr4yr6kwiq0ljaqnbm59h3";
-        };
-        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.5.0.20240519.95252";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/auctex-14.0.5.0.20240519.95252.tar";
-          sha256 = "0nb8djks4lpbkmsm4v8v6rnhh1wplcnarfc80fi7mglw26cls1lq";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/auctex.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.20240218.140135";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/bicep-ts-mode-0.1.3.0.20240218.140135.tar";
-          sha256 = "1qa1ws7hvn7ni8qnrzhmwnf8hq2wb3dc36i49vdiv0rf68kci210";
-        };
-        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.20240516.162426";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/bufferlo-0.8.0.20240516.162426.tar";
-          sha256 = "1w4vw1f5qmgv9207wpgmw5ahq4kans5dh775l213vzh32s6cdxx1";
-        };
-        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.20240517.221612";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/cape-1.5.0.20240517.221612.tar";
-          sha256 = "1gxk070lf204hp62zlxqkc0h8k7ml6sywms1m8kadbl650dl8fdc";
-        };
-        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.20221221.74904";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/cobol-mode-1.1.0.20221221.74904.tar";
-          sha256 = "0268d848pj3vszspmbcz9923945pzz4kzcd0jcrl7k3dasg3mpka";
-        };
-        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.0.0.20240427.103837";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/colorful-mode-1.0.0.0.20240427.103837.tar";
-          sha256 = "1ggasm3b678rnh96l4bynlbqciwsznsrljhxsi9ifak4xb3zlg8s";
-        };
-        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.20240514.232026";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/company-0.10.2.0.20240514.232026.tar";
-          sha256 = "10sh1pi3wb38r5v6vka0g3dxsmp3yr6p2iqrr3icqrx8mbz2mhvz";
-        };
-        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 = "29.1.4.5.0.20240520.101243";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/compat-29.1.4.5.0.20240520.101243.tar";
-          sha256 = "0ik2qlvkd414fs2zpks7bfdylcwpchx0mw2d5932156k3bchm0ib";
-        };
-        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.6.0.20240517.91901";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/consult-1.6.0.20240517.91901.tar";
-          sha256 = "0nyx7dncdqv40cfwzy2hfi4f23mph6q41yz5d04r0mzachpbh5zg";
-        };
-        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.0.0.0.20240521.82207";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/consult-denote-0.0.0.0.20240521.82207.tar";
-          sha256 = "1yj93195gzjgwfms6k2chwbhq3w14vpab7r9dq24gjxcgb3f63w3";
-        };
-        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.3.0.20240514.120535";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/corfu-1.3.0.20240514.120535.tar";
-          sha256 = "0nqq690pnjx7dlab6ba1y1n8m6bhbwm1yl7iqzv8php9j4bxyd20";
-        };
-        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.23.0.20240114.203711";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/csv-mode-1.23.0.20240114.203711.tar";
-          sha256 = "0r36dycnc76a5l94ad6p7lkx0f9ma6qmjvnivimgq6man5lw6lxh";
-        };
-        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.11.1.0.20240518.161137";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/dape-0.11.1.0.20240518.161137.tar";
-          sha256 = "1v359ilhbpsvyvr7x1c9lj2hadsblp2lxd7vwsqx87bf1ls2cpzi";
-        };
-        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 = "2.3.5.0.20240520.93621";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/denote-2.3.5.0.20240520.93621.tar";
-          sha256 = "12mxsadpikjp3315cd20cp59r9f3g9jznkljp2yc3bkkjfrbjz5v";
-        };
-        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.20230927.131718";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/denote-menu-1.2.0.0.20230927.131718.tar";
-          sha256 = "0pq8k2aif60y22sjxs6d4vlf43fqlizs1zlk3wrd1k52sn2dkgxp";
-        };
-        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.20240505.211034";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/diff-hl-1.9.2.0.20240505.211034.tar";
-          sha256 = "0mbxas2mx0pyvs3ccpp6ss2q8j7n5mva1ngg004fdhp8br8qknhn";
-        };
-        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.1.0.20231027.63811";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/do-at-point-0.1.1.0.20231027.63811.tar";
-          sha256 = "1cf4inz5805vd9hcrqsmwxjzc8wy7qwwxg9731d03czjxxcvyp0d";
-        };
-        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.20240511.124331";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/drepl-0.3.0.20240511.124331.tar";
-          sha256 = "0xfmna8a8nh48ir9nl5gv4y03kqsvrzars74lza5k0cdsslga4gr";
-        };
-        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 = "20240513.0.20240517.104050";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/eev-20240513.0.20240517.104050.tar";
-          sha256 = "03bdj2f3y5xj33vq7mgxb8s0n05b5qnrsbak2xqjv2bgfky08dmq";
-        };
-        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.20240510.44643";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/ef-themes-1.7.0.0.20240510.44643.tar";
-          sha256 = "0iygfxy4h74nd2glx7kb4faw4b0f2gpfakdwi1icfkkn021kr781";
-        };
-        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.20240518.213720";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/eglot-1.17.0.20240518.213720.tar";
-          sha256 = "10hpsip9ai41pxh5a32dwh9z90h2lrjvd3jh666zl3m11g906iwh";
-        };
-        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.20240223.120227";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/eldoc-1.15.0.0.20240223.120227.tar";
-          sha256 = "1jlvlzd2bvz0xgc8gdlzw655v5qiaihc4wz5k3yqqck6dbmhd8fy";
-        };
-        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.20240518.180006";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/elisp-benchmarks-1.16.0.20240518.180006.tar";
-          sha256 = "1pc3qs0j8hh68lbh4lqyf2xkahiylpqaaac3cpvard0wdp9b4wsr";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/elisp-benchmarks.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    ellama = callPackage ({ elpaBuild, emacs, fetchurl, lib, llm, spinner }:
-      elpaBuild {
-        pname = "ellama";
-        ename = "ellama";
-        version = "0.9.4.0.20240517.145740";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/ellama-0.9.4.0.20240517.145740.tar";
-          sha256 = "0qb849ij6v7d8kk9mkx7nbk24d1dh32kydjddxykyn64xixw79kc";
-        };
-        packageRequires = [ 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.20240418.225241";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/embark-1.1.0.20240418.225241.tar";
-          sha256 = "120wh0r76wnsk5kczdnr5b7029x78fyd8p0h9rl2sbss4ac8wa48";
-        };
-        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.20240418.225241";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/embark-consult-1.1.0.20240418.225241.tar";
-          sha256 = "09qqwd5p7gasazg0plz1ijq5lgxh26358sia4727rs75pxwlz0zv";
-        };
-        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.0.20240416.101741";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/ement-0.15.0.20240416.101741.tar";
-          sha256 = "1fjns4li3cvi3p2jkwxagzs6aj8x9s4zjc1lwpj013d54mflkndp";
-        };
-        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 = "19.0.20240512.173549";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/emms-19.0.20240512.173549.tar";
-          sha256 = "13y0g21giswhhysm5252q1rb066a3sap4z51j4cprmwhj282zglj";
-        };
-        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.6snapshot0.20240518.154805";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/erc-5.6snapshot0.20240518.154805.tar";
-          sha256 = "0hscaz2nn08zv54gr2xfcg4pf66hycjsz31v603mbqyzgx6538hl";
-        };
-        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.20240102.22814";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/external-completion-0.1.0.20240102.22814.tar";
-          sha256 = "0y2lh89zmyrfkdzwxhc7npbbyp97xi1mnr7qdlsnlnw8gllknf27";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/external-completion.html";
-          license = lib.licenses.free;
-        };
-      }) {};
-    exwm = callPackage ({ elpaBuild, emacs, fetchurl, lib, xelb }:
-      elpaBuild {
-        pname = "exwm";
-        ename = "exwm";
-        version = "0.28.0.20240517.92828";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/exwm-0.28.0.20240517.92828.tar";
-          sha256 = "0d65091s706ajfqi9kp3m6k9hvlwhab6f484fs5v14c9rvspy1pa";
-        };
-        packageRequires = [ 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.0.0.20240310.203607";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/filechooser-0.2.0.0.20240310.203607.tar";
-          sha256 = "1hcjnhb3bhk6im5k1mqrlb599jrdg9hxadjhvw31f5l5rjg2636l";
-        };
-        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.20240503.61639";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/flymake-1.3.7.0.20240503.61639.tar";
-          sha256 = "0qrdjynam3nvhm5qwjks308r28f8wlgsfdmdw4d7sb4xqyr2mzrz";
-        };
-        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.0.20221228.123117";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/gnu-elpa-keyring-update-2022.12.0.20221228.123117.tar";
-          sha256 = "18dqjkg9gva5a9967k4gkyjvzhjvh55z2jds7xwgbwczppg8mdz2";
-        };
-        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 ({ elpaBuild
-                           , emacs
-                           , fetchurl
-                           , lib }:
-      elpaBuild {
-        pname = "greader";
-        ename = "greader";
-        version = "0.9.20.0.20240427.100340";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/greader-0.9.20.0.20240427.100340.tar";
-          sha256 = "0g07dvn21g35vx0g7c5dhhwv1pci3jxlpacd9f0iyj42f52yxxhy";
-        };
-        packageRequires = [ emacs ];
-        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.6.0.20240511.23214";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/gtags-mode-1.6.0.20240511.23214.tar";
-          sha256 = "0wi1pfvx7wrd8jfnhlim2zp4k2n96c6prl42f8asbvq1rgi5qh1p";
-        };
-        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.20190417.81229";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/guess-language-0.0.1.0.20190417.81229.tar";
-          sha256 = "167cz86pfxxszr57v312m9gb0l9318mvgg2lld6m5ppgzfmxlmnm";
-        };
-        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.20240519.180059";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/hyperbole-9.0.2pre0.20240519.180059.tar";
-          sha256 = "0i5h57a2ng28ijwds7ddy5ay8dkkgg817p35ig51mjrk7ljz6w2n";
-        };
-        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.0.0.20240430.163614";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/idlwave-6.5.0.0.20240430.163614.tar";
-          sha256 = "165lbvhrvrd1szvqns6pd7wmr9zxszzvq3lqz11qg20didi6sngr";
-        };
-        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.20240519.163855";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/ivy-0.14.2.0.20240519.163855.tar";
-          sha256 = "1r1b5znx1dzwpz903sm85sm2yp03yp4mvds782j8lngl46r5ibsr";
-        };
-        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.7.0.20240515.101640";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/jinx-1.7.0.20240515.101640.tar";
-          sha256 = "1ghp16kmplj9kj92867xsv3bnl6f0w95xl8hgjxbck4krj8k6is5";
-        };
-        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.20240323.72834";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/jit-spell-0.4.0.20240323.72834.tar";
-          sha256 = "1as5s3y1hgjzaz2325rayg0xm80wq2frswcxcarywn85gyfbpskn";
-        };
-        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.20240427.91928";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/jsonrpc-1.0.25.0.20240427.91928.tar";
-          sha256 = "18x620ayb9bwp2crxn2mibl7arqc4dzhaykmp5lfqibjkx6qmm9i";
-        };
-        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;
-        };
-      }) {};
-    llm = callPackage ({ elpaBuild, emacs, fetchurl, lib, plz }:
-      elpaBuild {
-        pname = "llm";
-        ename = "llm";
-        version = "0.15.0.0.20240518.145931";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/llm-0.15.0.0.20240518.145931.tar";
-          sha256 = "0dzvgq7lvlg62rzv9p62r5m0gm5glwd37mnw3sf6w5h3jfnkpzv0";
-        };
-        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.4.0.20201130.183958";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/loccur-1.2.4.0.20201130.183958.tar";
-          sha256 = "1ghig684f2r6dl5czym3d5hqhf72y1hilnhbk95lg890cc0yacir";
-        };
-        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.20240404.45149";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/marginalia-1.6.0.20240404.45149.tar";
-          sha256 = "1bqynrmb99691k0cmdn30g780356gff30bd7lirlriraabj19y7h";
-        };
-        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.20240505.33119";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/modus-themes-4.4.0.0.20240505.33119.tar";
-          sha256 = "1y637n8cll4932hyi16gnzpjqypwgwxbyq8mfhgjbz26663nksxs";
-        };
-        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 = "2pre0.20240414.172616";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/mpdired-2pre0.20240414.172616.tar";
-          sha256 = "0c7rjws601wh7bxg549hbbfanh5lxwrhrm03ay2ziriswqdrq5ng";
-        };
-        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.20240319.93238";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/nano-theme-0.3.4.0.20240319.93238.tar";
-          sha256 = "0xh3m9c4wq7zvc634nvfvxyyi0snlb67286znmnfkpgb3j84vshk";
-        };
-        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.20240401.95916";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/orderless-1.1.0.20240401.95916.tar";
-          sha256 = "0w2n1b65hj642a36i6022kmzwgwlb72aicfc6hj3b7rk5zsjg0hc";
-        };
-        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.7pre0.20240530.133120";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/org-9.7pre0.20240530.133120.tar";
-          sha256 = "sha256-DuuLDBJKI2LwC0PH9PtujcPvaqaKLWYij+KzP1U7o9M=";
-        };
-        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.20240521.114436";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/org-contacts-1.1.0.20240521.114436.tar";
-          sha256 = "0srbl81ngk24c9kf991ps2j53kpqriwgs8ld4lfcqmxzclr5y8iv";
-        };
-        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.2.0.20240515.193202";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/org-modern-1.2.0.20240515.193202.tar";
-          sha256 = "05mbgm95rlcv5liswlckd26izz5p3a6mkcfnz60widnilfmza9k6";
-        };
-        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.20240325.201734";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/org-remark-1.2.2.0.20240325.201734.tar";
-          sha256 = "1m5fwry6854w1iv6pahvqgyakws31d82l8f14k585rdxx2n8fwzb";
-        };
-        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.14.0.20240111.181530";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/orgalist-1.14.0.20240111.181530.tar";
-          sha256 = "05nbkphk3ii3ibfap9y9ss3w0g3qzl6qiynflib1dhbk2v222z3x";
-        };
-        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.20240122.225511";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/osm-1.3.0.20240122.225511.tar";
-          sha256 = "0xddnwrnypqz5l4swwbi5k9qdlv260fyq766vpg31r86z92q7r24";
-        };
-        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.20240216.43949";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/pabbrev-4.3.0.0.20240216.43949.tar";
-          sha256 = "0lkqg6qv06ayianrxs9mivy8pny7hzr0743mlaa20adgk681v1s4";
-        };
-        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.0.20240114.52348";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/persist-0.6.0.20240114.52348.tar";
-          sha256 = "1k4m2zmcb4l3q39qnx3kfl2wsm4380ih3mf0lc54g9l77fw4rfxr";
-        };
-        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.8.0.20240425.201348";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/plz-0.8.0.20240425.201348.tar";
-          sha256 = "00kprdnnz584fa2r8mkn4wzyk4fyxgn5d22z6s5c6lag0il1bjvc";
-        };
-        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.20240501.111443";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/plz-event-source-0.1pre0.20240501.111443.tar";
-          sha256 = "1bygbgzvyc6k8bqrnl5gwdbjmlrdh25fmf7n0rllfz4b055cdj6a";
-        };
-        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.20240501.111146";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/plz-media-type-0.1pre0.20240501.111146.tar";
-          sha256 = "0l2zgxgi48rvzs79qq2bjmp7bg2qhd3709rpyzfkv77gigcjwqj6";
-        };
-        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.20240323.172152";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/popper-0.4.6.0.20240323.172152.tar";
-          sha256 = "1avpaza4w7hav5x7wz6jvk0gacxas11cdlpggx9chjlp0klns0v2";
-        };
-        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.20240507.14806";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/posframe-1.4.3.0.20240507.14806.tar";
-          sha256 = "08jhv15hwrdjgdzl6d8xwdmx46afwlpd6yz3h5k7y7lhbnlc5jkp";
-        };
-        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;
-        };
-      }) {};
-    project = callPackage ({ elpaBuild
-                           , emacs
-                           , fetchurl
-                           , lib
-                           , xref }:
-      elpaBuild {
-        pname = "project";
-        ename = "project";
-        version = "0.10.0.0.20240512.175655";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/project-0.10.0.0.20240512.175655.tar";
-          sha256 = "1228kpfyj3zd1bz8xjv257mhhxgvrj8d67saxgfxix3y62fhb2wc";
-        };
-        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.20240518.202234";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/python-0.28.0.20240518.202234.tar";
-          sha256 = "0nk9rdr62c9j27gbjz3z6ri35aw026pmj6lhqvn6j9ci8ijif3yf";
-        };
-        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.1.0.20240422.191938";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/rcirc-sqlite-1.0.1.0.20240422.191938.tar";
-          sha256 = "1nspv7qgwzjpy9jsgh3m75iimy8piicimv9r82ahm5vrpaxkwg3p";
-        };
-        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.20240313.182825";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/shell-command+-2.4.2.0.20240313.182825.tar";
-          sha256 = "17rqdk23w41dl44imrk6b7p3r4g0ldppj84hp7s6w7amx6fia7ah";
-        };
-        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.20240429.105240";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/svg-tag-mode-0.3.2.0.20240429.105240.tar";
-          sha256 = "0isp9zcyx9dqb0nah1b990nikwiaxm5lvqlbya9v1rcb3fbvf9hc";
-        };
-        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.13.0.20240124.3519";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/taxy-magit-section-0.13.0.20240124.3519.tar";
-          sha256 = "1z1cypw7g5vs8vrm1mjvfzxaasr8nz89w1br9dhk8wshyy4kmgf3";
-        };
-        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.20240216.154335";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/tempel-1.1.0.20240216.154335.tar";
-          sha256 = "14zraddmfxnz7bzr9m2qk38hqy3bmd8ypq5x7ni8xapc6lyqd0pm";
-        };
-        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;
-        };
-      }) {};
-    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.20240505.172329";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/track-changes-1.2.0.20240505.172329.tar";
-          sha256 = "1mvgwrrqfa3yix9lrsx4mb6zqaydjjqc69nh9lyrcgi54819jlvh";
-        };
-        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.6.3.0.20240331.120258";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/tramp-2.6.3.0.20240331.120258.tar";
-          sha256 = "07358iw3skm59qjry7qggj2rggbdbghmw0yrbdpyabrqmdfv3li8";
-        };
-        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.6.0.0.20240509.184906";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/transient-0.6.0.0.20240509.184906.tar";
-          sha256 = "1axy5ccwd4n63saaf10af182r2k3j8x4vbyhxa81rdv73ndr652g";
-        };
-        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.20240511.180511";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/urgrep-0.5.1snapshot0.20240511.180511.tar";
-          sha256 = "03dpbsmx11r14mi6vlh4phknmxlayxng2rfphv8q7wn4cvgv18q2";
-        };
-        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.20240518.103045";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/use-package-2.4.5.0.20240518.103045.tar";
-          sha256 = "0zh4vb5h2733glbj3izflw0laxvf2y34cm924jpgyrjkz66ld6wc";
-        };
-        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.20240314.104026";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/verilog-mode-2024.3.1.121933719.0.20240314.104026.tar";
-          sha256 = "1fk5jl9897jbzg4dqf1mhdk7dmjmcqxpb1v2sv9ni06bh25rn6z8";
-        };
-        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.20240511.204721";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/vertico-1.8.0.20240511.204721.tar";
-          sha256 = "0gd68x98dghqa7da0ybah2w27bxipal262n9d6rpdhxb361cmpca";
-        };
-        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.20240501.85118";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/which-key-3.6.0.0.20240501.85118.tar";
-          sha256 = "080i7b37fzvf020q4dqxy0dr8na0qqaymv8bd048yrw70wcrlz0w";
-        };
-        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 ({ elpaBuild
-                                   , emacs
-                                   , fetchurl
-                                   , lib }:
-      elpaBuild {
-        pname = "window-tool-bar";
-        ename = "window-tool-bar";
-        version = "0.2.0.20240519.64147";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/window-tool-bar-0.2.0.20240519.64147.tar";
-          sha256 = "1z5fdlrrjdx0lhfwzahnlqxg75fy9abrj3izc8mfwy5j1bkrym6m";
-        };
-        packageRequires = [ 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 ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "xelb";
-        ename = "xelb";
-        version = "0.18.0.20240415.160551";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/xelb-0.18.0.20240415.160551.tar";
-          sha256 = "13bvf0k39bdwh8xr2m096idx371xqdxh2x0g9kh6y65hc80l1k1x";
-        };
-        packageRequires = [ 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.6.3.0.20240518.3950";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/devel/xref-1.6.3.0.20240518.3950.tar";
-          sha256 = "0k60vvhpw5bzbs3qv28sip7dl2p44m8bczx54ff32klgfwpk06zk";
-        };
-        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/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix
index 085c0410bc..a0fdf0e1cb 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix
+++ b/third_party/nixpkgs/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 { };
 
@@ -64,26 +59,6 @@ self: let
         '';
       });
 
-      org = super.org.overrideAttrs (old: {
-        dontUnpack = false;
-        patches = old.patches or [ ] ++ lib.optionals (lib.versionOlder old.version "9.7.5") [
-          # security fix backported from 9.7.5
-          (pkgs.fetchpatch {
-            url = "https://git.savannah.gnu.org/cgit/emacs/org-mode.git/patch/?id=f4cc61636947b5c2f0afc67174dd369fe3277aa8";
-            hash = "sha256-bGgsnTSn6SMu1J8P2BfJjrKx2845FCsUB2okcIrEjDg=";
-            stripLen = 1;
-          })
-        ];
-        postPatch = old.postPatch or "" + "\n" + ''
-          pushd ..
-          local content_directory=${old.ename}-${old.version}
-          src=$PWD/$content_directory.tar
-          tar --create --verbose --file=$src $content_directory
-          popd
-        '';
-        dontBuild = true;
-      });
-
       pq = super.pq.overrideAttrs (old: {
         buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.postgresql ];
       });
@@ -119,6 +94,6 @@ self: let
 
     elpaDevelPackages = super // overrides;
 
-  in elpaDevelPackages // { inherit elpaBuild; });
+  in elpaDevelPackages);
 
 in generateElpa { }
diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix
index b1145baf37..9610c40702 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix
@@ -1,6780 +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.5";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/auctex-14.0.5.tar";
-          sha256 = "0sycj6ad5jazmsxq37hsnvbywkpj66lrw3d3mxqr1wqkb67cdd3k";
-        };
-        packageRequires = [ emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/auctex.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.0";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/colorful-mode-1.0.0.tar";
-          sha256 = "1gmbrb5z3rmw0fjrdymfbcx74szcy963dx53ksykvfd9355azj3x";
-        };
-        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 = "29.1.4.5";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/compat-29.1.4.5.tar";
-          sha256 = "0i57hs3ak5y0fsfdwg87ib64ny0ar1nk67f5dy2qrm8x3i0h086s";
-        };
-        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.6";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/consult-1.6.tar";
-          sha256 = "00wsv6dvlyf7ygi586pdyhgp7f5ic2qqyqjz3g2g8hmgya5javdb";
-        };
-        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.0.0";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/consult-denote-0.0.0.tar";
-          sha256 = "191qf8knrmimam98jv8kgrl6mfrnwpdmw160s5qw6wcik7j4z6kv";
-        };
-        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.3";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/corfu-1.3.tar";
-          sha256 = "13y0dws1k4682v039ab6b0xxqlg7anknscqs20bmj8lfm2z48znx";
-        };
-        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.23";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/csv-mode-1.23.tar";
-          sha256 = "0b5qcxdp7y78mfgcvh9plfc0l5qbwsvrj1bswyimrzg210zhk4zm";
-        };
-        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.11.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/dape-0.11.1.tar";
-          sha256 = "0i04wwklypzxh78gwd9zjxjm3lwi2sn7qpqnlgd6n8hhcigyzhp0";
-        };
-        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 = "2.3.5";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/denote-2.3.5.tar";
-          sha256 = "1l8nlr8q7c51j2f528a0568pa3ywfv8pr47fzpd6pk2scc0y372b";
-        };
-        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.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/do-at-point-0.1.1.tar";
-          sha256 = "1lqnarb9jiig85j3dv37jsqkmmfbcwb52i2akimzf9r57pypiylk";
-        };
-        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 = "20240513";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/eev-20240513.tar";
-          sha256 = "133blp5696f2adxqny5kyylr6s3n3vixs0ak1n3i58sqb0krp2pj";
-        };
-        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 ({ elpaBuild, emacs, fetchurl, lib, llm, spinner }:
-      elpaBuild {
-        pname = "ellama";
-        ename = "ellama";
-        version = "0.9.4";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/ellama-0.9.4.tar";
-          sha256 = "12l8k7dwcdgndy0zbdgkhx94y46fkzwjrbwlgj9922zbk38nnz46";
-        };
-        packageRequires = [ 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";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/ement-0.15.tar";
-          sha256 = "0mphkvmsmrfyr3prr5a2x6ijr27z96ixpaxs9871kn7f1x0brn5r";
-        };
-        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 = "19";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/emms-19.tar";
-          sha256 = "1k0hybw826f2hlw8m0aihkydlkdzjsgvrfibpsqrxxcn9d7zxwjd";
-        };
-        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.5";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/erc-5.5.tar";
-          sha256 = "02649ijnpyalk0k1yq1dcinj92awhbnkia2x9sdb9xjk80xw1gqp";
-        };
-        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 ({ elpaBuild, fetchurl, lib, xelb }:
-      elpaBuild {
-        pname = "exwm";
-        ename = "exwm";
-        version = "0.28";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/exwm-0.28.tar";
-          sha256 = "11j1ciyrnzkbcb7ffgs670mxqd1xbxf41c6jwnwwqjfzmqhsm0m4";
-        };
-        packageRequires = [ 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.0";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/filechooser-0.2.0.tar";
-          sha256 = "1fjf8bmdrrrgbv4sgx4nry5pl8plg9kyzyfd038985v3dsqasi9q";
-        };
-        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";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/gnu-elpa-keyring-update-2022.12.tar";
-          sha256 = "0pabqsfw0d9knfigpcsrwfw7qrf2vlg9h0i582212gsqd7snlnxb";
-        };
-        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 ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "greader";
-        ename = "greader";
-        version = "0.9.20";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/greader-0.9.20.tar";
-          sha256 = "11n88xmr2qa5as5kpy4yy616nlh08nw5rkcbgmf9skgka3g1hmip";
-        };
-        packageRequires = [ emacs ];
-        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.6";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/gtags-mode-1.6.tar";
-          sha256 = "1r3ih44kzkrx9bmfl8ri2yv90b7g4nhb0vvdnz1ba3f44x15ppjx";
-        };
-        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;
-        };
-      }) {};
-    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.7";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/jinx-1.7.tar";
-          sha256 = "13snfsrwdbn23fdwpk42xp24x8bskl8sgsbq51nr896smjp2x3b4";
-        };
-        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;
-        };
-      }) {};
-    llm = callPackage ({ elpaBuild, emacs, fetchurl, lib, plz }:
-      elpaBuild {
-        pname = "llm";
-        ename = "llm";
-        version = "0.15.0";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/llm-0.15.0.tar";
-          sha256 = "1y3gs8zsng87wmlkx5az396hci4xyn0ww7cbaavisqbrxam51qvj";
-        };
-        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.4";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/loccur-1.2.4.tar";
-          sha256 = "1b8rmbl03k8fdy217ngbxsc0a3jxxmqnwshf72f4iay8ln4hasgk";
-        };
-        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 = "1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/mpdired-1.tar";
-          sha256 = "08lc0j25kxisykd2l9v4iamalmm5hzsnsm026v808krny28wwbp3";
-        };
-        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.6.30";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/org-9.6.30.tar";
-          sha256 = "0h2p7gjiys5ch68y35l6bpw9pp852vprmfzi0dk86z1wkilhycip";
-        };
-        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.2";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/org-modern-1.2.tar";
-          sha256 = "1bm8kkcrn0glsb69sapj1zmb2ygd4sxksb3gag4hw1v5w3g51jjh";
-        };
-        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.14";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/orgalist-1.14.tar";
-          sha256 = "02diwanqldzr42aaa5kqcj1xgxmf1k6rqhk9zv40psqpzgd1yms5";
-        };
-        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, fetchurl, lib }:
-      elpaBuild {
-        pname = "persist";
-        ename = "persist";
-        version = "0.6";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/persist-0.6.tar";
-          sha256 = "1p6h211xk0lrk4zqlm51rsms5lza9ymx6ayh9ij0afqrjqgffw77";
-        };
-        packageRequires = [];
-        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.8";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/plz-0.8.tar";
-          sha256 = "0kg275kq5hi83ry0n83w8pi0qn2lmlv9gnxcbwf1dcqk7n9i2v64";
-        };
-        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;
-        };
-      }) {};
-    project = callPackage ({ elpaBuild, emacs, fetchurl, lib, xref }:
-      elpaBuild {
-        pname = "project";
-        ename = "project";
-        version = "0.10.0";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/project-0.10.0.tar";
-          sha256 = "07lv41asdah2v3k6nrc73z3pjhsm7viygr12ly9p96g2yw11irg6";
-        };
-        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.1";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/rcirc-sqlite-1.0.1.tar";
-          sha256 = "0n0492s500gplmv7l8n8l7s3rpm1nli3n706n9f91qc15z6p6mcv";
-        };
-        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;
-        };
-      }) {};
-    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.6.3";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/tramp-2.6.3.tar";
-          sha256 = "0z44mfpvn4qy2xc2fsiahw3xir140ljna8aq45dcb7qnmr044xjb";
-        };
-        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.6.0";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/transient-0.6.0.tar";
-          sha256 = "0rk4gafx3yylzawiny86ml4jzrs8x6cf2bvmnv36p8l13wgp0w9p";
-        };
-        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 ({ elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "window-tool-bar";
-        ename = "window-tool-bar";
-        version = "0.2";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/window-tool-bar-0.2.tar";
-          sha256 = "191v21rrw1j560512mjn1s1avhirk1awy746xajjra8lb1ywnxw7";
-        };
-        packageRequires = [ 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 ({ cl-generic, elpaBuild, emacs, fetchurl, lib }:
-      elpaBuild {
-        pname = "xelb";
-        ename = "xelb";
-        version = "0.18";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/xelb-0.18.tar";
-          sha256 = "1qixb236z01azjbc1xycji99rjkq747hip4gcf0gli1is8ink0bs";
-        };
-        packageRequires = [ cl-generic 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.6.3";
-        src = fetchurl {
-          url = "https://elpa.gnu.org/packages/xref-1.6.3.tar";
-          sha256 = "0mir1nhic0rnz12d8i1n6m2ihfynhkkg8yccy4v9j4kd31w6f1gs";
-        };
-        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/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix
index fac31ad711..8bffb346de 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix
+++ b/third_party/nixpkgs/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 { };
 
@@ -141,26 +136,6 @@ self: let
         };
       });
 
-      org = super.org.overrideAttrs (old: {
-        dontUnpack = false;
-        patches = old.patches or [ ] ++ lib.optionals (lib.versionOlder old.version "9.7.5") [
-          # security fix backported from 9.7.5
-          (pkgs.fetchpatch {
-            url = "https://git.savannah.gnu.org/cgit/emacs/org-mode.git/patch/?id=f4cc61636947b5c2f0afc67174dd369fe3277aa8";
-            hash = "sha256-bGgsnTSn6SMu1J8P2BfJjrKx2845FCsUB2okcIrEjDg=";
-            stripLen = 1;
-          })
-        ];
-        postPatch = old.postPatch or "" + "\n" + ''
-          pushd ..
-          local content_directory=${old.ename}-${old.version}
-          src=$PWD/$content_directory.tar
-          tar --create --verbose --file=$src $content_directory
-          popd
-        '';
-        dontBuild = true;
-      });
-
       plz = super.plz.overrideAttrs (
         old: {
           dontUnpack = false;
@@ -208,7 +183,7 @@ self: let
 
     elpaPackages = super // overrides;
 
-  in elpaPackages // { inherit elpaBuild; });
+  in elpaPackages);
 
 in
 generateElpa { }
diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/emacs2nix.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/emacs2nix.nix
index 6875030b24..130889e03b 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/emacs2nix.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/libgenerated.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/libgenerated.nix
index 391065ccfb..1a2a138b20 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/libgenerated.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix
index 4b4abfc6f3..34469eb196 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages.nix
@@ -4,111 +4,33 @@ self:
 let
   inherit (self) callPackage;
 in
-{
+lib.packagesFromDirectoryRecursive {
+  inherit callPackage;
+  directory = ./manual-packages;
+}
+// {
   inherit (pkgs) emacspeak;
 
-  acm = callPackage ./manual-packages/acm { };
-
-  acm-terminal = callPackage ./manual-packages/acm-terminal { };
-
-  agda2-mode = callPackage ./manual-packages/agda2-mode { };
-
-  beancount = callPackage ./manual-packages/beancount { };
-
-  cask = callPackage ./manual-packages/cask { };
-
-  codeium = callPackage ./manual-packages/codeium { };
-
-  consult-gh = callPackage ./manual-packages/consult-gh { };
-
-  control-lock = callPackage ./manual-packages/control-lock { };
-
-  copilot = callPackage ./manual-packages/copilot { };
-
-  ebuild-mode = callPackage ./manual-packages/ebuild-mode { };
-
-  el-easydraw = callPackage ./manual-packages/el-easydraw { };
-
-  elisp-ffi = callPackage ./manual-packages/elisp-ffi { };
-
-  emacs-conflict = callPackage ./manual-packages/emacs-conflict { };
-
-  enlight = callPackage ./manual-packages/enlight { };
-
-  evil-markdown = callPackage ./manual-packages/evil-markdown { };
-
-  font-lock-plus = callPackage ./manual-packages/font-lock-plus { };
-
-  git-undo = callPackage ./manual-packages/git-undo { };
-
-  grid = callPackage ./manual-packages/grid { };
-
-  helm-words = callPackage ./manual-packages/helm-words { };
-
-  idris2-mode = callPackage ./manual-packages/idris2-mode { };
-
-  isearch-plus = callPackage ./manual-packages/isearch-plus { };
-
-  isearch-prop = callPackage ./manual-packages/isearch-prop { };
-
-  jam-mode = callPackage ./manual-packages/jam-mode { };
-
-  ligo-mode = callPackage ./manual-packages/ligo-mode { };
-
-  llvm-mode = callPackage ./manual-packages/llvm-mode { };
+  codeium = callPackage ./manual-packages/codeium {
+    inherit (pkgs) codeium;
+  };
 
   lsp-bridge = callPackage ./manual-packages/lsp-bridge {
     inherit (pkgs) basedpyright git go gopls python3;
   };
 
-  lspce = callPackage ./manual-packages/lspce { };
-
   matrix-client = callPackage ./manual-packages/matrix-client {
     _map = self.map;
   };
 
-  mu4e = callPackage ./manual-packages/mu4e { };
-
-  notdeft = callPackage ./manual-packages/notdeft { };
-
-  ott-mode = callPackage ./manual-packages/ott-mode { };
-
-  pod-mode = callPackage ./manual-packages/pod-mode { };
-
-  prisma-mode = callPackage ./manual-packages/prisma-mode { };
-
   structured-haskell-mode = self.shm;
 
-  sv-kalender = callPackage ./manual-packages/sv-kalender { };
-
   texpresso = callPackage ./manual-packages/texpresso { inherit (pkgs) texpresso; };
 
   tree-sitter-langs = callPackage ./manual-packages/tree-sitter-langs { final = self; };
 
-  treesit-grammars = callPackage ./manual-packages/treesit-grammars { };
-
-  tsc = callPackage ./manual-packages/tsc { };
-
-  urweb-mode = callPackage ./manual-packages/urweb-mode { };
-
-  voicemacs = callPackage ./manual-packages/voicemacs { };
-
-  wat-mode = callPackage ./manual-packages/wat-mode { };
-
-  xapian-lite = callPackage ./manual-packages/xapian-lite { };
-
-  yes-no = callPackage ./manual-packages/yes-no { };
-
-  youtube-dl = callPackage ./manual-packages/youtube-dl { };
-
   # From old emacsPackages (pre emacsPackagesNg)
   cedille = callPackage ./manual-packages/cedille { inherit (pkgs) cedille; };
-  color-theme-solarized = callPackage ./manual-packages/color-theme-solarized { };
-  hsc3-mode = callPackage ./manual-packages/hsc3 { };
-  prolog-mode = callPackage ./manual-packages/prolog { };
-  rect-mark = callPackage ./manual-packages/rect-mark { };
-  session-management-for-emacs = callPackage ./manual-packages/session-management-for-emacs { };
-  sunrise-commander = callPackage ./manual-packages/sunrise-commander { };
 
   # camelCase aliases for some of the kebab-case expressions above
   colorThemeSolarized = self.color-theme-solarized;
diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/acm-terminal/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/acm-terminal/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/acm-terminal/default.nix
rename to third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/acm-terminal/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/acm/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/acm/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/acm/default.nix
rename to third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/acm/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/agda2-mode/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/agda2-mode/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/agda2-mode/default.nix
rename to third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/agda2-mode/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/beancount/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/beancount/default.nix
deleted file mode 100644
index 0e3c66e032..0000000000
--- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/beancount/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ lib
-, melpaBuild
-, fetchFromGitHub
-, emacs
-, writeText
-}:
-
-let
-  rev = "519bfd868f206ed2fc538a57cdb631c4fec3c93e";
-in
-melpaBuild {
-  pname = "beancount";
-  version = "20230205.436";
-
-  src = fetchFromGitHub {
-    owner = "beancount";
-    repo = "beancount-mode";
-    inherit rev;
-    hash = "sha256-nTEXJdPEPZpNm06uYvRxLuiOHmsiIgMLerd//dA0+KQ=";
-  };
-
-  commit = rev;
-
-  recipe = writeText "recipe" ''
-    (beancount :repo "beancount/beancount-mode" :fetcher github)
-  '';
-
-  meta = {
-    homepage = "https://github.com/beancount/beancount-mode";
-    description = "Emacs major-mode to work with Beancount ledger files";
-    maintainers = with lib.maintainers; [ polarmutex ];
-    license = lib.licenses.gpl3Only;
-    inherit (emacs.meta) platforms;
-  };
-}
diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/cask/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/cask/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/cask/default.nix
rename to third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/cask/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/codeium/codeium.el.patch b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/codeium/0000-set-codeium-command-executable.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/codeium/codeium.el.patch
rename to third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/codeium/0000-set-codeium-command-executable.patch
diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/codeium/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/codeium/default.nix
index 344843eeab..59be7f543d 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/codeium/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/codeium/default.nix
@@ -1,9 +1,10 @@
 {
+  lib,
+  codeium,
   fetchFromGitHub,
   melpaBuild,
-  pkgs,
-  lib,
   substituteAll,
+  gitUpdater,
 }:
 
 melpaBuild {
@@ -19,17 +20,19 @@ melpaBuild {
 
   patches = [
     (substituteAll {
-      src = ./codeium.el.patch;
-      codeium = "${pkgs.codeium}/bin/codeium_language_server";
+      src = ./0000-set-codeium-command-executable.patch;
+      codeium = lib.getExe' codeium "codeium_language_server";
     })
   ];
 
+  passthru.updateScript = gitUpdater { };
+
   meta = {
     description = "Free, ultrafast Copilot alternative for Emacs";
     homepage = "https://github.com/Exafunction/codeium.el";
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.running-grass ];
-    platforms = pkgs.codeium.meta.platforms;
+    inherit (codeium.meta) platforms;
     sourceProvenance = [ lib.sourceTypes.fromSource ];
   };
 
diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/color-theme-solarized/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/color-theme-solarized/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/color-theme-solarized/default.nix
rename to third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/color-theme-solarized/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/consult-gh/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/consult-gh/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/consult-gh/default.nix
rename to third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/consult-gh/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/control-lock/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/control-lock/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/control-lock/default.nix
rename to third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/control-lock/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/package.nix
similarity index 97%
rename from third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/default.nix
rename to third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/package.nix
index 406bd0c711..e56d39aa2c 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/default.nix
rename to third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/el-easydraw/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/el-easydraw/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/el-easydraw/default.nix
rename to third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/el-easydraw/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/elisp-ffi/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/elisp-ffi/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/elisp-ffi/default.nix
rename to third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/elisp-ffi/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/emacs-conflict/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/emacs-conflict/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/emacs-conflict/default.nix
rename to third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/emacs-conflict/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/enlight/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/enlight/default.nix
deleted file mode 100644
index 6faa3ef8ad..0000000000
--- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/enlight/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  lib,
-  compat,
-  fetchFromGitHub,
-  melpaBuild,
-}:
-
-melpaBuild {
-  pname = "enlight";
-  version = "20240601.1150";
-
-  src = fetchFromGitHub {
-    owner = "ichernyshovvv";
-    repo = "enlight";
-    rev = "76753736da1777c8f9ebbeb08beec15b330a5878";
-    hash = "sha256-Ccfv4Ud5B4L4FfIOI2PDKikV9x8x3a7VeHYDyLV7t4g=";
-  };
-
-  packageRequires = [ compat ];
-
-  meta = {
-    homepage = "https://github.com/ichernyshovvv/enlight";
-    description = "Highly customizable startup screen for Emacs";
-    license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ AndersonTorres ];
-  };
-}
diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/evil-markdown/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/evil-markdown/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/evil-markdown/default.nix
rename to third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/evil-markdown/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/font-lock-plus/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/font-lock-plus/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/font-lock-plus/default.nix
rename to third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/font-lock-plus/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/git-undo/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/git-undo/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/git-undo/default.nix
rename to third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/git-undo/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/grid/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/grid/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/grid/default.nix
rename to third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/grid/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/helm-words/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/helm-words/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/helm-words/default.nix
rename to third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/helm-words/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/hsc3/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/hsc3-mode/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/hsc3/default.nix
rename to third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/hsc3-mode/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/icicles/package.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/icicles/package.nix
new file mode 100644
index 0000000000..59b584d9f9
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/icicles/package.nix
@@ -0,0 +1,27 @@
+{
+  lib,
+  fetchFromGitHub,
+  melpaBuild,
+  unstableGitUpdater,
+}:
+
+melpaBuild {
+  pname = "icicles";
+  version = "0-unstable-2023-07-27";
+
+  src = fetchFromGitHub {
+    owner = "emacsmirror";
+    repo = "icicles";
+    rev = "dfc1d9caf1b5156567292c9548547a2975a841bc";
+    hash = "sha256-Xbt0D9EgmvN1hDTeLbdxq1ARHObj8M4GfH2sbFILRTI=";
+  };
+
+  passthru.updateScript = unstableGitUpdater { hardcodeZeroVersion = true; };
+
+  meta = {
+    homepage = "https://emacswiki.org/emacs/Icicles";
+    description = "Emacs library that enhances minibuffer completion";
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ AndersonTorres ];
+  };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/idris2-mode/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/idris2-mode/package.nix
similarity index 75%
rename from third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/idris2-mode/default.nix
rename to third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/idris2-mode/package.nix
index 5148daad19..2a7b7b571d 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/idris2-mode/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-plus/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-plus/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-plus/default.nix
rename to third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-plus/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-prop/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-prop/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-prop/default.nix
rename to third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-prop/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/jam-mode/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/jam-mode/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/jam-mode/default.nix
rename to third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/jam-mode/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ligo-mode/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ligo-mode/package.nix
similarity index 93%
rename from third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ligo-mode/default.nix
rename to third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ligo-mode/package.nix
index 7c9df31e5c..3be4a3b56b 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ligo-mode/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/llvm-mode/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/llvm-mode/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/llvm-mode/default.nix
rename to third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/llvm-mode/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix
index 19b472cd66..7b879d1248 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/default.nix
rename to third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lspce/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/mu4e/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/mu4e/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/mu4e/default.nix
rename to third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/mu4e/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/notdeft/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/notdeft/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/notdeft/default.nix
rename to third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/notdeft/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ott-mode/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ott-mode/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ott-mode/default.nix
rename to third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ott-mode/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/pod-mode/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/pod-mode/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/pod-mode/default.nix
rename to third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/pod-mode/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/prisma-mode/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/prisma-mode/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/prisma-mode/default.nix
rename to third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/prisma-mode/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/prolog/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/prolog-mode/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/prolog/default.nix
rename to third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/prolog-mode/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/rect-mark/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/rect-mark/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/rect-mark/default.nix
rename to third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/rect-mark/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/session-management-for-emacs/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/session-management-for-emacs/package.nix
similarity index 94%
rename from third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/session-management-for-emacs/default.nix
rename to third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/session-management-for-emacs/package.nix
index f21e79c8f3..0238bb6127 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/session-management-for-emacs/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/sunrise-commander/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/sunrise-commander/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/sunrise-commander/default.nix
rename to third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/sunrise-commander/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/sv-kalender/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/sv-kalender/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/sv-kalender/default.nix
rename to third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/sv-kalender/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/treesit-grammars/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/treesit-grammars/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/treesit-grammars/default.nix
rename to third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/treesit-grammars/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/default.nix
rename to third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/urweb-mode/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/urweb-mode/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/urweb-mode/default.nix
rename to third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/urweb-mode/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/voicemacs/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/voicemacs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/voicemacs/default.nix
rename to third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/voicemacs/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/wat-mode/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/wat-mode/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/wat-mode/default.nix
rename to third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/wat-mode/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/xapian-lite/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/xapian-lite/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/xapian-lite/default.nix
rename to third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/xapian-lite/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/yes-no/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/yes-no/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/yes-no/default.nix
rename to third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/yes-no/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/youtube-dl/default.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/youtube-dl/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/youtube-dl/default.nix
rename to third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/manual-packages/youtube-dl/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-generated.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-generated.nix
new file mode 100644
index 0000000000..45ab57b45f
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-packages.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-packages.nix
new file mode 100644
index 0000000000..01bca0ff1f
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix
index 762359a47e..1534ee9c4c 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix
@@ -1,3693 +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.0";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/arduino-mode-1.3.0.tar";
-          sha256 = "167b35s34x51qnlx59sawaz4wzlnk2kf9130ylz2b1bj7jy5n27a";
-        };
-        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;
-        };
-      }) {};
-    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.13.1";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/cider-1.13.1.tar";
-          sha256 = "0df5z57schfszlp1vkb6fiiadx12qlpk5qzfw61g664a2i654fsg";
-        };
-        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.18.1";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/clojure-mode-5.18.1.tar";
-          sha256 = "1p9nh4p3skjxbsnyj2in3m8jdyrrj8iw0malfcz0ppc4d7zm6klx";
-        };
-        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;
-        };
-      }) {};
-    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;
-        };
-      }) {};
-    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.0";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/elpher-3.6.0.tar";
-          sha256 = "1xf3kl09inswx4w03fxj35n1ypvlin39z493fw4ksnpf79ccfk4x";
-        };
-        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.30";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/geiser-0.30.tar";
-          sha256 = "0h63skslmc23rjlsrqmcnqf2s431ml0wmkbza38j44kzxnsz0x5g";
-        };
-        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.2";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/git-modes-1.4.2.tar";
-          sha256 = "0hdy4wpnyrn3a8i9yxk5gvsggnpgpg6r0wip0zmhcl9nxi4h6kb3";
-        };
-        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.8.6";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/gptel-0.8.6.tar";
-          sha256 = "1ds0i32bdmdi5w68cjxm9xlg0m9n29yr4hl6sqi8gn3kgswfx1sb";
-        };
-        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, popup, wfnames }:
-      elpaBuild {
-        pname = "helm";
-        ename = "helm";
-        version = "3.9.8";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/helm-3.9.8.tar";
-          sha256 = "1vcz3vj6drp5v66s3nsrai39rcwp1q3l2qdd1qxw7n58m4fgrkm6";
-        };
-        packageRequires = [ helm-core popup 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.8";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/helm-core-3.9.8.tar";
-          sha256 = "03l5sva3qhfmjdpys1k2pbcja58fsdxljvmffjx70j7wyclb3v03";
-        };
-        packageRequires = [ async emacs ];
-        meta = {
-          homepage = "https://elpa.gnu.org/packages/helm-core.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 = "1.1.1";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/j-mode-1.1.1.tar";
-          sha256 = "056af7l7rn116nygln41rsq2val5s3y0pz1pj2736mqsx3lcyiy2";
-        };
-        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.3.3";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/keycast-1.3.3.tar";
-          sha256 = "048j5q4hpr8y89lrcqwbcqjazj52rak8jv8nl6fs4sqjik10zcji";
-        };
-        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.21";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/mastodon-1.0.21.tar";
-          sha256 = "1qlpkg28q4iyvjjzv8b40b8q7ni7rc94lj5akgzxbzw4avpp1217";
-        };
-        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-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.20240514.112412";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/racket-mode-1.0.20240514.112412.tar";
-          sha256 = "1ysjq9jvkm8qibj0z6j4q90sx19xyz9z9qzdlci9mw872r21ak9h";
-        };
-        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 = "93.3";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/scad-mode-93.3.tar";
-          sha256 = "1d3mv50n3d0qg1sxvp11a4i15vc75j9gpzlqcxnc0l1lqhn64rwh";
-        };
-        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.11";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/subed-1.2.11.tar";
-          sha256 = "0grzlxibv57qds3dml6yjpw9hag86hbkrb1f66k7qn5hxaadmvpw";
-        };
-        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.6";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/undo-fu-session-0.6.tar";
-          sha256 = "057izvr86har50z1sfk4s6r88w2ga57afwm2w9p5v14lq31vj7cp";
-        };
-        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.2";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/with-editor-3.3.2.tar";
-          sha256 = "1yjx1w54qdjpmq5f7l3y19d4bayyk01rgd82c56swsaxsf4j5fpv";
-        };
-        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.6.20240521220424";
-        src = fetchurl {
-          url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-25.6.20240521220424.tar";
-          sha256 = "029hy3qmf6nvibbq9w2b964gzbw99lja595h4g1y5zzyrgzqrhrn";
-        };
-        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/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json
index 02857188f0..bba5811c01 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json
+++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json
@@ -318,8 +318,8 @@
   "repo": "abstools/abs-mode",
   "unstable": {
    "version": [
-    20230705,
-    1437
+    20240701,
+    1407
    ],
    "deps": [
     "erlang",
@@ -327,13 +327,13 @@
     "maude-mode",
     "yasnippet"
    ],
-   "commit": "bf21971bf57100e9e1ac26563207b35b377ec057",
-   "sha256": "070xa0hylkxy2j8g5jhdv3q003aqvasp7ald6f98skg6a0hsrvc7"
+   "commit": "252d9f2de3773dcfc7b07f5edfafc2d9298c366e",
+   "sha256": "1z52wlv60y002xniy7klnp9aww8c4y6lkfif52h1v4l4q23czbhh"
   },
   "stable": {
    "version": [
     1,
-    6
+    7
    ],
    "deps": [
     "erlang",
@@ -341,8 +341,8 @@
     "maude-mode",
     "yasnippet"
    ],
-   "commit": "e6edb867b5cc68b5c9c112a51f51f7c1d22554dc",
-   "sha256": "1h355815bk4bs7wmmjkchb3c5v2fd5sfw7cqcxf4dgll3jpnphkv"
+   "commit": "0132032d9317861e63bea865746124accab9db83",
+   "sha256": "0xm88xqwlvdz2jj2fb196c4af64psyll1bjxmr5pvsgnn4j1pjay"
   }
  },
  {
@@ -1569,14 +1569,14 @@
   "repo": "gvol/emacs-achievements",
   "unstable": {
    "version": [
-    20150531,
-    1317
+    20240703,
+    318
    ],
    "deps": [
     "keyfreq"
    ],
-   "commit": "5c3c430b21bcf685c412cf5ceb3769f630082e4f",
-   "sha256": "0zjncby2884cv8nz2ss7i0p17l15lsk88zwvb7b0gr3apbfpcpa3"
+   "commit": "c229d21ad5d1e13be08e087ab498800b2b9b7c97",
+   "sha256": "0xwhzrmiph9dg9gqm8fd3bv0sz8izl7cr298rbyjzlrq6lksaf5y"
   }
  },
  {
@@ -2049,11 +2049,11 @@
   "repo": "t4ccer/agenix.el",
   "unstable": {
    "version": [
-    20231016,
-    614
+    20240601,
+    1304
    ],
-   "commit": "c3afc8d109dc19bfe2f97ce47184ca748dbe4816",
-   "sha256": "0h7lk050c7arhnvv2anlgqq39r3690fw9l0n8bjk5qh38dsgwmah"
+   "commit": "b9c7ad33b534d80af207949cc06c0bcd1e60fd63",
+   "sha256": "0pibky4ndm765xwz6964yihl0v5pmfdj90rnalb5zld1bfv4dv1x"
   },
   "stable": {
    "version": [
@@ -2114,11 +2114,11 @@
   "repo": "vietor/agtags",
   "unstable": {
    "version": [
-    20221026,
-    904
+    20240701,
+    1433
    ],
-   "commit": "e8e04ece2f32d65b084974597bfe8077da3ddba0",
-   "sha256": "14sxysq606rq06banjhj5andny3j9r8yk3v4w8ipk0kd033qrr22"
+   "commit": "d47e58d024007d629b5a73c98c7c7e79f64be4d8",
+   "sha256": "13a9j56nnjh1zbglbd844wxr1zyw6jbdpmnmxcvhi9h5vksdxsgl"
   }
  },
  {
@@ -2254,14 +2254,14 @@
   "repo": "AnthonyDiGirolamo/airline-themes",
   "unstable": {
    "version": [
-    20211214,
-    1749
+    20240530,
+    1704
    ],
    "deps": [
     "powerline"
    ],
-   "commit": "6bd102e49a7d87af1a72eb86e953991ff7bc954e",
-   "sha256": "0yrkbg4wwbp2rm60gmsalz7vrrklw908m6ws66j611z6h6wgmj48"
+   "commit": "baaa4f1f0acd339b1efc1058654ea7d9e6e44ead",
+   "sha256": "0biyna1agxknsg2farj2bi0pnqqxkvdnicmnazl77kcxknhs0r9s"
   },
   "stable": {
    "version": [
@@ -2590,11 +2590,11 @@
   "repo": "domtronn/all-the-icons.el",
   "unstable": {
    "version": [
-    20240108,
-    559
+    20240623,
+    1800
    ],
-   "commit": "ee414384938ccf2ce93c77d717b85dc5538a257d",
-   "sha256": "18gk71fsh99m6hafc85nwg7rx416d5pnnjyk506i15nnwywsbbqd"
+   "commit": "39ef44f810c34e8900978788467cc675870bcd19",
+   "sha256": "00d7z43xxbgfi0yms57qj5yksd6wfri186fq26fjrdn5xbqqjnja"
   },
   "stable": {
    "version": [
@@ -3261,11 +3261,11 @@
   "repo": "anki-editor/anki-editor",
   "unstable": {
    "version": [
-    20240514,
-    1944
+    20240710,
+    536
    ],
-   "commit": "32d81be1d8305c5ccde12c7d0b29845d4f831888",
-   "sha256": "1chlj0igxk2mmmdvmw3qahp3pz9ra6yabm4711xhlnx7zj028lkc"
+   "commit": "b14a6ccb2c3d0b06f2359ce44f8fe6fb535bf391",
+   "sha256": "180f6wb9whnzifpl3x9gcqfs94w04plyy99xk1nl5syx6ila6km3"
   }
  },
  {
@@ -3492,21 +3492,21 @@
  },
  {
   "ename": "ansible",
-  "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683",
-  "sha256": "17pfdyfv5z7bw0xhh8apqww8wsmvb5p5y0xs8048gh427mgw5yrf",
-  "fetcher": "github",
-  "repo": "k1LoW/emacs-ansible",
+  "commit": "db66ccdf93a7dde428808db839dfc42e1fb7a429",
+  "sha256": "0h4zh2w3hja9psfafdfy1i8bxial4l77ba778wvxnfgmx3kyab1p",
+  "fetcher": "gitlab",
+  "repo": "emacs-ansible/emacs-ansible",
   "unstable": {
    "version": [
-    20240212,
-    325
+    20240624,
+    1452
    ],
    "deps": [
     "f",
     "s"
    ],
-   "commit": "1d7de8d3ddac980715eebd87ee66859f8665b101",
-   "sha256": "1indmjrk3gwvxpigmn8lkdgnb841k2n8s2q4dsl8vppy4hfrl7aa"
+   "commit": "eebb2fb49d3c0a0586d1e4ead9ba618c7d003cae",
+   "sha256": "0ivmhavvi25kwz9kn5pf5kmsncwaqj4hzsf4i77c14sh8s0fjka9"
   },
   "stable": {
    "version": [
@@ -3870,11 +3870,11 @@
   "repo": "Greybeard-Entertainment/app-monochrome",
   "unstable": {
    "version": [
-    20240406,
-    36
+    20240611,
+    1623
    ],
-   "commit": "9324ec430a5154853c1da711e1c9738d61f1135a",
-   "sha256": "09jxb4b4lb19z2dfvpa0rjba89gcsphkx5d45p56rbb1b0i3h5iz"
+   "commit": "e319fcfeb56d0fe28bbda7fc813537593c2f368d",
+   "sha256": "0qgj8l22cyyxwknkwc0104nhi5kcswgx5amd1b67pmrxj6cni0ws"
   }
  },
  {
@@ -3885,11 +3885,11 @@
   "repo": "alexmurray/apparmor-mode",
   "unstable": {
    "version": [
-    20240211,
-    2243
+    20240703,
+    221
    ],
-   "commit": "05a67cba7508cf63bed22763a8949e55a7bf6786",
-   "sha256": "0644zfmrhlfrrgy5z21bp95885spcfxi93lv77gz070zzxk4ciq7"
+   "commit": "66136e99ad507e9b5404e09d01fe6e1828a930c7",
+   "sha256": "033sy23ybkv5y8194xi9693dwzmrpdxf4r1agy2rs6lkxssd1hb8"
   }
  },
  {
@@ -4105,11 +4105,11 @@
   "repo": "motform/arduino-cli-mode",
   "unstable": {
    "version": [
-    20210511,
-    653
+    20240613,
+    640
    ],
-   "commit": "9ff2c47a3b56cbffd41a62376f7c2ff16ccbf4e0",
-   "sha256": "1vj649nrj7f7r7vmp97z1llbgl7sd8vlxvn30l8kdfrfkyf4gq3q"
+   "commit": "3265507b5fe4173b3f452a9519c3d09a777f35fb",
+   "sha256": "1xsd0y5m59701gz1xcy0n95c80ggz5q2rf0m4dbbncp2pcmwmnl1"
   }
  },
  {
@@ -4120,14 +4120,14 @@
   "url": "https://repo.or.cz/arduino-mode.git",
   "unstable": {
    "version": [
-    20220210,
-    1355
+    20240527,
+    1603
    ],
    "deps": [
     "spinner"
    ],
-   "commit": "652c6a328fa8f2db06534d5f231c6b6933be3edc",
-   "sha256": "16izwrk1dfsa14kylfhsxdwkx76g0jdk0znl1z7cypxh5q9ijy1x"
+   "commit": "b2ffd8441851659cb1cc844156073967729585e5",
+   "sha256": "0jk7l9y3x8p6c6m6qpg7vmzn3yirv0m5h483plq1i2qs8njk5v23"
   }
  },
  {
@@ -4461,11 +4461,11 @@
   "repo": "jwiegley/emacs-async",
   "unstable": {
    "version": [
-    20240323,
-    1912
+    20240712,
+    457
    ],
-   "commit": "72b70b004505db2f06318fefd6b358704b9167d7",
-   "sha256": "00dpd202b9g2qpzb1ijbw8j69j2fxf0q3hdqrxpbhcagh22yn0qr"
+   "commit": "585231547a495d0a36bdf6db9ef50bb9a19119f3",
+   "sha256": "17mrj3bvh29r7bncsz47gbpwhr1j7d4scj97yb4c58d2a6zmwwcz"
   },
   "stable": {
    "version": [
@@ -5097,20 +5097,20 @@
   "repo": "emacscollective/auto-compile",
   "unstable": {
    "version": [
-    20240415,
-    1533
+    20240628,
+    2027
    ],
-   "commit": "01844064e3f2bb9f109a8a064998baf89a864fbc",
-   "sha256": "1syrwi1rb9w4y4fi8kckvd27i879w35y0sbmlhqpp2li0yx51wwa"
+   "commit": "8f6d708d7021559e0d4577f77b5d42afb3a6cb4f",
+   "sha256": "1dicy4srxlr07qj4sbwaa8bcdbhz91wnxh9zrk2w29z08m0f18c7"
   },
   "stable": {
    "version": [
     2,
     0,
-    0
+    2
    ],
-   "commit": "4ba644f3e3e33afb2b263e9d184b6e2b70d5fadd",
-   "sha256": "1h0rq69flrjj65wa1x7x0ispm041qr2xrzs5qxciabhav2hs3hqh"
+   "commit": "a495b3b92a555953b58ec4b6a8ab8411c337ea3d",
+   "sha256": "1a7b0k0znlqxc47plp7ydm0qs3ql29fk0rzg13jg23n8g1sjhsnl"
   }
  },
  {
@@ -5412,11 +5412,11 @@
   "repo": "LionyxML/auto-dark-emacs",
   "unstable": {
    "version": [
-    20240322,
-    44
+    20240711,
+    2247
    ],
-   "commit": "066f9723001647bec88b051e543b82366c9b7a42",
-   "sha256": "1r9pr8ars3341mh9mvybaigdq83i225rj3xr4c8c8lw93wl0pk0n"
+   "commit": "39b168e8e09b89ae8c8ef2388b895140901be48e",
+   "sha256": "1id8i9p6l46m1c09a7mz2335i168dj4q701d3a2q21i22lamhbff"
   }
  },
  {
@@ -5465,14 +5465,14 @@
   "repo": "elp-revive/auto-highlight-symbol",
   "unstable": {
    "version": [
-    20240101,
-    905
+    20240627,
+    650
    ],
    "deps": [
     "ht"
    ],
-   "commit": "6194af718b758e10a0401104760b9d9cf96735db",
-   "sha256": "17rnhmnwmb5lrm8z8gps8sh8ni3c94ixwks09pfqvsj0mlvgiswc"
+   "commit": "fe230750fdd3de07f71e776cb3270754e0865234",
+   "sha256": "0y5jcx8fkljfcsl5g92fzwq4x0ifr843bi9hy452kwgim6afi9ri"
   },
   "stable": {
    "version": [
@@ -6326,26 +6326,26 @@
   "repo": "licht1stein/babashka.el",
   "unstable": {
    "version": [
-    20240417,
-    1347
+    20240527,
+    732
    ],
    "deps": [
     "parseedn"
    ],
-   "commit": "117138c0b7361e70282ee53825e2f4de1a782609",
-   "sha256": "1k3zy6y682g3sab0by6lp9bbx8w4m9npjpjkxhhxgcqhglhpqcm4"
+   "commit": "4ea9d7febf3e9d301c91231ba2833f3417ba9059",
+   "sha256": "0rjka55nbs76ykjfifwawm5knrsrhcx0q7dfaqvdjfzypz1r2bhc"
   },
   "stable": {
    "version": [
     1,
     0,
-    7
+    8
    ],
    "deps": [
     "parseedn"
    ],
-   "commit": "117138c0b7361e70282ee53825e2f4de1a782609",
-   "sha256": "1k3zy6y682g3sab0by6lp9bbx8w4m9npjpjkxhhxgcqhglhpqcm4"
+   "commit": "4ea9d7febf3e9d301c91231ba2833f3417ba9059",
+   "sha256": "0rjka55nbs76ykjfifwawm5knrsrhcx0q7dfaqvdjfzypz1r2bhc"
   }
  },
  {
@@ -6447,28 +6447,28 @@
   "repo": "tarsius/backline",
   "unstable": {
    "version": [
-    20240415,
-    1533
+    20240712,
+    2214
    ],
    "deps": [
     "compat",
     "outline-minor-faces"
    ],
-   "commit": "f070ebb33eb44087e07ff647d8d87d1b27ce40d4",
-   "sha256": "0d0dh67acqzqsys5rn0lfd8xwg4mhcyk32093s0qwybvsx42x7ng"
+   "commit": "39726634051b2c1ee8d661df894b130447fb7632",
+   "sha256": "07rk77zbjysdqkw2zh6rr3wf2mvqvcgkfjkplg1vyfqqvlsl5lwh"
   },
   "stable": {
    "version": [
     1,
     0,
-    0
+    1
    ],
    "deps": [
     "compat",
     "outline-minor-faces"
    ],
-   "commit": "f1d9e1cd5cba6362b152b5f4227d1714918fba59",
-   "sha256": "0f7rcbmaggj644z3j1pq2sjg4c12g9s2k4c5x3yrirjgazxfpr8x"
+   "commit": "af07e3862950c77bba6994ecbe9f62e0110dfc50",
+   "sha256": "0d0dh67acqzqsys5rn0lfd8xwg4mhcyk32093s0qwybvsx42x7ng"
   }
  },
  {
@@ -6681,11 +6681,11 @@
   "repo": "tinted-theming/base16-emacs",
   "unstable": {
    "version": [
-    20240421,
-    101
+    20240621,
+    2329
    ],
-   "commit": "c7ea8116d331fd9ce913267489e7846c34795b38",
-   "sha256": "07vziyp5nn1rxgx0z467yjahvm90w5f62h5ysggrp924ywwzblp5"
+   "commit": "8789114e45d09d114e0e197cb090ce7beb993901",
+   "sha256": "1gipaykmrp20ncf6jlc1cl2w8swsg70iagzid4hj69cc3klay6mk"
   },
   "stable": {
    "version": [
@@ -7779,26 +7779,26 @@
   "repo": "tarsius/bicycle",
   "unstable": {
    "version": [
-    20240415,
-    1533
+    20240712,
+    2215
    ],
    "deps": [
     "compat"
    ],
-   "commit": "0ac08d9946f0da7066a6c2242025b42983c0c2e8",
-   "sha256": "1pp8m5ai7353jzm54laxg3l1c3xfsk32dlrg8wnpz6cgqkd47ajs"
+   "commit": "0b7ea156d211e8a87a931afa210d4f6beea20f5d",
+   "sha256": "0mmmxxi29jcngslfas309nv7hvkr94w3m0yb111663x28z24v523"
   },
   "stable": {
    "version": [
     0,
     4,
-    6
+    7
    ],
    "deps": [
     "compat"
    ],
-   "commit": "dfc0c874d66d671cbb15149db27134e4ff4f54b8",
-   "sha256": "13aaz5fzdbplaf78713ax5f8v3qd7ggafdh1pgnc1mv4a37bjkl8"
+   "commit": "6244c479486b9a48369236b22a40d0830722e950",
+   "sha256": "1vildffmcj2k5q507ijn2s7f8x4fnabrq4gl2zrsx6ddddsbrym5"
   }
  },
  {
@@ -7966,14 +7966,14 @@
   "repo": "rnkn/binder",
   "unstable": {
    "version": [
-    20230729,
-    350
+    20240630,
+    725
    ],
    "deps": [
     "seq"
    ],
-   "commit": "859d89c00e21c83565ed2b45f8d7527b45b1292c",
-   "sha256": "0da3wx93rbsy9y1hd5w722sgblg5bffznw00vyylwnq5zaikh5lp"
+   "commit": "a17eb5089bbab05372c018e67b3da9aa25217d81",
+   "sha256": "0nbczlvcdygfjy0grlxqpc5ygnwk8nyxi3pk8kkgp681c19bcpdi"
   },
   "stable": {
    "version": [
@@ -7984,7 +7984,7 @@
    "deps": [
     "seq"
    ],
-   "commit": "3cf7c254703f5c3a90c2cd617b522d09e7913c7b",
+   "commit": "9881ca21d30400681e0b3de404e5cc020e060209",
    "sha256": "01y9yd1rvi1ll3pp2i44g7ivkvz1cvc22207f8a3dbv90jw4c66m"
   }
  },
@@ -8020,14 +8020,14 @@
   "repo": "liuyinz/binky.el",
   "unstable": {
    "version": [
-    20240519,
-    732
+    20240525,
+    715
    ],
    "deps": [
     "dash"
    ],
-   "commit": "f2fe74321f87dfe46421a7a7aaaec30b7f831059",
-   "sha256": "17h4jypfhlc7wbw3k7mr8l9hz3f5ji77xxi80i6p7mj5613j26fc"
+   "commit": "39c1a1e78aea36f79104fdc256949901e3d3d2c0",
+   "sha256": "086rcvdr58c9p2snqgh2mdnmrdigkzn8909a6ncg9c3j18x55bzj"
   },
   "stable": {
    "version": [
@@ -8142,16 +8142,16 @@
   "repo": "canatella/bitbake-el",
   "unstable": {
    "version": [
-    20220509,
-    1236
+    20240605,
+    1322
    ],
    "deps": [
     "dash",
     "mmm-mode",
     "s"
    ],
-   "commit": "434b088ab8715731d62978264cb934e34c75c4b3",
-   "sha256": "15p265zigxki80h3gfq61cmssqqwcnp0990zl8xmj8p377523l6m"
+   "commit": "8285f46fe19cb99fe5ed42d38de0fe5c51c98fb0",
+   "sha256": "1a929lxra50f99vc865iy2icprq3m40zg2zsgr5hxd2pvcpch927"
   }
  },
  {
@@ -8313,28 +8313,28 @@
   "repo": "Artawower/blamer.el",
   "unstable": {
    "version": [
-    20240512,
-    1514
+    20240701,
+    1909
    ],
    "deps": [
     "async",
     "posframe"
    ],
-   "commit": "4cc2e6daaecf84c8dd00792f86724413423293a6",
-   "sha256": "1xyx1gls4d9xzlfwr0xkbblk8mzk3xhwbdqlag1xxdqnd1z96n5n"
+   "commit": "a6526820ac37a2ab041c4abda57b78f133299bf2",
+   "sha256": "1snm5k56142drdi84vg328yzl00l0fm4sl704pnk9bj6wb28l6q2"
   },
   "stable": {
    "version": [
     0,
-    8,
-    0
+    9,
+    1
    ],
    "deps": [
     "async",
     "posframe"
    ],
-   "commit": "e249fa3ae23cfc013883bcc138ef9f46107acb0c",
-   "sha256": "03wvmhv4m7am4hhy0m454bn1c2cvpi33z2sxdwf9fnfd5drwhrgm"
+   "commit": "281963da789fe9e47ce9efc4f7a9c4d19bf3a405",
+   "sha256": "0imqw1nczhi2wvl7wzbiwdh0rf2gklrl1ck5wrr2lg26hkjs0fmz"
   }
  },
  {
@@ -8876,16 +8876,16 @@
   "repo": "jyp/boon",
   "unstable": {
    "version": [
-    20240314,
-    920
+    20240628,
+    703
    ],
    "deps": [
     "dash",
     "expand-region",
     "multiple-cursors"
    ],
-   "commit": "9e006726be9ac508e0bb0393393abce06f7493f4",
-   "sha256": "0n11869w4806lak36x54rfwsnckrv7ydp3lzmdbjcq48mcsh1jjg"
+   "commit": "19a7f76e75759f5266986b40c470edb1f70c43df",
+   "sha256": "1cv6hf3lfhbxaqv0r4d56gfw956mq5ylv2c85hcfhv5jmj4k69w8"
   },
   "stable": {
    "version": [
@@ -8909,15 +8909,15 @@
   "repo": "emacscollective/borg",
   "unstable": {
    "version": [
-    20240415,
-    1553
+    20240609,
+    1435
    ],
    "deps": [
     "epkg",
     "magit"
    ],
-   "commit": "dfc5d58b439042a6e323cb342ab7531692d118a0",
-   "sha256": "02rq0ps327v8xlhs69r0cxicg4kljcza8ha7gks7z728hprwvhdl"
+   "commit": "940dc6af73cc40b5254fdb15ff1a6058e1b2b8a5",
+   "sha256": "1hlq3ss6waz6xi8qcqig1267l626fddpaz9038xy96w5zcm5wzdj"
   },
   "stable": {
    "version": [
@@ -9069,11 +9069,11 @@
   "repo": "museoa/bqn-mode",
   "unstable": {
    "version": [
-    20231217,
-    1203
+    20240623,
+    126
    ],
-   "commit": "23fd9db096ab3a5c5fbd034e721b8a7d27d1d6b7",
-   "sha256": "0nlwhk353fdl3jwmi1c6mz5898mh717lvldv9jypj9jdipcw6icc"
+   "commit": "b2a524b67d07483888fa17649a0618dfb6b22990",
+   "sha256": "1saq9fkdr4wflpnf257ddm3yhnvryhjms5isrik5vjwjv5j5lwrh"
   }
  },
  {
@@ -9141,11 +9141,11 @@
   "repo": "Michael-Allan/Breccia.Emacs",
   "unstable": {
    "version": [
-    20240507,
-    504
+    20240620,
+    1213
    ],
-   "commit": "dafb49308796f75db802e2d23596dfd3fb7e37b0",
-   "sha256": "1fb20vhszf7la1skzy093m6kl3q3akicirbpdp0vhd3xs47jzk1h"
+   "commit": "942e042cc22224ec3940d0867c8c08f71e036924",
+   "sha256": "06ps4swqyf4b8pv3x51wqsnpkxp9dmq089rbyvhn4rp7rix8y8x7"
   }
  },
  {
@@ -9156,25 +9156,25 @@
   "url": "https://bitbucket.org/MikeWoolley/brf-mode",
   "unstable": {
    "version": [
-    20230803,
-    2022
+    20240702,
+    1846
    ],
    "deps": [
     "fringe-helper"
    ],
-   "commit": "8875f5fcd173e220bbfa6bf9f8f09d721a29cd50",
-   "sha256": "0iqakgg7yz409776p14adg4vdn9ik0mf95vhzx23g3pd79lv34wb"
+   "commit": "495d69e5c615a27d928592e0c6c8184e869a23f2",
+   "sha256": "0klw4fgayyaj0pga3n6bq1zhr90mwih4v0qxdi6kp6vwyf1ffm96"
   },
   "stable": {
    "version": [
-    1,
-    25
+    2,
+    0
    ],
    "deps": [
     "fringe-helper"
    ],
-   "commit": "ca6f9869707dab5929e1da9e13bdf602207bc7f9",
-   "sha256": "15qq87fhdb99qd9ndxpprk43ip1mk57k1f7gin2yv8wdvv36n6bz"
+   "commit": "495d69e5c615a27d928592e0c6c8184e869a23f2",
+   "sha256": "0klw4fgayyaj0pga3n6bq1zhr90mwih4v0qxdi6kp6vwyf1ffm96"
   }
  },
  {
@@ -9327,11 +9327,11 @@
   "repo": "agzam/browser-hist.el",
   "unstable": {
    "version": [
-    20240402,
-    2345
+    20240607,
+    406
    ],
-   "commit": "0b7e93274173e82c05e5d9c9d3055e4b9017612a",
-   "sha256": "0jsq1sk4vbs3r7lhz28a550w88qq0mj6y2ra5ry351dnxsypsmsn"
+   "commit": "0372c6d984ca194d9454b14eba6eadec480ec3ff",
+   "sha256": "0s19gglc9jwapy7a9mf4i97a7r5q9lpm2ivvn0zjhqxcmzj3295j"
   }
  },
  {
@@ -9357,14 +9357,14 @@
   "repo": "plandes/bshell",
   "unstable": {
    "version": [
-    20230805,
-    1646
+    20240112,
+    2303
    ],
    "deps": [
     "buffer-manage"
    ],
-   "commit": "57f3409168ec9649508e3ee30d0d2de8f81b960e",
-   "sha256": "1pmaz7gw45y7mlina3h0db26khdsbmlcw7adkvri33sgrr9x83q7"
+   "commit": "d59559cf7c5dded8b9639346ae5c1384d8b9be4e",
+   "sha256": "0shfv1lxhz5k07jppdn0shm0pv1lzwsncfyniwm15fwhvb71bzhv"
   },
   "stable": {
    "version": [
@@ -10672,8 +10672,8 @@
   "repo": "chenyanming/calibredb.el",
   "unstable": {
    "version": [
-    20240507,
-    456
+    20240707,
+    1121
    ],
    "deps": [
     "dash",
@@ -10683,13 +10683,13 @@
     "s",
     "transient"
    ],
-   "commit": "8ca1b5262f0f0e4a0e295efc2c14db00333e9a85",
-   "sha256": "0f3fqgl8kqb1r3dcfd9fn0sh68ky2l13mmd6hqib7lmg4lf7aljz"
+   "commit": "a12746cdd2605eba0ff88706473a04492dec84a2",
+   "sha256": "1a4gyc3gcq18j29pw2i296d70nvx5fbzlw9fdmqwzncciqz5as6m"
   },
   "stable": {
    "version": [
     2,
-    12,
+    13,
     0
    ],
    "deps": [
@@ -10700,8 +10700,8 @@
     "s",
     "transient"
    ],
-   "commit": "1e09bd7cdf7e3274a0f43a66bba3121ea6b42f4a",
-   "sha256": "1l30s3wv21mpybbxni5fziq2awai9k60i87s6fid56hg262r7jp0"
+   "commit": "a12746cdd2605eba0ff88706473a04492dec84a2",
+   "sha256": "1a4gyc3gcq18j29pw2i296d70nvx5fbzlw9fdmqwzncciqz5as6m"
   }
  },
  {
@@ -10851,14 +10851,14 @@
   "repo": "minad/cape",
   "unstable": {
    "version": [
-    20240517,
-    2216
+    20240710,
+    1919
    ],
    "deps": [
     "compat"
    ],
-   "commit": "a71e5c96564163837810b96bd34322b42f6e4d9c",
-   "sha256": "0rwkn8p8p7axrh46x9cp3f90n5ic0dpm409pjn627s9sbz0j2vkj"
+   "commit": "040c1ee30b6ff766ba0f3e1458b43ce4a65f068b",
+   "sha256": "1h3xnjp1897syj2dwbb32x8s00hkcsvn09vsgjg1z204cd2i5czj"
   },
   "stable": {
    "version": [
@@ -11212,27 +11212,65 @@
   }
  },
  {
-  "ename": "casual",
-  "commit": "8eeb0f07cd1b2fff661cf6523390e81adfc060ba",
-  "sha256": "0d33xs732pnc4z29w13amslpx9qqbaxms7apqdwxcsyr8jsvybw0",
+  "ename": "casual-avy",
+  "commit": "1650f2d8352c64072794a1563f5b7728206acebd",
+  "sha256": "18rbw3mkmvadh517zcapfqfrmxb91xpp0dsmpdvcg3x05208dg20",
   "fetcher": "github",
-  "repo": "kickingvegas/Casual",
+  "repo": "kickingvegas/casual-avy",
   "unstable": {
    "version": [
-    20240416,
-    2237
+    20240703,
+    1846
    ],
-   "commit": "a22cf128c3baa3e11f6aaff7dc44ef91cf0fe9ce",
-   "sha256": "0sx3hqpp8ikp3avzcj4d601zh80rs7qi2azl0vmgc4ymrd7g1af8"
+   "deps": [
+    "avy",
+    "casual-lib"
+   ],
+   "commit": "1f03aaddd1ad093a577fb7068af3e5e4ff7573f9",
+   "sha256": "1n369d7yk6wr5b1145zxviiri1n2f8pzfmzchcnii34zwa2y7x2y"
   },
   "stable": {
    "version": [
     1,
-    5,
+    4,
     0
    ],
-   "commit": "a22cf128c3baa3e11f6aaff7dc44ef91cf0fe9ce",
-   "sha256": "0sx3hqpp8ikp3avzcj4d601zh80rs7qi2azl0vmgc4ymrd7g1af8"
+   "deps": [
+    "avy",
+    "casual-lib"
+   ],
+   "commit": "1f03aaddd1ad093a577fb7068af3e5e4ff7573f9",
+   "sha256": "1n369d7yk6wr5b1145zxviiri1n2f8pzfmzchcnii34zwa2y7x2y"
+  }
+ },
+ {
+  "ename": "casual-calc",
+  "commit": "47f061be179f0c7f8b86faa99ff0d3e9d8552ac1",
+  "sha256": "1c0wk9zbh7rzi9s0jcdxnzxy989545ccz1xmj7cs9jw4dq0i63z6",
+  "fetcher": "github",
+  "repo": "kickingvegas/casual-calc",
+  "unstable": {
+   "version": [
+    20240628,
+    2332
+   ],
+   "deps": [
+    "casual-lib"
+   ],
+   "commit": "47d8c4fd2b4a2d91d3891320a42451577d9c804a",
+   "sha256": "0qdi6p3aybg0zwscf35l2dx51q7h4rz2g7r4xf7ml520dag7h5cw"
+  },
+  "stable": {
+   "version": [
+    1,
+    10,
+    0
+   ],
+   "deps": [
+    "casual-lib"
+   ],
+   "commit": "47d8c4fd2b4a2d91d3891320a42451577d9c804a",
+   "sha256": "0qdi6p3aybg0zwscf35l2dx51q7h4rz2g7r4xf7ml520dag7h5cw"
   }
  },
  {
@@ -11243,20 +11281,186 @@
   "repo": "kickingvegas/casual-dired",
   "unstable": {
    "version": [
-    20240517,
-    2348
+    20240710,
+    2115
    ],
-   "commit": "d49c5c84d222ff8db2038d1f25b32c607a46c8b6",
-   "sha256": "0rn71abqr198ww6v6fi813dnb4lgi1nsmgk7vw482znnd4jyw937"
+   "deps": [
+    "casual-lib"
+   ],
+   "commit": "fadaf987ea42e0f0b4adb96ceba86bdf3f02e897",
+   "sha256": "0l5cakm5fb4jihm7v0c0axmwypyflcqy2x8k589yqwwpi5xy0frq"
+  },
+  "stable": {
+   "version": [
+    1,
+    6,
+    1
+   ],
+   "deps": [
+    "casual-lib"
+   ],
+   "commit": "fadaf987ea42e0f0b4adb96ceba86bdf3f02e897",
+   "sha256": "0l5cakm5fb4jihm7v0c0axmwypyflcqy2x8k589yqwwpi5xy0frq"
+  }
+ },
+ {
+  "ename": "casual-ibuffer",
+  "commit": "de711e92fd2f8ff1c626c3f7f789f402e8e92007",
+  "sha256": "1gynvk22nhm8l7dix7hracr7m3y3d0h065mplkj78hpx2pkmhvja",
+  "fetcher": "github",
+  "repo": "kickingvegas/casual-ibuffer",
+  "unstable": {
+   "version": [
+    20240712,
+    423
+   ],
+   "deps": [
+    "casual-lib"
+   ],
+   "commit": "524453b71cb701b7366dd946fed1f97c4ebd1731",
+   "sha256": "02lvaqlvx95iqg676plk5xkkjyy3kdihyja0lvrcbah8qd6j6idq"
   },
   "stable": {
    "version": [
     1,
     1,
-    2
+    1
    ],
-   "commit": "d49c5c84d222ff8db2038d1f25b32c607a46c8b6",
-   "sha256": "0rn71abqr198ww6v6fi813dnb4lgi1nsmgk7vw482znnd4jyw937"
+   "deps": [
+    "casual-lib"
+   ],
+   "commit": "524453b71cb701b7366dd946fed1f97c4ebd1731",
+   "sha256": "02lvaqlvx95iqg676plk5xkkjyy3kdihyja0lvrcbah8qd6j6idq"
+  }
+ },
+ {
+  "ename": "casual-info",
+  "commit": "1b06cc08de41e82f3f148aa9e35663e2e06427ae",
+  "sha256": "1d6jmjhc0xalw1ll15k69bazbvprmw519lcsm2gd2jpkbngw9rmy",
+  "fetcher": "github",
+  "repo": "kickingvegas/casual-info",
+  "unstable": {
+   "version": [
+    20240711,
+    712
+   ],
+   "deps": [
+    "casual-lib"
+   ],
+   "commit": "23f970d58e5f3c2dc9fa291bdce5f9e560fb205c",
+   "sha256": "1s23pzmx2l5cs8n43yimf0fizxi0g7km9nxmv98gazkqb6shbqpz"
+  },
+  "stable": {
+   "version": [
+    1,
+    3,
+    1
+   ],
+   "deps": [
+    "casual-lib"
+   ],
+   "commit": "23f970d58e5f3c2dc9fa291bdce5f9e560fb205c",
+   "sha256": "1s23pzmx2l5cs8n43yimf0fizxi0g7km9nxmv98gazkqb6shbqpz"
+  }
+ },
+ {
+  "ename": "casual-isearch",
+  "commit": "7280670087e28ed08575c71165c095ee7be7da49",
+  "sha256": "02qb1bpx30cxyjrd821g4qc5v7xwv4rc1f67p1dx3fglms8p2zc5",
+  "fetcher": "github",
+  "repo": "kickingvegas/casual-isearch",
+  "unstable": {
+   "version": [
+    20240711,
+    403
+   ],
+   "deps": [
+    "casual-lib"
+   ],
+   "commit": "f86c54330a99961aa72e284a8744861f1ec8d94e",
+   "sha256": "1k7kpvxj4jgf53icrynl4w1zb00kglyvdngyijf7sy3z6mbr9qlj"
+  },
+  "stable": {
+   "version": [
+    1,
+    8,
+    1
+   ],
+   "deps": [
+    "casual-lib"
+   ],
+   "commit": "f86c54330a99961aa72e284a8744861f1ec8d94e",
+   "sha256": "1k7kpvxj4jgf53icrynl4w1zb00kglyvdngyijf7sy3z6mbr9qlj"
+  }
+ },
+ {
+  "ename": "casual-lib",
+  "commit": "fd3bb4b191bf416dd419c5c76d510c7f5890e673",
+  "sha256": "18g739n2dbcywamvkkpnrhsmmnk1l5b9v05d173b9qq1fj06pn8p",
+  "fetcher": "github",
+  "repo": "kickingvegas/casual-lib",
+  "unstable": {
+   "version": [
+    20240628,
+    2300
+   ],
+   "deps": [
+    "transient"
+   ],
+   "commit": "a7b4a576f01fa227aaff074e0ef2778cdd06fc5d",
+   "sha256": "0dn6jz8bbz17326g0jd1hvz80xxmbl7dwifb2nnw7nl6q6adbkmf"
+  },
+  "stable": {
+   "version": [
+    1,
+    1,
+    0
+   ],
+   "deps": [
+    "transient"
+   ],
+   "commit": "a7b4a576f01fa227aaff074e0ef2778cdd06fc5d",
+   "sha256": "0dn6jz8bbz17326g0jd1hvz80xxmbl7dwifb2nnw7nl6q6adbkmf"
+  }
+ },
+ {
+  "ename": "casual-suite",
+  "commit": "4294e2c5d538ee9e1f2a59ad0c32efcd7a6affd2",
+  "sha256": "1qbym111j4yjbkb87h31lnkx9c7jbzqgd9b2m2f9fkc1zj9ddkn9",
+  "fetcher": "github",
+  "repo": "kickingvegas/casual-suite",
+  "unstable": {
+   "version": [
+    20240705,
+    1758
+   ],
+   "deps": [
+    "casual-avy",
+    "casual-calc",
+    "casual-dired",
+    "casual-ibuffer",
+    "casual-info",
+    "casual-isearch"
+   ],
+   "commit": "c4ff037ac6a662968b499b9d18b3b2ef9ba6c956",
+   "sha256": "073rwpayr19ssci60gvqv68a4hh65sldb6fzb7wrqpgzcq6wl7mi"
+  },
+  "stable": {
+   "version": [
+    1,
+    2,
+    0
+   ],
+   "deps": [
+    "casual-avy",
+    "casual-calc",
+    "casual-dired",
+    "casual-ibuffer",
+    "casual-info",
+    "casual-isearch"
+   ],
+   "commit": "c4ff037ac6a662968b499b9d18b3b2ef9ba6c956",
+   "sha256": "073rwpayr19ssci60gvqv68a4hh65sldb6fzb7wrqpgzcq6wl7mi"
   }
  },
  {
@@ -11291,11 +11495,11 @@
   "repo": "catppuccin/emacs",
   "unstable": {
    "version": [
-    20240326,
-    900
+    20240607,
+    1703
    ],
-   "commit": "3d93abaa33e95f19b4a8b0e1e9bef1e3e68dd994",
-   "sha256": "1j6nsy9is067288x2riabb7kc3grghb2g7bkvwndn2jyglbbxgi0"
+   "commit": "2f15c7c7cca7834b072bb26421a2755a67786899",
+   "sha256": "19gbkdmjq6616x9q4zhzf6hz9g1d91sh26h00pjzpbp1cj1qml3l"
   },
   "stable": {
    "version": [
@@ -11381,30 +11585,6 @@
    "sha256": "0cpmryg6haqlrfz6hwm10k7iw66hgwclm8lhdbikr97b6536bni5"
   }
  },
- {
-  "ename": "cc-isearch-menu",
-  "commit": "63dbaed255d4c0f263d534077b33c9cffec50b1b",
-  "sha256": "00jb1m3fdlp3pn75c67phshb22shyhga31s3wf1s7wldandrbkwj",
-  "fetcher": "github",
-  "repo": "kickingvegas/cc-isearch-menu",
-  "unstable": {
-   "version": [
-    20240401,
-    48
-   ],
-   "commit": "6eecc77a89ea63cab69fc8eb6dd1c32ad582b05b",
-   "sha256": "057bsx330da9vpn0292gxzn9gary5piqinmrw8hk072iwgk6kdwi"
-  },
-  "stable": {
-   "version": [
-    1,
-    4,
-    1
-   ],
-   "commit": "6eecc77a89ea63cab69fc8eb6dd1c32ad582b05b",
-   "sha256": "057bsx330da9vpn0292gxzn9gary5piqinmrw8hk072iwgk6kdwi"
-  }
- },
  {
   "ename": "ccc",
   "commit": "7375cab750a67ede1a021b6a4371b678a7b991b0",
@@ -11600,15 +11780,14 @@
   "repo": "ema2159/centaur-tabs",
   "unstable": {
    "version": [
-    20240521,
-    2204
+    20240704,
+    1048
    ],
    "deps": [
-    "cl-lib",
     "powerline"
    ],
-   "commit": "3346b23545932c73c4c88a4cdb54778ecff95443",
-   "sha256": "1p2jllqv6d5xh1j06y9844msww56ldinnil8c1zd9jd4q6jsvnrz"
+   "commit": "12663a3ea01d2652d28e63a9644b68ac31c400be",
+   "sha256": "1jlwk3930i389f38mmkrzq5nwk1vfffczdcsc9i0si5rzr010zbs"
   },
   "stable": {
    "version": [
@@ -11828,16 +12007,16 @@
   "repo": "worr/cfn-mode",
   "unstable": {
    "version": [
-    20240519,
-    805
+    20240630,
+    804
    ],
    "deps": [
     "f",
     "s",
     "yaml-mode"
    ],
-   "commit": "6ef789934d6b9b78cdbe5c90703f4afead736ead",
-   "sha256": "04hynyv60g9y3z76zlwvgfqmm4i9450skxhx0r8bw9m8yf04841i"
+   "commit": "a16c17e7765f1ae54ae7d40e748871e6b1ffced6",
+   "sha256": "1m1v2an9dpsksar9v60srg9bdhsiiwjxba7lbd7s6iyraj30r2dn"
   },
   "stable": {
    "version": [
@@ -12101,14 +12280,14 @@
   "repo": "xenodium/chatgpt-shell",
   "unstable": {
    "version": [
-    20240517,
-    2003
+    20240709,
+    808
    ],
    "deps": [
     "shell-maker"
    ],
-   "commit": "910b0ad5cdb633f6be64f88596219a7eb58af226",
-   "sha256": "1mqdgsy1l9lc94cg1q8gzm7phc3f4rafk39cjlf5i9a1wai7f7p6"
+   "commit": "fce2b6d3609135f827da46dbb6d1f37d65a8b024",
+   "sha256": "1qlm6v2nbalfwwjwz956zmj9ipy2smfimlllidxdlbq0463hnsgs"
   }
  },
  {
@@ -12527,14 +12706,14 @@
   "repo": "breatheoutbreathein/chordpro-mode.el",
   "unstable": {
    "version": [
-    20231205,
-    26
+    20240618,
+    626
    ],
    "deps": [
     "compat"
    ],
-   "commit": "a63fc0b7181299befc4496cba04e0f84d5953000",
-   "sha256": "0b2psymnp5bvx1ags4dx0xpm852bygrslk2qj4c8br5g89xh3pil"
+   "commit": "ea530813edb4936f36efea9b2f0009c9feb6b90b",
+   "sha256": "1rxqqarhspfvyf7ii0h6sg5z8qknn6zqj3cfy797awc2fv3m3drs"
   },
   "stable": {
    "version": [
@@ -12711,11 +12890,11 @@
   "repo": "DarkBuffalo/chronos",
   "unstable": {
    "version": [
-    20230804,
-    1712
+    20240525,
+    1339
    ],
-   "commit": "517c53f57c54ec64e1bc870a63b0f4cf1772fcf1",
-   "sha256": "009wc3hb2mflcpk0jdifvppjjj7m5gzgcf1s4x1knsrzqhmm9vxz"
+   "commit": "5ea0bf7c3881ea905e280446342539b242401979",
+   "sha256": "1175kx6nbkl6s8qdfjsd4vv4n0g2yd5wf8vbj31z8rk45fv4gnv2"
   }
  },
  {
@@ -12736,6 +12915,21 @@
    "sha256": "06pvjw40qk017py9km26vjrh90acycnkr5r04nxf664qqkjlg2mc"
   }
  },
+ {
+  "ename": "chyla-dark-theme",
+  "commit": "bdae382c677e77d005fa08fa0ce7d7984e6ead86",
+  "sha256": "0pbywy3l44qanw4xbiav7djxr0kgghhdc9z5294mgxaka9m6z54f",
+  "fetcher": "github",
+  "repo": "chyla/ChylaDarkThemeForEmacs",
+  "unstable": {
+   "version": [
+    20240708,
+    2033
+   ],
+   "commit": "8d5c9a2eaaf04e0f1ad953a34b15e9777407b760",
+   "sha256": "0lx51z5iwm0wz9c8d2fjx9974z2rp48q50dljvcfw795zgbdm79b"
+  }
+ },
  {
   "ename": "chyla-theme",
   "commit": "5c55eebf8df165360ce1e5d18e484c90f296fe52",
@@ -12744,11 +12938,11 @@
   "repo": "chyla/ChylaThemeForEmacs",
   "unstable": {
    "version": [
-    20231220,
-    1545
+    20240708,
+    2017
    ],
-   "commit": "4d4b9dca3547e919ed5311cc7d04821f77860fbd",
-   "sha256": "1b41ar0ii5ikfi3hxss2maxgn2lx3kxzizpr9kf5218kmhjy3fh2"
+   "commit": "c2bb425eaff0975e0c7081f282d291f7853f8376",
+   "sha256": "0iqi0qfkwjhvqhs9yvs6pqbinp4jb6sj6fym4m69174fyqkjhc1b"
   }
  },
  {
@@ -12759,8 +12953,8 @@
   "repo": "clojure-emacs/cider",
   "unstable": {
    "version": [
-    20240522,
-    1030
+    20240711,
+    1319
    ],
    "deps": [
     "clojure-mode",
@@ -12771,13 +12965,13 @@
     "spinner",
     "transient"
    ],
-   "commit": "5a477c58dca86cbee723ddb2d0670689f53c47ed",
-   "sha256": "075ikfwrn3n0czzlj2233y7d0ljal8hwzab1vqhfl100q61j0hrj"
+   "commit": "42608a1369760b6e36a86f0a63daa876c8b24e9e",
+   "sha256": "1rwsfcmxm1fy1lc0h9d511hhp3x17vhsxzmwizdzpfw42xpa1pyq"
   },
   "stable": {
    "version": [
     1,
-    13,
+    15,
     1
    ],
    "deps": [
@@ -12789,8 +12983,8 @@
     "spinner",
     "transient"
    ],
-   "commit": "06dc45844ad05fe23fccb7dec1609404e3cda88e",
-   "sha256": "0aswxqhdhxm2hx8cvpa47siah1d8n7kswdj1p7nplzqzzqzcy34h"
+   "commit": "810337cee931d9f14aa16550a74516f8337a47f3",
+   "sha256": "0kzgkx6jcv2864c32qr9qvrxm66l6ncakcpw1j7vf24xi51cs9a1"
   }
  },
  {
@@ -12969,20 +13163,20 @@
   "repo": "guidoschmidt/circadian.el",
   "unstable": {
    "version": [
-    20221223,
-    1419
+    20240603,
+    935
    ],
-   "commit": "f20cdbf164be10ef0c55d26eba4d270c7c826f42",
-   "sha256": "03wh3zb1pwvjn990bvd461397v8fh5y6asy0g5wb7x86sg6za1hg"
+   "commit": "76464419f69e9758bc5a76b2420c9648ddf93dba",
+   "sha256": "1blpk69ba2dira5av3ad854h4xkxxl5f47mkbjbgmzjlqihv8q3p"
   },
   "stable": {
    "version": [
+    1,
     0,
-    4,
     0
    ],
-   "commit": "323039363588028c629604fae17b73a3d3c821cc",
-   "sha256": "108qsmzdbk4jw445chl6zhbd0mb95w3lc30c6jaijn4y7ys3dmls"
+   "commit": "76464419f69e9758bc5a76b2420c9648ddf93dba",
+   "sha256": "1blpk69ba2dira5av3ad854h4xkxxl5f47mkbjbgmzjlqihv8q3p"
   }
  },
  {
@@ -12993,14 +13187,14 @@
   "repo": "emacs-circe/circe",
   "unstable": {
    "version": [
-    20240407,
-    1101
+    20240630,
+    2055
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "9d703f481a2c65f2b17edcc2b05412f9865d24af",
-   "sha256": "1k8hydd45zqhbfd4lmcdr46wxj9m788wwjmr9ss0vyrqc0w6z6zw"
+   "commit": "3ae38790506311fd32b2d499804af69b16307652",
+   "sha256": "1gmzjcsk7vyp0mnx1ak4a5xi1wz9j1jcz5lvia68sx5wrwn2vicg"
   },
   "stable": {
    "version": [
@@ -13105,16 +13299,16 @@
   "repo": "pprevos/citar-denote",
   "unstable": {
    "version": [
-    20240520,
-    2325
+    20240709,
+    1954
    ],
    "deps": [
     "citar",
     "dash",
     "denote"
    ],
-   "commit": "1c62db7107b1ff9de5f87a03d9ac1973c4bbb0ec",
-   "sha256": "0140a7zxs479na6p94g9rsxg7sp08jx7ri4y1h764wxwfvl8qf8c"
+   "commit": "8333093ffcd05aaf5ec98568d9e4abe03a6eebb2",
+   "sha256": "19vrmsykp4j9p7ib686jc4qya2rra09685wp9c715r5kas4y8rva"
   },
   "stable": {
    "version": [
@@ -13203,8 +13397,8 @@
   "repo": "andras-simonyi/citeproc-el",
   "unstable": {
    "version": [
-    20240513,
-    1309
+    20240621,
+    1425
    ],
    "deps": [
     "compat",
@@ -13216,8 +13410,8 @@
     "s",
     "string-inflection"
    ],
-   "commit": "fed285385c1a8c0248890cd591f64a0e2598334d",
-   "sha256": "19m3q2izbgzvaimk9z38zznj1602vmr8y93c2sfrkyssjb4rmxfy"
+   "commit": "cfa30b6c95c7465a05da98eccf273608880b22d7",
+   "sha256": "0layhvngypfxms7ivhiqfhfx5787kq0vdp2m4k51mwgjk0cagfqc"
   },
   "stable": {
    "version": [
@@ -13285,19 +13479,20 @@
   "repo": "universal-ctags/citre",
   "unstable": {
    "version": [
-    20240508,
-    1154
+    20240630,
+    721
    ],
-   "commit": "fe670ff2410fe4cd59cdce8ef1b947deefa71879",
-   "sha256": "1fancp1z955z2clnr9rh6iqpg6cisama9drx51356n4afv60q9pv"
+   "commit": "d99483767016cada88a2877a77b9b76f8e118b80",
+   "sha256": "10sp5256354p6f3wcgvgniv7jsvb000nffzhq4lkc4kzf3b579q3"
   },
   "stable": {
    "version": [
     0,
-    4
+    4,
+    1
    ],
-   "commit": "ac01a5c5852fa3a170e5f00dafeb633012e25fd8",
-   "sha256": "0fq1f03v706gj6p2fjz51kvmj1pwc9p64chqap2ajr0a9cxpwln6"
+   "commit": "7c9c77276cc7dfcb77640df7d589eaac3198cfee",
+   "sha256": "1x5kxlzhzr2x4cszcqaxcg2lc71nwmmfnm2vzx7iz7h74hn4f1ld"
   }
  },
  {
@@ -13407,6 +13602,21 @@
    "sha256": "0y97f86qnpcscwj41icb4i6j40qhvpkyhg529hwibpf6f53j7ckl"
   }
  },
+ {
+  "ename": "clang-format-lite",
+  "commit": "748d88db575163fadbae8a20556351e4fe26d2dc",
+  "sha256": "0iy902lrk8518q2ndxb6b1xf9zdiy6h9hi021jpqg44v7rg7y9gp",
+  "fetcher": "github",
+  "repo": "arteen1000/clang-format-lite",
+  "unstable": {
+   "version": [
+    20240708,
+    223
+   ],
+   "commit": "4e60389129601ac81f8c698c1a6985ad72224b3e",
+   "sha256": "1hiviarym9ahf3hi0zqf2ja5y14cyvm56z922m11kyapbmwqprka"
+  }
+ },
  {
   "ename": "claude-shell",
   "commit": "a40f86ecc9a185f065a720318ff69afc10d92535",
@@ -13415,14 +13625,14 @@
   "repo": "arminfriedl/claude-shell",
   "unstable": {
    "version": [
-    20240420,
-    1917
+    20240707,
+    1743
    ],
    "deps": [
     "shell-maker"
    ],
-   "commit": "2574f5d1fe58c44dc0e16d3a7be36a9e4e0927ca",
-   "sha256": "1my1n0bsx7xghaxa3qyrsqkdn3nxxym00acncp24b1hsm63k12yx"
+   "commit": "6fb330578a84a8753e32b9ffc50a2506406f1099",
+   "sha256": "1v6jbqd3djk4h3id4spqax6wzg1sgqc7mypci1j1qvgxafg6iqyh"
   }
  },
  {
@@ -14079,20 +14289,20 @@
   "repo": "clojure-emacs/clojure-mode",
   "unstable": {
    "version": [
-    20240516,
-    525
+    20240526,
+    1825
    ],
-   "commit": "faee3efbb1e940af0e5777514923c8dea567f87d",
-   "sha256": "1d3pwwwwzfaqbynpmkpnmfmf2gh7nviy8nc18m0nm9g27i9x3wk4"
+   "commit": "815bc387ec1436fb2fcac00ba8a61207636d0186",
+   "sha256": "0rx7r4v6dfz26n9bqhfbd4jv0fj9zqnc22jk8pa5y4ldjzkas35c"
   },
   "stable": {
    "version": [
     5,
-    18,
-    1
+    19,
+    0
    ],
-   "commit": "25d713a67d8e0209ee74bfc0153fdf677697b43f",
-   "sha256": "1d5kkq2i8d04k2qfrb31zyjpij92ckbccnzvz01mls3xrvpr57m5"
+   "commit": "4afdd3539036bbd6b1c01b2e00559676c4d40085",
+   "sha256": "0kv7jw1cg145zcy0pffjk9n2kkcgdn46nb2ny06ynadbivk2l4ds"
   }
  },
  {
@@ -14103,26 +14313,26 @@
   "repo": "clojure-emacs/clojure-mode",
   "unstable": {
    "version": [
-    20231124,
-    732
+    20240526,
+    1824
    ],
    "deps": [
     "clojure-mode"
    ],
-   "commit": "25d713a67d8e0209ee74bfc0153fdf677697b43f",
-   "sha256": "1d5kkq2i8d04k2qfrb31zyjpij92ckbccnzvz01mls3xrvpr57m5"
+   "commit": "4afdd3539036bbd6b1c01b2e00559676c4d40085",
+   "sha256": "0kv7jw1cg145zcy0pffjk9n2kkcgdn46nb2ny06ynadbivk2l4ds"
   },
   "stable": {
    "version": [
     5,
-    18,
-    1
+    19,
+    0
    ],
    "deps": [
     "clojure-mode"
    ],
-   "commit": "25d713a67d8e0209ee74bfc0153fdf677697b43f",
-   "sha256": "1d5kkq2i8d04k2qfrb31zyjpij92ckbccnzvz01mls3xrvpr57m5"
+   "commit": "4afdd3539036bbd6b1c01b2e00559676c4d40085",
+   "sha256": "0kv7jw1cg145zcy0pffjk9n2kkcgdn46nb2ny06ynadbivk2l4ds"
   }
  },
  {
@@ -14195,11 +14405,11 @@
   "repo": "clojure-emacs/clojure-ts-mode",
   "unstable": {
    "version": [
-    20240314,
-    552
+    20240618,
+    301
    ],
-   "commit": "8afa5656955814193b3b27020faf4edf00abda88",
-   "sha256": "0jxfzcmqlmc88ib483n6y445xs7bpaqw3b1w0z3nmcdfk512d0fr"
+   "commit": "7b7a4705d1a952b4414672955e67fb9471213f2a",
+   "sha256": "02hz3wfpfkkiqx92swmj5avisq408934iybip6rs4pwrh69630aq"
   },
   "stable": {
    "version": [
@@ -14254,15 +14464,15 @@
   "repo": "magit/closql",
   "unstable": {
    "version": [
-    20240415,
-    1534
+    20240712,
+    2215
    ],
    "deps": [
     "compat",
     "emacsql"
    ],
-   "commit": "2bff36edd28c9a0d0c25b545b3837fa874376cc5",
-   "sha256": "1951r5p5p6jr9xahjw7sr0s01d6mhcp721b35gxa9d9kw3p52xx6"
+   "commit": "ebfb860510d895ebcbbe920dd0d86381f1b6504c",
+   "sha256": "0v1maxvxzcihg1ssvxc1h1m4l0yzhfp9702s6fmb7h18yd2g2gvy"
   },
   "stable": {
    "version": [
@@ -14447,20 +14657,20 @@
   "url": "https://gitlab.kitware.com/cmake/cmake.git",
   "unstable": {
    "version": [
-    20240412,
-    1329
+    20240624,
+    1425
    ],
-   "commit": "3bb04b05a527b2443298cb7bc9520f58e56c4e9e",
-   "sha256": "0cn206miz1z0b92rg95z7qr240awh92vfby62gjh9pv0mazhac3q"
+   "commit": "4b874546fc3711bb24fcdba5718e6c85a17c740a",
+   "sha256": "1mjw3wwn0bqqyvlf251mwbjq5pbw018qd6cnid5mjlxglfbj4y75"
   },
   "stable": {
    "version": [
     3,
-    29,
-    3
+    30,
+    0
    ],
-   "commit": "b39fb31bf411c3925bd937f8cffbc471c2588c34",
-   "sha256": "1bwa80zrqyav0bxpq6b9vrjijbfn5g52vqhzvy70g7bp3jbp6vzm"
+   "commit": "0f88f57389fd636d76b7f726ac94933476d6c195",
+   "sha256": "1p6jq4yq81r0vdzr7wshllvn8dl80snz6q4ihp2fhd2yjngxj1l4"
   }
  },
  {
@@ -15046,14 +15256,14 @@
   "repo": "purcell/color-theme-sanityinc-solarized",
   "unstable": {
    "version": [
-    20220917,
-    1350
+    20240712,
+    1038
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "b8f4a65bd53b97b56b93fff2fb14f71b2831aa6f",
-   "sha256": "10vfbl9dry03dw264w7b4grmzcv78x3p7r86bsyhyl74hwwvx1hp"
+   "commit": "e1854917d84051393b64de54883f2df7b9cec797",
+   "sha256": "121y3hb2v17shv5r0y4vqsbw1avc19rv9bk99l3ls7apx6xma8ji"
   },
   "stable": {
    "version": [
@@ -15072,11 +15282,11 @@
   "repo": "purcell/color-theme-sanityinc-tomorrow",
   "unstable": {
    "version": [
-    20240429,
-    949
+    20240621,
+    1005
    ],
-   "commit": "5f3b2039eda57e9e4501f8decab5808d9edf98eb",
-   "sha256": "11vpha0nmcxh7b1cp27778sacjzccp87b6db3mnsir5mbnxyhfx4"
+   "commit": "ddf2920a8866040e57359d2e1c5517fffcad2e38",
+   "sha256": "0qnn3dxzi40skrmi6a2w68c1dcn89zbdxnm18nw7axa7c0q0wcqs"
   },
   "stable": {
    "version": [
@@ -15414,20 +15624,19 @@
   "repo": "pzel/commentary-theme",
   "unstable": {
    "version": [
-    20210714,
-    1757
+    20240620,
+    1307
    ],
-   "commit": "a73e1256f667065933e96bd6032c463cb115201d",
-   "sha256": "0dwd42afh4brcwz1jahxmn8l3aj6dmplidqv4x55z3di1spdjs98"
+   "commit": "31e3724631d20fe5854cf522443a31fc12245ce3",
+   "sha256": "09sm5da945qfxmjcyvjwhgbrgns5kqqxb0i8qh2d7b08qj1wr5p2"
   },
   "stable": {
    "version": [
     0,
-    4,
-    1
+    5
    ],
-   "commit": "a73e1256f667065933e96bd6032c463cb115201d",
-   "sha256": "0dwd42afh4brcwz1jahxmn8l3aj6dmplidqv4x55z3di1spdjs98"
+   "commit": "31e3724631d20fe5854cf522443a31fc12245ce3",
+   "sha256": "09sm5da945qfxmjcyvjwhgbrgns5kqqxb0i8qh2d7b08qj1wr5p2"
   }
  },
  {
@@ -15516,11 +15725,11 @@
   "repo": "company-mode/company-mode",
   "unstable": {
    "version": [
-    20240428,
-    2258
+    20240713,
+    303
    ],
-   "commit": "32f030a4c79bbf082cc21ec21b2cf8ba9dfa22cc",
-   "sha256": "19y5s4jxz62ak9q3cq66d1gijpbv9bkxazm4qyglsk9ayjz03q43"
+   "commit": "31f7ad52e4d353a8b2f0ec7e2c3135c012e500e2",
+   "sha256": "1xj4nghrdns30s8672566gpcbqz22wz6wkchq6g370s76ngmrqhs"
   },
   "stable": {
    "version": [
@@ -16102,16 +16311,16 @@
   "repo": "jcs-elpa/company-fuzzy",
   "unstable": {
    "version": [
-    20240519,
-    904
+    20240616,
+    549
    ],
    "deps": [
     "company",
     "ht",
     "s"
    ],
-   "commit": "ae4dbb00d91fae8f13e236093d99c7e4d0d8fa73",
-   "sha256": "1akl4d83lydq1sjp56kfwwv4zya0awpvm8ifw7sj4f1fmvkz8awr"
+   "commit": "204f7d63a5388637a3767c0232173c477ce96df3",
+   "sha256": "1kxij0npbhfr9ngn0dyhlp77ida76nvlxs0a45ycmmj44y5a37ah"
   },
   "stable": {
    "version": [
@@ -17551,8 +17760,8 @@
   "repo": "mkcms/compiler-explorer.el",
   "unstable": {
    "version": [
-    20240517,
-    1816
+    20240617,
+    2114
    ],
    "deps": [
     "eldoc",
@@ -17560,21 +17769,23 @@
     "plz",
     "seq"
    ],
-   "commit": "ca01cbfa5941750f3cf2232f00e28032ef7f9bce",
-   "sha256": "05yzp9gch1hw10xgk742zdgky0vbbqhyn6fzxj2n6ilwaslcnprh"
+   "commit": "be99c0f00d4814c3602ea55ca116f5dcda6645a6",
+   "sha256": "1hdsa6jm75sga62xsw4054dnr1l8wqbb86bxqmq4zwlqnhi7rdp7"
   },
   "stable": {
    "version": [
     0,
-    4,
+    5,
     0
    ],
    "deps": [
     "eldoc",
-    "request"
+    "map",
+    "plz",
+    "seq"
    ],
-   "commit": "4980ed8f91a94b7a1cace9d199f1a0b35bed3a07",
-   "sha256": "1d181wm69r00j3wrvcb7i44v9c85ahk7b3hcqb91wlky25lsbjrz"
+   "commit": "f7b440125264efc043b9d61186e4ac662cb8b67c",
+   "sha256": "0yih4rl037f14v1cq13g49fx1dy6yl6v7ps13lrklv0pjjf7gc9c"
   }
  },
  {
@@ -17609,15 +17820,15 @@
   "repo": "emacs-php/composer.el",
   "unstable": {
    "version": [
-    20221120,
-    202
+    20240618,
+    1112
    ],
    "deps": [
     "php-runtime",
     "seq"
    ],
-   "commit": "2299cd731205906350d615021f99a66d7a8905c2",
-   "sha256": "1s1wmvav83djcg6jgf5cjvwjm045y5fbwf0sqwgkfk8m4ka4473a"
+   "commit": "42cf9848d438f8dc4c07ac684a83280ace7bb94c",
+   "sha256": "0a7hwikxzw1y6i4ny9bxj4lnyaz2p25sx5w97rhnkagr0859jflg"
   },
   "stable": {
    "version": [
@@ -17710,8 +17921,8 @@
   "repo": "necaris/conda.el",
   "unstable": {
    "version": [
-    20231109,
-    219
+    20240708,
+    2135
    ],
    "deps": [
     "dash",
@@ -17719,8 +17930,8 @@
     "pythonic",
     "s"
    ],
-   "commit": "60e14d1e9793431b91913a5688e278bd91d56224",
-   "sha256": "1irrcdm3ckbafsjr442i9iljsfjqsg5mj79hzwps2k1j7b911gy1"
+   "commit": "ce748a53f9c7d7a7d112632d32c848d6e5482e18",
+   "sha256": "0l63dbkv91ashpjvnns4z5fzhmacal1pslycnmj05gar4sj4339v"
   },
   "stable": {
    "version": [
@@ -17859,11 +18070,11 @@
   "repo": "tralph3/conner",
   "unstable": {
    "version": [
-    20240512,
-    1717
+    20240707,
+    2220
    ],
-   "commit": "d8dabaab32e39b01500841b7465076c6ad73c3b9",
-   "sha256": "1iw787gp2r7ab3xc8s6brsdc7a8cg5g2vsjlb1qhir6zmyz5y5dz"
+   "commit": "583d8288b07f4372b68e1c06917eb77c419c555d",
+   "sha256": "1ix3lrgdhc425kninmq9nly7472nzx9m925c3bpd8bf49pnd7ypk"
   },
   "stable": {
    "version": [
@@ -17897,25 +18108,25 @@
   "repo": "minad/consult",
   "unstable": {
    "version": [
-    20240516,
-    2240
+    20240710,
+    2028
    ],
    "deps": [
     "compat"
    ],
-   "commit": "80407622f323669c735737272ecbc3b602434b77",
-   "sha256": "0rrxyds14a3c1f96q3hx92hm4axl66cgghrvc3j745s257macx0y"
+   "commit": "3d7f3d2de22eacb125f56ae5b5af6411bbe00b46",
+   "sha256": "1j6biflxz03ywqnvwiwhpk2x3gscb26q72sxcm8s8p4zkx5wrcwq"
   },
   "stable": {
    "version": [
     1,
-    6
+    7
    ],
    "deps": [
     "compat"
    ],
-   "commit": "6eba1a3fa8e13681091a30b2490a03bdce5f243a",
-   "sha256": "1c6skqx5aqkb0mfnm5zw4mvzcrcr34zcd5jz3ypgb5483nv9kp3c"
+   "commit": "fe4852280006e61be7f1374d021ee06155ce5a26",
+   "sha256": "1xvxqv21b0d1c129dc72iajrbyyfibcv8gmv643h388p5wb69msv"
   }
  },
  {
@@ -18004,15 +18215,15 @@
   "repo": "mohkale/compile-multi",
   "unstable": {
    "version": [
-    20230904,
-    1806
+    20240507,
+    1949
    ],
    "deps": [
     "compile-multi",
     "consult"
    ],
-   "commit": "30edb0e86287101269debf20f43cead92310029a",
-   "sha256": "0ppm9zw65f1a7b6qb5hx60i6fxkqarrhlz2kn6p2b48s089dykyp"
+   "commit": "a8782ac55115b1afe0bee52664b46bfbd9bf202e",
+   "sha256": "1rr74klnariax66n7r5sbkqjszqslxg8l58rxmb1b3yv5mzic10y"
   },
   "stable": {
    "version": [
@@ -18266,14 +18477,14 @@
   "repo": "rcj/consult-ls-git",
   "unstable": {
    "version": [
-    20230924,
-    810
+    20240529,
+    641
    ],
    "deps": [
     "consult"
    ],
-   "commit": "3ccd9d80da73a05ef2a74616ffdc469860f74c21",
-   "sha256": "1gxh0zwfkm50493bbnvjlsx38i3sxmrajqm1gf65icp55s0slrp0"
+   "commit": "b1ca94f7c43cbd3811d09a0c9ab04f67f6318e95",
+   "sha256": "1r8d42r4dszg7jdabgs60inn6hkd293fddps1sjrs8y4ygkxcp61"
   }
  },
  {
@@ -18317,16 +18528,16 @@
   "repo": "mclear-tools/consult-notes",
   "unstable": {
    "version": [
-    20240516,
-    1423
+    20240624,
+    1219
    ],
    "deps": [
     "consult",
     "dash",
     "s"
    ],
-   "commit": "c97420c8e91aaae214be7de897eb7eb9b7843520",
-   "sha256": "0nf06al179p3g7n0zvcxkwhq1ygakg4n554a1w8f6k00m1syslsh"
+   "commit": "9858bb13b54934ea0a95df45947ff40ffde4553b",
+   "sha256": "0kv5hdc3cl7vkr06llyd6dcbddd55rmhhsfr8hzjpmvgw0h317kg"
   }
  },
  {
@@ -18567,20 +18778,20 @@
   "repo": "licht1stein/context-transient.el",
   "unstable": {
    "version": [
-    20240507,
-    1534
+    20240530,
+    1344
    ],
-   "commit": "efd8343f46f9fb2a1ee391c0292fb35d4f91b107",
-   "sha256": "0fmp011hnarc73b3zicknwfvql5a2q7ijmy63p0qnw735c9xcjvr"
+   "commit": "4461c3a5b8654cb1dacea404f78951172437804f",
+   "sha256": "1slj9js7c4cggdidr7miri9gf9xm7ij4hmd7y99km7bqmg57837l"
   },
   "stable": {
    "version": [
     1,
     0,
-    0
+    1
    ],
-   "commit": "efd8343f46f9fb2a1ee391c0292fb35d4f91b107",
-   "sha256": "0fmp011hnarc73b3zicknwfvql5a2q7ijmy63p0qnw735c9xcjvr"
+   "commit": "4461c3a5b8654cb1dacea404f78951172437804f",
+   "sha256": "1slj9js7c4cggdidr7miri9gf9xm7ij4hmd7y99km7bqmg57837l"
   }
  },
  {
@@ -18867,25 +19078,25 @@
   "repo": "minad/corfu",
   "unstable": {
    "version": [
-    20240413,
-    927
+    20240713,
+    1327
    ],
    "deps": [
     "compat"
    ],
-   "commit": "b779552341354d59365a981fd208ae07b7a2950a",
-   "sha256": "0yhdp1bf96m0llfc8v19swnrd4zl2dn5gxyppvjyidjvic3n0djv"
+   "commit": "f74d3e7b5aa658663705035aaac2c321bb8ed5cc",
+   "sha256": "1xm04c98kj5qnnjb2kn4ckhsykbvzsgyzp44xh4kma1q76g1glxj"
   },
   "stable": {
    "version": [
     1,
-    3
+    4
    ],
    "deps": [
     "compat"
    ],
-   "commit": "6088f0550dc8f10f5bcf6f24d35ce24159b01b43",
-   "sha256": "1nrwh00dy2ffzd3np8yk4n0vn0r5iqqhgcr40wbnv5qzgbdw9kas"
+   "commit": "cdc3e13ad312f5f12b3f78f842fff0b398eb4473",
+   "sha256": "04vsy5dv3zlid914igyi6ya9hf08ph0hc4c09pbja0z1if4mjrqh"
   }
  },
  {
@@ -19076,14 +19287,14 @@
   "repo": "ideasman42/emacs-counsel-at-point",
   "unstable": {
    "version": [
-    20240422,
-    116
+    20240616,
+    2345
    ],
    "deps": [
     "counsel"
    ],
-   "commit": "5aa7a483c5188d71c04c3302cfd900e7be91ffd6",
-   "sha256": "147v6nz5vhai38wxmfzsziwn50110viq575j33k0cm2iimv4gkpb"
+   "commit": "7da3813fe01e5a7a651632b1af031891c009b559",
+   "sha256": "15mq1lkjf72fb7g2di8gwvqk6iads2znhzbpx2khchia1vl30qba"
   }
  },
  {
@@ -19919,14 +20130,14 @@
   "repo": "emacsfodder/emacs-theme-creamsody",
   "unstable": {
    "version": [
-    20240109,
-    557
+    20240619,
+    731
    ],
    "deps": [
     "autothemer"
    ],
-   "commit": "5f4fce9de6920cd2788bf6baf3a3da110f09bffd",
-   "sha256": "0qk76dk3g5whnx49qwahh32di7x9adw6d7gj4rr03d10zlvwsssb"
+   "commit": "10acf5c5d3e1108fc1e7a4ab487aa2ac79720f42",
+   "sha256": "0s07lvzrr12faxf5wpyg9s44g2v8w6vm4f59mam4xl6v8nq6pfdh"
   },
   "stable": {
    "version": [
@@ -21076,11 +21287,11 @@
   "repo": "Emacs-D-Mode-Maintainers/Emacs-D-Mode",
   "unstable": {
    "version": [
-    20240218,
-    1753
+    20240529,
+    611
    ],
-   "commit": "dc583981dd2d4097ce1c9a80a958a7a1bf225ad4",
-   "sha256": "1vrv2iwglrv6xnpcrdgy9wwsixz2bcimn3ylh10gyv3rajym69fk"
+   "commit": "cbdabb9ca566cc12403f37f46d4102fe778e2721",
+   "sha256": "1rzmmc40cyg5z5jd8bns7fxb0pkiiiki4cg03wjq415mx7lli5n8"
   },
   "stable": {
    "version": [
@@ -21100,11 +21311,11 @@
   "repo": "andorsk/d2-mode",
   "unstable": {
    "version": [
-    20230210,
-    1130
+    20240707,
+    1850
    ],
-   "commit": "cbe7b16141bd80fe4344f0403e61fd7ee4e0fd89",
-   "sha256": "1mdiafxbfz31blp7c86m6sp0dmn4yhnbs2mhzh75mczsg0gzqc4v"
+   "commit": "69374e0249df20139f3f2d475de9eae2b201d019",
+   "sha256": "0hr2q2d3qfrbd7vpxbcamawvdzvak30rdsbrkxcqz9d36grhsj97"
   },
   "stable": {
    "version": [
@@ -21334,8 +21545,8 @@
   "repo": "emacs-lsp/dap-mode",
   "unstable": {
    "version": [
-    20240514,
-    1617
+    20240611,
+    1356
    ],
    "deps": [
     "bui",
@@ -21348,8 +21559,8 @@
     "posframe",
     "s"
    ],
-   "commit": "11431a26bc4c8ca92b097dbdbcbdc9e3d7fb5583",
-   "sha256": "1m77dwy1p7jy41v7gjqk9w7jy6sh3blg2qrlw22f3y1d6n0h3lvs"
+   "commit": "b407773ebca56e3bd8e6a4643854e91cbde0c35e",
+   "sha256": "1a1iwx299xcm5ldd2sh7sjhmpb6wndyrwx7q0q6nih6j8ly0nppr"
   },
   "stable": {
    "version": [
@@ -21709,11 +21920,11 @@
   "repo": "emacs-dashboard/emacs-dashboard",
   "unstable": {
    "version": [
-    20240407,
-    12
+    20240529,
+    2058
    ],
-   "commit": "89b42bff4d60fb00ef3d679e2d2289541e5009f6",
-   "sha256": "1cl9p8a9dxjbl8kn7fqkx1abr90frk4g7n09lqriyf8hn5bizy5c"
+   "commit": "3852301f9c6f3104d9cc98389612b5ef3452a7de",
+   "sha256": "198xf1ydmgz795a7ffk9s5q4jszy6nrg1d54g1bacipwnq0c654v"
   },
   "stable": {
    "version": [
@@ -22104,29 +22315,29 @@
   "repo": "Wilfred/deadgrep",
   "unstable": {
    "version": [
-    20240408,
-    1537
+    20240627,
+    1535
    ],
    "deps": [
     "dash",
     "s",
     "spinner"
    ],
-   "commit": "eafc642c551e6d5df7eb1fee9aa7596e59811178",
-   "sha256": "029szbwssvdxrsrzv0ppgik30hl9apr0dp5hcp666zgpm415frc4"
+   "commit": "609a9c3bf52f44998dd0ec7275374d059a3fdc15",
+   "sha256": "0j8ggh70xvf72bf0d86kxqn19vpdylj7rchyf8asd0b9gq6l2ah6"
   },
   "stable": {
    "version": [
     0,
-    12
+    13
    ],
    "deps": [
     "dash",
     "s",
     "spinner"
    ],
-   "commit": "d32fe49079c1e9e0af95387120fa4990d4107778",
-   "sha256": "0bwf8gsqw7hsmacqd34piwgv066ijfclmxaigkvhvpac0lpsmi79"
+   "commit": "ad7ddfbce9d1b665281c2ec6ea48644602925d30",
+   "sha256": "1ry9qvvxwhh3gkb0kkwiwpx37jpdzgky1h2zkwpzjpkv5jm022dr"
   }
  },
  {
@@ -22137,11 +22348,11 @@
   "url": "https://salsa.debian.org/emacsen-team/debian-el.git",
   "unstable": {
    "version": [
-    20240519,
-    1104
+    20240704,
+    2138
    ],
-   "commit": "a76a38cf0af5625b38e1d298bbfa3ae5a2a1ebc9",
-   "sha256": "0k3r9a9qsi380m4j53j4irfv591irg9w2i0pqk1c8fv3rwxrdiq5"
+   "commit": "8e41a9b4957b9d56ec6c55ee5d4ce84038d01dd6",
+   "sha256": "1k8w5h0n8imf7w2mnic68rkhb3mhp38nngwzssvmvfilnfb4bmiv"
   },
   "stable": {
    "version": [
@@ -22367,10 +22578,10 @@
  },
  {
   "ename": "defcapture",
-  "commit": "96bb0339b35e5a7128889637bbd811eb5df1aa7d",
-  "sha256": "0gmvrpq8fyq6g85fl5078v9yyg5pjydnfl14aapgcsdd2iml97f6",
+  "commit": "1d636bef32d060df0e0da9dff699436bf949ed3b",
+  "sha256": "1hkbmhirlb1pbpavr61nxzw58a9pjvh0f93abbdf3sqs1lhybbbk",
   "fetcher": "github",
-  "repo": "aggu4/defcapture",
+  "repo": "sawyerkirbi/defcapture",
   "unstable": {
    "version": [
     20230909,
@@ -22529,11 +22740,11 @@
   "repo": "jrblevin/deft",
   "unstable": {
    "version": [
-    20240407,
-    149
+    20240524,
+    1524
    ],
-   "commit": "7f352747a2c4dfe40ba060ab42f47ae8a9ddab41",
-   "sha256": "048kzgqxild8ywclp659wyvpjiqi16kpbc91zh1r459gzmawcll3"
+   "commit": "b369d7225d86551882568788a23c5497b232509c",
+   "sha256": "0zqkapm01czz6syvh125f2fird2mbxmrcgbksz4qycdc89hlrl1k"
   },
   "stable": {
    "version": [
@@ -22675,6 +22886,27 @@
    "sha256": "0dazxjk3p53y8xpzd62557i9qz0r0hy1xcv7h2vc1mg2jdxlf2xm"
   }
  },
+ {
+  "ename": "denote-citar-sections",
+  "commit": "9ba5d6796e1c2564f2fb49b6a020ab4f7aa90968",
+  "sha256": "00dskskj3gyqcm75akhply0c77z97g3yzx2fr6kvd0mmyc39qi7b",
+  "fetcher": "sourcehut",
+  "repo": "swflint/denote-sections",
+  "unstable": {
+   "version": [
+    20240608,
+    1629
+   ],
+   "deps": [
+    "citar",
+    "citar-denote",
+    "denote",
+    "universal-sidecar"
+   ],
+   "commit": "00c7084652fa32f9f4ab504facaaed623f299684",
+   "sha256": "0cd9207b9gwbxgv1vvlfk9yv9fy51697fwpr6j0s9v2px3jv9ahj"
+  }
+ },
  {
   "ename": "denote-explore",
   "commit": "f304db78b4bfeb4e1061b4ef221bf46e1bafe9d0",
@@ -22683,15 +22915,34 @@
   "repo": "pprevos/denote-explore",
   "unstable": {
    "version": [
-    20240512,
-    113
+    20240616,
+    359
    ],
    "deps": [
     "dash",
     "denote"
    ],
-   "commit": "7073ef97758fbcf953557efa15da9226283ff6b0",
-   "sha256": "151ba0mhq61y2iwic5645rh4agklp1rg3618xcc7r76b4078fybs"
+   "commit": "242c4d79ee13e9aca4566b552d29c74026b1ff6d",
+   "sha256": "1lgk351d33h0inp9i0vmaz12i57f1l73yswlipd59mpjvdzg04fa"
+  }
+ },
+ {
+  "ename": "denote-sections",
+  "commit": "95afd698f7adbd47adb3ce1a8918cd75b87c1a5a",
+  "sha256": "1151f40j23yn1rllnnk10nr1vs3plm9087cx8320c7h7ccpmms0z",
+  "fetcher": "sourcehut",
+  "repo": "swflint/denote-sections",
+  "unstable": {
+   "version": [
+    20240608,
+    1629
+   ],
+   "deps": [
+    "denote",
+    "universal-sidecar"
+   ],
+   "commit": "00c7084652fa32f9f4ab504facaaed623f299684",
+   "sha256": "0cd9207b9gwbxgv1vvlfk9yv9fy51697fwpr6j0s9v2px3jv9ahj"
   }
  },
  {
@@ -23152,11 +23403,11 @@
   "repo": "ideasman42/emacs-diff-ansi",
   "unstable": {
    "version": [
-    20240421,
-    810
+    20240616,
+    2345
    ],
-   "commit": "9e5b61a82e04ffd0e81f88fcf159575618886d72",
-   "sha256": "1jwgw5ypl9iw6hy1yk4y34l8n5mxaw3zhk4bly7wxpyq4di0n9ik"
+   "commit": "0338970469375eadd3c0e492997aec2fcb06bb27",
+   "sha256": "1mjazx6zcskijijdrgm0iqdi2kii01q2j1b6ifwdzg8c9pr7swmq"
   }
  },
  {
@@ -23182,14 +23433,14 @@
   "repo": "dgutov/diff-hl",
   "unstable": {
    "version": [
-    20240505,
-    2110
+    20240702,
+    2020
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "11f3113e790526d5ee00f61f8e7cd0d01e323b2e",
-   "sha256": "1a6hqb0258kdskixcwacq41d7x71rlpwwapmbpd9ds8w6dj5vi40"
+   "commit": "a942b2383db0dc16df389611b84031c29d5c17ed",
+   "sha256": "1i4wgf0mb7c0w2i1zkapds6gbs2njr7ddpfh9g2a7yfjlpb9hyln"
   },
   "stable": {
    "version": [
@@ -23212,11 +23463,11 @@
   "repo": "ber-ro/diffed",
   "unstable": {
    "version": [
-    20230208,
-    1546
+    20240618,
+    2037
    ],
-   "commit": "f7dc37f13a4f1660212c41a6e9faba61eb8cc078",
-   "sha256": "0g1xjwby2sljmkf4nl0das45464162hwlsrjhbwzf4bp4i1c8gi9"
+   "commit": "93251169a4fc8c07fdd5f3d32c89b4d3401d37a1",
+   "sha256": "1am6a4b7yvdr4v54zmanirqbqvsk3bzf4ghf1rpdab5jk3rdzzg9"
   }
  },
  {
@@ -23305,15 +23556,15 @@
   "repo": "pkryger/difftastic.el",
   "unstable": {
    "version": [
-    20240429,
-    2057
+    20240528,
+    1657
    ],
    "deps": [
     "compat",
     "magit"
    ],
-   "commit": "90b9b223bfc39786f6fcf266cdc1cb982bdc37aa",
-   "sha256": "1z7q6rr3cnp6fpx0439hbk22g1kl84xa6k3pbxm4mph2cqw536jm"
+   "commit": "79753bfec7c32f44dc0d5ed57a8bc6b370392a87",
+   "sha256": "02rl4zrh871cck7gr0b7jgw2xzlx50lgldbdcx2vdmd3ljkq383h"
   }
  },
  {
@@ -23347,20 +23598,20 @@
   "repo": "retroj/digistar-mode",
   "unstable": {
    "version": [
-    20240515,
-    1529
+    20240613,
+    225
    ],
-   "commit": "546adaccb1f90d6947c2c80c2fab4933f40bc274",
-   "sha256": "16a4x0zxrhs2c4k7v3qhinbxayx213mb8b84jrs21sq7whfad63d"
+   "commit": "1a02a4773d1380d8cab44f5e342a1e9bcc7276e8",
+   "sha256": "0x0927zfhxx25xplyifnq4qg76ahifk9m51dqqqyahnf9rpljrhl"
   },
   "stable": {
    "version": [
     0,
     9,
-    13
+    14
    ],
-   "commit": "a0f0756b132202fadf487d689d3c4312f480d2a7",
-   "sha256": "0i055f0kvm4ymq9a7ad4zg2kzw4gf60db0kcg5q8gmlsri7ppsl2"
+   "commit": "4e5d0b463468fcc4a54df1310360ba13b2bdff6a",
+   "sha256": "10ng3dxckgzanxl4p4yn6syabhkzpiq49c9czdbfqhmabr5ayb3m"
   }
  },
  {
@@ -23480,26 +23731,26 @@
   "repo": "tarsius/dim-autoload",
   "unstable": {
    "version": [
-    20240415,
-    1534
+    20240712,
+    2215
    ],
    "deps": [
     "compat"
    ],
-   "commit": "54bd356cdac7bdae2bdff994b048f847374cec6c",
-   "sha256": "0hjs9nxw6hy7kvaw389n1k1rwqq22pvc3q5cbndnybpkbfpmrhjq"
+   "commit": "9d08ecf4f8b00e53093864a59b51f58e4fb6ae4b",
+   "sha256": "18mp2ls5fs1kjg6wd11gkyqn9x83hkzqzq1djjssbh65z5ln6qd9"
   },
   "stable": {
    "version": [
     2,
     0,
-    5
+    6
    ],
    "deps": [
     "compat"
    ],
-   "commit": "9e7b4d47f2dc972ec16baa6bd56b016000790ff4",
-   "sha256": "1f7syxknpqxvrng1sa9a7ypwg7c4r5gsc3c88rm1p5mrak2xpcg9"
+   "commit": "bb57bf5367b48862864f0dea4287fa81d51a0d5e",
+   "sha256": "0li7s5ny3w75k1r11bsh5psc9d0a3r9ap909brcldrpnp567wvq6"
   }
  },
  {
@@ -23563,11 +23814,11 @@
   "repo": "jcs-elpa/diminish-buffer",
   "unstable": {
    "version": [
-    20240327,
-    210
+    20240612,
+    52
    ],
-   "commit": "c577a8ed289d1a2cf56845fb6b8c7b9c638d4bc8",
-   "sha256": "11858nlkvpwyzkn7za8c45amv185pklg3x9z0s4a25zkxjrswi7m"
+   "commit": "ba65fec96983ae471edbeee2b38c2107bee94f31",
+   "sha256": "0blnbr4prdm1bg9qvyh8h2bkzzqnzbijrqzsz1327b1agqjh6j7c"
   },
   "stable": {
    "version": [
@@ -23759,15 +24010,15 @@
   "repo": "Fuco1/dired-hacks",
   "unstable": {
    "version": [
-    20230512,
-    1107
+    20240629,
+    1857
    ],
    "deps": [
     "dash",
     "dired-hacks-utils"
    ],
-   "commit": "523f51b4152a3bf4e60fe57f512732c698b5c96f",
-   "sha256": "09z238y41rgy0jrn2hq5k6kj1k2skkgpf4kbfzyjzi6kcw8586bf"
+   "commit": "d1a85901c892ba7ec273995070a43cbbbe5d0b37",
+   "sha256": "0gk01vhk69l61k9wjzdin7dqzq19flzz405x14j1h0cjcxs0w5pr"
   }
  },
  {
@@ -23778,16 +24029,16 @@
   "repo": "Fuco1/dired-hacks",
   "unstable": {
    "version": [
-    20240328,
-    1154
+    20240629,
+    1857
    ],
    "deps": [
-    "dash",
     "dired-hacks-utils",
-    "f"
+    "f",
+    "s"
    ],
-   "commit": "e596b0bac3de8e7730dfb43ca10b0331b6f94469",
-   "sha256": "0sny6wqvckwp7h9dwsdvn55irnw94axqfa7jcbbwyxqs9ird8pg2"
+   "commit": "d1a85901c892ba7ec273995070a43cbbbe5d0b37",
+   "sha256": "0gk01vhk69l61k9wjzdin7dqzq19flzz405x14j1h0cjcxs0w5pr"
   }
  },
  {
@@ -23920,8 +24171,8 @@
   "repo": "Fuco1/dired-hacks",
   "unstable": {
    "version": [
-    20221127,
-    1247
+    20240629,
+    1857
    ],
    "deps": [
     "cl-lib",
@@ -23929,8 +24180,8 @@
     "dired-hacks-utils",
     "f"
    ],
-   "commit": "41d3eb42195d9f0894c20d18cc8e722b099aa1c1",
-   "sha256": "0r08nxx5gw0sz9xhby77nw6rxd19wzvi9zkjkqwgixpxhbz6akvv"
+   "commit": "d1a85901c892ba7ec273995070a43cbbbe5d0b37",
+   "sha256": "0gk01vhk69l61k9wjzdin7dqzq19flzz405x14j1h0cjcxs0w5pr"
   }
  },
  {
@@ -23986,14 +24237,14 @@
   "repo": "Fuco1/dired-hacks",
   "unstable": {
    "version": [
-    20230512,
-    1107
+    20240629,
+    1906
    ],
    "deps": [
     "dash"
    ],
-   "commit": "523f51b4152a3bf4e60fe57f512732c698b5c96f",
-   "sha256": "09z238y41rgy0jrn2hq5k6kj1k2skkgpf4kbfzyjzi6kcw8586bf"
+   "commit": "63b04d17936c98cb4ad7ce6bc3331cda8e30c55a",
+   "sha256": "187qgpfnfyw6qbif0hqw987inz6kbxmb2nx6431f9rjzzyz9q75r"
   }
  },
  {
@@ -24178,15 +24429,15 @@
   "repo": "Fuco1/dired-hacks",
   "unstable": {
    "version": [
-    20230512,
-    1107
+    20240629,
+    1953
    ],
    "deps": [
     "dash",
     "dired-hacks-utils"
    ],
-   "commit": "523f51b4152a3bf4e60fe57f512732c698b5c96f",
-   "sha256": "09z238y41rgy0jrn2hq5k6kj1k2skkgpf4kbfzyjzi6kcw8586bf"
+   "commit": "e9e408e8571aee5574ca0a431ef15cac5a3585d4",
+   "sha256": "0lq73f49qd4ld55f3842vdhy8j6yxz2j37qhzy608pcnbraq0408"
   }
  },
  {
@@ -24197,15 +24448,38 @@
   "repo": "Fuco1/dired-hacks",
   "unstable": {
    "version": [
-    20240330,
-    1831
+    20240629,
+    1857
    ],
    "deps": [
     "dash",
     "dired-hacks-utils"
    ],
-   "commit": "a01c126c3b1068655509487c76971895f5459d09",
-   "sha256": "128wy7i7qrs7yzw82hzsr7lxiifdgbvmxb1w18kspd82ijlj4j5q"
+   "commit": "d1a85901c892ba7ec273995070a43cbbbe5d0b37",
+   "sha256": "0gk01vhk69l61k9wjzdin7dqzq19flzz405x14j1h0cjcxs0w5pr"
+  }
+ },
+ {
+  "ename": "dired-open-with",
+  "commit": "e4a6a8f4ccf395c3dc2e9b5638d90550a8497891",
+  "sha256": "060x16662pscafvl8lnfrhj03v4lpyiz2z8dlnghmr2zcj7d5ymw",
+  "fetcher": "github",
+  "repo": "FrostyX/dired-open-with",
+  "unstable": {
+   "version": [
+    20240614,
+    2213
+   ],
+   "commit": "f82f986263c7ded9ae87853544548d5bf7fbae81",
+   "sha256": "0vxi61hyifcz19bzlb5lx9xfw193awk64k08h6vr9bg98dic83wc"
+  },
+  "stable": {
+   "version": [
+    1,
+    1
+   ],
+   "commit": "f82f986263c7ded9ae87853544548d5bf7fbae81",
+   "sha256": "0vxi61hyifcz19bzlb5lx9xfw193awk64k08h6vr9bg98dic83wc"
   }
  },
  {
@@ -24275,15 +24549,15 @@
   "repo": "Fuco1/dired-hacks",
   "unstable": {
    "version": [
-    20221127,
-    1247
+    20240629,
+    1857
    ],
    "deps": [
     "dash",
     "dired-hacks-utils"
    ],
-   "commit": "41d3eb42195d9f0894c20d18cc8e722b099aa1c1",
-   "sha256": "0r08nxx5gw0sz9xhby77nw6rxd19wzvi9zkjkqwgixpxhbz6akvv"
+   "commit": "d1a85901c892ba7ec273995070a43cbbbe5d0b37",
+   "sha256": "0gk01vhk69l61k9wjzdin7dqzq19flzz405x14j1h0cjcxs0w5pr"
   }
  },
  {
@@ -24294,14 +24568,15 @@
   "repo": "Fuco1/dired-hacks",
   "unstable": {
    "version": [
-    20230512,
-    1107
+    20240629,
+    1857
    ],
    "deps": [
-    "dash"
+    "dash",
+    "dired-hacks-utils"
    ],
-   "commit": "523f51b4152a3bf4e60fe57f512732c698b5c96f",
-   "sha256": "09z238y41rgy0jrn2hq5k6kj1k2skkgpf4kbfzyjzi6kcw8586bf"
+   "commit": "d1a85901c892ba7ec273995070a43cbbbe5d0b37",
+   "sha256": "0gk01vhk69l61k9wjzdin7dqzq19flzz405x14j1h0cjcxs0w5pr"
   }
  },
  {
@@ -24427,14 +24702,14 @@
   "repo": "jojojames/dired-sidebar",
   "unstable": {
    "version": [
-    20240320,
-    1952
+    20240522,
+    2316
    ],
    "deps": [
     "dired-subtree"
    ],
-   "commit": "573658021fd6e6cf032d789de29aca4e5dd258fd",
-   "sha256": "0icy2mzkbcrf7dq0zlakq56h89jw0rdlgfn0z6zz0hlyq2d2zhz6"
+   "commit": "702165ad53a473992d84e0207b984b9be5114bde",
+   "sha256": "0f9cikyb53ybsawkm9g1sja2wsz2lmnc9zq63sx2h8d86acza2cp"
   },
   "stable": {
    "version": [
@@ -24481,15 +24756,15 @@
   "repo": "Fuco1/dired-hacks",
   "unstable": {
    "version": [
-    20230512,
-    1107
+    20240629,
+    1859
    ],
    "deps": [
     "dash",
     "dired-hacks-utils"
    ],
-   "commit": "523f51b4152a3bf4e60fe57f512732c698b5c96f",
-   "sha256": "09z238y41rgy0jrn2hq5k6kj1k2skkgpf4kbfzyjzi6kcw8586bf"
+   "commit": "b769c7de9c8c5dc70e4dcdbb3267c70fae3cb9b7",
+   "sha256": "05akgf4aqf687cvf5nw35v46c95f7nycdmxb4y6qmj2r39y5rmvz"
   }
  },
  {
@@ -24805,11 +25080,11 @@
   "repo": "purcell/disable-mouse",
   "unstable": {
    "version": [
-    20210512,
-    2114
+    20240604,
+    900
    ],
-   "commit": "cae3be9dd012727b40ad3b511731191f79cebe42",
-   "sha256": "0zx3ihhxhjvhsi08khyx8fdhw2kg065zhhicqc587jsabk0wzj6f"
+   "commit": "93a55a6453f34049375f97d3cf817b4e6db46f25",
+   "sha256": "0acqinbhb4vjyq4fhw2abslgkn6qwnvqbgzk6wbglff2m256vrdi"
   },
   "stable": {
    "version": [
@@ -25466,11 +25741,11 @@
   "repo": "ideasman42/emacs-doc-show-inline",
   "unstable": {
    "version": [
-    20240421,
-    943
+    20240616,
+    2345
    ],
-   "commit": "d2bfa37f2f027c5da0abca319882daa3740ca57b",
-   "sha256": "0j70sg2gnf2qi367pskwbm24qvy8bl2qims04rjaw7knd9yiyh43"
+   "commit": "cc363ed39f023642c4d8e7c91b26c802ca356fa3",
+   "sha256": "02kh8wk202qppac7l7ap8hknb1hbg06gi66w5cpxhp32lijh1m90"
   }
  },
  {
@@ -25919,16 +26194,16 @@
   "repo": "seagle0128/doom-modeline",
   "unstable": {
    "version": [
-    20240510,
-    144
+    20240625,
+    230
    ],
    "deps": [
     "compat",
     "nerd-icons",
     "shrink-path"
    ],
-   "commit": "65d0bd83eb7c393092e032c24b882f3ba19b4899",
-   "sha256": "1w657ss91f00kb3gghi9rs0a8cw2bszvik4yjzn6cj7m8ji3k3qi"
+   "commit": "1505c13564b83e44d3187611e326a48b742cad3a",
+   "sha256": "1scq3ahqg6s7ccvd0gs0m2ifa8k9rzflaslz3lmp0i7kmv1prs49"
   },
   "stable": {
    "version": [
@@ -25953,15 +26228,15 @@
   "repo": "elken/doom-modeline-now-playing",
   "unstable": {
    "version": [
-    20210831,
-    1442
+    20240522,
+    1704
    ],
    "deps": [
     "async",
     "doom-modeline"
    ],
-   "commit": "ef9158dfdf32e8eb789b69e7394d0bddaa68f42c",
-   "sha256": "1namv6qfmf5xxwbhsl5887cp41y8krr7g9vf3dzvi5n924ixlm2l"
+   "commit": "1532f324f98a234aa14e12ebdfd17cebba978d6a",
+   "sha256": "0mk759hznnpwvwzqykncgij60773z87x976ql5ccarz4j79j44sv"
   }
  },
  {
@@ -25972,14 +26247,14 @@
   "repo": "doomemacs/themes",
   "unstable": {
    "version": [
-    20240404,
-    2042
+    20240712,
+    1822
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "3b2422b208d28e8734b300cd3cc6a7f4af5eba55",
-   "sha256": "1ksv964vlzszbd2372kl80l60mmmiqxgyxypysrylrw831kkxfi9"
+   "commit": "2c794a09b023bda09d2f36a7be80684f4e416d88",
+   "sha256": "16mhcbnk8cv0lacl9wycbj1d1i2brrb3vf6lb4hxyici5qlfyykh"
   },
   "stable": {
    "version": [
@@ -26199,11 +26474,14 @@
   "url": "https://salsa.debian.org/emacsen-team/dpkg-dev-el.git",
   "unstable": {
    "version": [
-    20240421,
-    628
+    20240626,
+    1953
    ],
-   "commit": "acfc3bd42271286d22d7cbadd48a5b9d5675f85c",
-   "sha256": "1mhh6kmlkbzaliyx8fwdnbmkhaaing4jkjc9ai76l5nyisjimqrc"
+   "deps": [
+    "debian-el"
+   ],
+   "commit": "dbebf6fc2c50facff195ae9fb14bf691ad0f4544",
+   "sha256": "0pj2sjj0dnv12m982icaqf93bnklaab4wg96bbyzhiji981yjs2x"
   },
   "stable": {
    "version": [
@@ -26249,11 +26527,11 @@
   "repo": "dracula/emacs",
   "unstable": {
    "version": [
-    20231013,
-    821
+    20240614,
+    1303
    ],
-   "commit": "29d5180f7e34c0c858a520068fb650f705b8cfc2",
-   "sha256": "0hjimiv6a0kaszypndb5l0axhiv0zih728p8wffil6jff9k8pr38"
+   "commit": "1dd3702bcca1191b082783062bde42668515c700",
+   "sha256": "0sxanisx51vcplnhgz7yn3xslslky4xp4ydjkrgwq045ppmq3rr7"
   },
   "stable": {
    "version": [
@@ -26453,6 +26731,30 @@
    "sha256": "156cscpavrp695lp8pgjg5jnq3b8n9c2h8qg8w89dd4vfkc3iikd"
   }
  },
+ {
+  "ename": "dslide",
+  "commit": "9e8c6aadf7a38beb2e18306067c5870195dc6b7c",
+  "sha256": "1hzz7bbn7d2qixa76jyw88z3bd42dm1p54lnjnzcnw3v7pikpwvq",
+  "fetcher": "github",
+  "repo": "positron-solutions/dslide",
+  "unstable": {
+   "version": [
+    20240703,
+    1523
+   ],
+   "commit": "2d8a9ac3e37157ce8b78880ebc1defc61303a44d",
+   "sha256": "177cfim8hd6292lhvvsapk695i0q378v4wk221l57nv197rnmy4n"
+  },
+  "stable": {
+   "version": [
+    0,
+    5,
+    3
+   ],
+   "commit": "2d8a9ac3e37157ce8b78880ebc1defc61303a44d",
+   "sha256": "177cfim8hd6292lhvvsapk695i0q378v4wk221l57nv197rnmy4n"
+  }
+ },
  {
   "ename": "dsvn",
   "commit": "be27e728327016b819535ef8cae10020e5a07c2e",
@@ -26542,19 +26844,19 @@
   "repo": "jscheid/dtrt-indent",
   "unstable": {
    "version": [
-    20240211,
-    1111
+    20240623,
+    2118
    ],
-   "commit": "5d1b44f9a1a484ca229cc14f8062609a10ef4891",
-   "sha256": "1k8d4a7hq21ahiad0mlpyi637r0b2mzjpxhz09c69h1nk38nkzjn"
+   "commit": "339755e4fb5245862737babf7f2c1e3bae1c129c",
+   "sha256": "1sw0wabk68ixqip7kmkdvhw9rxz266cj8rs4hz3zlbcf7q6pjq6r"
   },
   "stable": {
    "version": [
     1,
-    17
+    18
    ],
-   "commit": "e45fa760eecf74edfa9e8419f9f9773d8a7abadd",
-   "sha256": "0mjdqzl5mbasix8awav2qp9367waycmbcjy07s53nhv2xpqam9la"
+   "commit": "339755e4fb5245862737babf7f2c1e3bae1c129c",
+   "sha256": "1sw0wabk68ixqip7kmkdvhw9rxz266cj8rs4hz3zlbcf7q6pjq6r"
   }
  },
  {
@@ -26624,16 +26926,16 @@
   "repo": "jacktasia/dumb-jump",
   "unstable": {
    "version": [
-    20240514,
-    702
+    20240625,
+    224
    ],
    "deps": [
     "dash",
     "popup",
     "s"
    ],
-   "commit": "3c2ab8dfff3a10d3c5f2efd69cfbc81fb5dbbd39",
-   "sha256": "0q37akv7xnwq14a7zn7cjr3njkkkl7vfrkkr0di8bw9p6dyvwqw4"
+   "commit": "cd65a743370ac7b1a12e9ef0a7371b285a2597fb",
+   "sha256": "1ly7xsfliyw38hqh862p6m37mxl460k4zq1fy3xs0jz9q3ak84iq"
   },
   "stable": {
    "version": [
@@ -26682,11 +26984,11 @@
   "stable": {
    "version": [
     3,
-    15,
-    2
+    16,
+    0
    ],
-   "commit": "c28817c416ac0b381f6a6938236419ab5d86d6e1",
-   "sha256": "0rgrfpw588mgw78p87xlrlidc9xhkppf6b7dqa3vqlhjxs5q6kqg"
+   "commit": "e4380ffddbdf924b3ec4c56048cd8331e1bf39ed",
+   "sha256": "0sxz15g1lhgm880glix2y0dinsidpv83ss7cvb2ff12rbjhk4a4w"
   }
  },
  {
@@ -26804,11 +27106,11 @@
   "repo": "sadiq/dwim-coder-mode",
   "unstable": {
    "version": [
-    20230830,
-    1215
+    20240712,
+    1047
    ],
-   "commit": "94a752fca078144dd309343880abafbc4eacca5f",
-   "sha256": "010z2bcscizd75shmbgrjfvlkzsfjcvqcif7pm5a5iynmjx5n4n7"
+   "commit": "02f5fa0c3ae5cc17ca860c792d988705f41b0eee",
+   "sha256": "0p1yz2lnzifqsjqcbk2jk9darj72icnydaxwhs2h0hmvl786g4gi"
   }
  },
  {
@@ -26819,11 +27121,11 @@
   "repo": "xenodium/dwim-shell-command",
   "unstable": {
    "version": [
-    20240520,
-    1732
+    20240712,
+    859
    ],
-   "commit": "c20a474ba8fc0ad73a1b30aeb99502cbfc709c0b",
-   "sha256": "0lj8rkvpns4fpdmwriax0i5yijqraji1vjbdc6scyvpmdmsqd3p1"
+   "commit": "715f0ae8cfe455f1dc611074bb8bb90e03533dab",
+   "sha256": "0gjz3sliwdxgsvd2c1chmqfzwzk1bbflb7qn8gc3ims1fwjhz0jc"
   }
  },
  {
@@ -26964,11 +27266,11 @@
   "repo": "countvajhula/dynaring",
   "unstable": {
    "version": [
-    20230619,
-    1854
+    20240615,
+    129
    ],
-   "commit": "909a64aa96f09b05fe59d5703f7e0ad22d161bb5",
-   "sha256": "18vf0646wqnahnc7rj0wzq9shd1g69hr5j35psgcdzkrczma16m7"
+   "commit": "90daf413abee1723c37697e72bb700a06727ff4b",
+   "sha256": "12634kmx7fdb3lndyjgf7hisdzcqg3hn90xqr56gjdj0m5yzq310"
   },
   "stable": {
    "version": [
@@ -27287,20 +27589,20 @@
   "repo": "emacs-eask/eask",
   "unstable": {
    "version": [
-    20240420,
-    44
+    20240614,
+    541
    ],
-   "commit": "ecee5a60b9e13796400e9dec84ce55f89767b6fa",
-   "sha256": "09g53ijbxlk48i1s7fj7iyhh4j230xpv673lia19k3364pzy361g"
+   "commit": "8015c62602188c008988fc6825ff97b04c614c8f",
+   "sha256": "1qz7jql5g2n643hws5ybaj78zdrqm6pnnbi0bvgzchfbc5nc1h2b"
   },
   "stable": {
    "version": [
     0,
-    9,
-    5
+    10,
+    0
    ],
-   "commit": "a0361201d5d0c4552b3075cec8ffaf11a867054d",
-   "sha256": "1irwqampchd2n70pnlhamnjnlaaj4qiqhwnmvhjgk5bi51bp8kb9"
+   "commit": "94a45a3422a04819a5090d8acaec4fc563c6dfa9",
+   "sha256": "0wm2bhadsgs429f67bgvxxfdxkhf4z3v3mypdxbyrhlkzwqdmiag"
   }
  },
  {
@@ -27338,8 +27640,8 @@
   "repo": "emacs-eask/easky",
   "unstable": {
    "version": [
-    20240420,
-    113
+    20240608,
+    744
    ],
    "deps": [
     "ansi",
@@ -27348,8 +27650,8 @@
     "lv",
     "marquee-header"
    ],
-   "commit": "bde4a0af084f356b993b5fd5b727c05c54e1d132",
-   "sha256": "17cg70n50h1jpi2j705wpy4g3xgca8hqhraqinbk1lac9z2s3sil"
+   "commit": "d75ec4865742a4939bd685360f8ec5b076bdcf77",
+   "sha256": "10zqx7kfjw6rzq0mqpj4s3sdb13rabw98bkgm9nddi387ffmamql"
   },
   "stable": {
    "version": [
@@ -27618,28 +27920,28 @@
   "repo": "joostkremers/ebib",
   "unstable": {
    "version": [
-    20240430,
-    1436
+    20240618,
+    1008
    ],
    "deps": [
     "compat",
     "parsebib"
    ],
-   "commit": "2f2d39d1953fa10d7c3dad6a4611d8ec0d489aba",
-   "sha256": "0x40cwcibl3dsyxmqn3yhsbw5pyisx5yypjy6qm7hzi6r2wxgvzr"
+   "commit": "dcebdbfdd3129a8e0b40fe69c27a6933bc0b7a4f",
+   "sha256": "1ib9jicj3hfwqz909fw4mzspbdg61g1kbi142r6qg99kaim5py2k"
   },
   "stable": {
    "version": [
     2,
-    41,
-    1
+    42,
+    2
    ],
    "deps": [
     "compat",
     "parsebib"
    ],
-   "commit": "3458aa7777e0acf883b17008da78788c62d9a337",
-   "sha256": "1ylq4l044rals7xbf8rcx97gz84kypksl2fs5xwin2rc6rvpli8d"
+   "commit": "dcebdbfdd3129a8e0b40fe69c27a6933bc0b7a4f",
+   "sha256": "1ib9jicj3hfwqz909fw4mzspbdg61g1kbi142r6qg99kaim5py2k"
   }
  },
  {
@@ -27731,11 +28033,11 @@
   "repo": "benzanol/echo-bar.el",
   "unstable": {
    "version": [
-    20240521,
-    326
+    20240601,
+    1744
    ],
-   "commit": "0e221754cb40406609ae5c79ac294683850638e1",
-   "sha256": "0cwpphdj78g6w4an58qrf3mbqji0lm6cfzkz099pcppg17ljz4h4"
+   "commit": "80f5a8bbd8ac848d4a69796c9568b4a55958e974",
+   "sha256": "1mpq8ha42lffzzwy0ib8vbb2dp9fgqnh112wfa1a6b3vh21wnxm8"
   }
  },
  {
@@ -28193,14 +28495,14 @@
   "repo": "editorconfig/editorconfig-emacs",
   "unstable": {
    "version": [
-    20240512,
-    1958
+    20240604,
+    602
    ],
    "deps": [
     "nadvice"
    ],
-   "commit": "6ac848e380322bb52d6f70a032e12f70d60daab1",
-   "sha256": "08fl3jg2vklyczqdz3ifaa0j4zkq7siz0m141lzcq5rahi7c65g6"
+   "commit": "0ce1abc65bfb030ccec97b0d4231667ca431e663",
+   "sha256": "1kxj0srq9f6ibhdd25428585h5v73xgdf5wq95qlz2r4vshmpxw0"
   },
   "stable": {
    "version": [
@@ -28451,11 +28753,11 @@
   "repo": "oxidase/eff",
   "unstable": {
    "version": [
-    20240108,
-    658
+    20240708,
+    231
    ],
-   "commit": "b8ce5d82dc2ef4df912b2b0cbe79e20b455ebd84",
-   "sha256": "0y7hz4cmhr6n91wv5q82ly2fjj4k0ihvc7pgr7wmbj63pvzbdys8"
+   "commit": "b8298439360b29333d3dcd8a352e00cde2b6ccd7",
+   "sha256": "0s8k4nfr8m13c1ylsn401yhf17ym15lh950smv01lbymkghcxvkg"
   },
   "stable": {
    "version": [
@@ -28727,22 +29029,22 @@
  },
  {
   "ename": "eglot-signature-eldoc-talkative",
-  "commit": "1639318f0f1730ab5b0e575256d93882d2fd063f",
-  "sha256": "03nz0xnzwf1db0b3whz7s8bykp2m9jnlssa9g4mpslaq1bwvfkry",
+  "commit": "1839deb57d34adc76db0b1a1a877b3cb542a6810",
+  "sha256": "1b1ymfm8nc505dy7c6cgmhac22pz98jb21gwnjynv5gbbqscb78s",
   "fetcher": "codeberg",
-  "repo": "mekeor/emacs-eglot-signature-eldoc-talkative",
+  "repo": "mekeor/eglot-signature-eldoc-talkative",
   "unstable": {
    "version": [
-    20240424,
-    801
+    20240626,
+    815
    ],
    "deps": [
     "eglot",
     "eldoc",
     "jsonrpc"
    ],
-   "commit": "859aa6f2c0acf060a8e7549b79daf46c8d63ea8d",
-   "sha256": "1s44kz9b2b61f5gy922rvzv1kpmx62chvdsnb1g785skdhfdzb6v"
+   "commit": "34cc207265f26f13142f5c62276e0ba18e1d55e4",
+   "sha256": "1p2qsv525jnmdsb7d3wqdhpryb1srgpf83g5l79lkq9mx776m2qn"
   },
   "stable": {
    "version": [
@@ -29479,6 +29781,21 @@
    "sha256": "0laq0qwlp1172yirvcyxsrmgqj8mjs4rfavjy4apiyxvv7131mss"
   }
  },
+ {
+  "ename": "elcute",
+  "commit": "53b72d7a58b48652ecb140cb4ddac93536522c01",
+  "sha256": "0dawqaaghaiz6mqvmcmmws5wlhx3h9x8bnbf9qam4pvzm4c29nz4",
+  "fetcher": "codeberg",
+  "repo": "vilij/slurpbarf-elcute",
+  "unstable": {
+   "version": [
+    20240708,
+    1910
+   ],
+   "commit": "625da6298f7128204de7464d6e2df298741f784f",
+   "sha256": "1g6gajikz1g9hni15r2sa206208q1v23d9yryrr7vrp8my1n72d4"
+  }
+ },
  {
   "ename": "eldev",
   "commit": "6d94da66938ea895c0b32bb54057c3b36bebf36d",
@@ -29487,11 +29804,11 @@
   "repo": "emacs-eldev/eldev",
   "unstable": {
    "version": [
-    20240511,
-    2039
+    20240609,
+    1211
    ],
-   "commit": "5153b5a747aaadb51ac14f3963e3ffbf59273e74",
-   "sha256": "183pa9sxg0qg0kd75vgll7xfaplpkrlj077vdqhh5qcciikhqhla"
+   "commit": "bb1938237ee85e477243cd45421330403df29390",
+   "sha256": "01fmgafs294lns10nj31pj327v943x7r4y81plp43gm8cngzgf0r"
   },
   "stable": {
    "version": [
@@ -29511,20 +29828,20 @@
   "repo": "casouri/eldoc-box",
   "unstable": {
    "version": [
-    20240426,
-    408
+    20240605,
+    1742
    ],
-   "commit": "4392128d4caaa21f7810ba0955514c395e9f3cae",
-   "sha256": "0nf28jh02al8vqyj0awij2hbqa03jkggdysc0v8kjlsrd673scgp"
+   "commit": "9658ba7d4616e97f2feeda3abf4aab3e96c91f28",
+   "sha256": "0gr8k2xbqc43jhzd3j91dzl639hgq5083qx8k9rx30wjdlpd4j09"
   },
   "stable": {
    "version": [
     1,
-    11,
+    12,
     1
    ],
-   "commit": "24c216ea3a2d369b814047271a8edf0c7c404b39",
-   "sha256": "0fzcyjg61icwjw1ml3p9qzd4a10vl7n1hqdpynqr5nlq9ih7rrgq"
+   "commit": "0be491c30e2f97da6bd680174a3223847eae567a",
+   "sha256": "1v163zk8qazz92q2iv9f0sgq2paryx80m94hbl588lhnyk227lsb"
   }
  },
  {
@@ -30046,26 +30363,26 @@
   "repo": "sp1ff/elfeed-score",
   "unstable": {
    "version": [
-    20230728,
-    1433
+    20240711,
+    433
    ],
    "deps": [
     "elfeed"
    ],
-   "commit": "cc1a05a95bff953eb28151056ce3ce14ba3e901d",
-   "sha256": "0s37m8566g396d8480jac07c89f2jjpg6p3hcwwmz89s27agp81q"
+   "commit": "c2be8c12d4c1e7027409d4a1b7876da68f3c167c",
+   "sha256": "0kmg3pciqihs8r5xja3pv48gzkn3vs6y6ij0dlmzmavymfp7hq5z"
   },
   "stable": {
    "version": [
     1,
     2,
-    7
+    8
    ],
    "deps": [
     "elfeed"
    ],
-   "commit": "cc1a05a95bff953eb28151056ce3ce14ba3e901d",
-   "sha256": "0s37m8566g396d8480jac07c89f2jjpg6p3hcwwmz89s27agp81q"
+   "commit": "c2be8c12d4c1e7027409d4a1b7876da68f3c167c",
+   "sha256": "0kmg3pciqihs8r5xja3pv48gzkn3vs6y6ij0dlmzmavymfp7hq5z"
   }
  },
  {
@@ -30108,15 +30425,15 @@
   "repo": "karthink/elfeed-tube",
   "unstable": {
    "version": [
-    20240511,
-    418
+    20240606,
+    241
    ],
    "deps": [
     "aio",
     "elfeed"
    ],
-   "commit": "1f5ad2cc26d6290eb77dd36716e5887cb2cd617c",
-   "sha256": "1c0nxzqhldn59hgalvx24r7wn0s641jv6akv8vra6m8qwarw9ksk"
+   "commit": "0c3fbc21259e1fa794f3179a53b410ba610231f2",
+   "sha256": "0hg2s5yzpd1fsl0fyrfv2cc2m61a67drfg86msfqpqdmkv30pbca"
   },
   "stable": {
    "version": [
@@ -30280,30 +30597,32 @@
   "repo": "s-kostyaev/elisa",
   "unstable": {
    "version": [
-    20240401,
-    1528
+    20240712,
+    1639
    ],
    "deps": [
     "async",
     "ellama",
-    "llm"
+    "llm",
+    "plz"
    ],
-   "commit": "c03baded1e6b1bb6b37f8df83a0d1af4cdbaf860",
-   "sha256": "0xl6yz6536mbnba2g1ghv3c8zqqbag3kr8nqa87p0hpcqa6daz0m"
+   "commit": "3882b9b322cc8ac65d552bf8d134c20856ce3c1a",
+   "sha256": "1p05r0gghn97dpr91cs79s2alfj2x2v602brd60azb7drijhglk5"
   },
   "stable": {
    "version": [
-    0,
     1,
-    4
+    0,
+    0
    ],
    "deps": [
     "async",
     "ellama",
-    "llm"
+    "llm",
+    "plz"
    ],
-   "commit": "c03baded1e6b1bb6b37f8df83a0d1af4cdbaf860",
-   "sha256": "0xl6yz6536mbnba2g1ghv3c8zqqbag3kr8nqa87p0hpcqa6daz0m"
+   "commit": "3882b9b322cc8ac65d552bf8d134c20856ce3c1a",
+   "sha256": "1p05r0gghn97dpr91cs79s2alfj2x2v602brd60azb7drijhglk5"
   }
  },
  {
@@ -30314,11 +30633,11 @@
   "repo": "ideasman42/emacs-elisp-autofmt",
   "unstable": {
    "version": [
-    20240421,
-    854
+    20240616,
+    2345
    ],
-   "commit": "0560fe21d1173b2221fd8c600fab818f7eecbad4",
-   "sha256": "00vsgjqb3qfm2lr2vqf10yr84b07l63pgkqvi0s1a0js7mvv6s65"
+   "commit": "98edd8158b778ff9a0e34b5c6615523c0035f8d6",
+   "sha256": "11p41lpw0vvbwm3mshmhqmgqs39b9lmrba45im0hwfpa9wcmx73z"
   }
  },
  {
@@ -30628,28 +30947,30 @@
   "repo": "s-kostyaev/ellama",
   "unstable": {
    "version": [
-    20240517,
-    1457
+    20240710,
+    2027
    ],
    "deps": [
+    "compat",
     "llm",
     "spinner"
    ],
-   "commit": "fddc1022b5e16e356d6f65ddac51bd2ccf25209c",
-   "sha256": "0pkhm4kz6wrad3vwk9xf8876sz3fc9m7bypffzfa7wg0ivz547jk"
+   "commit": "8ee58b9f850f788f3fddd8e924a01091f3c76328",
+   "sha256": "08wk11fnic41piv0pf4skmnl54np69cyi4kp3mgvkb08zhaxnpby"
   },
   "stable": {
    "version": [
     0,
-    9,
-    4
+    11,
+    9
    ],
    "deps": [
+    "compat",
     "llm",
     "spinner"
    ],
-   "commit": "fddc1022b5e16e356d6f65ddac51bd2ccf25209c",
-   "sha256": "0pkhm4kz6wrad3vwk9xf8876sz3fc9m7bypffzfa7wg0ivz547jk"
+   "commit": "8ee58b9f850f788f3fddd8e924a01091f3c76328",
+   "sha256": "08wk11fnic41piv0pf4skmnl54np69cyi4kp3mgvkb08zhaxnpby"
   }
  },
  {
@@ -31009,11 +31330,11 @@
   "url": "https://thelambdalab.xyz/git/elpher.git",
   "unstable": {
    "version": [
-    20240324,
-    1315
+    20240702,
+    816
    ],
-   "commit": "56bc74e224d9835c41b6e6b68c9705b60e6dbbe2",
-   "sha256": "00z41vw63vm71i5szmvrxspvnzkpzflpip56jnmkjc94qfla2l8s"
+   "commit": "0bd12913940a047724d830725bf8649e4f8df499",
+   "sha256": "0pbx9zgig14qzgaar0ks425hmrmmgl3a50w4ykzy6r7ahbg93g88"
   },
   "stable": {
    "version": [
@@ -31391,28 +31712,28 @@
   "repo": "emacscollective/elx",
   "unstable": {
    "version": [
-    20240506,
-    1556
+    20240712,
+    2216
    ],
    "deps": [
     "compat",
     "llama"
    ],
-   "commit": "9db9f8dcc595717d82943fef66f554a4b40aff0b",
-   "sha256": "1cn4qya2miky1bwiwdkbp6kykcf5syy3hb7vfz5jlld4i9ckc23c"
+   "commit": "1159333ab9a09eaf32b3ab4fe10e4e7cea5a1a64",
+   "sha256": "1976vnpfpk4bz5pw7abh2624dwjwn0bfyf7fyb75djr4yg3g1bjy"
   },
   "stable": {
    "version": [
     2,
     0,
-    0
+    2
    ],
    "deps": [
     "compat",
     "llama"
    ],
-   "commit": "f3dfcb41c6471b8150cc19cea5ff96fe1321f5a1",
-   "sha256": "1m01fmhxgqrk22llwwafyg3a29h5bhrbdv9mpf6yyqdm2f37h3yb"
+   "commit": "bb621713e2a111be5d2e3c45f4d168ccc8dd6fcd",
+   "sha256": "071x09yh7zaqpm3yphs6gn3lj1yxxzqlh5lf2rzykhnl6241pmv5"
   }
  },
  {
@@ -31438,20 +31759,21 @@
   "repo": "knu/emacsc",
   "unstable": {
    "version": [
-    20240104,
-    634
+    20240629,
+    1325
    ],
-   "commit": "9bec453a4170dbcb409b884e3e8d30f388de7b8d",
-   "sha256": "0w24vkxdl7z9yfijc1r02siz48sixdm3mygm5dig0b30kc76agz1"
+   "commit": "49b0bbbcd021424da4000bf47193bd2d928b2228",
+   "sha256": "0fyxhbng9cckdbmp0jc2x88azajr68r14jzak2zqh5pqlvs6hcjz"
   },
   "stable": {
    "version": [
     1,
     5,
-    20230104
+    20240629,
+    1
    ],
-   "commit": "9bec453a4170dbcb409b884e3e8d30f388de7b8d",
-   "sha256": "0w24vkxdl7z9yfijc1r02siz48sixdm3mygm5dig0b30kc76agz1"
+   "commit": "49b0bbbcd021424da4000bf47193bd2d928b2228",
+   "sha256": "0fyxhbng9cckdbmp0jc2x88azajr68r14jzak2zqh5pqlvs6hcjz"
   }
  },
  {
@@ -31477,11 +31799,11 @@
   "repo": "magit/emacsql",
   "unstable": {
    "version": [
-    20240415,
-    1535
+    20240623,
+    1340
    ],
-   "commit": "5108c16c5e1d5bfdd41fcc0807241e28886ab763",
-   "sha256": "0sww0d4kbrsvf3123m0ddqxi59p4myajz1y2v25yx3ixrpy6xpmv"
+   "commit": "efddd69c5e69214dbbe921fbf90f938501414894",
+   "sha256": "1abwc7kzlmk6z68glnya6kxffrrqrhgpwrpzqpjc1l179gg1i1rg"
   },
   "stable": {
    "version": [
@@ -31593,14 +31915,14 @@
   "repo": "magit/emacsql",
   "unstable": {
    "version": [
-    20240415,
-    1535
+    20240623,
+    1340
    ],
    "deps": [
     "emacsql"
    ],
-   "commit": "5108c16c5e1d5bfdd41fcc0807241e28886ab763",
-   "sha256": "0sww0d4kbrsvf3123m0ddqxi59p4myajz1y2v25yx3ixrpy6xpmv"
+   "commit": "efddd69c5e69214dbbe921fbf90f938501414894",
+   "sha256": "1abwc7kzlmk6z68glnya6kxffrrqrhgpwrpzqpjc1l179gg1i1rg"
   },
   "stable": {
    "version": [
@@ -31756,14 +32078,14 @@
   "repo": "oantolin/embark",
   "unstable": {
    "version": [
-    20240419,
-    452
+    20240607,
+    2213
    ],
    "deps": [
     "compat"
    ],
-   "commit": "195add1f1ccd1059472c9df7334c97c4d155425e",
-   "sha256": "1361jvwr3wjbpmq6dfkrhhhv9vrmqpkp1j18syp311g6h8hzi3hg"
+   "commit": "9c166c4b96a0b1e85401bcc6fb95ce021e7b5013",
+   "sha256": "1l8jqvcn61a1lzclq77z82645f7qsq7i61f9rknwbdwxb9aaidij"
   },
   "stable": {
    "version": [
@@ -31970,11 +32292,11 @@
   "repo": "smihica/emmet-mode",
   "unstable": {
    "version": [
-    20221111,
-    329
+    20240617,
+    45
    ],
-   "commit": "63b6932603184956b5ea8919036d2b307b48d7fd",
-   "sha256": "1g0fvp98w23dsyi75idyv4jf90635z80hchd1k13pychla6bw76j"
+   "commit": "322d3bb112fced57d63b44863357f7a0b7eee1e3",
+   "sha256": "1y41iqlybfls1rsagi9g1s879vw020r252j8m9jc89lsp5vkhawk"
   },
   "stable": {
    "version": [
@@ -31994,28 +32316,29 @@
   "url": "https://git.savannah.gnu.org/git/emms.git",
   "unstable": {
    "version": [
-    20240512,
-    1735
+    20240704,
+    1359
    ],
    "deps": [
     "cl-lib",
     "nadvice",
     "seq"
    ],
-   "commit": "c86ede13e80ad573f52e46de54fd24a97e2faa88",
-   "sha256": "04zw0al519n1xiyy15lzf1mv65d2fip5ha46h8lj03psl777bc4x"
+   "commit": "b5567be2176dcbdf42aa2d0ccad32a44f245dd09",
+   "sha256": "1kwybpr86ih0g739x3mqfpvbgsd9pfns1h6hm89f79qlgla282xz"
   },
   "stable": {
    "version": [
-    19
+    20,
+    1
    ],
    "deps": [
     "cl-lib",
     "nadvice",
     "seq"
    ],
-   "commit": "384ca4544ec359bba08d2f9d2a78acb8f9917e25",
-   "sha256": "06yk5fpmgqkxrpcyd8gqq9g11x0clv8zgbwvxr95nwz720j70i72"
+   "commit": "e0331bd7c480b3ac326140bd5b312bfdbc4881c9",
+   "sha256": "06vsf3mlj0sxhmcgz70haihsrskr98w2jnhy68h7g3b9rkbxgmhc"
   }
  },
  {
@@ -32405,28 +32728,28 @@
   "repo": "isamert/empv.el",
   "unstable": {
    "version": [
-    20240517,
-    1701
+    20240712,
+    2241
    ],
    "deps": [
     "compat",
     "s"
    ],
-   "commit": "c7313288e350de7331779c0b37a8298980f6ff57",
-   "sha256": "00w59r7ycpv7819kbyjcvpiif9kzqh7k5nk1nfy2wgs1saxkg8ln"
+   "commit": "89d378e2e94ef12ef473535ee3fa50ff6db5f53e",
+   "sha256": "1x756842bwyzp8qqlkcnisbsvpb1i8dc7ajq32ra4l3zfk8vqbh1"
   },
   "stable": {
    "version": [
     4,
-    1,
+    4,
     0
    ],
    "deps": [
     "compat",
     "s"
    ],
-   "commit": "c48cd223b145806a6a36167c299e9a0384a5f2e6",
-   "sha256": "0p62wfsxk0sh8lpjm52md8kaixkfagfsl9gpmps76448iznn04m7"
+   "commit": "89d378e2e94ef12ef473535ee3fa50ff6db5f53e",
+   "sha256": "1x756842bwyzp8qqlkcnisbsvpb1i8dc7ajq32ra4l3zfk8vqbh1"
   }
  },
  {
@@ -32585,6 +32908,35 @@
    "sha256": "1jpiyjb5291jk6pd649d6i8nxaazqjznb3zpksp7ykrqqgw4wgjm"
   }
  },
+ {
+  "ename": "enlight",
+  "commit": "b7f467a2dcf96f67e641b6bea9262bee469bea3a",
+  "sha256": "14ygvcd6ppvdcwlxj5mnhxp47h6ls9azhnjw0zalhb55rq62vq89",
+  "fetcher": "github",
+  "repo": "ichernyshovvv/enlight",
+  "unstable": {
+   "version": [
+    20240602,
+    2025
+   ],
+   "deps": [
+    "compat"
+   ],
+   "commit": "5194c1a4f4c245a1ef544205d723381fac30414b",
+   "sha256": "0crccz28f54xc0202gdbnpkn7kfsxf66p2m2grs6wnwyjxrmpnsq"
+  },
+  "stable": {
+   "version": [
+    0,
+    3
+   ],
+   "deps": [
+    "compat"
+   ],
+   "commit": "5194c1a4f4c245a1ef544205d723381fac30414b",
+   "sha256": "0crccz28f54xc0202gdbnpkn7kfsxf66p2m2grs6wnwyjxrmpnsq"
+  }
+ },
  {
   "ename": "enlightened-theme",
   "commit": "93728d3fe62331b49627c1cfa1c4273a43407da8",
@@ -32709,25 +33061,25 @@
   "repo": "purcell/envrc",
   "unstable": {
    "version": [
-    20240517,
-    1633
+    20240613,
+    907
    ],
    "deps": [
     "inheritenv"
    ],
-   "commit": "4405f6e7b2e300aa91211bd505364d8f01667c97",
-   "sha256": "0jkydssnmljj8d29h15gar90r5cgin8qnlwampf2af26zfxxgq3v"
+   "commit": "2316e004c1574234fe4d991bd75a254cdeaa83ae",
+   "sha256": "1kx5p85p2c682j50cah18njdraj07v9dg8imi7p97bkx7n5malxm"
   },
   "stable": {
    "version": [
     0,
-    11
+    12
    ],
    "deps": [
     "inheritenv"
    ],
-   "commit": "8571bf94b6a63ffd9a84100106602f88ba186854",
-   "sha256": "03mjws4fp00g5smivs1iz0r78mmd5sgj1g4xyi8aq21mpv5rd2m0"
+   "commit": "2316e004c1574234fe4d991bd75a254cdeaa83ae",
+   "sha256": "1kx5p85p2c682j50cah18njdraj07v9dg8imi7p97bkx7n5malxm"
   }
  },
  {
@@ -32852,8 +33204,8 @@
   "repo": "emacscollective/epkg",
   "unstable": {
    "version": [
-    20240415,
-    1554
+    20240712,
+    2216
    ],
    "deps": [
     "closql",
@@ -32861,8 +33213,8 @@
     "emacsql",
     "llama"
    ],
-   "commit": "91c3e441eaa9f85b13d5957ee82f7c440addd147",
-   "sha256": "0n6psk9k2aglfsbxpnqfsmah4c9060sgf13wix0mmakba2iq11wc"
+   "commit": "e864055a1916a54127050fbb50f07614e2f6319b",
+   "sha256": "0d0y50dacjg6jwz1vn8hmacighn0q7g1h15pwh32gd9qakmp15z1"
   },
   "stable": {
    "version": [
@@ -32885,8 +33237,8 @@
   "repo": "emacscollective/epkg-marginalia",
   "unstable": {
    "version": [
-    20240415,
-    1536
+    20240712,
+    2216
    ],
    "deps": [
     "compat",
@@ -32894,8 +33246,8 @@
     "llama",
     "marginalia"
    ],
-   "commit": "41bb627934e0a389e24573d2c9d088f6f6afdbcc",
-   "sha256": "1m0g1h81if11v0mw8l3kd6i2mxs1r1s1dh9c84niig0gw0dgligw"
+   "commit": "11e551187b7fa37aa8989bee50939ed0adbacdeb",
+   "sha256": "1mplkpm7h33g0y3p98kcywyrw6k0xvyrwjpy1xkiswlwknmvx51i"
   },
   "stable": {
    "version": [
@@ -33108,11 +33460,11 @@
   "repo": "leathekd/erc-hl-nicks",
   "unstable": {
    "version": [
-    20200317,
-    16
+    20240615,
+    2058
    ],
-   "commit": "a67fe361c8f2aa20fc235447fbb898f424b51439",
-   "sha256": "0k57scxa8rm859fqsm8srhps7rlq06jzazhjbwnadzrh8i5fyvra"
+   "commit": "fd2759bde20c25226a332c3d19aed6c7f135bf10",
+   "sha256": "1lpsm3z3q89hfpay476m7n7p1m897j0sl6z5bnvgn6cqyvhl1d8a"
   },
   "stable": {
    "version": [
@@ -33568,19 +33920,20 @@
   "repo": "erlang/otp",
   "unstable": {
    "version": [
-    20240517,
-    1225
+    20240709,
+    1136
    ],
-   "commit": "601a012837ea0a5c8095bf24223132824177124d",
-   "sha256": "1vaczg52wb4nzkm3py6b2ndxq1fb7nr3n41sn9wc16v4r8nq35b1"
+   "commit": "ee9628e7ed09ef02e767994a6da5b7a225316aaa",
+   "sha256": "0m3l2d5vpd7wlw7grzdvz63vi1h8px9pjqqls7i70idsxbsqk7if"
   },
   "stable": {
    "version": [
     27,
-    0
+    0,
+    1
    ],
-   "commit": "601a012837ea0a5c8095bf24223132824177124d",
-   "sha256": "1vaczg52wb4nzkm3py6b2ndxq1fb7nr3n41sn9wc16v4r8nq35b1"
+   "commit": "ee9628e7ed09ef02e767994a6da5b7a225316aaa",
+   "sha256": "0m3l2d5vpd7wlw7grzdvz63vi1h8px9pjqqls7i70idsxbsqk7if"
   }
  },
  {
@@ -34045,6 +34398,21 @@
    "sha256": "14dmsnixf9vqdhsixw693sml0fn80zcf0b37z049fb40cmppqxdw"
   }
  },
+ {
+  "ename": "eshell-command-not-found",
+  "commit": "908102fbfdb7e7b3bbb0bf5a8bc5bfd37ce67586",
+  "sha256": "1vyl80078wswk4nypn3gjsbjas7vbz9dkljc0ch0zq975vr4wapz",
+  "fetcher": "github",
+  "repo": "jaeyeom/eshell-command-not-found",
+  "unstable": {
+   "version": [
+    20240708,
+    512
+   ],
+   "commit": "28427f0ca266fd75890ceafdd96997b5507e1bc4",
+   "sha256": "0cid9caklxbp4rfdpam42cmkxj1izzw84g9hpk7jabjmfgashrxg"
+  }
+ },
  {
   "ename": "eshell-did-you-mean",
   "commit": "a7649eca21a21ddbbc7131f29cbbd91a00a84060",
@@ -34224,11 +34592,11 @@
   "repo": "akreisher/eshell-syntax-highlighting",
   "unstable": {
    "version": [
-    20240509,
-    241
+    20240701,
+    502
    ],
-   "commit": "1198fd658d317747eb606a50c7767fef579af324",
-   "sha256": "1j2qfaw2jrd9gpn7a0i0wd5hjqgzj3akgkayrw73bh285iz19fm6"
+   "commit": "26f49633308ea876b5850256e07622de34ad0bdd",
+   "sha256": "1p2lqx3rzfmn1lamnx9ns5mr0svjqamx7ah9342l30bmv87skz1h"
   },
   "stable": {
    "version": [
@@ -35190,6 +35558,30 @@
    "sha256": "19s6cid42q0lm2w94a7f6sxvmy3zpjdj5r5dbwcxxp5n3qfs7nip"
   }
  },
+ {
+  "ename": "evenok",
+  "commit": "c2568edb7d30ce34acd64ce0a211699ae87a0cb1",
+  "sha256": "03kvr25rd91hkrrymyhsv1j48hr06p1k6hrz0skfd4ns617ambd0",
+  "fetcher": "codeberg",
+  "repo": "mekeor/evenok",
+  "unstable": {
+   "version": [
+    20240627,
+    2213
+   ],
+   "commit": "0f3291547de570ce8f03326443bf65452e848fd7",
+   "sha256": "1gf611r3vaq03gf696c2ig7idvxz0k52nji9w08rcmg1qwbl09va"
+  },
+  "stable": {
+   "version": [
+    0,
+    11,
+    1
+   ],
+   "commit": "1cdd8f8d09473bc8fb1c5157bd3a2129883701bc",
+   "sha256": "1qnncjdd2jc65zz2slm8pjgg64nqyvc9v8p6m0zl15xhh7kdavi3"
+  }
+ },
  {
   "ename": "everlasting-scratch",
   "commit": "7d14ddda9729eec229a72a8827d0f0a5be779db7",
@@ -35198,11 +35590,11 @@
   "repo": "beacoder/everlasting-scratch",
   "unstable": {
    "version": [
-    20240430,
-    1713
+    20240612,
+    814
    ],
-   "commit": "1837142ae14fdfd4d634434ceff966b348826259",
-   "sha256": "15509mjlk382yws41gb90xqn9g06agjpd6c8b8ps4ykmswm6ad5h"
+   "commit": "fa1b2af29e8bb463400bbea912ab4dfaa2b0c890",
+   "sha256": "10zckrrz0mh6alrmav8lbzyz4imh7966m7524jzm2576pn6mxf04"
   },
   "stable": {
    "version": [
@@ -35221,15 +35613,15 @@
   "repo": "emacs-evil/evil",
   "unstable": {
    "version": [
-    20240521,
-    954
+    20240712,
+    2240
    ],
    "deps": [
     "cl-lib",
     "goto-chg"
    ],
-   "commit": "0b134d3bbf73c93f5fed2bb89a35f408a9d627ed",
-   "sha256": "1nrvrb520wpphbhj1ck7jz2ks55yd7bkzycbjzbh534zax1nri93"
+   "commit": "fc993435bbb3c486bdf0666298e2204ec170880b",
+   "sha256": "09a7kl45sj1wxlz8abir2c4d8whmf4kcbv2baldqj80jbljfvpyd"
   },
   "stable": {
    "version": [
@@ -35351,8 +35743,8 @@
   "repo": "emacs-evil/evil-cleverparens",
   "unstable": {
    "version": [
-    20240308,
-    751
+    20240529,
+    1025
    ],
    "deps": [
     "dash",
@@ -35360,8 +35752,8 @@
     "paredit",
     "smartparens"
    ],
-   "commit": "aa19ed6fec73c883442fb4ffd8d300355d5a8580",
-   "sha256": "1lidyj1xk1xaszsi832f8bhpxgmfpjykd1gxn1y9zqi9rg9b8hpw"
+   "commit": "6637717af0bdac55f97eef98433d53a10395cf77",
+   "sha256": "15vsqm2pgyb1qg2rwnd4b6pny771zyp5x9z4a0p9pc67f11mrwp0"
   }
  },
  {
@@ -35422,15 +35814,15 @@
   "repo": "emacs-evil/evil-collection",
   "unstable": {
    "version": [
-    20240417,
-    1647
+    20240711,
+    1239
    ],
    "deps": [
     "annalist",
     "evil"
    ],
-   "commit": "5886bab852dc9e31959e70384d535473e44504ad",
-   "sha256": "0dz9dkmxm4j2r2nilgxwgvsgbm531rrsiszzx480zrmqybdsziq6"
+   "commit": "28d64031ff58871828a0dec25ef437beb9371337",
+   "sha256": "0zm7mgcapkc6nhn531qxnv8wsr5zvhhpd966yfi5f6nwhj7yv10l"
   },
   "stable": {
    "version": [
@@ -36024,15 +36416,15 @@
   "repo": "gabesoft/evil-mc",
   "unstable": {
    "version": [
-    20230529,
-    210
+    20240701,
+    140
    ],
    "deps": [
     "cl-lib",
     "evil"
    ],
-   "commit": "bdf893ea6f52fd0f10bece8ddae813658e17bbb4",
-   "sha256": "12r2vi3a3la93fm18rcwjy6v6x4rqa6khryxggdki3whlmzv60xf"
+   "commit": "cff3374bfe1b7b1932743425d7fc5d4ab66d747e",
+   "sha256": "1kmc9vmryqnzkc1xmdkycrrakcyscg2apixff63hdcr715bljrm9"
   },
   "stable": {
    "version": [
@@ -37492,8 +37884,8 @@
   "repo": "anonimitoraf/exercism.el",
   "unstable": {
    "version": [
-    20231007,
-    1253
+    20240610,
+    32
    ],
    "deps": [
     "a",
@@ -37505,8 +37897,8 @@
     "s",
     "transient"
    ],
-   "commit": "9d164a54fd7be933e6f65d4cc7112c99bd957b26",
-   "sha256": "1b73274krk38jb8znnp5q788jh66g3s8w8lslf79b34s586p8ih4"
+   "commit": "f9a287a4cd533fdbd3b0e645f425a7b9c469e6ab",
+   "sha256": "0lf6xa0x2g0izwfcpi48b0s0146mz8r60gf4ynqpx4fmyl2mccj5"
   }
  },
  {
@@ -38218,19 +38610,19 @@
   "repo": "WJCFerguson/emacs-faff-theme",
   "unstable": {
    "version": [
-    20240520,
-    1303
+    20240619,
+    1314
    ],
-   "commit": "452546431e3bef05fbf8914f6d41b8b7a3557bf3",
-   "sha256": "1dikgq84xfv2hq340f9m2nvhn4h09sv9py0sm3214nfssn6z4a55"
+   "commit": "763d524b5dd6273843256810e8531954335583bd",
+   "sha256": "117hbybdlcvgmisiagf247myww5b2q38yhi47fmlf9dqmpzfw4fz"
   },
   "stable": {
    "version": [
     3,
-    4
+    5
    ],
-   "commit": "9b8ff139442b29a16a437c367f201f263bbb884c",
-   "sha256": "103npmlln3c394fkacapx17zjyw4niwqqn8c768gij0ny4k0qfg4"
+   "commit": "763d524b5dd6273843256810e8531954335583bd",
+   "sha256": "117hbybdlcvgmisiagf247myww5b2q38yhi47fmlf9dqmpzfw4fz"
   }
  },
  {
@@ -38681,14 +39073,14 @@
   "repo": "martianh/fedi.el",
   "unstable": {
    "version": [
-    20240311,
-    1417
+    20240711,
+    753
    ],
    "deps": [
     "markdown-mode"
    ],
-   "commit": "b4996a467868b11e7f4ee9c53354131a99bc6bad",
-   "sha256": "0shh0k73h39yq44yrcqsvci88byrvc52x2r2vgld9fh1kfw9iq66"
+   "commit": "7c31f0d580bb20f70285bae136c6b4634a6c21b5",
+   "sha256": "0jxs8ic6z2rcv8l62614phf1hgq4zr4nmfm2bznbqf49kc5hpxhk"
   },
   "stable": {
    "version": [
@@ -38913,15 +39305,15 @@
   "repo": "Artawower/file-info.el",
   "unstable": {
    "version": [
-    20231207,
-    2041
+    20240621,
+    653
    ],
    "deps": [
     "browse-at-remote",
     "hydra"
    ],
-   "commit": "158524c92f37eeccf55e096f3090db2baa12fbae",
-   "sha256": "0l17mmail2gcz71rmk2p1p4lf0lc10mhj5pdq1c1dpppri42cbwm"
+   "commit": "36fb3469a4d1c9d803e9d13e7e2e9582ced3043f",
+   "sha256": "1cd6m5acclfwzqpnrnqz08gm52jfjg7m137l005g9hn3vwlbc3bj"
   },
   "stable": {
    "version": [
@@ -39398,6 +39790,21 @@
    "sha256": "0pbbqwms0w7n2blqan7jbk38klc85gwqw3j4w5c90shg9a8xsr01"
   }
  },
+ {
+  "ename": "firebase-rules-mode",
+  "commit": "c9d7c4fd4118244c73f11f8e34e478bb05642752",
+  "sha256": "0xqkyq6nbvy636r13pq61cykk00vl62a3cm9x798mbc958w01ny0",
+  "fetcher": "github",
+  "repo": "dherbst/firebase-rules-mode",
+  "unstable": {
+   "version": [
+    20240520,
+    1326
+   ],
+   "commit": "c88cb10251cdfce931e4fe48ce76eaa50cc7e791",
+   "sha256": "0sdqljlpgmhszkd8psfpx99wjcg5z5wg8q9lfcnw2j30hdlxiik2"
+  }
+ },
  {
   "ename": "firecode-theme",
   "commit": "641d1959bd31598fcdacd39a3d1bb077dcccfa5c",
@@ -39945,11 +40352,11 @@
   "repo": "crmsnbleyd/flexoki-emacs-theme",
   "unstable": {
    "version": [
-    20240109,
-    607
+    20240702,
+    1515
    ],
-   "commit": "9339a2a1a8052159916e9913b14ec062c0a3f506",
-   "sha256": "071if59ikrfyc17vw1fbzpqsg16zd7zpnfgxhi02sz8ng7q4jmx7"
+   "commit": "e9c352075eb3a0d06e280d60968b6147f9678b6e",
+   "sha256": "1g0n72j05s2k70a5d4plawrmffvinkc970pidysfjc7rpzfzrpgc"
   }
  },
  {
@@ -40261,11 +40668,11 @@
   "repo": "flycheck/flycheck",
   "unstable": {
    "version": [
-    20240411,
-    449
+    20240703,
+    1352
    ],
-   "commit": "900b8e79754d21853a6e5b5a2802f317a7112a1e",
-   "sha256": "0k9gf7aim1ns09rmicaqy93lp1915c8llr9i837gw8a86c8fjfrr"
+   "commit": "eb29cd8b4adb211226e2b87eac49b8d5fb169c55",
+   "sha256": "1rnn63vwy8fx3g578zlqipffr0w0zl43mmzz0bgdafr4mal4ac5x"
   },
   "stable": {
    "version": [
@@ -40428,15 +40835,15 @@
   "repo": "shuxiao9058/flycheck-buf-lint",
   "unstable": {
    "version": [
-    20230724,
-    1501
+    20240612,
+    1219
    ],
    "deps": [
     "flycheck",
     "s"
    ],
-   "commit": "51c439dcb9fa40966256d8cce835f7b7aabf44d0",
-   "sha256": "1gq8abj5ld2hqhwc0p7qmf8vfy8nj3pfzzdba2yh8zx8l22r2h3i"
+   "commit": "6cf7e7a01bfe150f9be45e83f9fc2d0c8b9d8de3",
+   "sha256": "1lf69gmbh0q9drjxb1h1wz426hxjr4mkzl8grz6ggl56rxwxj2f4"
   }
  },
  {
@@ -41087,15 +41494,15 @@
   "repo": "flycheck/flycheck-eglot",
   "unstable": {
    "version": [
-    20240214,
-    1937
+    20240705,
+    1738
    ],
    "deps": [
     "eglot",
     "flycheck"
    ],
-   "commit": "a38101634c55ef6cfcfc74b4fd9a50b541b42457",
-   "sha256": "0r4h4c0pzfgp22iscgszvzv1sf3b286wrgmds0ijlha4r99ln88s"
+   "commit": "09e37f4c726d9b565b040ba9e89215158d3bd6b6",
+   "sha256": "0hxkgdgxlj4faylckbfj68pg0dxj5y8nfyq3rkqshswma1537zg1"
   }
  },
  {
@@ -41678,14 +42085,14 @@
   "repo": "flycheck/flycheck-inline",
   "unstable": {
    "version": [
-    20200808,
-    1019
+    20240709,
+    1812
    ],
    "deps": [
     "flycheck"
    ],
-   "commit": "0662c314bd819f9b46f8b2b13f0c650445b3a8c5",
-   "sha256": "1wlvwi8y5pb3gy3j061v7krxfb1766yw5iika5ymk4zjg9g057vn"
+   "commit": "de96ba2eb4619a9a7d891773629ec70f2be89aec",
+   "sha256": "1nh28p3sf1swxgip732lh9k9bmw1k4x4z0pnjw8ihcas4xw0bygy"
   }
  },
  {
@@ -42231,15 +42638,15 @@
   "repo": "emacs-php/phpstan.el",
   "unstable": {
    "version": [
-    20230417,
-    1142
+    20240527,
+    2142
    ],
    "deps": [
     "flycheck",
     "phpstan"
    ],
-   "commit": "2dc25cb2f3d83484ea0eb063c9ffca8148828a2b",
-   "sha256": "0drsp230nxs336zzfy8gjr7r3p7m8w9rp4ih1zjwarzl1svpp7yp"
+   "commit": "6f1c7bb357b1eb90b10a081f1831c1c548c40456",
+   "sha256": "1hnnhbma3mgbralp1f5c1gvm9pfswzf5xzi2nr22rs5d9r0zk2fj"
   },
   "stable": {
    "version": [
@@ -43325,11 +43732,11 @@
   "repo": "purcell/flymake-easy",
   "unstable": {
    "version": [
-    20141022,
-    1828
+    20240624,
+    1702
    ],
-   "commit": "2a24f260cdc3b9c8f9263b653a475d90efa1d392",
-   "sha256": "1j35k52na02b59yglfb48w6m5qzydvzqfsylb8ax5ks0f287yf0c"
+   "commit": "1986500f75ea06f006ab1734abcce441117d385d",
+   "sha256": "1pb2angvlfdg4s9qbsm6yzhshxpfz75p3dd50vw7cbb4q1iws8a0"
   },
   "stable": {
    "version": [
@@ -43933,11 +44340,11 @@
   "repo": "LionyxML/flymake-margin",
   "unstable": {
    "version": [
-    20240401,
-    2342
+    20240612,
+    306
    ],
-   "commit": "fe4da9f947c7a11aba331dd77637d471cedbd061",
-   "sha256": "1p3q7s5n1szggj8w8fmpz8l7g27srmsrgla5wag2320dnd6djrir"
+   "commit": "4e36634789d64c33a9fc0dc5bc2eb4a21c391d96",
+   "sha256": "05fw8ncspafk4j2mvqaznw78cqwf2v1xdl70b7j30cya97wab4kn"
   }
  },
  {
@@ -44303,14 +44710,14 @@
   "repo": "erickgnavar/flymake-ruff",
   "unstable": {
    "version": [
-    20240419,
-    232
+    20240709,
+    1338
    ],
    "deps": [
     "project"
    ],
-   "commit": "15bf4d3a4ebe899991e385b64901b5cde0daa177",
-   "sha256": "0g9czaf6his577g1fcgi5xiy3fhfjkf8ihilgnxjydiwgr4fg4f1"
+   "commit": "3b69008d6cc3084338392bc03373d00844ad4261",
+   "sha256": "0yy16n5lqyv5bd2q3jlnmcg9hjx79985kf9ap283shx5ssb217zq"
   }
  },
  {
@@ -44412,11 +44819,11 @@
   "repo": "erickgnavar/flymake-sqlfluff",
   "unstable": {
    "version": [
-    20231105,
-    2009
+    20240611,
+    1257
    ],
-   "commit": "598dff268231f74ba902e2c607c85dd014fbee28",
-   "sha256": "0r32vhb9krjhq4xk0bmzk43x756jcw39k7vl0ps10zha7p7mnm69"
+   "commit": "0a836d7a919723ae5897fce01c3c7d651a30e8c6",
+   "sha256": "1i75c2i6ks2drq5a8y48m7wyk50jm5p7lj2xks3jwkzj4dgl7c4p"
   }
  },
  {
@@ -44834,14 +45241,14 @@
   "repo": "larstvei/Focus",
   "unstable": {
    "version": [
-    20221016,
-    1846
+    20240528,
+    901
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "2507ec4ec5a9402647ef85540669db1815520c15",
-   "sha256": "0qbzbs18isxyf5yiz64vyxvzjpfjdaafxnas2lhx3sjkgglb08i2"
+   "commit": "17c471544f540f2cf9a05fd6cd87e52e5de317e2",
+   "sha256": "0aqcnvnla4rmpc9iy679jaw1vqqg16j2fw7m9iis7j3w0wcw5c77"
   },
   "stable": {
    "version": [
@@ -45236,8 +45643,8 @@
   "repo": "magit/forge",
   "unstable": {
    "version": [
-    20240519,
-    1510
+    20240712,
+    1313
    ],
    "deps": [
     "closql",
@@ -45252,8 +45659,8 @@
     "transient",
     "yaml"
    ],
-   "commit": "d3b14f2cb6740d18827ed713715908b517e4a899",
-   "sha256": "058g4gi3p3r70h1bdpphbg65xwggq4azyw70wgq30b9q13v90lkh"
+   "commit": "03d012ae24eafa89a1a5ba7d9ed4069b05d54e21",
+   "sha256": "09pclclvw92i216m45m5hzw55vi3zszps1jkykyqc2vpl0zna0i8"
   },
   "stable": {
    "version": [
@@ -45471,14 +45878,14 @@
   "repo": "rnkn/fountain-mode",
   "unstable": {
    "version": [
-    20240520,
-    307
+    20240710,
+    937
    ],
    "deps": [
     "seq"
    ],
-   "commit": "7e10f27dd5d9a5d18e08a5454321e961167dfbf7",
-   "sha256": "0z7lf948l4yn8znir2nca2bd38c6wqcgihf6cx603j1q7ipfxnwb"
+   "commit": "70967d12f59cef29b7d301c2ed51c32b4a11c7f1",
+   "sha256": "1216wfps6zm0rq2ghq8m7m3nrjqk2j4ky6k1fsqkj5d5lj25x2gx"
   },
   "stable": {
    "version": [
@@ -45489,7 +45896,7 @@
    "deps": [
     "seq"
    ],
-   "commit": "b25315fed996cf1d41cc2d612dacc62b3e95f928",
+   "commit": "195fa8670456855b592e76fb495d03cc621ad647",
    "sha256": "15r0pzdmimm72jx26zgdxf7fwwcppl45vvh33xx5wnhqzd140hwn"
   }
  },
@@ -45655,26 +46062,26 @@
   "repo": "tarsius/frameshot",
   "unstable": {
    "version": [
-    20240415,
-    1537
+    20240712,
+    2217
    ],
    "deps": [
     "compat"
    ],
-   "commit": "8bceac0988ea2e84452f87b96e0a9f669d717843",
-   "sha256": "1xw8cd8gaawggywpqkalzcjsvn6ns52v7bsp0jmbz113y6l8q689"
+   "commit": "23d550389ca978945300f5a1076d5c4f530d8d0e",
+   "sha256": "0563z8ahn4jlmfwrz391h340d69hmn4szkk41cy1v9nig0f7vp8k"
   },
   "stable": {
    "version": [
     0,
     2,
-    6
+    8
    ],
    "deps": [
     "compat"
    ],
-   "commit": "f74d99be64dc7afa4bdea106c0597c1fa59b9a3d",
-   "sha256": "0qwffkpjh5zsj487yi5m5j5y7vxqc67pga5nj127nbg4rdmjs3ng"
+   "commit": "c60ef067f582f7dc7ebdfb8e1b544068f56e2bf1",
+   "sha256": "0pbxzn16hjvmf81hscq3d3jj07d1j4x7amg67j741fwddvzkm8wc"
   }
  },
  {
@@ -45799,11 +46206,11 @@
   "repo": "rnkn/freeze-it",
   "unstable": {
    "version": [
-    20220301,
-    148
+    20240630,
+    730
    ],
-   "commit": "ad92e33a7ebd860905da60d194833516bf61cbf5",
-   "sha256": "0gvc6f8jdvrfwhm5rlvrjd6lbvw1j84z3pwcfajpgyr1a5y6gx49"
+   "commit": "0d0b6c425769a602ab18d41927feb8c0e22e214b",
+   "sha256": "0zs0d7r14yzw7nihw5v24drwbv1pf8ldrgfackkdkhxh1x6laqqm"
   },
   "stable": {
    "version": [
@@ -45811,7 +46218,7 @@
     2,
     2
    ],
-   "commit": "1f252a922612e0d6ee62a683b7cdab8956460f11",
+   "commit": "6891d3b7a85da13e6d5982ac6b9588473941ec98",
    "sha256": "0bwd3hw5qdijmvbfm69iyhijjx12yqvsa8n08cawxfa26cs6hi1g"
   }
  },
@@ -46159,14 +46566,14 @@
   "repo": "factor/factor",
   "unstable": {
    "version": [
-    20230824,
-    1321
+    20240523,
+    1604
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "e10b64dbc53a8583098e73580a1eb9ff4ce0c709",
-   "sha256": "0fscknmhqc1lzjrv920wlch33vbxkys4290n51r9mrgz830lg41s"
+   "commit": "436d9a61aaa1fdaa319f14d0eac6b5aec920db05",
+   "sha256": "0z2xrin546dycz0vp9y9rq6jb3i13x0sfnmq0041zmr9nywb7wr6"
   },
   "stable": {
    "version": [
@@ -46319,14 +46726,14 @@
   "repo": "jojojames/fussy",
   "unstable": {
    "version": [
-    20240224,
-    1641
+    20240607,
+    2153
    ],
    "deps": [
     "flx"
    ],
-   "commit": "0f58683355986e3f8d49734cb1f2ecdd71729439",
-   "sha256": "1hqh656h7gy233d1557qrp4vq9vsalgdn9wa2bsd1c11z46f3r8f"
+   "commit": "21f4ac6b971f61890d46308d7ac5db64c20228e6",
+   "sha256": "0skjr9pqjbr4am3cdq78frf5bckpv5761j0ppp0pg6pfbrcdbaa3"
   },
   "stable": {
    "version": [
@@ -46461,26 +46868,26 @@
   "repo": "tarsius/fwb-cmds",
   "unstable": {
    "version": [
-    20240415,
-    1537
+    20240712,
+    2218
    ],
    "deps": [
     "compat"
    ],
-   "commit": "2214ad1094b0b4d466825521eefe39bba65634d0",
-   "sha256": "0cqxin5mnmkjzswh6vk46dhxyh6parxd74w4i2cd44ijrh6rx9yn"
+   "commit": "257659fc0bf0112d40f921717c57e558b25f91ea",
+   "sha256": "02b5kgnmadgnq8cpmrh1srxpzw30gxn52azy58g9p16jy0i0lnnf"
   },
   "stable": {
    "version": [
     2,
     0,
-    0
+    1
    ],
    "deps": [
     "compat"
    ],
-   "commit": "1b375c6890de61eaccc97c92f2b46de6f9205417",
-   "sha256": "0wqkd8p04hklp1hysppp83rx3d32qv62ln5baf725f3xz0lilv21"
+   "commit": "a2569c7c986dcde2c859e390a0da5aeacf69db77",
+   "sha256": "0dql8nh79sh10fhxc2h3sypx6qvrg30j2x3ib3mw32qwgx33v8m2"
   }
  },
  {
@@ -46592,11 +46999,11 @@
   "repo": "ShiroTakeda/gams-mode",
   "unstable": {
    "version": [
-    20231202,
-    1410
+    20240502,
+    1456
    ],
-   "commit": "03c24b19c270feca0d3fc9494698cf6d4c7f8152",
-   "sha256": "1g1w0z04qc6k61p9y7mfplqk83yi3pcabv3mr4kfq1pmny8l46sp"
+   "commit": "cf0fce18ed51aa6b66e672e3f5655faf4631d9cd",
+   "sha256": "09ldm491m1zf47x6gwdylilc5slcwzsbl498axlpzy723ysf916y"
   },
   "stable": {
    "version": [
@@ -46691,6 +47098,21 @@
    "sha256": "13nafw4rz1xfzcag0390xxs1nqadplvkrkiw72h0i8y2kwa9yya3"
   }
  },
+ {
+  "ename": "gdb-x",
+  "commit": "563763f2ef13c67fef65d54df6a7370cfa07ab81",
+  "sha256": "1ilzb1gagis1jkwnr00xq2szvmbzv0a1k99n1gv4x2a9crn122ma",
+  "fetcher": "codeberg",
+  "repo": "shepherd/gdb-x",
+  "unstable": {
+   "version": [
+    20240617,
+    1857
+   ],
+   "commit": "367dbb31e1591ffb3f4b7630f2c8ddcc0692e133",
+   "sha256": "0x1i1lrs5szrmabakhm07d6hiywn072b0bid0ir2jva4msqkcajp"
+  }
+ },
  {
   "ename": "gdscript-mode",
   "commit": "0694d21374661c7ff94202468d57ddd438c0973d",
@@ -46800,25 +47222,25 @@
   "repo": "emacs-geiser/geiser",
   "unstable": {
    "version": [
-    20240208,
-    26
+    20240706,
+    1537
    ],
    "deps": [
     "project"
    ],
-   "commit": "4e64934bd2ae7c6f0e4acb9f2ed017844c187223",
-   "sha256": "098xbywraa8a8qcg07iy2svvsqr10s9wdk2ixwcxdh0cskfq40m4"
+   "commit": "a81969a5271f155d2d1e389ccbe47e1c7ec36ae7",
+   "sha256": "17srwjw84lxpcfdl0jg7pxh6vdh3am6fs5dk0l4hy3z1axzd3i12"
   },
   "stable": {
    "version": [
     0,
-    30
+    31
    ],
    "deps": [
     "project"
    ],
-   "commit": "f343592a52da0f947989d07c208a51ad6c972a5e",
-   "sha256": "1y9k9v7ll816rs20krchrk080b3a5q4hikskaamvr5hrmi0jw938"
+   "commit": "b6b4ac070d136345345c80ff649f0084e3c512a5",
+   "sha256": "1lxvgj50c3lbyib4lcv4f5xjhgnngnklc8sszrx5yy9snsrd1sn5"
   }
  },
  {
@@ -46972,15 +47394,15 @@
   "repo": "emacs-geiser/guile",
   "unstable": {
    "version": [
-    20240314,
-    1950
+    20240712,
+    1202
    ],
    "deps": [
     "geiser",
     "transient"
    ],
-   "commit": "71a6be00433a157de3936f208c7a1bd0192b12cd",
-   "sha256": "0chwpwl55qbgfig7z4zdd4ly9vj2367b1ll1wg0q41sn34fqgpq5"
+   "commit": "ebdd1923b0780778706ea6b16aa2b0ce3e7dc33d",
+   "sha256": "1fhv3r93vq497rkbwrfn6nwq525vviqlfbry6x2fimcm02sizsa1"
   },
   "stable": {
    "version": [
@@ -47617,16 +48039,16 @@
   "repo": "magit/ghub",
   "unstable": {
    "version": [
-    20240507,
-    1647
+    20240618,
+    1527
    ],
    "deps": [
     "compat",
     "let-alist",
     "treepy"
    ],
-   "commit": "1df5298c3c4d26ec3720dc6c31f8bfd07858f8a9",
-   "sha256": "1ag8jkc9kkq6rikz19gv2m2hj85f37zwdxxnx16825hf1q9xcjpk"
+   "commit": "e44aceeb12831f8b7afac4e089525b5a2dd5a5e8",
+   "sha256": "18k7w0fw56ris6wkf48dp5x4isq11zxzy712grdgax6gp0ls8m84"
   },
   "stable": {
    "version": [
@@ -48041,16 +48463,16 @@
   "repo": "magit/magit",
   "unstable": {
    "version": [
-    20240520,
-    1135
+    20240623,
+    1335
    ],
    "deps": [
     "compat",
     "transient",
     "with-editor"
    ],
-   "commit": "22fd8f8594202a0679ccc2f7d02bca44d48b8039",
-   "sha256": "1ddx82j2j8sf9w7vc9jqa8fm54slprz4jyg3bxmsh6qb0y7n3yni"
+   "commit": "196abe727054a440bf6262c5c254ad4565cbaa66",
+   "sha256": "09hrg76rhjzz1y5svzbcbw2qpq6hxcq0rc4iasb0bqmvljcra0aq"
   },
   "stable": {
    "version": [
@@ -48103,6 +48525,21 @@
    "sha256": "0w5xl9r7sbhlwxzg391x50pnsjmjjakn761v3qg0lj6xhv23sdl5"
   }
  },
+ {
+  "ename": "git-commit-ts-mode",
+  "commit": "18b52cd5af8b5ccd5c28efcde18758d03e4c76dd",
+  "sha256": "0vp7r70j8sn5q8n30lhqjdhbk6kl2qrly1dq4a8vl5rfxs5rx81c",
+  "fetcher": "github",
+  "repo": "danilshvalov/git-commit-ts-mode",
+  "unstable": {
+   "version": [
+    20240527,
+    708
+   ],
+   "commit": "04219fdac2a5c1816cd08141513770adc0c2a48b",
+   "sha256": "0chhls16pz215hxsh2c9c95msz4jmj941fvpiqp57alsv7fva9ci"
+  }
+ },
  {
   "ename": "git-dwim",
   "commit": "f8e4328cae9b4759a75da0b26ea8b68821bc71af",
@@ -48136,6 +48573,40 @@
    "sha256": "0c1hfh62vdi9ly530crsz2aghapf0s2z9i3xdvfyyynr1gqs3mis"
   }
  },
+ {
+  "ename": "git-grep-transient",
+  "commit": "f44d0bfeebbc326f39f6996fe387389c421e4368",
+  "sha256": "133c8lss7nkak0983ax1fnzagd6vw5fx5ii87krszy3izzwiagil",
+  "fetcher": "github",
+  "repo": "adelplanque/git-grep-transient",
+  "unstable": {
+   "version": [
+    20240521,
+    648
+   ],
+   "deps": [
+    "magit",
+    "symbol-overlay",
+    "transient"
+   ],
+   "commit": "c9eb6d76e6b0600d2f90d009fdc28a171f69dd80",
+   "sha256": "0kfzj77rl0lcdlwjcq6dqpm4ylqqxj38j4ymvdsk7whgnd1pwgji"
+  },
+  "stable": {
+   "version": [
+    0,
+    1,
+    1
+   ],
+   "deps": [
+    "magit",
+    "symbol-overlay",
+    "transient"
+   ],
+   "commit": "c9eb6d76e6b0600d2f90d009fdc28a171f69dd80",
+   "sha256": "0kfzj77rl0lcdlwjcq6dqpm4ylqqxj38j4ymvdsk7whgnd1pwgji"
+  }
+ },
  {
   "ename": "git-gutter",
   "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b",
@@ -48334,20 +48805,20 @@
   "repo": "sshaw/git-link",
   "unstable": {
    "version": [
-    20240413,
-    1547
+    20240630,
+    626
    ],
-   "commit": "f16ced38f954f1159fda2f0ba7b60842f8d7e9f9",
-   "sha256": "08miy2jdn5bbmwpz5p3a196p60j8ldgb4sk77rf1cz24dp490h1i"
+   "commit": "f66d1f3cdc2c99a2a5c193a6e2521118807f59e8",
+   "sha256": "1z7m7xl72x7as3d9l3zspac53kyij7hixpz1y2aq5gqpa7wzh87z"
   },
   "stable": {
    "version": [
     0,
     9,
-    1
+    2
    ],
-   "commit": "14156291e0eb7156bd779a80c17e1935a7f8f5e5",
-   "sha256": "1dxmzk4qrz69h097lwshfg4qavdp92an5212ndhjkpmkgvk1v0xl"
+   "commit": "f66d1f3cdc2c99a2a5c193a6e2521118807f59e8",
+   "sha256": "1z7m7xl72x7as3d9l3zspac53kyij7hixpz1y2aq5gqpa7wzh87z"
   }
  },
  {
@@ -48387,26 +48858,26 @@
   "repo": "magit/git-modes",
   "unstable": {
    "version": [
-    20240415,
-    1538
+    20240618,
+    1609
    ],
    "deps": [
     "compat"
    ],
-   "commit": "52ea2a1281ea9df9b8732fe2add0e6a0c9c2cd11",
-   "sha256": "1nf9ij8qab4lfcgj6h63mxlqph04z4icq5fxs5hsdxzcxrz3y6g1"
+   "commit": "7901415b39bef1b789d161ca2c10dfb910d13780",
+   "sha256": "0p7985708fc3nln1qazpdqb0qw0sq12hz5rdkqwvijc5iimdr73i"
   },
   "stable": {
    "version": [
     1,
     4,
-    2
+    3
    ],
    "deps": [
     "compat"
    ],
-   "commit": "399b1b446644afce8d0949ff85a882bfdbbfb7bf",
-   "sha256": "0npwjcm04gg1cy19gsha5m6my9xa0din860gv3h32cx8q3nizjjc"
+   "commit": "7901415b39bef1b789d161ca2c10dfb910d13780",
+   "sha256": "0p7985708fc3nln1qazpdqb0qw0sq12hz5rdkqwvijc5iimdr73i"
   }
  },
  {
@@ -48766,10 +49237,10 @@
  },
  {
   "ename": "github-modern-theme",
-  "commit": "35763febad20f29320d459394f810668db6c3353",
-  "sha256": "07xv4psw34mrpb1f5fsvj8vcm9k3xlm43zxr6qmj00p46b35z25r",
+  "commit": "0ee692a25ee31066d22cd1cbe3405ec6c323e72e",
+  "sha256": "1i4589cwf5m7bf1x39mljsi0qjiwva8zpx14i03xbpnmc6h8x3nk",
   "fetcher": "github",
-  "repo": "philiparvidsson/GitHub-Modern-Theme-for-Emacs",
+  "repo": "vexx9/GitHub-Modern-Theme-for-Emacs",
   "unstable": {
    "version": [
     20171109,
@@ -48896,10 +49367,10 @@
  },
  {
   "ename": "github-theme",
-  "commit": "3416586d4d782cdd61a56159c5f80a0ca9b3ddf4",
-  "sha256": "132jahd8vvhzhhkm71dzq6x46wmaakbbxg9s7r9779bfwbrms9j9",
+  "commit": "41c3ba590a2bb7c864b7f86abf0bf8e82b157f1d",
+  "sha256": "0r22rhhv3qjvd9la0p13hpdk9ar9cblib4m8s8hax0lxqwr0h0gx",
   "fetcher": "github",
-  "repo": "philiparvidsson/GitHub-Theme-for-Emacs",
+  "repo": "vexx9/GitHub-Theme-for-Emacs",
   "unstable": {
    "version": [
     20170630,
@@ -49502,28 +49973,28 @@
   "url": "https://git.thanosapollo.org/gnosis",
   "unstable": {
    "version": [
-    20240517,
-    334
+    20240712,
+    1936
    ],
    "deps": [
     "compat",
     "emacsql"
    ],
-   "commit": "b9c6c04e33ad2f541ab116dda9e460f21034a8eb",
-   "sha256": "0h9jjag7ip4rgwr3if9rjlglsp7fiklx52685d527gkv6wqqd5a7"
+   "commit": "9f678e624d7e89478d0090826f813d05bb811e27",
+   "sha256": "0xlv6vp51gkd2i2xnhajkzhraz0nb8ykynbm8g9kjn8nq5y8dqmp"
   },
   "stable": {
    "version": [
     0,
-    2,
-    5
+    3,
+    0
    ],
    "deps": [
     "compat",
     "emacsql"
    ],
-   "commit": "b9c6c04e33ad2f541ab116dda9e460f21034a8eb",
-   "sha256": "0h9jjag7ip4rgwr3if9rjlglsp7fiklx52685d527gkv6wqqd5a7"
+   "commit": "688dc187a1684fabb209d4d08a2d2baa5ae0e99d",
+   "sha256": "19mzyg4hg6mplv3s2kb8xiaw06zkbj7a3gvfvy51cwvb8k979ap6"
   }
  },
  {
@@ -50188,11 +50659,11 @@
   "repo": "dominikh/go-mode.el",
   "unstable": {
    "version": [
-    20230823,
-    2304
+    20240620,
+    1948
    ],
-   "commit": "8dce1e3ba1cdc34a856ad53c8421413cfe33660e",
-   "sha256": "0l002gcjmwrfkc4972hc8sal6xaja05s50rg7cbv2q9axb18rcqj"
+   "commit": "636d36e37a0d2b6adb2e12d802ff4794ccbba336",
+   "sha256": "0n8qx85ijrijq8wdmmlga69v47vq0kw0njjkvmvibv05hi8g2q2h"
   },
   "stable": {
    "version": [
@@ -50429,11 +50900,11 @@
   "repo": "lorniu/go-translate",
   "unstable": {
    "version": [
-    20240522,
-    333
+    20240711,
+    28
    ],
-   "commit": "8cc1f9d013fd99d5bec8b862f8acb249c9104e7e",
-   "sha256": "15z86y5dvwdcds6w6vl1bv6j4rakc5a4gzawbacpb8wz25nbbigx"
+   "commit": "97468ed8ff5ae93e01e93d4018e7be1b711046a1",
+   "sha256": "0c6snl8jm9ykpq2h3cl7335pmzycq9kg6ki3mqq8yzzrp51a6ffh"
   },
   "stable": {
    "version": [
@@ -51057,8 +51528,8 @@
   "stable": {
    "version": [
     0,
-    37,
-    2
+    38,
+    0
    ],
    "deps": [
     "dash",
@@ -51066,8 +51537,8 @@
     "magit-popup",
     "s"
    ],
-   "commit": "9a1b3c8fdfd0fcbe460b3546ef1fba26905e6bd0",
-   "sha256": "1bcakhih2c3ql2npq4v8bsq88dknbk8658b94hbfhy16an81l2zn"
+   "commit": "51648874c24e2232274693e92218551e3292c425",
+   "sha256": "1bk2bnxc5b7y2ng0pdxnxfwr6s3yp4kpw50zwrak3phiv8z862k7"
   }
  },
  {
@@ -51221,28 +51692,28 @@
   "repo": "karthink/gptel",
   "unstable": {
    "version": [
-    20240520,
-    1943
+    20240626,
+    2246
    ],
    "deps": [
     "compat",
     "transient"
    ],
-   "commit": "3bce2caa5dc773d1b1fce53e8453d2e1ce534b8b",
-   "sha256": "1v6pvla6kv9ym3vkd37k2hkn71ycgh4av933ipjqycy1zrwb968i"
+   "commit": "dcc4e3640ebaa0f94e24b3ad2099a01f7f3a517a",
+   "sha256": "00y8kmzgsyqgvy0hcjinnqnm6jsf22wyg7jfadybwbnw9aiy7q6a"
   },
   "stable": {
    "version": [
     0,
-    8,
-    6
+    9,
+    0
    ],
    "deps": [
     "compat",
     "transient"
    ],
-   "commit": "cdb07d0d2bb6a4fe6d6a620aa4eec98f70fe6f78",
-   "sha256": "1k3mq0xjxdbwbhssd16yh6hfg3jpm9qqx4q4jc2igisjja75nmrv"
+   "commit": "4c0583b2bd6557a09d66dfec84bab776242d0848",
+   "sha256": "0q99lms7dwfa5w48mykynyjs1wv4qjnlhf7qd816j6lvxkd40pi4"
   }
  },
  {
@@ -51253,11 +51724,11 @@
   "repo": "mkcms/gpx-mode",
   "unstable": {
    "version": [
-    20240513,
-    1737
+    20240609,
+    2200
    ],
-   "commit": "b79baf93040fb5c89e803848e8aff31331ea03b8",
-   "sha256": "0ffqzihh1c874bj53hdgjcvwhkmp2pdmcl6rmzjv1m9ijxhxnjmj"
+   "commit": "88aa5fed1b0987d90f442eb002ab0f2e4731e223",
+   "sha256": "1gc52avqkwq9l119ckah0qvwml6cc3w02gvl772ncj821ci90d7r"
   },
   "stable": {
    "version": [
@@ -51708,6 +52179,25 @@
    "sha256": "0vkv34aslcw2fl9yx8j6094s8j5mgpqrwvyf07a1d16rixncffpm"
   }
  },
+ {
+  "ename": "greader",
+  "commit": "adeadbbb9d48e015f621a86bd4fbfb26465ff5e6",
+  "sha256": "1z3qqbbaydfpmzwm5ih9b3grf1xwjaxh5s565lbd8r9kmfvb08zp",
+  "fetcher": "gitlab",
+  "repo": "michelangelo-rodriguez/greader",
+  "unstable": {
+   "version": [
+    20240712,
+    2322
+   ],
+   "deps": [
+    "compat",
+    "seq"
+   ],
+   "commit": "7301a27f22bcae3e57a85e1e88d7917077b4d791",
+   "sha256": "0zxjkihz5x8jwpyxfykmkp5zna1m9p3kg9bir5h5k7aak07jj7mf"
+  }
+ },
  {
   "ename": "greek-polytonic",
   "commit": "bf0e6206be0e6f416c59323cf10bf052882863f3",
@@ -52047,14 +52537,14 @@
   "repo": "greduan/emacs-theme-gruvbox",
   "unstable": {
    "version": [
-    20240515,
-    553
+    20240615,
+    432
    ],
    "deps": [
     "autothemer"
    ],
-   "commit": "3388a96d8e59c120bc243c1f90c614237f6ac3b5",
-   "sha256": "0r0yqa47zlwr9bv9m84dq3vl43k1gk5hlclcg40v4wqkiiyhwbvw"
+   "commit": "d2404eb157845536b111999a4332d58a4867427e",
+   "sha256": "1bnmp9nbpsrnxhn6v81533xcb9hx043wf86n5hwj9mpacl5ic33y"
   },
   "stable": {
    "version": [
@@ -52236,14 +52726,14 @@
   "repo": "tmalsburg/guess-language.el",
   "unstable": {
    "version": [
-    20220408,
-    1545
+    20240528,
+    1319
    ],
    "deps": [
     "cl-lib"
    ],
-   "commit": "b1fc363ca2c30b8a8ddaf2e366bca7770c8cfbec",
-   "sha256": "1sgzvi6ax05rfnjdlmhkd52sr26b6w3q1lfcrrv6rdzsifarh2iv"
+   "commit": "a17203d26135b970e4d7c5d101955d41303a758f",
+   "sha256": "1v9wwpfjl7a37jx0s2w5g48mv58vw8b3d0552v5ksxw21mbkya8s"
   }
  },
  {
@@ -52355,11 +52845,11 @@
   "repo": "Overdr0ne/gumshoe",
   "unstable": {
    "version": [
-    20240304,
-    525
+    20240628,
+    2142
    ],
-   "commit": "223d19ffbd6296864a775d18025150ccbcbc7800",
-   "sha256": "1lad09axg7iyk3iclk35fxpdb42s8sxxncfqgpqcc56grin7jq85"
+   "commit": "569ee770d022df9f6d51ff448652788a379c377c",
+   "sha256": "1gl0w48gpqd02zq3jh4gn2n41mr8g850fq6s10jlmkdh6q1za233"
   }
  },
  {
@@ -52491,14 +52981,14 @@
   "repo": "abrochard/emacs-habitica",
   "unstable": {
    "version": [
-    20220215,
-    1758
+    20240601,
+    2029
    ],
    "deps": [
     "org"
    ],
-   "commit": "9e1fde7f359f7f6a6976b857fbbdbc8dd4fd3327",
-   "sha256": "0xi0yvm4v2mjyml44jbprdl9lza7lhxmf2j177nbgvn8zgfjc7ac"
+   "commit": "b884301058c075e6f530f10e970b744aa29f5937",
+   "sha256": "1jfizwqi54bw0w9p77wrz9b2a5jbyd2v14nrb1nr03l5jxmx0f1n"
   }
  },
  {
@@ -52509,14 +52999,14 @@
   "repo": "hhvm/hack-mode",
   "unstable": {
    "version": [
-    20230227,
-    1950
+    20240524,
+    1838
    ],
    "deps": [
     "s"
    ],
-   "commit": "278e4cc4032bff92060496cf1179643cfc6f9c0f",
-   "sha256": "0b7831sklgal1zky772qdmg6b2a1kdy4nwhz398rb8shx66fx4pm"
+   "commit": "ccf20511f0f2ed45d00d423c703bb91ab6a8b80c",
+   "sha256": "0jnxys3zcmswb0z4zcd05c58cpw9qbw8hgwfqfsixyk720722b9g"
   },
   "stable": {
    "version": [
@@ -52767,27 +53257,27 @@
   "repo": "alphapapa/hammy.el",
   "unstable": {
    "version": [
-    20240423,
-    407
+    20240608,
+    359
    ],
    "deps": [
     "svg-lib",
     "ts"
    ],
-   "commit": "e3b2e365140abd87537edc09cd87fb04268bc439",
-   "sha256": "166wjgkdrp2gdw10a8bkpqbiaqhhxlwmk80ia9djnz6js50hx8xq"
+   "commit": "d5d154060bb13e9b61d74a83b25a12238973099d",
+   "sha256": "0mwp20nnrcbli4pp2lh4mkfcnfmckppigfi161cgbng44idywvsi"
   },
   "stable": {
    "version": [
     0,
-    2,
-    1
+    3
    ],
    "deps": [
+    "svg-lib",
     "ts"
    ],
-   "commit": "84c0f14e2fcbaa36dfbf2986d44e672d028fa2e6",
-   "sha256": "1jz3cfmlwf5p5hzix4phl7gz8nymmbf5h3h3qd2ni37yz01d2xch"
+   "commit": "d5d154060bb13e9b61d74a83b25a12238973099d",
+   "sha256": "0mwp20nnrcbli4pp2lh4mkfcnfmckppigfi161cgbng44idywvsi"
   }
  },
  {
@@ -53076,11 +53566,11 @@
   "repo": "haskell/haskell-mode",
   "unstable": {
    "version": [
-    20240116,
-    1718
+    20240527,
+    853
    ],
-   "commit": "43b4036bf02b02de75643a1a2a31e28efac1c50b",
-   "sha256": "09lz6w8rwfvp57byzalz8l3622kb06inqf5p6ijngkrildfgzgcr"
+   "commit": "727f72a2a4b8e4fd0a7b62129668baea55a2c3e0",
+   "sha256": "0r0fzvrmqg4vi4q9h3b260dppxszq4gpak5jl8kqb84s22hx4g33"
   },
   "stable": {
    "version": [
@@ -53403,30 +53893,28 @@
   "repo": "emacs-helm/helm",
   "unstable": {
    "version": [
-    20240521,
-    1457
+    20240710,
+    509
    ],
    "deps": [
     "helm-core",
-    "popup",
     "wfnames"
    ],
-   "commit": "c65a9039b6574183aa3f3e0b647c85470c002339",
-   "sha256": "0m0b6gb393q60cha19wm0xsry6rihqyp2v6yqcrbmhjr4qbsmni6"
+   "commit": "568f104747876a675aad5f2ded395f487a5e6492",
+   "sha256": "1kgkvx6ys43awv6vryr6k0n8z70svn5i3pdx0lcwzc51sysy3zil"
   },
   "stable": {
    "version": [
     3,
     9,
-    8
+    9
    ],
    "deps": [
     "helm-core",
-    "popup",
     "wfnames"
    ],
-   "commit": "6ae44dba0cb72a3a6950cbe36d104db9c69dfb49",
-   "sha256": "01lqwqjgg1m7ixm160z88cv6mbacs1vxbkvzcgns0lspxckvl1b1"
+   "commit": "aa51c1a8d6ff4e1e88e61e989f41ac3aa808a592",
+   "sha256": "14wpfsxs9k0d6184d0laz1w11z9x2rmdii4kx4vfkd1qg0jglg7v"
   }
  },
  {
@@ -54296,26 +54784,26 @@
   "repo": "emacs-helm/helm",
   "unstable": {
    "version": [
-    20240518,
-    1434
+    20240712,
+    1822
    ],
    "deps": [
     "async"
    ],
-   "commit": "ba2eb552353635222f14984b8a2f4456b4ac62e2",
-   "sha256": "15nb9dd59fbzmq2b78pnb9iy1d2q6bdnq6xxsmpycqr10kbmsv1p"
+   "commit": "0b3a41934051ae9be4b97f92115c121f9fb0352a",
+   "sha256": "0w0h8j4m6prxyhqznprwnzdqlqfqmcpvry2f6cb4fx2c4rxvv5sn"
   },
   "stable": {
    "version": [
     3,
     9,
-    8
+    9
    ],
    "deps": [
     "async"
    ],
-   "commit": "6ae44dba0cb72a3a6950cbe36d104db9c69dfb49",
-   "sha256": "01lqwqjgg1m7ixm160z88cv6mbacs1vxbkvzcgns0lspxckvl1b1"
+   "commit": "aa51c1a8d6ff4e1e88e61e989f41ac3aa808a592",
+   "sha256": "14wpfsxs9k0d6184d0laz1w11z9x2rmdii4kx4vfkd1qg0jglg7v"
   }
  },
  {
@@ -55852,14 +56340,14 @@
   "repo": "emacs-helm/helm-ls-git",
   "unstable": {
    "version": [
-    20240315,
-    1721
+    20240702,
+    811
    ],
    "deps": [
     "helm"
    ],
-   "commit": "8b0b9484d43153e0c1a1fb664a14b1a53874e60b",
-   "sha256": "1ggsx4hvkq7q13pxa4lqxj4s78fm5acl55z7b5c1qrvykkwjdfc4"
+   "commit": "1cf4e5caf8f18ae323764015496b13d0e85c716f",
+   "sha256": "1nixr1si7zgrdpprxr3wrm89fl4g8dnnaq21wr217f9wf3gp7nkr"
   },
   "stable": {
    "version": [
@@ -56321,23 +56809,24 @@
   "repo": "alphapapa/org-ql",
   "unstable": {
    "version": [
-    20240403,
-    2026
+    20240613,
+    355
    ],
    "deps": [
+    "compat",
     "dash",
     "helm-org",
     "org-ql",
     "s"
    ],
-   "commit": "1f264bf4649dc2ad90f16a763794561ee6164d84",
-   "sha256": "0425r0qjl83d1zq2z9myish3iqa6pc9ml2jlwmffjnj5gm3vgfsj"
+   "commit": "f7c3a61e32e8da62da1e69a2a79ec5b333a7d1f5",
+   "sha256": "1di581sgfqjbij1s2ka5mkycdkrsg39rh6g51x1iicvs5j8r0ih9"
   },
   "stable": {
    "version": [
     0,
     8,
-    6
+    7
    ],
    "deps": [
     "dash",
@@ -56345,8 +56834,8 @@
     "org-ql",
     "s"
    ],
-   "commit": "1f264bf4649dc2ad90f16a763794561ee6164d84",
-   "sha256": "0425r0qjl83d1zq2z9myish3iqa6pc9ml2jlwmffjnj5gm3vgfsj"
+   "commit": "c2b4404808185a9d5e160c8eea7967f906f77fd3",
+   "sha256": "0smk5affzlf0i4m10kx8mcffpysd61pjm4zidz2qdv5vsg3j9z50"
   }
  },
  {
@@ -58087,8 +58576,8 @@
   "repo": "Wilfred/helpful",
   "unstable": {
    "version": [
-    20231028,
-    516
+    20240613,
+    1523
    ],
    "deps": [
     "dash",
@@ -58096,8 +58585,8 @@
     "f",
     "s"
    ],
-   "commit": "a32a5b3d959a7fccf09a71d97b3d7c888ac31c69",
-   "sha256": "1shv5v0rls38znv64g8h80541qyjqk39fpr7wkq5vis8xpfvvpp5"
+   "commit": "4ba24cac9fb14d5fdc32582cd947572040e82b2c",
+   "sha256": "1xhhm7avgv9iqnc9pdx8dzcx8p5xaqk81j5zp96qbv035mqkpzrx"
   },
   "stable": {
    "version": [
@@ -59226,26 +59715,26 @@
   "repo": "tarsius/hl-todo",
   "unstable": {
    "version": [
-    20240415,
-    1538
+    20240707,
+    1351
    ],
    "deps": [
     "compat"
    ],
-   "commit": "36b66cde5777943ca0f190ad7a33fae3b2f6a404",
-   "sha256": "0v9mrkqxbvjpx1ynx8pja5djghwnix80vkbazrfv39j7shmx2dkh"
+   "commit": "2e50b16a9cb263706ecea7e0e54bb7f131b65c8d",
+   "sha256": "13qwh736srkrqiim1xpfkc5hjk1c77i9y6a71nv5iqaffykizkx0"
   },
   "stable": {
    "version": [
     3,
-    6,
+    8,
     0
    ],
    "deps": [
     "compat"
    ],
-   "commit": "70ce48470c85f1441de2c9428a240c3287995846",
-   "sha256": "1rq16zrdmq9j2jrsg136r5qbqvsgd2bkgpb2wmxca91kfx86r2qq"
+   "commit": "2e50b16a9cb263706ecea7e0e54bb7f131b65c8d",
+   "sha256": "13qwh736srkrqiim1xpfkc5hjk1c77i9y6a71nv5iqaffykizkx0"
   }
  },
  {
@@ -59796,11 +60285,11 @@
   "repo": "hniksic/emacs-htmlize",
   "unstable": {
    "version": [
-    20240422,
-    1351
+    20240527,
+    1456
    ],
-   "commit": "54ac89c5edc7a83344cf51d8be08e1e701f88863",
-   "sha256": "0sw9jc860fhlljq9s61qz6cgg2cf43zi2l0ff6mp4np5rdiyrwjd"
+   "commit": "ed5e5b05fd260e8f161a488d56f10e7f6e01fb75",
+   "sha256": "19q4m3bc7dljh04662vm4rr1kz5c11rwyyv27vp01yakwbfig772"
   },
   "stable": {
    "version": [
@@ -59946,11 +60435,11 @@
   "repo": "pnor/huecycle",
   "unstable": {
    "version": [
-    20210830,
-    340
+    20240614,
+    49
    ],
-   "commit": "a05e32351dcff3e61b5f15800556adfe1939c112",
-   "sha256": "1qnid40hmz3yw5jr1i9xr91d57hjh90s98js48nk6m0sjbkkbb4r"
+   "commit": "8f3e8641f950072ebf4bb03afd49b87aad147ad9",
+   "sha256": "0v5d96sgfmglm4q2gi676ardkigdqws5k5cwcg8bk72cc2b35di1"
   },
   "stable": {
    "version": [
@@ -60247,11 +60736,11 @@
   "url": "https://git.savannah.gnu.org/git/hyperbole.git",
   "unstable": {
    "version": [
-    20240519,
-    1800
+    20240713,
+    827
    ],
-   "commit": "61937530ea3713b37ed34b8ad62331a507ccf8c6",
-   "sha256": "0i6h8m04njp9vwzibm2ja299lrgygw222mgknf773dys3bdnf7pm"
+   "commit": "e0504916079e982025ca3d260f53dba2ef122679",
+   "sha256": "10r5dhlq3djw1xiz1i21h5a1va5p0wc2q8rbxl9phcgvkph6mmij"
   }
  },
  {
@@ -60262,19 +60751,20 @@
   "repo": "ushin/hyperdrive.el",
   "unstable": {
    "version": [
-    20240522,
-    627
+    20240713,
+    434
    ],
    "deps": [
     "compat",
     "map",
+    "org",
     "persist",
     "plz",
     "taxy-magit-section",
     "transient"
    ],
-   "commit": "f32525eea6032d3422a4419fe65d6c32eb359b8b",
-   "sha256": "0rs5ij0z82f2aiq5lrr0rkp33cxx2wb149mb2mrjczwrqm9riwbn"
+   "commit": "5afca563c757a7c3ced908f9193beee0cc0b013c",
+   "sha256": "1asaky1r47p1brybjjlcrf6lnwrhxc13m43xq9y08d10r1fvx4ch"
   },
   "stable": {
    "version": [
@@ -60369,6 +60859,30 @@
    "sha256": "1r5h55zcm5n2vx126q16ndhgdchcj59qqcybhsqw69vk02x96arg"
   }
  },
+ {
+  "ename": "hyperstitional-themes",
+  "commit": "0c845614a741c81502707156a4665b41cc504a78",
+  "sha256": "12z2dg035phanfdly1bkl48496yds4zbv7j9cn0211sx7bxfb265",
+  "fetcher": "github",
+  "repo": "precompute/hyperstitional-themes",
+  "unstable": {
+   "version": [
+    20240528,
+    2016
+   ],
+   "commit": "e87e4ca39384c75398c64c920bf4cbc253f6740b",
+   "sha256": "0026mlsank67q32sxhjmis9jhsd267gm1v5b7bdw8sm5mh96yx9g"
+  },
+  "stable": {
+   "version": [
+    1,
+    2,
+    0
+   ],
+   "commit": "e87e4ca39384c75398c64c920bf4cbc253f6740b",
+   "sha256": "0026mlsank67q32sxhjmis9jhsd267gm1v5b7bdw8sm5mh96yx9g"
+  }
+ },
  {
   "ename": "i-ching",
   "commit": "28b05f2e04d286f3115e33e9d3e717caef8a0a46",
@@ -60455,11 +60969,11 @@
   "repo": "mkcms/interactive-align",
   "unstable": {
    "version": [
-    20240326,
-    1233
+    20240531,
+    2023
    ],
-   "commit": "764aea597b8c9292da2d91294bb6a70e7ad7d6d7",
-   "sha256": "1hdkkrcs86xmw6j5z7bqqvk4kdsf4a8ksr9bfzwkfs8sc68314zv"
+   "commit": "96043dff1c542d15cccf5df46b778927fcf5680d",
+   "sha256": "1c9qpygvs5zqrsc2q0sdm6s3yz4qgwa6qin7vax13b1f654hz6mb"
   },
   "stable": {
    "version": [
@@ -61268,15 +61782,15 @@
   "repo": "idris-hackers/idris-mode",
   "unstable": {
    "version": [
-    20240423,
-    1320
+    20240704,
+    1334
    ],
    "deps": [
     "cl-lib",
     "prop-menu"
    ],
-   "commit": "aa580b61eb3d409ae9ceb141547937ad27fae24c",
-   "sha256": "0ylb8my9qs9agqv6i7xj4lgca2pg0cdlqagn345pydjhgd8n5cbx"
+   "commit": "09de86a8f056c61de72c678386039894779a9375",
+   "sha256": "1kdsrbh32dr3j0icnplpd4wjyp0n6d0kp7gfgbz1xcvh21gn8rdb"
   },
   "stable": {
    "version": [
@@ -61378,28 +61892,28 @@
   "repo": "KarimAziev/igist",
   "unstable": {
    "version": [
-    20240322,
-    953
+    20240713,
+    920
    ],
    "deps": [
     "ghub",
     "transient"
    ],
-   "commit": "051a58085cd9593665c59c75208cc10189b53504",
-   "sha256": "1pcm39n1kgl7h7bqkp7grwgd8fa720ss1px1by07al08g39xq72y"
+   "commit": "b3d6d3d95d0a394e19b3068e3ff553009b498fbc",
+   "sha256": "0byfi9ksms0hdzqx51qmv6as9bhjfmf5l0mpp48lcz0b0mbj542z"
   },
   "stable": {
    "version": [
     1,
     6,
-    1
+    3
    ],
    "deps": [
     "ghub",
     "transient"
    ],
-   "commit": "051a58085cd9593665c59c75208cc10189b53504",
-   "sha256": "1pcm39n1kgl7h7bqkp7grwgd8fa720ss1px1by07al08g39xq72y"
+   "commit": "b3d6d3d95d0a394e19b3068e3ff553009b498fbc",
+   "sha256": "0byfi9ksms0hdzqx51qmv6as9bhjfmf5l0mpp48lcz0b0mbj542z"
   }
  },
  {
@@ -61554,26 +62068,26 @@
   "repo": "tarsius/imake",
   "unstable": {
    "version": [
-    20240415,
-    1539
+    20240618,
+    1725
    ],
    "deps": [
     "compat"
    ],
-   "commit": "55c86a15fb253c7e351d55e762ece0a15dc816b9",
-   "sha256": "1svvjgp7ndn4i9rrg5idrqinhpfnmw0m5s5f4nr3c0zp44l2xn4i"
+   "commit": "fa1e9d8885158f9bd4776e3529b26994dcdba43d",
+   "sha256": "0mqpm1j2wdib58rn80jhxkhzc45vcyq1nzbhjv4jp35kcdi23qvz"
   },
   "stable": {
    "version": [
     1,
     2,
-    0
+    1
    ],
    "deps": [
     "compat"
    ],
-   "commit": "96ac809dbe9cae0e620bb5b1d5d1fb391f3f4741",
-   "sha256": "0xxh1jci3gvbiv0kcif1b39gfakgwaqd7a8pfwpw7f7prv44ifp6"
+   "commit": "fa1e9d8885158f9bd4776e3529b26994dcdba43d",
+   "sha256": "0mqpm1j2wdib58rn80jhxkhzc45vcyq1nzbhjv4jp35kcdi23qvz"
   }
  },
  {
@@ -61860,14 +62374,14 @@
   "repo": "jcs-elpa/impatient-showdown",
   "unstable": {
    "version": [
-    20240101,
-    929
+    20240617,
+    1944
    ],
    "deps": [
     "impatient-mode"
    ],
-   "commit": "f24ebb103cd8cba36943f6a41a0fed303bd7ba5c",
-   "sha256": "1hxxygwbs1wc080gs8lm2dij6m5qkzp0f88ifi9309b2gd0grg7n"
+   "commit": "6bdb55c33e99f97a26aab617b686daa6f193eafa",
+   "sha256": "00fh12ryrfvihckrvd9gh1cfxbj8gix0jagw816yzlj6i7530ldl"
   },
   "stable": {
    "version": [
@@ -61980,11 +62494,11 @@
   "repo": "flashcode/impostman",
   "unstable": {
    "version": [
-    20230111,
-    2012
+    20240524,
+    847
    ],
-   "commit": "936575500f733c2428ba878f9400f3eef8c9645e",
-   "sha256": "16zd5bk7s1h9yrrsk0ngpzb4cfyj4gkmq70m0ijsc94az7m9rlx3"
+   "commit": "c0d7b5b0950fd8113f55a02b3ee7e0fc9c431bea",
+   "sha256": "0iydxmv5kawizfi0ibzlz38ycnacgskj6l1mrx47a2hxd5laz71i"
   },
   "stable": {
    "version": [
@@ -62313,11 +62827,11 @@
   "repo": "nonsequitur/inf-ruby",
   "unstable": {
    "version": [
-    20240509,
-    143
+    20240627,
+    2135
    ],
-   "commit": "1dcaa0aad2eec23582263f934005140ddf70f52c",
-   "sha256": "1rxxn0329c3xvcn931rwb2chfzxm2m9zi2zq6kvgi5bwq2p5b53q"
+   "commit": "b234625c85a48cc71e7045f5d48f079f410d576a",
+   "sha256": "13x6jg89wg0s41p12srv61if9jwz1j0j0q5yfc543lx6ndk1w67g"
   },
   "stable": {
    "version": [
@@ -62749,10 +63263,10 @@
   "repo": "ideasman42/emacs-theme-inkpot",
   "unstable": {
    "version": [
-    20230618,
-    715
+    20240610,
+    1406
    ],
-   "commit": "2f59c524e17f8fb157bdbae5cf10cfe42f63c6bd",
+   "commit": "259272084f8ead2453f83f526ed95061f879d464",
    "sha256": "08lnbvnn56hkm78sxs7k5h8wy4v0c2aynq41bqjr3p2j19hkxssr"
   }
  },
@@ -63156,6 +63670,29 @@
    "sha256": "14zfxa8fc7h4rkz1hyplwf4q2lga3l5dd7a2xq5kk0kvf2fs4mk3"
   }
  },
+ {
+  "ename": "iosevka-theme",
+  "commit": "82c26e97c7d96817b9ae524a976b243cfe2d9c38",
+  "sha256": "0a6z01qqx63wg95cyvs1yc2mxsyys51j1msvx7myi9z8nqj5l3s7",
+  "fetcher": "codeberg",
+  "repo": "mekeor/iosevka-theme",
+  "unstable": {
+   "version": [
+    20240621,
+    2151
+   ],
+   "commit": "1f17b9cdb48021a0ac1369d9622742e0f5442c9d",
+   "sha256": "0gv79s2v0g5vjqg5xlbxhlqrg7fjymch4skgrnz0ni21h4m9c6gk"
+  },
+  "stable": {
+   "version": [
+    0,
+    2
+   ],
+   "commit": "4b4fecee994b62c4b2b3d7bc34c181937c41eafc",
+   "sha256": "1ysdq690r8ks86j837dm5v9mlyh3l4mzxfm2dmhl0cg051azv0p2"
+  }
+ },
  {
   "ename": "iota",
   "commit": "4062b8df284ac67c8324c7aee82c6be955e6e3a8",
@@ -63743,11 +64280,11 @@
   "repo": "abo-abo/swiper",
   "unstable": {
    "version": [
-    20240519,
-    1636
+    20240524,
+    1139
    ],
-   "commit": "6a98b006f140b588490c24c5f794aac4250bf300",
-   "sha256": "054wjara59jjqrhr7hq0h4h3f3k6gvbx6m8066s5hryvi1ij2p4y"
+   "commit": "2a25a6fb5b081cb141c5eccac8ee58ab1feeb747",
+   "sha256": "1z5975q7a67z2kgnx3klr35magrcgy6idhzhi73in133cff0d21n"
   },
   "stable": {
    "version": [
@@ -64659,11 +65196,11 @@
   "repo": "zellio/j-mode",
   "unstable": {
    "version": [
-    20171224,
-    1856
+    20240611,
+    2211
    ],
-   "commit": "e8725ac8af95498faabb2ca3ab3bd809a8f148e6",
-   "sha256": "0icrwny3cif0iwgyf9i25sj9i5gy056cn9ic2wwwbzqjqb4xg6dd"
+   "commit": "3f852d1476be5625fea51dcaaad66dd57593101a",
+   "sha256": "05biqy3gdq3k5yldjwpnsn9jabnchmdzcfkpkmcdr3j2dsh7rciw"
   },
   "stable": {
    "version": [
@@ -64683,15 +65220,15 @@
   "repo": "emacs-jabber/emacs-jabber",
   "unstable": {
    "version": [
-    20240522,
-    1532
+    20240624,
+    528
    ],
    "deps": [
     "fsm",
     "srv"
    ],
-   "commit": "02372a6673372779571b524319e08b84241e87c6",
-   "sha256": "0ps998w5z0qs676l29ag47mrrsg9k2g7pgl7fbfc0crbi2ivzj2a"
+   "commit": "e766d84b81d5df6abc30fcbbb94f7c8640ea54e2",
+   "sha256": "0b6msdyvhjr4v4j8hl6kmcjks88iq001w1fhjgfvg8ii9n77n6xn"
   }
  },
  {
@@ -65480,25 +66017,25 @@
   "repo": "minad/jinx",
   "unstable": {
    "version": [
-    20240515,
-    1016
+    20240708,
+    2122
    ],
    "deps": [
     "compat"
    ],
-   "commit": "3c36f1eb31713869ffbdbf55971671efa4f01966",
-   "sha256": "04f9yd710rrn1v5b44jaackrnc7f6ywy4r5j5ig12gkddbx3r29i"
+   "commit": "e39f2682ea902a1d06bd118d5899b2bbadfb6dce",
+   "sha256": "0cy2qsgcg4xbivr5qz573xz00mp34igw5kv01h81n98a17cafga4"
   },
   "stable": {
    "version": [
     1,
-    7
+    9
    ],
    "deps": [
     "compat"
    ],
-   "commit": "3c36f1eb31713869ffbdbf55971671efa4f01966",
-   "sha256": "04f9yd710rrn1v5b44jaackrnc7f6ywy4r5j5ig12gkddbx3r29i"
+   "commit": "4580aad8a0267bf30c98d210b6bdc1a08b1aad75",
+   "sha256": "17bygyvllmmnngmbp8grs5nrngiy61c2kbyxykf1hgvmj4hqwkv8"
   }
  },
  {
@@ -65589,11 +66126,11 @@
   "repo": "ideasman42/emacs-jit-lock-stealth-progress",
   "unstable": {
    "version": [
-    20240422,
-    105
+    20240616,
+    2345
    ],
-   "commit": "8f517230266faf1decb8e948110baef7539c9df3",
-   "sha256": "0n78ijl1z1rlyx8y83c71rhwf63lzicc39d05myj25r31may5k2l"
+   "commit": "caf256543cfe5404333f5cf914a478d14b2ec102",
+   "sha256": "1iiinybr3alh0afmyhb2mz7c1r3c360bxy7x6ha2jhjk8ncz946c"
   }
  },
  {
@@ -65634,11 +66171,11 @@
   "repo": "Michael-Allan/Java_Mode_Tamed",
   "unstable": {
    "version": [
-    20240508,
-    951
+    20240617,
+    1034
    ],
-   "commit": "4a0bcf5a8f86e26ce76df0ea984c316e63df13f3",
-   "sha256": "11ka3hcfzh7dzk37zb7lblyq6r5k2f4dpn8c1nkiyzamchbfg4df"
+   "commit": "278db38c30bd556793c9ce0c939045e95dbb6f32",
+   "sha256": "1viiwc8fjazrchbkxr63k4k3m9gsaay64jikq4prrnbpmz9ljng7"
   }
  },
  {
@@ -65752,11 +66289,11 @@
   "repo": "ljos/jq-mode",
   "unstable": {
    "version": [
-    20240304,
-    911
+    20240528,
+    752
    ],
-   "commit": "d533567a680bc87060c56a50f83d80e58646d2f2",
-   "sha256": "02bl5v7y64xl14g396yl9z8bb87aldhg8yb4c72jycqf9xkmanai"
+   "commit": "a0f79eba786d46f01aeabb5913aadc337e985d6c",
+   "sha256": "0x2rgy5f55zrgmcg4rz2ivrb8pws1v5yyy69bfkbqqggniplh5y8"
   },
   "stable": {
    "version": [
@@ -66260,26 +66797,26 @@
   "repo": "taku0/json-par",
   "unstable": {
    "version": [
-    20240217,
-    550
+    20240608,
+    725
    ],
    "deps": [
     "json-mode"
    ],
-   "commit": "52f69108d4eca328f7eb74c2dfb841db2f0ffa8a",
-   "sha256": "0ifsy0016yrh9dkw9zlfd4l7m30fncli954zm3n1qknk6dmyd19r"
+   "commit": "c4a9566142de6b0812cf4dfe0b0bf49b3e35f038",
+   "sha256": "0hhwhlfxrm6qnb99awy3hxm5zdjsz40jifxyp6qjsny5cg418zf9"
   },
   "stable": {
    "version": [
-    4,
+    5,
     0,
     0
    ],
    "deps": [
     "json-mode"
    ],
-   "commit": "8d6f6adb24c08896fbc285b7144202074c2d6244",
-   "sha256": "0himbsm42sgjc576p45r1v5jqpr91lzi2s54lrj45gf0bixgvql3"
+   "commit": "7b346b0f0db62d65f382ce48a9b2ecd9e180b0d7",
+   "sha256": "1rppp5yi3v3jf90di9jsil18fl00l4qlgandzb3bdrv0j9z2lfqc"
   }
  },
  {
@@ -66540,20 +67077,20 @@
   "repo": "llemaitre19/jtsx",
   "unstable": {
    "version": [
-    20240519,
-    1546
+    20240603,
+    1609
    ],
-   "commit": "7bbf02f046e375c23fe5a90eb0a9557e843eba41",
-   "sha256": "1x7w6g535la7fs05v2xil4bggif7j9f3qphc49fz9ay6q6rfsc84"
+   "commit": "2b50a2e0d4c59ec465ba3bd8848743eeea13fc09",
+   "sha256": "0yf44n933k772gmav72l5svbl06pss3hnqqni8mi3vff0cy3sdva"
   },
   "stable": {
    "version": [
     0,
-    4,
-    2
+    5,
+    0
    ],
-   "commit": "32dec6d5d5725a7fe2d50537e46c224349008896",
-   "sha256": "1g82cfkkv7vjsk29bfjjwjhwark1h371pzrfqnrm5sfpyn1h3nxv"
+   "commit": "2ad20cef1b2a6fc1e8b282f34127de82f6e463b1",
+   "sha256": "1kia04cs3xm2f3dvas9i6r9vz62xdlx6g5a0pz995gyxw91f7q3g"
   }
  },
  {
@@ -66874,8 +67411,8 @@
   "repo": "emacs-jupyter/jupyter",
   "unstable": {
    "version": [
-    20240418,
-    1642
+    20240420,
+    1918
    ],
    "deps": [
     "cl-lib",
@@ -66884,8 +67421,8 @@
     "websocket",
     "zmq"
    ],
-   "commit": "f1394d303be76a1fa44d4135b4f3ceab9387a16b",
-   "sha256": "0346ws7ym873dc3xbmpzlg371v0rgclz93hbfzcld7gv4g1dncfb"
+   "commit": "aec436af541549ccd02e23c066a6c497d1365f6b",
+   "sha256": "1cssm3jrj20n9wjcqq4sz74rx0sm6yg5dbskn9d5h86df00af2zh"
   },
   "stable": {
    "version": [
@@ -66935,8 +67472,8 @@
   "repo": "psibi/justl.el",
   "unstable": {
    "version": [
-    20240224,
-    428
+    20240701,
+    1259
    ],
    "deps": [
     "f",
@@ -66944,8 +67481,8 @@
     "s",
     "transient"
    ],
-   "commit": "1b16ca44b227dc761a2c8631690140f62e024f98",
-   "sha256": "1ciwiamby7w8snkrn6c3s7y5fyfpv6982rihfx6gmbsg0r6vgmwl"
+   "commit": "e74fef3e99c5c9e2e1a8495c539e1eca2cd0676d",
+   "sha256": "07gj3xfwim1df5c1dck9a3w00xg4syywmfzdayby5af79lrbcyrf"
   },
   "stable": {
    "version": [
@@ -67144,14 +67681,14 @@
   "repo": "bram85/kagi.el",
   "unstable": {
    "version": [
-    20240424,
-    2021
+    20240629,
+    557
    ],
    "deps": [
     "shell-maker"
    ],
-   "commit": "b3d45264fb25aa95130352c65bc87ec4659e6e71",
-   "sha256": "0jm4h2sbj7wn6s520zi62l9iqggp2q5whpncc1mb3ckfvwn0vhfk"
+   "commit": "eb767d1e0dc56b14ebc8f4362890b7fd2be7a542",
+   "sha256": "0gs7lngj5ng6caiafh2hzjjwb3zm95j9kzslxis20lyqmpp64r1l"
   },
   "stable": {
    "version": [
@@ -67272,17 +67809,17 @@
  },
  {
   "ename": "kanagawa-theme",
-  "commit": "e4033364b3a2898858cecee0d6deff5779195f29",
-  "sha256": "00zx1zjvshvld6f1q9lk8j08nng1ra0isyhbyhnic6mhljb20mk3",
+  "commit": "031d8e3e0b3caa06935005d4388c605a2b9a9e7d",
+  "sha256": "0bipgikp4280j46yk91zdyg53yscs93lsdzfm7w8ppfl1c4g6xxh",
   "fetcher": "github",
-  "repo": "meritamen/emacs-kanagawa-theme",
+  "repo": "Fabiokleis/emacs-kanagawa-theme",
   "unstable": {
    "version": [
-    20240501,
-    38
+    20240709,
+    1230
    ],
-   "commit": "3ac33b6a4c7c7ad751ec8f264aa05f135b5d953d",
-   "sha256": "0dbdv64yzhrhhzg0asxnabzhv1jhcihmkby3ilw8hgls0w0r24c0"
+   "commit": "2cad3191be7c574d0fc933a8566468fa520862e0",
+   "sha256": "0pmy0vjd05vvciryjkscpnmknd5kvjm61pybz4nbzckkzqd6r9g2"
   }
  },
  {
@@ -67323,30 +67860,30 @@
   "repo": "magnars/kaocha-runner.el",
   "unstable": {
    "version": [
-    20240410,
-    1348
+    20240625,
+    1010
    ],
    "deps": [
     "cider",
     "parseedn",
     "s"
    ],
-   "commit": "ab5b4f32c733e238bdf08e10cab9a0606675faa4",
-   "sha256": "0qjbaahx04nrasz75ni3s3snhpbrcrv0a6g3gqqjs6f7kw327laj"
+   "commit": "98f45ee396802c2225595c9151d4a941f9dcaa9d",
+   "sha256": "15smw8033hjwg7wh5zcdngr9my7yy8lbjgw5x3kck87chrwyj6fr"
   },
   "stable": {
    "version": [
     0,
     3,
-    0
+    2
    ],
    "deps": [
     "cider",
     "parseedn",
     "s"
    ],
-   "commit": "c4ec9cdc817e5f4c3f8d6013e44ea2df8f3eb07f",
-   "sha256": "062c6j8l2vv2vc23z5iq4b50p92k6bni1rayhhd8j0h5bkiml4w3"
+   "commit": "e5071ce09ec2d8c700bac91c902318035c5489bf",
+   "sha256": "0kxsrk4brk24mlc7fxvv0yrx5piq26fyjqllxx3vkkrzps792z3x"
   }
  },
  {
@@ -67526,11 +68063,11 @@
   "repo": "conao3/keg.el",
   "unstable": {
    "version": [
-    20230709,
-    1321
+    20240713,
+    1007
    ],
-   "commit": "c0d24fdad4248e0291685b47a02df54e9f980aba",
-   "sha256": "0bd5jp1qy4d4v71jfn3qp7rfwfbjvsbcmk9c6m4dympv1w9dp56d"
+   "commit": "e1726f89dab1811a110eebb3f3e4b673742faf05",
+   "sha256": "02wwr40jxny9w0xnjwi4n40hn5jmdkkzng4rml846hw4ih1vxc0k"
   }
  },
  {
@@ -67556,8 +68093,8 @@
   "repo": "jinnovation/kele.el",
   "unstable": {
    "version": [
-    20240428,
-    2141
+    20240621,
+    2110
    ],
    "deps": [
     "async",
@@ -67569,13 +68106,13 @@
     "s",
     "yaml"
    ],
-   "commit": "ee667b6581113be21e7d24935cf8a431eb382432",
-   "sha256": "038zqsgbg4j7mrhw7rf61qp0bja2m675rhxk6y8bbnvkva8z24w9"
+   "commit": "2460094aede77054f3200c61d807a445e3b79c9a",
+   "sha256": "1izyfhabmlqhbn0zv0vxc8c2ncxs26qw17k4772gpksvxxa29i44"
   },
   "stable": {
    "version": [
     0,
-    5,
+    6,
     0
    ],
    "deps": [
@@ -67583,12 +68120,13 @@
     "dash",
     "f",
     "ht",
+    "memoize",
     "plz",
     "s",
     "yaml"
    ],
-   "commit": "642c415a833a7a2aa1fb577261b1e2ae0c4bbb72",
-   "sha256": "07yb4sdgzqwr7snpvmc72zvpc5aq37gmwbjq4b05rwcrhcv88kc6"
+   "commit": "beec4a76c090101d8a98e631c292207be3c3a6a1",
+   "sha256": "0h67jvvql9z969wzzxx8g2hnnzxw5p1wqc211258bgyxm6p25yzq"
   }
  },
  {
@@ -67758,26 +68296,26 @@
   "repo": "tarsius/keycast",
   "unstable": {
    "version": [
-    20240415,
-    1539
+    20240618,
+    1727
    ],
    "deps": [
     "compat"
    ],
-   "commit": "04fa2c65f0ae901ed3015f691ea70f7658ea24b8",
-   "sha256": "088grlq97g5csb1w84mjj7ffc3hjg55aa2i2km63xqx112l7h3m1"
+   "commit": "f04466cd8f8226715f113635204dc978171f63b7",
+   "sha256": "0ibg746xvy96rmzbh4bsgg2ifmrab6w0figz3ag3wyibcg2frdml"
   },
   "stable": {
    "version": [
     1,
-    3,
-    3
+    4,
+    0
    ],
    "deps": [
     "compat"
    ],
-   "commit": "c47fa154c756abd044da4a1353c30b978782f7dc",
-   "sha256": "0hwmjy90ngnbvhxiyf4l3lb7212i5bsqdz73qnfg1iwa7vgkv1q7"
+   "commit": "f04466cd8f8226715f113635204dc978171f63b7",
+   "sha256": "0ibg746xvy96rmzbh4bsgg2ifmrab6w0figz3ag3wyibcg2frdml"
   }
  },
  {
@@ -67861,26 +68399,26 @@
   "repo": "tarsius/keymap-utils",
   "unstable": {
    "version": [
-    20240415,
-    1539
+    20240628,
+    1857
    ],
    "deps": [
     "compat"
    ],
-   "commit": "06572084a7965b86262d7f1b52c32ed2dde86a9e",
-   "sha256": "1mlf3g1ywbh4xk5fv0nq9fw6c39xh9r87csr8c09dkrjlgp0fagn"
+   "commit": "6605cc638e22865f2c9b98345db4f9f52a2c3d2e",
+   "sha256": "012yhg74r52yx8ma8cid75i4hhqphx63lvjasrszkqmaxlqq2g5i"
   },
   "stable": {
    "version": [
     4,
     0,
-    0
+    1
    ],
    "deps": [
     "compat"
    ],
-   "commit": "1806ff73b0a68e84234d65c7d08a18cf3f0d29e5",
-   "sha256": "1amcipkd4k8kfrlnq5sqzgwwhd42kx6aw5fnallidahz8pw79s7g"
+   "commit": "ff539a421f750e6e06ea38a6757461598f857a65",
+   "sha256": "1nb9s5v00r4kx39pa7z7b419xzlv108ilp6b9drx6wzsb1lil6fn"
   }
  },
  {
@@ -68053,20 +68591,20 @@
   "repo": "hperrey/khalel",
   "unstable": {
    "version": [
-    20240314,
-    1347
+    20240527,
+    527
    ],
-   "commit": "9dea9e45ebb2364f9fe873ca773b9324b34b720f",
-   "sha256": "0gqwqhbg4hjlgln5gvkppq3rx2iwrqpdp9ivwspnpfqxrn1b8ihd"
+   "commit": "14ef50352394cd1d62b80bc17ab14f4f801f47cd",
+   "sha256": "017hw2mr810r7hxs8jvnf590n6van8w29ibryz9dwxszrij21gd7"
   },
   "stable": {
    "version": [
     0,
     1,
-    11
+    12
    ],
-   "commit": "9dea9e45ebb2364f9fe873ca773b9324b34b720f",
-   "sha256": "0gqwqhbg4hjlgln5gvkppq3rx2iwrqpdp9ivwspnpfqxrn1b8ihd"
+   "commit": "14ef50352394cd1d62b80bc17ab14f4f801f47cd",
+   "sha256": "017hw2mr810r7hxs8jvnf590n6van8w29ibryz9dwxszrij21gd7"
   }
  },
  {
@@ -68107,28 +68645,28 @@
   "repo": "khoj-ai/khoj",
   "unstable": {
    "version": [
-    20240501,
-    1100
+    20240707,
+    1256
    ],
    "deps": [
     "dash",
     "transient"
    ],
-   "commit": "bc8b92a77dc40c93a5fdf6639f367d814339bbad",
-   "sha256": "195b9xnlmnlnnl84app8kqbacvlxfxr3li393p43wp5inqsajg2h"
+   "commit": "9e31ebff936c4aa5e504aefc2f5fd88f1f9d2112",
+   "sha256": "1wvffkk2qs7kl518iws326ifim092rismz89gk49qv7nl2j2yn0w"
   },
   "stable": {
    "version": [
     1,
-    12,
+    16,
     0
    ],
    "deps": [
     "dash",
     "transient"
    ],
-   "commit": "bc8b92a77dc40c93a5fdf6639f367d814339bbad",
-   "sha256": "195b9xnlmnlnnl84app8kqbacvlxfxr3li393p43wp5inqsajg2h"
+   "commit": "9e31ebff936c4aa5e504aefc2f5fd88f1f9d2112",
+   "sha256": "1wvffkk2qs7kl518iws326ifim092rismz89gk49qv7nl2j2yn0w"
   }
  },
  {
@@ -68992,8 +69530,8 @@
   "repo": "isamert/lab.el",
   "unstable": {
    "version": [
-    20240517,
-    1837
+    20240712,
+    2254
    ],
    "deps": [
     "async-await",
@@ -69004,8 +69542,8 @@
     "request",
     "s"
    ],
-   "commit": "fec1d5ad4e09c89c7260dc440f2dce6692b1ec0f",
-   "sha256": "0gfkxxdqli97x81pcxj1p3w1z6q5w7sn7q636hycrj97v3rdv8br"
+   "commit": "0528ca5c9e445700d7361b4263e85f618686fb38",
+   "sha256": "14qaz5grvkhy4sa6743qblg6b1r17zy5cpwsq1qxqml1kaliiv9q"
   },
   "stable": {
    "version": [
@@ -69285,11 +69823,11 @@
   "repo": "lassik/emacs-language-id",
   "unstable": {
    "version": [
-    20240510,
-    1342
+    20240609,
+    1616
    ],
-   "commit": "435114f208b97e97aa1576ef1966a33d90cad01b",
-   "sha256": "1gwdiyvzm3dz1dj5l763f1v68bb15g5qfmy5b9p58695l5hi135z"
+   "commit": "44452e4f7962aca41cc2539fce1d27799d6e656c",
+   "sha256": "1x87qrqyg12w5ncgv6592amp08bpdn4sybhwyf3nwfp8zpfficms"
   },
   "stable": {
    "version": [
@@ -69893,14 +70431,14 @@
   "repo": "conao3/leaf-keywords.el",
   "unstable": {
    "version": [
-    20210816,
-    1107
+    20240618,
+    10
    ],
    "deps": [
     "leaf"
    ],
-   "commit": "849b579f87c263e2f1d7fb7eda93b6ce441f217e",
-   "sha256": "00fnkk6hl9l64dgmkhsqibhna7gdpazs4j28f7833n1dmg626ki6"
+   "commit": "febda9969046019aae3bf3b7d1f042e9dbef2af9",
+   "sha256": "0d2va4hj66kq0v60caxvl20fpqvz5z9wv1rw54vp765ccslv7y05"
   },
   "stable": {
    "version": [
@@ -70087,11 +70625,11 @@
   "repo": "ledger/ledger-mode",
   "unstable": {
    "version": [
-    20240423,
-    445
+    20240709,
+    1803
    ],
-   "commit": "c66e3e9adfb5d91f83a401387fad345f12004c8a",
-   "sha256": "1i0rar36xzv2gqkn8cn29m5xz0pwmd5y5in8iac2h2fcxvd48vc5"
+   "commit": "17983be9e9de42eadccd50709ccc1d3c147e85ca",
+   "sha256": "008hb5d9xyq16mfgxg1hll4szf12q4r1i4p6kc3l7xc7ancb7vr6"
   },
   "stable": {
    "version": [
@@ -70179,15 +70717,15 @@
   "repo": "martianh/lem.el",
   "unstable": {
    "version": [
-    20240313,
-    1154
+    20240630,
+    1228
    ],
    "deps": [
     "fedi",
     "markdown-mode"
    ],
-   "commit": "48caf7b856efc0c98f5d735dc605fbe0db793ec5",
-   "sha256": "181n1ng8nlx3dkj9lhjjva80a9i4xz6lj3yajzmf36y2b35va6s9"
+   "commit": "2dc5036f0991db352948ea93ae895654c0fe775d",
+   "sha256": "0zf3wpzqxphzxlgvqhns4yf1aa6yfgkxi5r32wi2gcrwnd97qwqn"
   },
   "stable": {
    "version": [
@@ -70368,20 +70906,20 @@
   "repo": "fniessen/emacs-leuven-theme",
   "unstable": {
    "version": [
-    20240304,
-    1034
+    20240713,
+    929
    ],
-   "commit": "04ac63e73f060edcb1bf5fadad3466c3ab557d47",
-   "sha256": "0g95z1khr1g4sr5ppzqxnakm2hkfxhavw1rl03r99csqj9qppv4c"
+   "commit": "4f355a9832095c49ec109cfc5b8f82cd8c469572",
+   "sha256": "148qb2k3np5k1sa8i7yc7qbn5s4sm9x2n3akvpvf512byx3mivs3"
   },
   "stable": {
    "version": [
     1,
     2,
-    0
+    1
    ],
-   "commit": "04ac63e73f060edcb1bf5fadad3466c3ab557d47",
-   "sha256": "0g95z1khr1g4sr5ppzqxnakm2hkfxhavw1rl03r99csqj9qppv4c"
+   "commit": "4f355a9832095c49ec109cfc5b8f82cd8c469572",
+   "sha256": "148qb2k3np5k1sa8i7yc7qbn5s4sm9x2n3akvpvf512byx3mivs3"
   }
  },
  {
@@ -70779,16 +71317,16 @@
   "repo": "emacs-vs/line-reminder",
   "unstable": {
    "version": [
-    20240101,
-    857
+    20240707,
+    730
    ],
    "deps": [
     "fringe-helper",
     "ht",
     "ov"
    ],
-   "commit": "91d8f57f11f5ddbb5e94cb23877c67a8f59d4d8c",
-   "sha256": "0pvyfnf7qy6m0gwbmr74lvmrki6cpm9k836bbrsjdh7rip4k6xrq"
+   "commit": "9c9248aff4aca8ae09fdcf391a315569d9ed4c65",
+   "sha256": "1xhlrb2wxm9pny79bs6cclmn72bhm1xh4brvqbxk4wannj3w4zkc"
   },
   "stable": {
    "version": [
@@ -70899,11 +71437,11 @@
   "repo": "martianh/lingva.el",
   "unstable": {
    "version": [
-    20220910,
-    1435
+    20240607,
+    1120
    ],
-   "commit": "6c33594068fa33de622172503deeec6778d9c744",
-   "sha256": "0r2f4wrd2v67m7198z0194pg853hbq4vvpd3x96y5ikbypywf426"
+   "commit": "c4cd68fb3ab1ebf419be0ec92b77d9feac921a87",
+   "sha256": "18kl31d5cxxj990vi11b9k0q2hhkchgb5d326h9v912d0bv64qfm"
   }
  },
  {
@@ -70937,14 +71475,14 @@
   "repo": "noctuid/link-hint.el",
   "unstable": {
    "version": [
-    20240409,
-    1250
+    20240626,
+    1159
    ],
    "deps": [
     "avy"
    ],
-   "commit": "9ead085e9e6798ec4ea4791d9906d6655ea2b402",
-   "sha256": "055p9p6qnzhnlm97gnbjwk1dls796zsbsvcphlivkx4zlval099w"
+   "commit": "391930f2010014b9b5bc16bb431db01dd21ca7bd",
+   "sha256": "05arbdh5z3hk9z1h0yyafx51hakm9xgsdf8l1ha4bw686r83zxh6"
   }
  },
  {
@@ -70955,11 +71493,11 @@
   "repo": "erickgnavar/linkode.el",
   "unstable": {
    "version": [
-    20200607,
-    2152
+    20240604,
+    53
    ],
-   "commit": "e31bdae11ff38b736b1869fbe94920e862f29794",
-   "sha256": "1klzqwnfb8f33ycx9nhlmbmmy61lgq1nqkkwr7s2gb9y0bxgfzzl"
+   "commit": "5152aa3ba7a4360133efd5892f0891837af30440",
+   "sha256": "0c9ly7lf1ydn3zjqn265vkjq4n4qn3xvr4lhs66gh2krk8qrm9cm"
   }
  },
  {
@@ -71659,11 +72197,11 @@
   "repo": "donkirkby/live-py-plugin",
   "unstable": {
    "version": [
-    20240419,
-    404
+    20240602,
+    513
    ],
-   "commit": "bea9903bca0ece7546df9a00883f17e4eb49b4c7",
-   "sha256": "0mv9fsmjvixdk3db8j1cw7i2bgi2phwbdwwr0fq96azxzzgqh5jx"
+   "commit": "65eb99ca34c306c9f495ac199b9365f46f50ff03",
+   "sha256": "13d657gdviw6k61ivq8gd8hmapp968bq3vk82giih703isx065md"
   },
   "stable": {
    "version": [
@@ -71773,11 +72311,11 @@
   "repo": "tarsius/llama",
   "unstable": {
    "version": [
-    20240520,
-    1947
+    20240609,
+    1445
    ],
-   "commit": "cea812d16129749deb524771e615a4a831604a83",
-   "sha256": "1wlc1m9w5s03w91i132yzxbd93pdfnxsf0pq56pfsl6xvrqbj82k"
+   "commit": "485949eb0122203b388a2de3a46a7a770a2cb622",
+   "sha256": "1rh3nm9s10pq3l4nyz89f79l5nzrsp6k7p5hlkjqxbk5f6sgcmii"
   },
   "stable": {
    "version": [
@@ -71951,11 +72489,11 @@
   "repo": "fourier/loccur",
   "unstable": {
    "version": [
-    20210224,
-    2041
+    20240610,
+    1830
    ],
-   "commit": "01b7afa62589432a98171074abb8c5a1e089034a",
-   "sha256": "1b1x1xsiwqzsiss1jc6w990v1vfvbn5d5w67yzmx59s9ldjmdqq2"
+   "commit": "f47c53a24a9d262898517c71284337821dad7ea9",
+   "sha256": "08slwg063x51c2dm742sd7nlq5zf20xrdyprwk3irdanpn9skxjb"
   }
  },
  {
@@ -71973,6 +72511,30 @@
    "sha256": "0sm73w2in65kdb68m9w3jrr5pa392x75bv063r8cdhy868031l49"
   }
  },
+ {
+  "ename": "loco",
+  "commit": "80862bea5a620c338af456f1daff6de13f7650de",
+  "sha256": "0r67b3fd91w6nvifc3hydiihh2456sfiq5wr98shbd76b1zgimjw",
+  "fetcher": "github",
+  "repo": "csmclaren/loco",
+  "unstable": {
+   "version": [
+    20240712,
+    1721
+   ],
+   "commit": "f55b0a59eb0528d3f086cc82cf71178efc6d3a63",
+   "sha256": "1gxbwmjcy5fbhdhqgj5p3p0iys5n59gc7f23z0v1d3098h2zqxnm"
+  },
+  "stable": {
+   "version": [
+    0,
+    1,
+    12
+   ],
+   "commit": "f55b0a59eb0528d3f086cc82cf71178efc6d3a63",
+   "sha256": "1gxbwmjcy5fbhdhqgj5p3p0iys5n59gc7f23z0v1d3098h2zqxnm"
+  }
+ },
  {
   "ename": "lodgeit",
   "commit": "c82e72535aefade20e23e38931ca573e3459401e",
@@ -72350,16 +72912,17 @@
   "repo": "okamsn/loopy",
   "unstable": {
    "version": [
-    20240310,
-    50
+    20240708,
+    156
    ],
    "deps": [
     "compat",
     "map",
-    "seq"
+    "seq",
+    "stream"
    ],
-   "commit": "de9a2933f4794d13236236db6165403d722e5105",
-   "sha256": "0ngmp81jd9fnvninw0v52535570np5jy194jwfqz6sp7b7394ijv"
+   "commit": "1c2a2164f24174a87194649f0286e0432594c84d",
+   "sha256": "1hrzyh6lzxl4pl8sg4lkqz3840pw3ngm3zlpq66qnwxqkq11dcsk"
   },
   "stable": {
    "version": [
@@ -72628,15 +73191,15 @@
   "repo": "emacs-lsp/lsp-haskell",
   "unstable": {
    "version": [
-    20231011,
-    1723
+    20240705,
+    832
    ],
    "deps": [
     "haskell-mode",
     "lsp-mode"
    ],
-   "commit": "89d16370434e9a247e95b8b701f524f5abfc884b",
-   "sha256": "0j1a6c1vz57xvk64n32qlaqwpvg91zh14ik7ajpyb7xm8gbw5ahv"
+   "commit": "1d15706321ac86ce2275442fe67c2778ecb567a6",
+   "sha256": "0y56l4ln8l5cg2jidr2vvr3ri729si88yfpfv72zf5dmzvyhlgar"
   }
  },
  {
@@ -72698,8 +73261,8 @@
   "repo": "emacs-lsp/lsp-java",
   "unstable": {
    "version": [
-    20240501,
-    1928
+    20240524,
+    2207
    ],
    "deps": [
     "dap-mode",
@@ -72711,8 +73274,8 @@
     "request",
     "treemacs"
    ],
-   "commit": "37c95ef7e992001250d893277acfccf4af0099b4",
-   "sha256": "172mp8na5w3dc7k6rl543dar85siz15vlhqidinim8hg9c4v6xqz"
+   "commit": "4909c14b9012eed669a9c3f11a8df055d5bb8a0e",
+   "sha256": "0qw824vdqk92r8hrrjsi7pd00rw60wf5jfjk1x3nhs06hijs0x0s"
   },
   "stable": {
    "version": [
@@ -72932,8 +73495,8 @@
   "repo": "emacs-lsp/lsp-mode",
   "unstable": {
    "version": [
-    20240514,
-    1430
+    20240711,
+    212
    ],
    "deps": [
     "dash",
@@ -72944,8 +73507,8 @@
     "markdown-mode",
     "spinner"
    ],
-   "commit": "62e1f68c1f2363f7ebe8f1c2762e472f3b5de46a",
-   "sha256": "17r4jg0i9df74bbphi4809l3q3mqy462syw5msf0sjv7k0f5fml0"
+   "commit": "52987755175042b9569e32d72ae29eba119020d6",
+   "sha256": "0sj9by3xnpc8xdj7df3x2lfkv32hwq9bakcdyyjhzaydkivsqd6s"
   },
   "stable": {
    "version": [
@@ -73093,16 +73656,16 @@
   "repo": "emacs-lsp/lsp-pyright",
   "unstable": {
    "version": [
-    20240416,
-    610
+    20240710,
+    611
    ],
    "deps": [
     "dash",
     "ht",
     "lsp-mode"
    ],
-   "commit": "b891a5071fcb4371d7d817069cbb04f5bd160468",
-   "sha256": "1qiqbjvp315m7mjsyj1ab53fpk6m6qn6pjzkxls1m0rmmjmszzg4"
+   "commit": "b3ed995c335e4195f35322645c2624fdd95673fb",
+   "sha256": "0f8rg6p81rqsglzpgkm97sixgzp76hn0j54q4krrs2gm0cs1651b"
   },
   "stable": {
    "version": [
@@ -73238,16 +73801,16 @@
   "repo": "emacs-lsp/lsp-sonarlint",
   "unstable": {
    "version": [
-    20230814,
-    1954
+    20240628,
+    2255
    ],
    "deps": [
     "dash",
     "ht",
     "lsp-mode"
    ],
-   "commit": "d131779950d5d45c3129eb088cef5fd11099f47c",
-   "sha256": "0qr9cmk148rcvn0swnvhicyy89n6lw8gkchxvvd8lwwl4ky6x9pb"
+   "commit": "043bda7b2210440169a4a551e16ae9a093a14589",
+   "sha256": "00f6sm8z54jl2vka5nyx73qh7lq3d1j565w1jxy98jfvxfjw8jq1"
   },
   "stable": {
    "version": [
@@ -73918,8 +74481,8 @@
   "repo": "magit/magit",
   "unstable": {
    "version": [
-    20240522,
-    204
+    20240711,
+    2313
    ],
    "deps": [
     "compat",
@@ -73930,8 +74493,8 @@
     "transient",
     "with-editor"
    ],
-   "commit": "f9268a959828d0c6ab26171dd2fb1ffc55e5ae70",
-   "sha256": "1xghq21qqjb2b31i75rd7j0h4fk7242vhbq976q1hls5j7a7x2mr"
+   "commit": "7b4ab4348ea9ab1022a2717c2bcada62575bf091",
+   "sha256": "1192369nkxb42mfv0bwbjmdmbyg4k624kw6xsycihm0xs7691kzz"
   },
   "stable": {
    "version": [
@@ -74047,30 +74610,30 @@
   "repo": "gekoke/magit-file-icons",
   "unstable": {
    "version": [
-    20240520,
-    216
+    20240627,
+    1228
    ],
    "deps": [
     "el-patch",
     "magit",
     "nerd-icons"
    ],
-   "commit": "d85fad81e74a9b6ce9fd7ab341f265d5a181d2a8",
-   "sha256": "1q03a4zzb2nvxgm84jj3wm4067hp2n4894xmxhc98w981vli41qm"
+   "commit": "861670d448df4fba6fb993941d41953cee230a7b",
+   "sha256": "0zldfmx9vx6fnaadx0q0vmgdsarfs284ffsj0b6qmcgxsbl2z67b"
   },
   "stable": {
    "version": [
-    1,
+    2,
     0,
-    2
+    0
    ],
    "deps": [
     "el-patch",
     "magit",
     "nerd-icons"
    ],
-   "commit": "33458112ae3701a82a02a4b88dd52baef48ababe",
-   "sha256": "1whx00jp2rgad2f3zir7qmhjpspsx6zs2hk8wlkv4hlsv9s1knpa"
+   "commit": "861670d448df4fba6fb993941d41953cee230a7b",
+   "sha256": "0zldfmx9vx6fnaadx0q0vmgdsarfs284ffsj0b6qmcgxsbl2z67b"
   }
  },
  {
@@ -74233,6 +74796,40 @@
    "sha256": "0jz69wrrzvqadaphmjrr146nzvmphsbl7rmc3ccnpw1gw6gnz81f"
   }
  },
+ {
+  "ename": "magit-gitlab",
+  "commit": "421a510ea3876c1787ddd46041174190b82a053b",
+  "sha256": "1xm7hxzwg4bq0mjlix1wnqsmz21h1clfsgqngpmawk04628ga01s",
+  "fetcher": "gitlab",
+  "repo": "arvidnl/magit-gitlab",
+  "unstable": {
+   "version": [
+    20240707,
+    1506
+   ],
+   "deps": [
+    "ghub",
+    "magit",
+    "transient"
+   ],
+   "commit": "6f10468f9091d02aa6f1ce4af914443209a7d2a5",
+   "sha256": "0c8wf5cywfqjjhdylcdrb0xq4pp2larfxxiicwp04ffapyq0z5bb"
+  },
+  "stable": {
+   "version": [
+    0,
+    1,
+    0
+   ],
+   "deps": [
+    "ghub",
+    "magit",
+    "transient"
+   ],
+   "commit": "cca91ae8b192bb5b50361aab1f94f4ff2bf9e969",
+   "sha256": "12fma78fv3fp1cmazddll4jp4f1waigsmw55mdi3j6z58m3af6xh"
+  }
+ },
  {
   "ename": "magit-gptcommit",
   "commit": "674e68c28ee0e12e6f2b217b7d140eae22473d16",
@@ -74241,16 +74838,16 @@
   "repo": "douo/magit-gptcommit",
   "unstable": {
    "version": [
-    20240406,
-    807
+    20240625,
+    356
    ],
    "deps": [
     "dash",
-    "gptel",
+    "llm",
     "magit"
    ],
-   "commit": "3584b1036574c704e5bae04274b8849590a097b0",
-   "sha256": "1rfiaqdpkf9xh57gf4vsz65f2mnhzxyadddwxyk1yfzan1il7j01"
+   "commit": "91b23fde4a880566a4e493240865e3582cad7306",
+   "sha256": "0zbj8bk3vdzfpih8242gan7a8i4gkmixxzs952mm15wg2fd98gm5"
   }
  },
  {
@@ -74475,15 +75072,15 @@
   "repo": "magit/magit",
   "unstable": {
    "version": [
-    20240508,
-    2349
+    20240710,
+    2125
    ],
    "deps": [
     "compat",
     "dash"
    ],
-   "commit": "855d924969eb6231d62ab446f727c9f7ad5c4913",
-   "sha256": "0x13wwm6f93qvaqq7qlx97ahvbvgkqf2xdq7vjn6wm9h2mdkw4hh"
+   "commit": "804c623cf6fa50a291273f582e3355fde408239b",
+   "sha256": "0ml7vg70c7yqn3qy4zjx17psk0cfxp8nj8ck90y9piq6a1kpxwdg"
   },
   "stable": {
    "version": [
@@ -75303,14 +75900,14 @@
   "repo": "minad/marginalia",
   "unstable": {
    "version": [
-    20240404,
-    451
+    20240710,
+    953
    ],
    "deps": [
     "compat"
    ],
-   "commit": "58eb5fd6e5cc21b12c5455ae69e7ae93579647bc",
-   "sha256": "196gjpmzra9azhrnvlhx50dlc59390hq4wxn0f9m4n86ig4i5dr0"
+   "commit": "40534231fd2805aa17ba3c59fd57e6a34b5a526b",
+   "sha256": "0jvd8vjhwvjv9f2h16dqc3c8ax3mdcfak5lik0p8m8kfzrb4grl1"
   },
   "stable": {
    "version": [
@@ -75445,11 +76042,11 @@
   "repo": "jrblevin/markdown-mode",
   "unstable": {
    "version": [
-    20240501,
-    1057
+    20240626,
+    826
    ],
-   "commit": "0cdebc833ed9b98baf9f260ed12b1e36b0ca0e89",
-   "sha256": "09v1vkj02l58kz74rqh3vdfy75gi48pvcaz99k9i54wncy61bv5j"
+   "commit": "8aab017f4790f7a1e0d8403239cce989c88412f6",
+   "sha256": "11922fkzsglvmfqzz0vzkg6w7q83qb0fkv2q7xlp1xi995041wqp"
   },
   "stable": {
    "version": [
@@ -75790,28 +76387,28 @@
   "repo": "martianh/mastodon.el",
   "unstable": {
    "version": [
-    20240521,
-    1721
+    20240701,
+    1604
    ],
    "deps": [
     "persist",
     "request"
    ],
-   "commit": "49def07b3d9b6f0718ef9402a3808ca01557245e",
-   "sha256": "158a5hqhmz1dvdg7rcrdikbsqli8gc1kwks6gvbji2qb99zcd8x6"
+   "commit": "a191fb5f3fb118892845792fe34ab41d98ccdf53",
+   "sha256": "1365n7nswh7f6py82hkb5qd9fhl6mdr0jcpnbzsx0mc75vpyjvl8"
   },
   "stable": {
    "version": [
     1,
     0,
-    21
+    24
    ],
    "deps": [
     "persist",
     "request"
    ],
-   "commit": "49def07b3d9b6f0718ef9402a3808ca01557245e",
-   "sha256": "158a5hqhmz1dvdg7rcrdikbsqli8gc1kwks6gvbji2qb99zcd8x6"
+   "commit": "a191fb5f3fb118892845792fe34ab41d98ccdf53",
+   "sha256": "1365n7nswh7f6py82hkb5qd9fhl6mdr0jcpnbzsx0mc75vpyjvl8"
   }
  },
  {
@@ -76434,11 +77031,11 @@
   "repo": "gvol/emacs-memento-mori",
   "unstable": {
    "version": [
-    20240429,
-    327
+    20240702,
+    2332
    ],
-   "commit": "424dc591b3dd8fe7f2f3ddef1baa647aa2b0cc7e",
-   "sha256": "1drsc9akr48q5bxrw43fs2lqjp5cdf2nxvng0nvr5v4xvckd1a9x"
+   "commit": "c53707871aa5aeb551c6b9c02bdca6f477bc9c5b",
+   "sha256": "1g70dsfm678jg8r7sg4661w9af0wqdl4csxg6vb76f4n44jy7zvb"
   },
   "stable": {
    "version": [
@@ -76535,11 +77132,11 @@
   "repo": "meow-edit/meow",
   "unstable": {
    "version": [
-    20240407,
-    1642
+    20240712,
+    2221
    ],
-   "commit": "99e08c92bb5d8a695062ce53e2cffeffd3a058a6",
-   "sha256": "12fp6bj38a4rcxrra4w50wb4qrl5jbw1wyp5hhx26ayh99ajaigi"
+   "commit": "369014fd92e44f4cec54a78fa9be11d35b44f277",
+   "sha256": "0aj3hhdff5vbp97j09ch5ajdhdmnvr0gbj0f2xibqxyb8k1pp9jk"
   },
   "stable": {
    "version": [
@@ -76551,6 +77148,36 @@
    "sha256": "0xv6wg4lyi5bv68h5hk5hfxdwxa2g3ybxd8z0l420az4rnhr6zhq"
   }
  },
+ {
+  "ename": "meow-tree-sitter",
+  "commit": "58128354525e09c1707eddd11d34edbe53501a68",
+  "sha256": "0kf47gs65ssazf4xgn39wwkymwf7w4mqq4n9s87g7y20pa7p1b69",
+  "fetcher": "github",
+  "repo": "skissue/meow-tree-sitter",
+  "unstable": {
+   "version": [
+    20240701,
+    1422
+   ],
+   "deps": [
+    "meow"
+   ],
+   "commit": "d8dce964fac631a6d44b650a733075e14854159c",
+   "sha256": "0fzj8hnf9qiylx2b2s2vj8js32rd79gnw0x2c6l35zs9mm9dxm2x"
+  },
+  "stable": {
+   "version": [
+    2,
+    0,
+    0
+   ],
+   "deps": [
+    "meow"
+   ],
+   "commit": "d8dce964fac631a6d44b650a733075e14854159c",
+   "sha256": "0fzj8hnf9qiylx2b2s2vj8js32rd79gnw0x2c6l35zs9mm9dxm2x"
+  }
+ },
  {
   "ename": "merlin",
   "commit": "17598d9a0e9f88db28014019769f3181c863e99e",
@@ -76559,11 +77186,11 @@
   "repo": "ocaml/merlin",
   "unstable": {
    "version": [
-    20231201,
-    918
+    20240604,
+    1521
    ],
-   "commit": "ad9955c76b1cb031e847e139c5cf7b7cc5cb4696",
-   "sha256": "08p6zx4swycc4wi5rhynyip24skwhg0y1zlz4krrs9ar6m2lmfwm"
+   "commit": "bd900fd6cda97cfd10f2bf520848d0a8b0fe35b7",
+   "sha256": "1866y962v1xpw5klwn9sx8fvfhxg9w5sdj66nms815qkrkd3gvmk"
   },
   "stable": {
    "version": [
@@ -76752,11 +77379,11 @@
   "repo": "wentasah/meson-mode",
   "unstable": {
    "version": [
-    20240218,
-    1834
+    20240601,
+    1647
    ],
-   "commit": "c8f4fbf075bb5db2bc0872afe02af2edac075e4e",
-   "sha256": "135glcrnbr7wmrygrngsxpma8bxajpxlanbkvk08v92p7ar6a21j"
+   "commit": "0449c649daaa9322e1c439c1540d8c290501d455",
+   "sha256": "0mmz5rqb0v668indj132kaiws1lcm1pw81pmq2nwx0d043dsci8k"
   },
   "stable": {
    "version": [
@@ -77055,8 +77682,8 @@
   "repo": "danielsz/meyvn-el",
   "unstable": {
    "version": [
-    20231213,
-    230
+    20240628,
+    2350
    ],
    "deps": [
     "cider",
@@ -77067,16 +77694,25 @@
     "projectile",
     "s"
    ],
-   "commit": "3afb0a4283afd4f63ef7fdd48eb5da972421fd7a",
-   "sha256": "1flxvaj8j5kg4r0cvns8z1xixgvsavq1i27z28j97m8dmndihihf"
+   "commit": "f2b809da1d1bf66f1a215a0e5c64f95d10118b76",
+   "sha256": "1zcckiqk046lbc059jxkh94sjicpvpsf1xkgi8i73rds2xxjyvpk"
   },
   "stable": {
    "version": [
     1,
-    0
+    3
    ],
-   "commit": "3119214ff45db630789f9371f956d5ac06229b1d",
-   "sha256": "0mnvc3f56x4icrqmc4kx6bzc9vac40f020npimdgiylbmyxj97vn"
+   "deps": [
+    "cider",
+    "dash",
+    "geiser",
+    "parseclj",
+    "parseedn",
+    "projectile",
+    "s"
+   ],
+   "commit": "f2b809da1d1bf66f1a215a0e5c64f95d10118b76",
+   "sha256": "1zcckiqk046lbc059jxkh94sjicpvpsf1xkgi8i73rds2xxjyvpk"
   }
  },
  {
@@ -77284,11 +77920,11 @@
   "repo": "erikbackman/mindre-theme",
   "unstable": {
    "version": [
-    20220827,
-    1031
+    20240610,
+    2131
    ],
-   "commit": "fc9ab1ba03494f2fb8cb8dc4e2ba5120ae35eb31",
-   "sha256": "1xqaxrzq7ws8ilbcmx5kb7g7xhch91lb9cisjydmi0xcfv34sxah"
+   "commit": "cbecece36988f83b7e355a3fcf5229f2494f3688",
+   "sha256": "1xhql4wy7r5f8bx4k1293gawbw83agf1s6va073q1pxqd94rjk6y"
   }
  },
  {
@@ -77361,28 +77997,28 @@
   "repo": "liuyinz/mini-echo.el",
   "unstable": {
    "version": [
-    20240518,
-    849
+    20240612,
+    1328
    ],
    "deps": [
     "dash",
     "hide-mode-line"
    ],
-   "commit": "4e2918225bea7fa7d232260bd0b2de48df68c6f8",
-   "sha256": "1bccmx0sd7qjfgd1p8yskw12phxc89arbiz064xk9jcl1cxaz57x"
+   "commit": "802321f0658b364d4e9d90a4ac43959d46048015",
+   "sha256": "1jkv1bhgiznxaj1jy8si505k86179wdnwipcqr2bgqckpr5dg7rk"
   },
   "stable": {
    "version": [
     0,
-    9,
-    2
+    11,
+    1
    ],
    "deps": [
     "dash",
     "hide-mode-line"
    ],
-   "commit": "f0feae3bbd0becd79ea086d4a1b811162470b162",
-   "sha256": "1wz5ssp480zlfxdvgywxx72gkf7mldrd4gxah18ys09yycawa0hi"
+   "commit": "b556c0fa68dad76a478bd3f508e0501aa6933689",
+   "sha256": "1n00jpr6hyv1hwx36whpim6kzrybk236fhzj6dgnm6icarfmfzfa"
   }
  },
  {
@@ -77592,26 +78228,26 @@
   "repo": "tarsius/minions",
   "unstable": {
    "version": [
-    20240415,
-    1544
+    20240618,
+    1732
    ],
    "deps": [
     "compat"
    ],
-   "commit": "ef234da0625397b994c0a17d1038037732c3c457",
-   "sha256": "1zd1gjg16yggmccpvv7fv32pfmh2a6227p21q2vdh8f1p0bwm10p"
+   "commit": "4566325917791b878430526f42349a644b03089d",
+   "sha256": "1m51amzflq3l8x02azwjri721zf6aj0q4sld266j7fcyp24wwk1g"
   },
   "stable": {
    "version": [
     1,
     0,
-    0
+    1
    ],
    "deps": [
     "compat"
    ],
-   "commit": "62948a4a2951dab0716977421bfe0a87ea2583c5",
-   "sha256": "0ralw9znj749ii046l0dfa3aacm05g1ix59rfsjafhky8fiwz37m"
+   "commit": "4566325917791b878430526f42349a644b03089d",
+   "sha256": "1m51amzflq3l8x02azwjri721zf6aj0q4sld266j7fcyp24wwk1g"
   }
  },
  {
@@ -77760,28 +78396,28 @@
   "repo": "liuyinz/mise.el",
   "unstable": {
    "version": [
-    20240514,
-    452
+    20240707,
+    1428
    ],
    "deps": [
     "dash",
     "inheritenv"
    ],
-   "commit": "cb19405eba3cfd679a5e3ac75c8c4c1146b16015",
-   "sha256": "0h0xkps9m1g7q21hij23rli7jq1ygzc74h8fn9am9rmj4dgy5dkg"
+   "commit": "20179a58132e5518a0868eac01dcd1d72db2e254",
+   "sha256": "0s81nsk500g5aqh1d8q3rbp4b9jkv4msfxsiqbgkf60ypzchc3zp"
   },
   "stable": {
    "version": [
     0,
-    1,
+    3,
     0
    ],
    "deps": [
     "dash",
     "inheritenv"
    ],
-   "commit": "e2db0d204890721e372ed89deb554d9a75385486",
-   "sha256": "02j067pyqf2xx48qg383wvhk267pj9wd6ckv1azsa20cm713bph4"
+   "commit": "20179a58132e5518a0868eac01dcd1d72db2e254",
+   "sha256": "0s81nsk500g5aqh1d8q3rbp4b9jkv4msfxsiqbgkf60ypzchc3zp"
   }
  },
  {
@@ -77872,20 +78508,20 @@
   "repo": "jdtsmith/mlscroll",
   "unstable": {
    "version": [
-    20240420,
-    1515
+    20240606,
+    1855
    ],
-   "commit": "cb9d7a256b8998565795d4be469d5a8dea96eb16",
-   "sha256": "1mvgb8fi7w0rpksfz4aalmn7f5a67zbq6a64cx9cmmqnn6r3llss"
+   "commit": "805d913771270f8157730f634108a237ca03137e",
+   "sha256": "0id3jglmqvzdpl5r26czxyb5vf0namvcxrql9b8djanvkd1pasz4"
   },
   "stable": {
    "version": [
     0,
-    1,
-    10
+    2,
+    1
    ],
-   "commit": "cb9d7a256b8998565795d4be469d5a8dea96eb16",
-   "sha256": "1mvgb8fi7w0rpksfz4aalmn7f5a67zbq6a64cx9cmmqnn6r3llss"
+   "commit": "805d913771270f8157730f634108a237ca03137e",
+   "sha256": "0id3jglmqvzdpl5r26czxyb5vf0namvcxrql9b8djanvkd1pasz4"
   }
  },
  {
@@ -78215,26 +78851,26 @@
   "repo": "tarsius/mode-line-debug",
   "unstable": {
    "version": [
-    20240415,
-    1545
+    20240618,
+    1733
    ],
    "deps": [
     "compat"
    ],
-   "commit": "0ff591110c9db0bbc1372234902e28486c168a86",
-   "sha256": "0whjiadyygq8i3mf325zha8jl6hxm1q44rwvmlzvxzmjm42ag2gg"
+   "commit": "b6d2821a84646d484a34b45c10bb1630bf001d0b",
+   "sha256": "1d9glgap2si4llgxl2hrbs2hbp34n11l9j076kfx73adznyyxjpj"
   },
   "stable": {
    "version": [
     1,
     4,
-    2
+    3
    ],
    "deps": [
     "compat"
    ],
-   "commit": "8e58bd51f1a8292c5df92e75a8c4a470e11a03e4",
-   "sha256": "157zssn9f5jd1b011x66ii97vmd9a16ng556xwlbnmqkcw2w42gq"
+   "commit": "b6d2821a84646d484a34b45c10bb1630bf001d0b",
+   "sha256": "1d9glgap2si4llgxl2hrbs2hbp34n11l9j076kfx73adznyyxjpj"
   }
  },
  {
@@ -78389,11 +79025,11 @@
   "repo": "protesilaos/modus-themes",
   "unstable": {
    "version": [
-    20240505,
-    331
+    20240709,
+    638
    ],
-   "commit": "d2762db19ed48bd0cbba61c41940be479760a35e",
-   "sha256": "1y8z4yfnqic9gg2nm0rqldhwkfz134zxv1x57x3jh9k04p1nblc1"
+   "commit": "a9f709e3448ff3def66328db74f5ca41366da957",
+   "sha256": "1ybhq9xpm3p7h9nk2a9069b7sw8v0qvwjjk1447gf26p5ah39dgl"
   },
   "stable": {
    "version": [
@@ -78580,11 +79216,11 @@
   "repo": "ideasman42/emacs-mono-complete",
   "unstable": {
    "version": [
-    20240421,
-    1234
+    20240627,
+    317
    ],
-   "commit": "3cb92a75cf20e1a5394e77e0e44a6b1c14cf315b",
-   "sha256": "1jzjy4pwwlyphj0warfywfqm2025wfkb8hvnn0478j26hs7141xs"
+   "commit": "3db3fa4ff88fc77fb56a54eee345bf326e0fa963",
+   "sha256": "0il28846vkql28a0dxsfncji9i2zmbqy4y6mdh4hbhg6xl16qbvk"
   }
  },
  {
@@ -78640,11 +79276,11 @@
   "repo": "oneKelvinSmith/monokai-emacs",
   "unstable": {
    "version": [
-    20240324,
-    1830
+    20240710,
+    1027
    ],
-   "commit": "df6c23d14e52f9d7f5bc2265facfbedfb07a444e",
-   "sha256": "0l0cc5qxr9fg7qs2fs2yk0nbgm6xnp2i0wvyxdnjzz6mz6c84ngk"
+   "commit": "9222cdf8209f0c3329f857ccb9edc1c79b06041a",
+   "sha256": "19zv7q9ixrvf3qbfj8xchcn7n0in6rpnkl4dd2vzbvic2lhg7nnr"
   },
   "stable": {
    "version": [
@@ -78751,26 +79387,26 @@
   "repo": "tarsius/moody",
   "unstable": {
    "version": [
-    20240520,
-    1715
+    20240618,
+    1736
    ],
    "deps": [
     "compat"
    ],
-   "commit": "1faf8c16073bb62ade53906eef549ed8ac79ae70",
-   "sha256": "1jbly23pr5lhgd9i6c0619v9pfrppk6614czf0wvz8ibkgdwsk2c"
+   "commit": "7f7d390bd082c0786cc52618866905f28e31ec98",
+   "sha256": "1pj1gpwmwl5affnvwb8ckx4xl9vm7xs8bn1xncsr0m8aamv2rh03"
   },
   "stable": {
    "version": [
     1,
-    0,
+    1,
     0
    ],
    "deps": [
     "compat"
    ],
-   "commit": "888e6fb37eb5122803c70ae60d28fc54589e26c0",
-   "sha256": "03rg1f8lnxc16cipadaxgvl9cdxlihn64xbww35n8cbkhgmmir5z"
+   "commit": "7f7d390bd082c0786cc52618866905f28e31ec98",
+   "sha256": "1pj1gpwmwl5affnvwb8ckx4xl9vm7xs8bn1xncsr0m8aamv2rh03"
   }
  },
  {
@@ -78878,26 +79514,26 @@
   "repo": "tarsius/morlock",
   "unstable": {
    "version": [
-    20240415,
-    1545
+    20240618,
+    1737
    ],
    "deps": [
     "compat"
    ],
-   "commit": "ea728ba7dbae47d8516a6026038c305092d38078",
-   "sha256": "0qa4i6hx9xljrmhds7xfnyq391p7hkzdmkfa16yhfs75479dw805"
+   "commit": "c9b6fff41e72f27f5c93230e4f3649a2cfb447f0",
+   "sha256": "1jyh1yd1vkpma4wszaic0bxvqhzqxqdddj3ykr6pgw906l2iydxf"
   },
   "stable": {
    "version": [
     1,
-    0,
-    5
+    1,
+    0
    ],
    "deps": [
     "compat"
    ],
-   "commit": "b7e2066a69c059c5d4c72e829b615a6b15cef4dc",
-   "sha256": "03q388lkbs1fx0x0wb0n06f9bfl4k67qvbhkxkw59kdlhxi7qwqm"
+   "commit": "c9b6fff41e72f27f5c93230e4f3649a2cfb447f0",
+   "sha256": "1jyh1yd1vkpma4wszaic0bxvqhzqxqdddj3ykr6pgw906l2iydxf"
   }
  },
  {
@@ -78959,6 +79595,29 @@
    "sha256": "1yxy6m5igvsy37vn93ijs0b479v50vsnsyp8zi548iy2ribr0qr5"
   }
  },
+ {
+  "ename": "most-faces",
+  "commit": "30ccf0c8f688679815bfebaed6a5c122f9fb6616",
+  "sha256": "1fjr0jb1n8p4jlp1sdf338yj9iq5pmgwc2j4ljrhwzvp90szag6f",
+  "fetcher": "codeberg",
+  "repo": "mekeor/most-faces",
+  "unstable": {
+   "version": [
+    20240620,
+    2145
+   ],
+   "commit": "846ca6db64527fe26d21421b8eaf7a63d8844c3e",
+   "sha256": "1r3gzrryd1pnhplnwzgh9x31hmm8bw9fys2mqfr40sbwzqphsdna"
+  },
+  "stable": {
+   "version": [
+    0,
+    2
+   ],
+   "commit": "e37cd1baa74f1bdf3230a9174e5c6cde73e3474c",
+   "sha256": "0yr6r7dxrkh3r7sh7qwgd33px1ckxqxjbjxcz5frdbvxlhg0npp7"
+  }
+ },
  {
   "ename": "most-used-words",
   "commit": "934e64df7fba95b6dc06e76382013dc4a9ced82f",
@@ -79115,6 +79774,30 @@
    "sha256": "1k3b018xq2qqq30v0ik13imy9c84241kyavj5ascxhywx956v18g"
   }
  },
+ {
+  "ename": "mowie",
+  "commit": "e995f6ce91c578a14966092246b6f48729500c10",
+  "sha256": "071agnqd4m3hzy3dh8plg7xk66n2b5ampa0djmf47lwnyy15va76",
+  "fetcher": "codeberg",
+  "repo": "mekeor/mowie",
+  "unstable": {
+   "version": [
+    20240626,
+    717
+   ],
+   "commit": "5236a231c172ffe3a831bb649031f4a1aaec5b15",
+   "sha256": "0kz0av456mzp3cblvkdwr6l6xwi9ibw7jhd7wjfypjajz5bzb9d1"
+  },
+  "stable": {
+   "version": [
+    0,
+    1,
+    1
+   ],
+   "commit": "7b826c751014a294b493a6bfebe1cda6a1832ab0",
+   "sha256": "19k89z6ji2j99q72b3dc28w2d9pqhcfwnzfll1yqd8sc1dkkd03k"
+  }
+ },
  {
   "ename": "mozc",
   "commit": "30fef77e1d7194ee3c3c1d4775c349a4a9f6af2c",
@@ -80585,11 +81268,11 @@
   "repo": "kenranunderscore/emacs-naga-theme",
   "unstable": {
    "version": [
-    20240327,
-    819
+    20240607,
+    1946
    ],
-   "commit": "a044e5eb5bf9bbefe34982ae9cc80ac9739a3e58",
-   "sha256": "13m17vwwrcs44xhzkh80nssgsn9p84f5vl50zk4y1712d087pc0d"
+   "commit": "84b28f3f5dcdd03205d5ff4764704806019ff332",
+   "sha256": "14816rkx6xws5gx9az4g3dk06cg8wpa3zc2iixyr4q6qc9xbp6yq"
   }
  },
  {
@@ -80934,11 +81617,11 @@
   "repo": "skeeto/nasm-mode",
   "unstable": {
    "version": [
-    20190410,
-    342
+    20240610,
+    1505
    ],
-   "commit": "65ca6546fc395711fac5b3b4299e76c2303d43a8",
-   "sha256": "00rv6m004hcsn71hv3p3rxmrpwajdy02qpi2ymhxx2w3r49ba562"
+   "commit": "7079eb4ce14d94830513facf9bf2fca9e030a4d1",
+   "sha256": "1dacd8yvbl6arvrxwdjws42nnvwflvwxz366y295izf00pl0knaj"
   },
   "stable": {
    "version": [
@@ -80958,11 +81641,11 @@
   "repo": "CeleritasCelery/emacs-native-shell-complete",
   "unstable": {
    "version": [
-    20231218,
-    316
+    20240628,
+    1901
    ],
-   "commit": "56b20b414a9298f45b0923edf633c7153b97892b",
-   "sha256": "0d4h36ns13fra744nhk9azxqmxw14fwn908i3f1h2f4ll3hqbpfa"
+   "commit": "14e0a434cffa5688992b30d1b29bb21c561f8cd0",
+   "sha256": "14zrrvwppv12wj6rrp1agsmbpx9cmx1zr03jpc9162xz7sdq1szk"
   }
  },
  {
@@ -81186,20 +81869,20 @@
   "repo": "babashka/neil",
   "unstable": {
    "version": [
-    20240402,
-    1032
+    20240701,
+    1458
    ],
-   "commit": "9a795828e4c201a47c5851157868c06f2ca37448",
-   "sha256": "0fxla1s6sn9gzqrkmlm00klhbfa7h0ki80j8jp68zlqc984ah5a2"
+   "commit": "054ca51542837fec87e289a74ab139b4ae6e108b",
+   "sha256": "1jhpk9h9dv1zqba9076lvvy5cayirb49fzw9gfrqi1qp8zqi41cb"
   },
   "stable": {
    "version": [
     0,
     3,
-    65
+    67
    ],
-   "commit": "9a795828e4c201a47c5851157868c06f2ca37448",
-   "sha256": "0fxla1s6sn9gzqrkmlm00klhbfa7h0ki80j8jp68zlqc984ah5a2"
+   "commit": "054ca51542837fec87e289a74ab139b4ae6e108b",
+   "sha256": "1jhpk9h9dv1zqba9076lvvy5cayirb49fzw9gfrqi1qp8zqi41cb"
   }
  },
  {
@@ -81287,11 +81970,11 @@
   "repo": "rainstormstudio/nerd-icons.el",
   "unstable": {
    "version": [
-    20240520,
-    1050
+    20240524,
+    311
    ],
-   "commit": "5ed32f43f2e92ac2600d0ff823ec75e4476cc53e",
-   "sha256": "0x0zipfdm6w861kmw3jjjsc1jqxdw0ggpylvwxbgbspfngl83awj"
+   "commit": "3dac80b712fb3043ec2bd7510f587548074484a3",
+   "sha256": "1nf6hjjkp6r9cnf6gzb2hsxp1z638b04h4yl5gsl0knby3zpip1x"
   },
   "stable": {
    "version": [
@@ -81594,11 +82277,11 @@
   "repo": "vekatze/neut-mode",
   "unstable": {
    "version": [
-    20240414,
-    2254
+    20240610,
+    2326
    ],
-   "commit": "e75f5f6bbcab4c042f331fcb2d0a628516cfec5f",
-   "sha256": "16iv3vn3inwjh29zk00w1l1cm8jqp96n2hrkgpmhcj0kbliy298h"
+   "commit": "c723e0a2e1f14b7f41d824ca354b0590399e2bc0",
+   "sha256": "0gcw7s3phyyidll37dm7cfrrvj7b7j5iqsbam5a0lpbi1p38rnlj"
   }
  },
  {
@@ -81922,11 +82605,11 @@
   "repo": "ninja-build/ninja",
   "unstable": {
    "version": [
-    20230421,
-    1748
+    20240528,
+    1945
    ],
-   "commit": "adf9bddd73869084a505fac83246e55c35880079",
-   "sha256": "1p6nrqsjlpr1kkndihdkjl9cm37xblaky3jda6484y6d51mixgrv"
+   "commit": "0b4b43aa3e2fee391443dcc0c961c9d2354d8954",
+   "sha256": "1g779g7x1d0f7vi7d2sraqmd9zsccnmglp9fn7w5146swqpgsvqp"
   },
   "stable": {
    "version": [
@@ -82090,11 +82773,11 @@
   "repo": "nix-community/nix-ts-mode",
   "unstable": {
    "version": [
-    20240514,
-    1605
+    20240710,
+    1039
    ],
-   "commit": "49d890e86a4597911366208930af6457ce1d46e7",
-   "sha256": "1s2kcm8rg35cl3vgbqny0ac2l00nqj5xdpll4z0is7zbhib74ll5"
+   "commit": "59ad17690576190811e0746c12ad6809596ca3ac",
+   "sha256": "0c9hxvh8v1pz4ni087dw84wzr7db057fgb37rk1qhjca0yq01mhf"
   },
   "stable": {
    "version": [
@@ -82291,8 +82974,8 @@
   "repo": "dickmao/nnreddit",
   "unstable": {
    "version": [
-    20230705,
-    1328
+    20240629,
+    2347
    ],
    "deps": [
     "anaphora",
@@ -82302,8 +82985,8 @@
     "s",
     "virtualenvwrapper"
    ],
-   "commit": "221963fb0b7116729829145f055ed750d0e2f961",
-   "sha256": "1sha2sdamq583xaaiqx40vl12ahbsk93ksx7xwp5mmvgsns7wppk"
+   "commit": "f8e26834b523c03dfcb0c751373123ffd32b8522",
+   "sha256": "1a0b0dk578kw33qgfbb4zvqnc4cmix4mfwrlqy2rcg13z3ax39c7"
   }
  },
  {
@@ -82334,14 +83017,14 @@
   "repo": "ranmaru22/no-clown-fiesta-theme.el",
   "unstable": {
    "version": [
-    20231214,
-    2115
+    20240708,
+    1611
    ],
    "deps": [
     "autothemer"
    ],
-   "commit": "0cd04a72aa5dcf61e82e2a613670334816326b02",
-   "sha256": "0ly95561skwfkn3kpv3269ffk7sd6p92dm1q6p4cq2fbm3v0w6xd"
+   "commit": "857c6261b6047855c9ccb4e9af3ba6b456566fd5",
+   "sha256": "12d7fzax3nkn2mnhaq980zkfmwzy5spa2shgam7pq5y5ay0bi754"
   }
  },
  {
@@ -82367,26 +83050,26 @@
   "repo": "emacscollective/no-littering",
   "unstable": {
    "version": [
-    20240415,
-    1545
+    20240624,
+    1447
    ],
    "deps": [
     "compat"
    ],
-   "commit": "554d890c5d5b59ebcf83c67256d0012e23cd07f0",
-   "sha256": "0x0dk7yvrzcw1pjn86gqck5ksg48dnipvwir6va20i7cgi060qfy"
+   "commit": "f45335ede7c1246f922816610139face112e236b",
+   "sha256": "010ldsn75xrbjj82115gxib150knj9q76k1jwpz1rd1alx0l16qj"
   },
   "stable": {
    "version": [
     1,
-    5,
+    7,
     0
    ],
    "deps": [
     "compat"
    ],
-   "commit": "1773beeb23c43ce52428957814a2be62532870f8",
-   "sha256": "14f07irjbk3akc07a0y5awyflmhsxvj8gg67y81zp90danjkgvvr"
+   "commit": "9078334e44393696c78c6acb4484480fd4cf4b5d",
+   "sha256": "062fdryl8yhk6qcj1x98qa732d9lfn8x9dsa25ss11c5x3sywjv4"
   }
  },
  {
@@ -82636,6 +83319,29 @@
    "sha256": "1hhhspkxpgr8sa12bvahq4i4dl3apjwar2ais6lkpplknqzr2ddw"
   }
  },
+ {
+  "ename": "noman",
+  "commit": "e3c3445e29450f72a13543c888da5488b6fc2e08",
+  "sha256": "0g8l6clky05qxl7ql6nrkfvpfhl9p2m8r60kjmygm0p61z6brmnl",
+  "fetcher": "github",
+  "repo": "andykuszyk/noman.el",
+  "unstable": {
+   "version": [
+    20240610,
+    1145
+   ],
+   "commit": "61ab9c52273fc03b28881a5ce814b863cf050571",
+   "sha256": "0lxvl8mmmk01i14x7jjn3cq55620x420vxzsrqnbsmcpgzn5g6l5"
+  },
+  "stable": {
+   "version": [
+    0,
+    6
+   ],
+   "commit": "953e3761b05874dee49952fad63ce1cb3c91d707",
+   "sha256": "0rh1p9nlhkmhfqmp507rz8hwfgwrdvxx0zba41lxsd2admai90wv"
+  }
+ },
  {
   "ename": "non-edit-mode",
   "commit": "6b0aafa28b53c49796016c34b6e35d6e8af974cf",
@@ -82692,11 +83398,11 @@
   "repo": "ashton314/nordic-night",
   "unstable": {
    "version": [
-    20240311,
-    2147
+    20240626,
+    1936
    ],
-   "commit": "a9e5918c7755ccb1fa20d3d8e3a3ea069455f87b",
-   "sha256": "079685xsh9jpariiagns06z8zqbna7s3pr054s1lx4y701bmxmss"
+   "commit": "72043ab206dea50b366b3848e8f66c0a7737bda4",
+   "sha256": "0mlpqzql5jghssnx9i474gvc0rdj2sw9wsd46pgs2xn7lcqfjgrf"
   },
   "stable": {
    "version": [
@@ -82798,11 +83504,11 @@
   "repo": "MetroWind/notink-theme",
   "unstable": {
    "version": [
-    20220114,
-    1955
+    20240625,
+    326
    ],
-   "commit": "6115857fe75c1adbbce4165a2b77a11a271aaf31",
-   "sha256": "07gr1apbhd4kli2g0ld4yzpsc9hvkrh054b2dk47l2p9d1ki1j7g"
+   "commit": "d1e84622a491bb570d6a450706833fafaad74f39",
+   "sha256": "1xqjh28hpavk1lq51fs4nmpm8zkz8i7skrf034460kilnzyh2csr"
   }
  },
  {
@@ -82813,11 +83519,11 @@
   "url": "https://git.notmuchmail.org/git/notmuch",
   "unstable": {
    "version": [
-    20240406,
-    1803
+    20240619,
+    1038
    ],
-   "commit": "cd89065dc36e36b22a2a53832d2cac9b06fba41c",
-   "sha256": "179x3kz1504zlilh5y5h50sk5d0d9rhl6r6ccfgp4am2nn0d1qp7"
+   "commit": "b526c5ef0e1ae78380e68e5a24170542b884cbe3",
+   "sha256": "0is93vccnhz1gliiz6xh35xxwr2ginvgr094dkz5r920lhvc5s61"
   },
   "stable": {
    "version": [
@@ -82837,28 +83543,28 @@
   "repo": "tarsius/notmuch-addr",
   "unstable": {
    "version": [
-    20240422,
-    15
+    20240618,
+    1830
    ],
    "deps": [
     "compat",
     "notmuch"
    ],
-   "commit": "e5755c5a752d2026b1c847bc5944bdd5f015c1a6",
-   "sha256": "0ysb99rda0ix6lcb8z8p72wb6z35agyn9jd1z0jxhqpp5xyajjsl"
+   "commit": "fee2fbe426edad380104f8ef13e4e36f974c11d4",
+   "sha256": "025ggci10crs2gnkbp08ihfc9msybwspa767xisi6llnwl4i682y"
   },
   "stable": {
    "version": [
     0,
     2,
-    2
+    3
    ],
    "deps": [
     "compat",
     "notmuch"
    ],
-   "commit": "89ced49cf3fb4d62bd4fea8bf9bd53ec8e4c7176",
-   "sha256": "0wggx4cqh1zgmax99bx2g90h51f2jxahqr5f35d0k1770zsds7f5"
+   "commit": "fee2fbe426edad380104f8ef13e4e36f974c11d4",
+   "sha256": "025ggci10crs2gnkbp08ihfc9msybwspa767xisi6llnwl4i682y"
   }
  },
  {
@@ -82929,28 +83635,28 @@
   "repo": "tarsius/notmuch-maildir",
   "unstable": {
    "version": [
-    20240415,
-    1545
+    20240618,
+    1831
    ],
    "deps": [
     "compat",
     "notmuch"
    ],
-   "commit": "3a7240e6728731b427a763228c60104602f0fe4b",
-   "sha256": "13cajk4pb0x5r9azxilibc4v9xg3pxqiy0cx14b6kh6l9b0f26pq"
+   "commit": "b7183378f4a47c4717746c1f000f75a94c299ae6",
+   "sha256": "00b0jzb6k629bwnrci36wmi2s48cddqva3v8b0bwz2ik43ba8d0n"
   },
   "stable": {
    "version": [
     0,
     2,
-    2
+    3
    ],
    "deps": [
     "compat",
     "notmuch"
    ],
-   "commit": "4686e8e7b6d88439d4b0c39c7b17502b102a6f58",
-   "sha256": "09f5g2xll2wh9jkd8crgngnbhxxkiy1rqsjg5g4c0i3hdyk4c3s5"
+   "commit": "b7183378f4a47c4717746c1f000f75a94c299ae6",
+   "sha256": "00b0jzb6k629bwnrci36wmi2s48cddqva3v8b0bwz2ik43ba8d0n"
   }
  },
  {
@@ -82961,30 +83667,30 @@
   "repo": "tarsius/notmuch-transient",
   "unstable": {
    "version": [
-    20240421,
-    2351
+    20240618,
+    1832
    ],
    "deps": [
     "compat",
     "notmuch",
     "transient"
    ],
-   "commit": "ef7a977a16e2c6a0ed3e139bdd6cc00a42b8c758",
-   "sha256": "1njy6cq7b9n2shvcgzrl8b3iclcyhx24bq1li1p292ipj3x3rkg4"
+   "commit": "c161fb66cfe148c046274f8efea23bdf7ccfc2f3",
+   "sha256": "0dchjhjfy7zfwap2k7bqp9rb5yiq14a8i1kbdxnlbbx38kywvpym"
   },
   "stable": {
    "version": [
     0,
     2,
-    1
+    2
    ],
    "deps": [
     "compat",
     "notmuch",
     "transient"
    ],
-   "commit": "b2a318be18ad2fc7553601f564132fa6882a4a0d",
-   "sha256": "0p90mdcwhfqpw6jzs8l4iw5072ziq82hm4xc18qyjj32h8lbs9p3"
+   "commit": "c161fb66cfe148c046274f8efea23bdf7ccfc2f3",
+   "sha256": "0dchjhjfy7zfwap2k7bqp9rb5yiq14a8i1kbdxnlbbx38kywvpym"
   }
  },
  {
@@ -85166,8 +85872,8 @@
   "repo": "licht1stein/obsidian.el",
   "unstable": {
    "version": [
-    20231218,
-    1043
+    20240713,
+    906
    ],
    "deps": [
     "dash",
@@ -85177,8 +85883,8 @@
     "s",
     "yaml"
    ],
-   "commit": "24ff6ef051ba1f1a1e80a2132fdada37e77eaad6",
-   "sha256": "12va9svwgsjwakqw17ik8xzpda1w9fjplfj5i7aq10ic8yq6fkyx"
+   "commit": "5730759eb22d6d3bc78761865dd0f2fdb4100e37",
+   "sha256": "0llf7ahgf2rb0b2znq99mr1wkvxnh1lb0lppk2zcklqhdw05ylzk"
   },
   "stable": {
    "version": [
@@ -85521,30 +86227,30 @@
   "repo": "tarsius/ol-notmuch",
   "unstable": {
    "version": [
-    20240503,
-    1711
+    20240618,
+    1833
    ],
    "deps": [
     "compat",
     "notmuch",
     "org"
    ],
-   "commit": "f176ad73496ee086688ec5eeafcfff9372a833bc",
-   "sha256": "0gychpz53nhrrbs9w67400hbpyxp3q5jmhpj84fnqhnmf9q2dmnz"
+   "commit": "f58197816a6c7e2576696415aefad93bd778a224",
+   "sha256": "1hqppr7z3b9wwlsh5ahv3n3snqll6ipdczk47g72bihzjvg9fxyn"
   },
   "stable": {
    "version": [
     2,
     0,
-    1
+    2
    ],
    "deps": [
     "compat",
     "notmuch",
     "org"
    ],
-   "commit": "781c3518a537da2a8b5e8a4424f9441df463a147",
-   "sha256": "1rlpl3kb709q5brkjrrpirdnhvyh447q93li9lgfz67yya29rfqd"
+   "commit": "f58197816a6c7e2576696415aefad93bd778a224",
+   "sha256": "1hqppr7z3b9wwlsh5ahv3n3snqll6ipdczk47g72bihzjvg9fxyn"
   }
  },
  {
@@ -85630,7 +86336,7 @@
     20240519,
     914
    ],
-   "commit": "5a7bd951d6135ff7ee3b45086308c14abce0936f",
+   "commit": "683a13adc4197af632b35484d2b58bdb1d6c9b5e",
    "sha256": "1hww0900rfvfj43bn86ybzyc745js1xabp2whqd6dxajiklynky1"
   },
   "stable": {
@@ -85639,7 +86345,7 @@
     0,
     5
    ],
-   "commit": "1f8b3d5cb155f7497083001037a09a972befab21",
+   "commit": "c5ca99bcffd3f92444c182622ff2c7f161a01fcf",
    "sha256": "1v5f0glp0ggmmzzhaxlijc58w4ip1nlik9lx7rcl6symsqcmqmq1"
   }
  },
@@ -86103,26 +86809,18 @@
   }
  },
  {
-  "ename": "opencl-mode",
-  "commit": "d97575fdae88d55b55686aa6814f858813cad171",
-  "sha256": "1g351wiaycwmg1bnf4s2mdnc3lb2ml5l54g19184xqssfqlx7y79",
+  "ename": "opencl-c-mode",
+  "commit": "b32886c36b1953c1448cee2d0c9536b2ebfdacaa",
+  "sha256": "0hf6ibgiw391cqvs1hkdsiwcdagv2kv98239avqmrrw3z26yp9iq",
   "fetcher": "github",
   "repo": "salmanebah/opencl-mode",
   "unstable": {
    "version": [
-    20201025,
-    1656
+    20240621,
+    1714
    ],
-   "commit": "15091eff92c33ee0d1ece40eb99299ef79fee92d",
-   "sha256": "1zn6rr48w0ai0sn51zzyp546va6flfgf9lm12vfrdb6kkiiiq403"
-  },
-  "stable": {
-   "version": [
-    1,
-    0
-   ],
-   "commit": "14109a4bb56105a9c052ae49ad4c638b4cc210b2",
-   "sha256": "0n64l1jrrk60g192nn0240qcv2p9r138mi9gb38qq5k65wffbc21"
+   "commit": "d33ce29c19629e9c2f42e468d2687a475915f531",
+   "sha256": "085a16i7n5ph2spvvf60pg2bn42nfr017dy4zx6zzhghazmw7xzs"
   }
  },
  {
@@ -86350,11 +87048,11 @@
   "repo": "oantolin/orderless",
   "unstable": {
    "version": [
-    20240401,
-    959
+    20240711,
+    2002
    ],
-   "commit": "ac4aeb66f331f4c4a430d5556071e33177304c37",
-   "sha256": "1nphxjsxd6bi7lbhx5r1nzay6gkkwhm1q995k90gg9zcnyxz9k0c"
+   "commit": "178b0c55f2cb49f27cd972f731ea45e5d3aea262",
+   "sha256": "1pm4xaf7394gbjg5g9vwdn99ii7swvna88g40h1safhbbbc60ga6"
   },
   "stable": {
    "version": [
@@ -86506,26 +87204,26 @@
   "repo": "rksm/org-ai",
   "unstable": {
    "version": [
-    20240517,
-    1114
+    20240710,
+    155
    ],
    "deps": [
     "websocket"
    ],
-   "commit": "fdcff489ef11bbc4b54c87b34a97bcc02f3994d4",
-   "sha256": "1j6rr8kn10j9wxqwhs4yd9k4fzjf2rz545if23xwqlg6ca39l16x"
+   "commit": "812b59f88851536ed3ded199fb55d303c16c7c12",
+   "sha256": "00f6k2gcglcr5mwdr3ixy5gazn2p1dnw3cvzsvzz870pl855f8fk"
   },
   "stable": {
    "version": [
     0,
-    4,
-    7
+    5,
+    1
    ],
    "deps": [
     "websocket"
    ],
-   "commit": "44e1298fd1b6ca9466f13ab6aadb08be6bde0b12",
-   "sha256": "0bag3ysg94l8dbvn7qnpyv2cd9f164aipmvkmxpvrgw4xl41lcqw"
+   "commit": "812b59f88851536ed3ded199fb55d303c16c7c12",
+   "sha256": "00f6k2gcglcr5mwdr3ixy5gazn2p1dnw3cvzsvzz870pl855f8fk"
   }
  },
  {
@@ -86536,15 +87234,15 @@
   "repo": "spegoraro/org-alert",
   "unstable": {
    "version": [
-    20240122,
-    1728
+    20240612,
+    137
    ],
    "deps": [
     "alert",
     "org"
    ],
-   "commit": "b4bfd4cead89215cc9a46162234f7a4836da4dad",
-   "sha256": "0l4h5hi37s0b28v2ds8m01li0z80adlnhnvqhd6jszdsxv44fw5f"
+   "commit": "9d54b9d0956b2f9e199d8add48d544d09e58794c",
+   "sha256": "1nhbr8f137c2hxysc2sggnz095ah8qchrmx6g9ligq6gl3v0k7fj"
   },
   "stable": {
    "version": [
@@ -86592,30 +87290,30 @@
   "repo": "eyeinsky/org-anki",
   "unstable": {
    "version": [
-    20240427,
-    1628
+    20240630,
+    1401
    ],
    "deps": [
     "dash",
     "promise",
     "request"
    ],
-   "commit": "75c2cd6ababf3e2808107af32efc754bfd06a88b",
-   "sha256": "1plh177491bbfaybpaphd407iaadlm9imsdpkd8nws0qa9sflaw5"
+   "commit": "8b255bba68ee19c4e8a2704c1197ad963d0eb128",
+   "sha256": "19y513k1m6na6gvby10icdcl7bkik2694aq55liybp4iz33sw8ys"
   },
   "stable": {
    "version": [
     3,
     3,
-    0
+    2
    ],
    "deps": [
     "dash",
     "promise",
     "request"
    ],
-   "commit": "75c2cd6ababf3e2808107af32efc754bfd06a88b",
-   "sha256": "1plh177491bbfaybpaphd407iaadlm9imsdpkd8nws0qa9sflaw5"
+   "commit": "8b255bba68ee19c4e8a2704c1197ad963d0eb128",
+   "sha256": "19y513k1m6na6gvby10icdcl7bkik2694aq55liybp4iz33sw8ys"
   }
  },
  {
@@ -86881,20 +87579,26 @@
   "repo": "alphapapa/org-bookmark-heading",
   "unstable": {
    "version": [
-    20231216,
-    1234
+    20240622,
+    947
    ],
-   "commit": "ed8b7fe2a08b06a1d750d1e1230e6728815e0bcd",
-   "sha256": "19fayjglgr3vk365a2f0c2mdnww30cxpzmi1sl2p2n3mic21av37"
+   "deps": [
+    "compat"
+   ],
+   "commit": "b667cfdde7631c656778473e6c87bc51e46280cd",
+   "sha256": "06pwxlhqcvz6fb8y4mm54r851x8gcqrwj3pgfnag7ydw881rlqg3"
   },
   "stable": {
    "version": [
     1,
     3,
-    1
+    2
    ],
-   "commit": "3e95313837898ec8660c7a8b0f601ec7edda7bfc",
-   "sha256": "0dixym930mxsl954rbjay2wk4p0r5d90jgz2cyv5hs3pa40msgdl"
+   "deps": [
+    "compat"
+   ],
+   "commit": "c7c7dcc52d3ad78084ea15e95bd7f6037bf02543",
+   "sha256": "1xzwbvhj6x5vszxbrf1sws37i8m3kff3sf1xkzijvjn8c8da9r97"
   }
  },
  {
@@ -86905,19 +87609,19 @@
   "url": "https://repo.or.cz/org-bookmarks.git",
   "unstable": {
    "version": [
-    20240520,
-    16
+    20240710,
+    1738
    ],
-   "commit": "774b2cad8b77920e5ea2089d7dd11c8ccab4a471",
-   "sha256": "0z2703qjwbvivpqxqdxjb7rzv3yrcxvzksrpm768wdazvrk7gq9b"
+   "commit": "23942cd3f14f691a35bfb71e0559ed5eb5100909",
+   "sha256": "1l61v51hk1bs0rn7r3nw7pjmxccg9ghx1hf4y24363a70wkl45qw"
   },
   "stable": {
    "version": [
     1,
-    1
+    2
    ],
-   "commit": "cdd57bf2aee9a26883312a2c5e48701e4b60802f",
-   "sha256": "04ydqa930b4xkk67i1ql59man08pc9y6l3nx3bpsi6va2djh0zjz"
+   "commit": "340319879d43e0a90c8f29f2b896ce28a69ec205",
+   "sha256": "13yk5j8461nz89bd0yi113wrhyc55g12yxzjqnrr7i0z7s09k9ni"
   }
  },
  {
@@ -87048,14 +87752,14 @@
   "repo": "dengste/org-caldav",
   "unstable": {
    "version": [
-    20240415,
-    1535
+    20240525,
+    2231
    ],
    "deps": [
     "org"
    ],
-   "commit": "086a8f385138ef71f7e29f78f19fb3a65f8ee27c",
-   "sha256": "09j9sbjpj9bgxx2rrrmsyz9vk0xmhsljy6qrdjjzm230k80817xw"
+   "commit": "f406828d3945c434de13e8aa9f7707d3466aee1b",
+   "sha256": "05j098b74zkkibhl4h5pplnqf584py90lccsg7alnx0isgld28bx"
   },
   "stable": {
    "version": [
@@ -87173,14 +87877,26 @@
   "repo": "swflint/org-cite-overlay",
   "unstable": {
    "version": [
-    20240207,
-    1611
+    20240523,
+    100
    ],
    "deps": [
     "citeproc"
    ],
-   "commit": "cb401787b4569f43815cac55be8a319c489de3de",
-   "sha256": "1f4n67hlfaaxz12cyjj759kjkr1vxh8dfbaq987c5dzh5afjjzsj"
+   "commit": "dc23b55c708c6399a12dbc79281110de7681b121",
+   "sha256": "0ymgy0jns2fr0s5c2q3i8xwwn15ln5l2rxng0y6lgnazxsp35p50"
+  },
+  "stable": {
+   "version": [
+    1,
+    0,
+    0
+   ],
+   "deps": [
+    "citeproc"
+   ],
+   "commit": "dc23b55c708c6399a12dbc79281110de7681b121",
+   "sha256": "0ymgy0jns2fr0s5c2q3i8xwwn15ln5l2rxng0y6lgnazxsp35p50"
   }
  },
  {
@@ -87191,8 +87907,8 @@
   "repo": "swflint/org-cite-overlay",
   "unstable": {
    "version": [
-    20240213,
-    1802
+    20240523,
+    100
    ],
    "deps": [
     "citeproc",
@@ -87200,8 +87916,23 @@
     "universal-sidecar",
     "universal-sidecar-citeproc"
    ],
-   "commit": "bb23142f5d0d390196839fa9b3ce27ce4d149b59",
-   "sha256": "1vjmygl9gm1syikf06iarri1yb8hrp3zvk0c9sm46h2wj476v4dy"
+   "commit": "dc23b55c708c6399a12dbc79281110de7681b121",
+   "sha256": "0ymgy0jns2fr0s5c2q3i8xwwn15ln5l2rxng0y6lgnazxsp35p50"
+  },
+  "stable": {
+   "version": [
+    1,
+    0,
+    0
+   ],
+   "deps": [
+    "citeproc",
+    "org-cite-overlay",
+    "universal-sidecar",
+    "universal-sidecar-citeproc"
+   ],
+   "commit": "dc23b55c708c6399a12dbc79281110de7681b121",
+   "sha256": "0ymgy0jns2fr0s5c2q3i8xwwn15ln5l2rxng0y6lgnazxsp35p50"
   }
  },
  {
@@ -87371,14 +88102,14 @@
   "url": "https://repo.or.cz/org-contacts.git",
   "unstable": {
    "version": [
-    20240521,
-    1144
+    20240609,
+    1058
    ],
    "deps": [
     "org"
    ],
-   "commit": "722bc2ec91ca66a33f6b57cd02010f4fdbf542a9",
-   "sha256": "0750kckr7qfwnz5c3vr0s0d4nnfx3dshpgj19wh9yijq92v6q6mf"
+   "commit": "d0cb221502c9e104b6e3c358128b28761ffddb55",
+   "sha256": "12a5lmmblx644sav0jbhffqhw0ylqjwvy4p90wfy5ha4m4gkm279"
   }
  },
  {
@@ -87982,15 +88713,15 @@
   "repo": "conao3/org-generate.el",
   "unstable": {
    "version": [
-    20200815,
-    736
+    20240713,
+    159
    ],
    "deps": [
     "mustache",
     "org"
    ],
-   "commit": "98825efb73c4537f05f653ce40e639a220d2ee5d",
-   "sha256": "0p4xc4rznkq0vp0bbm1k69bfbmlp46lap12q75wdpkdrn5k4sr2p"
+   "commit": "39dbf8b5c3d225438f7d65e0dc7e9766d61d4c81",
+   "sha256": "03xd0cm0splhiznd8sdaipjvifc8pvsyj82s7mj5f3nzpqvv1m9m"
   },
   "stable": {
    "version": [
@@ -88406,30 +89137,30 @@
   "repo": "ahungry/org-jira",
   "unstable": {
    "version": [
-    20230915,
-    57
+    20240712,
+    2234
    ],
    "deps": [
     "cl-lib",
     "dash",
     "request"
    ],
-   "commit": "295b01ede42952c848bd8d76bc8c456a87876cbc",
-   "sha256": "1qyabrz49fmzyylf2kpm2ygwzlxx3v3aa71pi8r7dnxc5fzcc5z1"
+   "commit": "bd573584a9d93b320d5adbfc09dee30e83e5120d",
+   "sha256": "1g48n7m1ind29vixzgyj615d484w073bkr4p0sdz8flrnlvsfdyd"
   },
   "stable": {
    "version": [
     4,
     4,
-    1
+    2
    ],
    "deps": [
     "cl-lib",
     "dash",
     "request"
    ],
-   "commit": "fce9f8f28788d1d422fff2e17eb059e6ea546622",
-   "sha256": "1pkqyvziwp2573hnr8s41chsbm40564f76i3l8ynjr7955nccsms"
+   "commit": "ac625b080545a1ade22d070c23624f71b7ab02b5",
+   "sha256": "1mg7p9y4d4m6b6qkjvdz6lqby3kvvdb7qcjqgkrf75rzv0rsn1h2"
   }
  },
  {
@@ -88519,29 +89250,28 @@
   "repo": "gizmomogwai/org-kanban",
   "unstable": {
    "version": [
-    20240430,
-    944
+    20240607,
+    1612
    ],
    "deps": [
     "dash",
     "s"
    ],
-   "commit": "e316be6a4f64c4869b911d2cbdc4673a0e398a5f",
-   "sha256": "10hczqx620vhf93y61rf4hliqpasrw3r12sxsh6z03x2zv6jhl0s"
+   "commit": "cdc66ff97cdf5275db9f507bf2c915bbc0183c30",
+   "sha256": "1v3r7yrvlxhaj5mj0r8vgd0a22q6qj9d61zf7q9cixcl72ifq8qr"
   },
   "stable": {
    "version": [
     0,
     6,
-    6
+    9
    ],
    "deps": [
     "dash",
-    "org",
     "s"
    ],
-   "commit": "83d5a657d4c190c62663c9b2357105002795b2e3",
-   "sha256": "1ma1grcwjfkps3chs1f0md33hkkl4bj7s9apws61anr2yfcj5j7k"
+   "commit": "cdc66ff97cdf5275db9f507bf2c915bbc0183c30",
+   "sha256": "1v3r7yrvlxhaj5mj0r8vgd0a22q6qj9d61zf7q9cixcl72ifq8qr"
   }
  },
  {
@@ -88592,15 +89322,15 @@
   "repo": "seokbeomKim/org-linenote",
   "unstable": {
    "version": [
-    20240325,
-    320
+    20240410,
+    410
    ],
    "deps": [
     "projectile",
     "vertico"
    ],
-   "commit": "4c081f4bbe13c48df7cb17f2f006465b8b95196b",
-   "sha256": "0a8pcds5vv5px47gzvmv94ymvhki7kjqah8i4w43f0lpx9dhwqzx"
+   "commit": "a015295ebf271c8b518238f7969a0b6e60429805",
+   "sha256": "1jn22rvlxy5d2p56vm2jgs5jz4nm76ji4xmd71pnc18x2ci2p2c8"
   }
  },
  {
@@ -88611,16 +89341,16 @@
   "url": "https://repo.or.cz/org-link-beautify.git",
   "unstable": {
    "version": [
-    20240312,
-    529
+    20240713,
+    844
    ],
    "deps": [
     "fb2-reader",
     "nerd-icons",
     "qrencode"
    ],
-   "commit": "c77338cfac89a41f90eafea80d11d8134e8096f4",
-   "sha256": "1pvq83lca6sj19vra0r2cvzngqkkcwswqq1ma96dkl5xyn01ggw9"
+   "commit": "73b74b9e5006934f1ef302142512f51396ae2761",
+   "sha256": "0cm33d57hygwk4rlvvzaqkkz4hz35i1pgs8apsymsf482hx3w0az"
   },
   "stable": {
    "version": [
@@ -88875,25 +89605,25 @@
   "repo": "minad/org-modern",
   "unstable": {
    "version": [
-    20240515,
-    1932
+    20240708,
+    2157
    ],
    "deps": [
     "compat"
    ],
-   "commit": "ea829ce4b3ac035808d411b1a088e0947d75f554",
-   "sha256": "1igv0ph5nk0b6bav5fndgl5jrnf20hml0vkx81ia1amhv7isbiax"
+   "commit": "bf2cec740dcf41fe8b4cc1ecc537c4fc4c7e9403",
+   "sha256": "15lh3hlf9hgc2xjzr6p5myp512a9arfma3p9hlh7m10bhfpabxgb"
   },
   "stable": {
    "version": [
     1,
-    2
+    3
    ],
    "deps": [
     "compat"
    ],
-   "commit": "a2ff4c8e9cac412e8cb9c7faf618ac18146107ea",
-   "sha256": "19mn29f294wng6pgm1vwncx50963wnh7zj33ipynx8qxndbi6hsm"
+   "commit": "0b7af08548e586c0d3b0ca4a683253da407220d1",
+   "sha256": "0bk8mz3va5vwkkvgvq761bnm9id8sb70rnf3ydq62ap27k0ab967"
   }
  },
  {
@@ -89079,14 +89809,14 @@
   "repo": "AntonHakansson/org-nix-shell",
   "unstable": {
    "version": [
-    20240205,
-    1642
+    20240603,
+    859
    ],
    "deps": [
     "org"
    ],
-   "commit": "d9843aa0f62a39b9938a89388e25129ecb39a4cc",
-   "sha256": "1ci8galz7cc8y2fdq1nl1wbpbid2ixvz77744yxxk43977gbpn1c"
+   "commit": "f359d9e1053fadee86dd668f4789ae2e700d8e8a",
+   "sha256": "1zbp2qwkj23nf4k3in9cb8rmymw7cg0v22b1wwbqlfh4b6h3jakm"
   },
   "stable": {
    "version": [
@@ -89627,8 +90357,8 @@
   "repo": "alphapapa/org-ql",
   "unstable": {
    "version": [
-    20240403,
-    2027
+    20240627,
+    1432
    ],
    "deps": [
     "compat",
@@ -89643,14 +90373,14 @@
     "transient",
     "ts"
    ],
-   "commit": "c9370982bfd4df04b590762bd795a7da3012c4dd",
-   "sha256": "1df7qd9f74gvpixpqchn1j47g4iwq6r9cvpc2g9cnb9mb16r2mjk"
+   "commit": "b7d4856f926cb71e01427a940dc948a48b0a702d",
+   "sha256": "07d8zq0a89qc3yrvq8qkvdqgw4rvbrrhwgj08qqdk698ny96qiwr"
   },
   "stable": {
    "version": [
     0,
     8,
-    6
+    7
    ],
    "deps": [
     "compat",
@@ -89665,8 +90395,8 @@
     "transient",
     "ts"
    ],
-   "commit": "1f264bf4649dc2ad90f16a763794561ee6164d84",
-   "sha256": "0425r0qjl83d1zq2z9myish3iqa6pc9ml2jlwmffjnj5gm3vgfsj"
+   "commit": "c2b4404808185a9d5e160c8eea7967f906f77fd3",
+   "sha256": "0smk5affzlf0i4m10kx8mcffpysd61pjm4zidz2qdv5vsg3j9z50"
   }
  },
  {
@@ -89939,8 +90669,8 @@
   "repo": "jkitchin/org-ref",
   "unstable": {
    "version": [
-    20240509,
-    1211
+    20240610,
+    1833
    ],
    "deps": [
     "avy",
@@ -89956,8 +90686,8 @@
     "request",
     "s"
    ],
-   "commit": "e435bc60228b985806ea7ea0856ceef1e5262c83",
-   "sha256": "1d13p33aypa3jip4xs5lx6vsimv7xg0m766nm35xapbmjjfihjkv"
+   "commit": "7ab51359954648c20753f66039a33d3b4993eeed",
+   "sha256": "08y302fb5xbcg5sfxsf8xk956lr8qrvwmj5kfvbn9x0mc7v1jgmp"
   },
   "stable": {
    "version": [
@@ -90033,28 +90763,29 @@
   "repo": "akirak/org-reverse-datetree",
   "unstable": {
    "version": [
-    20221203,
-    259
+    20240619,
+    1307
    ],
    "deps": [
     "dash",
     "org"
    ],
-   "commit": "fca95cd22ed29653f3217034c71ec0ab0a7c7734",
-   "sha256": "15jymjfdsmbcr5l03c605kbi68afcnwandhpgkcn912add9iqczr"
+   "commit": "3ac9b35ebe872f5a619f2e6abe281df66ebbcfe0",
+   "sha256": "0lfr88wb98yh9fi2hnvd5f3xdcb1d480shqrcyg7gyqcvx64shii"
   },
   "stable": {
    "version": [
     0,
     4,
+    2,
     2
    ],
    "deps": [
     "dash",
     "org"
    ],
-   "commit": "6e5240f54423a3b98167e2fb7bbe51a1f15b7f75",
-   "sha256": "09xvkw2h7i702wr4k5zqcd91sc4jwqzawwqsxf13qiwdm4kfxfk8"
+   "commit": "3ac9b35ebe872f5a619f2e6abe281df66ebbcfe0",
+   "sha256": "0lfr88wb98yh9fi2hnvd5f3xdcb1d480shqrcyg7gyqcvx64shii"
   }
  },
  {
@@ -90104,8 +90835,8 @@
   "repo": "org-roam/org-roam",
   "unstable": {
    "version": [
-    20240114,
-    1941
+    20240703,
+    1856
    ],
    "deps": [
     "dash",
@@ -90113,8 +90844,8 @@
     "magit-section",
     "org"
    ],
-   "commit": "2e94f55cc58f6dce2772a6f33521eb5afcf67265",
-   "sha256": "0hhq2qfdhp2nlnz3ldx9y36s95n6nmywmbfjrqgn2viwzap23xgn"
+   "commit": "6644cb27a902b2ceeca89e83fde31e6ad01be79e",
+   "sha256": "05l15xfv1cdyqmqw2y6m1rb68y4h0g8f6lv6qzqlxim7w17ja10c"
   },
   "stable": {
    "version": [
@@ -90388,11 +91119,11 @@
   "repo": "lordnik22/org-shoplist",
   "unstable": {
    "version": [
-    20210629,
-    2157
+    20240605,
+    2257
    ],
-   "commit": "71ea7643e66c97d21df49fb8b600578ca0464f83",
-   "sha256": "0pjcpry9hzma87f8isyi0q5si0i67g0gd8shj2y3qyizi9ns64a2"
+   "commit": "6c2daa0b663d01a498dca2f2f4f4b645be1c365a",
+   "sha256": "0i71mgmvvsfycqlqj046184k3fzrqszhfffrjxfg2ai4lp9a8aql"
   }
  },
  {
@@ -90403,11 +91134,11 @@
   "repo": "localauthor/org-side-tree",
   "unstable": {
    "version": [
-    20240130,
-    656
+    20240601,
+    1001
    ],
-   "commit": "62169a26edfafacd681ecaf84289dd6b58be6c32",
-   "sha256": "1cjypg5fvvdd8flcbi4jyaql2bpd5xq283lxhgp9kr51x2ibzdnb"
+   "commit": "e8da5217ce23440a62f4a46ef60e2082b6284b28",
+   "sha256": "0cbnmw0ha6sbs1hvxv1j7mirdzy9kq3b1h60jx8a83gwgsbihzbg"
   }
  },
  {
@@ -90456,14 +91187,14 @@
   "repo": "jcfk/org-sliced-images",
   "unstable": {
    "version": [
-    20240325,
-    710
+    20240624,
+    428
    ],
    "deps": [
     "org"
    ],
-   "commit": "f3964d4ba421953fe9f109a99811b6d884ca56ab",
-   "sha256": "0lf275dqvgjfsh6kfmrb05gxcv78ng6pdijj2b1c2arw4pwsjb0r"
+   "commit": "b98b88a55eff07e998e7789e0bf7307dd71db050",
+   "sha256": "0iq03zp3bm1ph5ryhx6zpjm830sliqj6bb7i0h2v0nfn07l0cby2"
   }
  },
  {
@@ -90686,8 +91417,8 @@
   "repo": "alphapapa/org-super-agenda",
   "unstable": {
    "version": [
-    20240301,
-    1602
+    20240630,
+    18
    ],
    "deps": [
     "compat",
@@ -90697,8 +91428,8 @@
     "s",
     "ts"
    ],
-   "commit": "51c9da5ce7b791150758984bab469d2222516844",
-   "sha256": "1mddkfd6xiy2q0907dzyy3vf77yamm6pa608dhdy2chgc26l0ji4"
+   "commit": "17954dc4b064d7fb09719222045d31feae8aa923",
+   "sha256": "0bha2mfvfyz57lv02pkn0lk92qq7vmvxdpd43jfmcynzipia1b9p"
   },
   "stable": {
    "version": [
@@ -90875,14 +91606,14 @@
   "url": "https://repo.or.cz/org-tag-beautify.git",
   "unstable": {
    "version": [
-    20240422,
-    607
+    20240712,
+    439
    ],
    "deps": [
     "nerd-icons"
    ],
-   "commit": "2f8b66e7aa2227411665f36d96bfc8a1b184bfbb",
-   "sha256": "0qz3f8phczmpyj8n6m9851cscwb7z0nkn4b5w79k21pgfhcmp6zf"
+   "commit": "52f09a8c363b75dd8554285e61025aeb9c0d945c",
+   "sha256": "1146x53j9yl38w1j04q2zxyk8ca2q4v4z8akxgd0vcxcalicyg4l"
   }
  },
  {
@@ -91137,6 +91868,37 @@
    "sha256": "1aq7qv5jyc2x2a4iphnzmmsvak6dbi7nwdcf3m8nly8w75vrl5lj"
   }
  },
+ {
+  "ename": "org-transclusion-http",
+  "commit": "d733b6eb2fe02b098f3c49f6bafb809156114cc5",
+  "sha256": "1nc31djfdyhfkr6yybx308dihp7kfbih58zwrxzkg4pl63sbmkyq",
+  "fetcher": "sourcehut",
+  "repo": "ushin/org-transclusion-http",
+  "unstable": {
+   "version": [
+    20240619,
+    2130
+   ],
+   "deps": [
+    "org-transclusion",
+    "plz"
+   ],
+   "commit": "65caad0d9b19bf19c815bd7c033ffb907c3ebb12",
+   "sha256": "1cksd818yjxsydpmxb6744km8q97ykix071s7iqhzjamg8c7l6ca"
+  },
+  "stable": {
+   "version": [
+    0,
+    4
+   ],
+   "deps": [
+    "org-transclusion",
+    "plz"
+   ],
+   "commit": "a764f05a9eaeca002c76b85d090ca6b036e9dbaf",
+   "sha256": "0cz67lkm8dajvyxhzj5mchav5dxif3pk3bs03fz9jna6yc1v2fja"
+  }
+ },
  {
   "ename": "org-transform-tree-table",
   "commit": "afca0e652a993848610606866609edbf2f5f76ae",
@@ -91503,30 +92265,28 @@
   "repo": "p-snow/org-web-track",
   "unstable": {
    "version": [
-    20240424,
-    756
+    20240628,
+    1032
    ],
    "deps": [
     "enlive",
     "request"
    ],
-   "commit": "92e97112aa63cbe14f7727b157eb3c11239bf86c",
-   "sha256": "1ni3l38zh2lzr2ri7vh6khp9c6fn4hafgc6234y707ysniz9dryx"
+   "commit": "bca3a6e159b1b939906f9fc033c7a93e6be3c41c",
+   "sha256": "0wgv5ikgdp7m6lx2y0p6cxb7zcqdflr99ymk9fz105f2adnv7c6c"
   },
   "stable": {
    "version": [
     0,
     0,
-    1
+    2
    ],
    "deps": [
     "enlive",
-    "org",
-    "org-agenda",
     "request"
    ],
-   "commit": "dab6a42982ad290564b09d2c1c3dbe3c63295964",
-   "sha256": "1v6zj6hkhn5xjq318vs5yhsdg6mgaw4qjd9fgi2fps7ry79drzf3"
+   "commit": "ee15faf47c308f37bfcfffe38e8f4ee55661af3e",
+   "sha256": "0g86fqn08lgxz71snfnbgmyihnfl50m0zr7ysh25w4b4bla234jy"
   }
  },
  {
@@ -91642,14 +92402,14 @@
   "repo": "ymherklotz/org-zettelkasten",
   "unstable": {
    "version": [
-    20230613,
-    1924
+    20240708,
+    1242
    ],
    "deps": [
     "org"
    ],
-   "commit": "5863a057f9b41dfa4cbf383c325b3fcddbbe5449",
-   "sha256": "1ibwcwn47pgf6dpqz71cm6azwdngb3blkwclii0y876fmyqhywsw"
+   "commit": "ab31cf4436fabc7e44addf60f383a2ee6a4558e3",
+   "sha256": "06hn6j3rk279ys9k7izvm2176xm82y3j6hl3r4dqfg7ak3k52amp"
   },
   "stable": {
    "version": [
@@ -91995,30 +92755,30 @@
   "repo": "tarsius/orglink",
   "unstable": {
    "version": [
-    20240415,
-    1547
+    20240618,
+    1835
    ],
    "deps": [
     "compat",
     "org",
     "seq"
    ],
-   "commit": "e513f25024b2db082dbdbd8bd713d57a2b7456eb",
-   "sha256": "0dmh9j9dz3j7h881126zj9bpbzh5sr444qw5029wfmsq4x5ls0yg"
+   "commit": "6d482393c45f52c793b7ccfac871c87937a58640",
+   "sha256": "00lxfn78768kwp1sxcafzpycarqi7a9zsy4p22cjbp9vi6l8qx7j"
   },
   "stable": {
    "version": [
     1,
     2,
-    2
+    3
    ],
    "deps": [
     "compat",
     "org",
     "seq"
    ],
-   "commit": "afbeffdfa15a9fc532bba2e03626b9e82768ba2c",
-   "sha256": "0jkk6jiqmsns1pb0almaihyz6c3lim0r6l4x75qp7448p46q2him"
+   "commit": "6d482393c45f52c793b7ccfac871c87937a58640",
+   "sha256": "00lxfn78768kwp1sxcafzpycarqi7a9zsy4p22cjbp9vi6l8qx7j"
   }
  },
  {
@@ -92136,11 +92896,11 @@
   "repo": "tbanel/orgaggregate",
   "unstable": {
    "version": [
-    20240228,
-    720
+    20240616,
+    506
    ],
-   "commit": "cc129b543c472c704c8dc074500a8192ac3d9f88",
-   "sha256": "1kcw09k5ga1sc8p4zzlcp3mnmqs6kx626vkk29awm0b1qyg8pk92"
+   "commit": "f343b6009d87630588d39dc3d92651008c1bad13",
+   "sha256": "0dig8axp5isv39nxmx1387yg9dy8cwl47qk8a1m0jv2dsybagw4s"
   }
  },
  {
@@ -92181,11 +92941,11 @@
   "repo": "tbanel/orgtbljoin",
   "unstable": {
    "version": [
-    20240228,
-    719
+    20240616,
+    528
    ],
-   "commit": "f243511ec4b3a712d0b868ecbc4c7b1310a3382d",
-   "sha256": "1lpgprrcwhzglddkr9q4v4qlr503wvvg1ri31445vp8fd4ldz0aa"
+   "commit": "441a426447965e9b4dc1b0a1fc010c07192f73b6",
+   "sha256": "16isqgnysbp64wvgl9skyhfqlwjxsvs4i8k5zzaxm5c7jrcwc78l"
   }
  },
  {
@@ -92344,14 +93104,14 @@
   "repo": "minad/osm",
   "unstable": {
    "version": [
-    20240122,
-    2255
+    20240708,
+    2157
    ],
    "deps": [
     "compat"
    ],
-   "commit": "5dffbc00e4acfcddc13677f3b76a65dc3b6aee30",
-   "sha256": "1dr0415xr7a2h4y4zpjkh0hrrcfw4sa55y8y98131h2n5fzhd5sx"
+   "commit": "17dfc017cdb0cf21325a9e636fd23e912aea84b3",
+   "sha256": "17zk9mrh7w1bj0z0a95rfa41zp2a1lygf6khls77z58gfvffqfjk"
   },
   "stable": {
    "version": [
@@ -92649,26 +93409,26 @@
   "repo": "tarsius/outline-minor-faces",
   "unstable": {
    "version": [
-    20240415,
-    1547
+    20240628,
+    2016
    ],
    "deps": [
     "compat"
    ],
-   "commit": "9f5c75e996388ead3472cd0dce8e9fc00407e210",
-   "sha256": "11jn4y2pa5v6bkijaf0d6ahg9zbz4mn11v9g1j46ldjwg3c7mbsf"
+   "commit": "8f1b8ab4c49b30d0a58b55666463ed2318150178",
+   "sha256": "0zw7qmrq2sh01av4871gkybn24nh5j64g04h5axvhls6znyv7pxq"
   },
   "stable": {
    "version": [
     1,
     0,
-    0
+    1
    ],
    "deps": [
     "compat"
    ],
-   "commit": "57c4a0fac36a26cfa8d1296e76afbcf7a5b87a57",
-   "sha256": "1pavzlb48a7062mrv9ldfwh1fl7pbhwy1i4j24lgmynbnv1kk96n"
+   "commit": "4a264ffed9dae7d04ce1c72b07c9566b4bb8b6a6",
+   "sha256": "14h7idc160w38h82r4q1cq9rcbaw73dpqrxmp905wvnkvbncwhdk"
   }
  },
  {
@@ -93357,11 +94117,11 @@
   "repo": "DamienCassou/ox-linuxmag-fr",
   "unstable": {
    "version": [
-    20240326,
-    722
+    20240624,
+    1829
    ],
-   "commit": "893a401db7d3b93e977b3c2608169dbb6e3fbdce",
-   "sha256": "1fh36w8iyrh5pqrfrcrh0f6clrmin5vg7r7hcg70z8s6w08ylzfy"
+   "commit": "3319c309f6fb0b0771363bec80557bc387243a82",
+   "sha256": "0iq63n4r78s4v75iadaqk06m37pg3allzrrdz2r1x3pm3br24nz0"
   },
   "stable": {
    "version": [
@@ -93452,16 +94212,16 @@
   "repo": "emacsorphanage/ox-pandoc",
   "unstable": {
    "version": [
-    20231222,
-    1103
+    20240710,
+    1424
    ],
    "deps": [
     "dash",
     "ht",
     "org"
    ],
-   "commit": "399d787b6e2124bd782615338b845c3724a47718",
-   "sha256": "0267m5n08w3h0zpniiwp4ngpmxkjwzndl9kg88k0cknkbqhg27ps"
+   "commit": "34e6ea97b586e20529d07158a73af3cf33cdd1d5",
+   "sha256": "0s4d639vfvqb6spnr3b0isrspbl876h22977pkb943ygd93bzx4p"
   },
   "stable": {
    "version": [
@@ -93951,11 +94711,11 @@
   "repo": "phillord/pabbrev",
   "unstable": {
    "version": [
-    20240216,
-    439
+    20240617,
+    1622
    ],
-   "commit": "bf8a498f2ddd268981d43fb71cf98aa2e4be3942",
-   "sha256": "1ilj6zm85hq95xlnx6b7sbzxdrkk5pdbcnd26igmy6z0z3br2kl3"
+   "commit": "d5f120c523ddce2e8dea1868150248cd188d8ad8",
+   "sha256": "1givc7d5wvq1chfbi2rdkwn36jfvdm930qzy5gzyav1ywdcm5sis"
   },
   "stable": {
    "version": [
@@ -94066,14 +94826,14 @@
   "repo": "melpa/package-build",
   "unstable": {
    "version": [
-    20240415,
-    1547
+    20240628,
+    1901
    ],
    "deps": [
     "compat"
    ],
-   "commit": "d9ce37b82529827ce720ad3ccf4af887d19fcfb0",
-   "sha256": "1hnv0yjc0yyjcp369z9nlvyxiqmzs0zqz5g6ly9cc3g43bjfavbj"
+   "commit": "33221b6a0aaf4d7648b50afbc66b5691d90b6924",
+   "sha256": "0321sx2va3r3paivv72s45pnw26n02silhk8f43hkw0il46d07vl"
   },
   "stable": {
    "version": [
@@ -94203,36 +94963,6 @@
    "sha256": "1mhsf0l0253d9b7n3c68mw5kwnsk7wf217y7m2fiybh51bdgjfnd"
   }
  },
- {
-  "ename": "packed",
-  "commit": "f7cc44a1b339829cf7ee9b0cb4b2f113befd2c0d",
-  "sha256": "166s0kff4jn38xi1ygcalpqd90y124zscjvf5szqwxyjrrpqhdx8",
-  "fetcher": "github",
-  "repo": "emacsorphanage/packed",
-  "unstable": {
-   "version": [
-    20221130,
-    2228
-   ],
-   "deps": [
-    "compat"
-   ],
-   "commit": "169064f7acfe198cc7dd43d02518b773691e1314",
-   "sha256": "1y3dbyaxr5smw9zxvy0cgfcg1i3ciq7r40njf8dkra4080ibxdnx"
-  },
-  "stable": {
-   "version": [
-    3,
-    1,
-    0
-   ],
-   "deps": [
-    "compat"
-   ],
-   "commit": "c0d075fa02424b39bd5a3492167f914b8522f686",
-   "sha256": "0i2j5yk6xhv4rh3317f241y9llwf4wk18a6a4lkqrvbjpvi9yvn0"
-  }
- },
  {
   "ename": "pacmacs",
   "commit": "52ce427e046267655dd9f836e57176d59f23e601",
@@ -94416,11 +95146,19 @@
   "repo": "danielsz/Palimpsest",
   "unstable": {
    "version": [
-    20200804,
-    2308
+    20200805,
+    1048
    ],
-   "commit": "5310c4a026954254ab82e5f3fe9f98dde2bb5c8b",
-   "sha256": "191d4x7fk5kl30fcgzfm6xn4mwxfpx65p5811ybyxci3rddd8al6"
+   "commit": "f474b3ad706373d9953abdc401d683a2a023d28e",
+   "sha256": "0wzxl1zcbm3svspjpjzvx92is1k9sz7g0a99r8q066j2364la0zh"
+  },
+  "stable": {
+   "version": [
+    1,
+    1
+   ],
+   "commit": "f474b3ad706373d9953abdc401d683a2a023d28e",
+   "sha256": "0wzxl1zcbm3svspjpjzvx92is1k9sz7g0a99r8q066j2364la0zh"
   }
  },
  {
@@ -94513,15 +95251,15 @@
   "repo": "joostkremers/pandoc-mode",
   "unstable": {
    "version": [
-    20240311,
-    2218
+    20240602,
+    1006
    ],
    "deps": [
     "dash",
     "hydra"
    ],
-   "commit": "c7fa568ab9cfbb2abfb9b22f419d28ce570d7b22",
-   "sha256": "00l4vh8mx899k330fvkplz77rg502j406gjc3v2nyakfmf67h85h"
+   "commit": "18214fc2df357b50e62c79993aac4ff0cf1d9499",
+   "sha256": "01rpbvxpdmqrrdy6h3m86xng6vmnlavbhrl9p9ydg2x00iv8l09a"
   },
   "stable": {
    "version": [
@@ -94682,11 +95420,11 @@
   "url": "https://mumble.net/~campbell/git/paredit.git",
   "unstable": {
    "version": [
-    20221127,
-    1452
+    20230718,
+    2027
    ],
-   "commit": "d700549d8aad684f1fabcfff565a9ad8b468199b",
-   "sha256": "0lx0l07psdm4dypvfadgdsx2wsjd7xpsdlagfbr7jr2nbgjkxzy7"
+   "commit": "037b9b8acbca75151f133b6c0f7f3ff97d9042e5",
+   "sha256": "0s3ia5yrhcl0wr4y7v70a68bhsvgkkfm3wvm3kmj37i84bb0nlrc"
   },
   "stable": {
    "version": [
@@ -94766,26 +95504,26 @@
   "repo": "tarsius/paren-face",
   "unstable": {
    "version": [
-    20240415,
-    1547
+    20240618,
+    1837
    ],
    "deps": [
     "compat"
    ],
-   "commit": "0cad6a4657ebfcdd2902746b99f01fea7cc05bd7",
-   "sha256": "17r70dwlg23kpv2dx4j7bs3pshisgz1j8k70vv3izyq0qg0n6vlp"
+   "commit": "b6b60ad39391cde91e36c127714f7658eb4151ff",
+   "sha256": "16rq4q4irzdxcnyhqbjcg7sy2n54wmbp9awn0dbz4w0yif80374v"
   },
   "stable": {
    "version": [
     1,
     1,
-    0
+    1
    ],
    "deps": [
     "compat"
    ],
-   "commit": "8b575bc215e715525644ed66152a9bcefde3bd08",
-   "sha256": "0ma2sxhds4b73zap8kyphbng7a77fsbwrzlybar11if4asd1dfba"
+   "commit": "b6b60ad39391cde91e36c127714f7658eb4151ff",
+   "sha256": "16rq4q4irzdxcnyhqbjcg7sy2n54wmbp9awn0dbz4w0yif80374v"
   }
  },
  {
@@ -94820,26 +95558,26 @@
   "repo": "justinbarclay/parinfer-rust-mode",
   "unstable": {
    "version": [
-    20240506,
-    816
+    20240625,
+    740
    ],
    "deps": [
     "track-changes"
    ],
-   "commit": "d3bfb2745cc0858e2741dc2a2f00a86f456656ec",
-   "sha256": "0q60hj9300wiz1kr5x1r3zqhfk97ndyzj2ks49y1r5klmp9w5l9a"
+   "commit": "7f7fa030e3ca51eb0a060df2694cbab2eb3b27b7",
+   "sha256": "1rdwzsgwv50dy4rqnydwlaihvv6fdg2sysig571f0sh049in8iqq"
   },
   "stable": {
    "version": [
     0,
     9,
-    0
+    2
    ],
    "deps": [
     "track-changes"
    ],
-   "commit": "d3bfb2745cc0858e2741dc2a2f00a86f456656ec",
-   "sha256": "0q60hj9300wiz1kr5x1r3zqhfk97ndyzj2ks49y1r5klmp9w5l9a"
+   "commit": "a96c768e9dc4427c9ea18812a2f09e209a5e1a5e",
+   "sha256": "17kkyqkn0r3s2rbgc6v5jygrq5bm5jcw54byjfkhnif90zvdch0n"
   }
  },
  {
@@ -95530,21 +96268,6 @@
    "sha256": "19xwwpfcf0l9jh7xixyjd5adivj27jw00zvxb7n1240k5p332pzi"
   }
  },
- {
-  "ename": "pcmpl-git",
-  "commit": "a6ff6bbfa11f08647bf17afe75bfb4dcafd86683",
-  "sha256": "078ajwsalirr9xkqfbbbmc5z3fdh9n5jckc6z7r90g899cxwcyzz",
-  "fetcher": "github",
-  "repo": "leoliu/pcmpl-git-el",
-  "unstable": {
-   "version": [
-    20170121,
-    59
-   ],
-   "commit": "9472ac70baeda025ef7becd1cf141d72aec93f32",
-   "sha256": "17y3rdp7fgyg4i9hwyzgpv1d19i5c6rqdf1gm5bdm2csk12vfg9n"
-  }
- },
  {
   "ename": "pcmpl-homebrew",
   "commit": "cdd1f8002636bf02c7a3d3d0a075758972eaf228",
@@ -95617,10 +96340,10 @@
   "repo": "joddie/pcre2el",
   "unstable": {
    "version": [
-    20240220,
-    1530
+    20240629,
+    2322
    ],
-   "commit": "380723b2701cceb75c266440fb8db918f3340d50",
+   "commit": "b4d846d80dddb313042131cf2b8fbf647567e000",
    "sha256": "0h73d9f1zj74vjir2kiq4s2g5rai7b59z7da20kh862xnldfcxsx"
   },
   "stable": {
@@ -96003,11 +96726,11 @@
   "repo": "bram85/emacs-persist-state",
   "unstable": {
    "version": [
-    20230728,
-    714
+    20240703,
+    2100
    ],
-   "commit": "0b0dd8dca90414db3395860c2bf32a4c736acfb4",
-   "sha256": "0ib6racii2wrpf9j63bi29r2y54dy7hhwj40ys74isiysk2r8x07"
+   "commit": "2d3d81717fbb2fac26362e8308f33d589818d7f0",
+   "sha256": "0kv05j8zi8msnx9ibw923c03z9bx8ckhvxf7sxazdlmf2clxyfkz"
   },
   "stable": {
    "version": [
@@ -96356,21 +97079,21 @@
   "repo": "wyuenho/emacs-pet",
   "unstable": {
    "version": [
-    20230906,
-    46
+    20240713,
+    1406
    ],
    "deps": [
     "f",
     "map",
     "seq"
    ],
-   "commit": "acd54c5b0171a82f88988b4fe2e6db112df5bf9a",
-   "sha256": "128mxbfzc42kmymbn7vwi4xvj6hzg8klv6iq212c47mzrgg8ycds"
+   "commit": "a3c74988c2ae89695026e6d314b5eb27c35fbc3a",
+   "sha256": "0dsyr2w5md86w8kpf8y2qk5rgsy58abza4wm1fb6k7rxfbds16p2"
   },
   "stable": {
    "version": [
-    2,
-    0,
+    3,
+    1,
     0
    ],
    "deps": [
@@ -96378,8 +97101,8 @@
     "map",
     "seq"
    ],
-   "commit": "acd54c5b0171a82f88988b4fe2e6db112df5bf9a",
-   "sha256": "128mxbfzc42kmymbn7vwi4xvj6hzg8klv6iq212c47mzrgg8ycds"
+   "commit": "2041ba1caee94242362c955e697a3c03bfbc0402",
+   "sha256": "18mz7nhsii9l1iqa9yk97xbf6dn4mladwrnl5w7ksa2zcpcpph61"
   }
  },
  {
@@ -96414,25 +97137,25 @@
   "repo": "emarsden/pg-el",
   "unstable": {
    "version": [
-    20240520,
-    1322
+    20240710,
+    2114
    ],
    "deps": [
     "peg"
    ],
-   "commit": "0f20a0051ab898ea53903284c47a4703555380ca",
-   "sha256": "0ynv154yhb878aqcjg1fv7zfvfrp839n8ys4wqp7gqhdqdwrf68h"
+   "commit": "614becd4182d2411e17acf4f88918d7c5df75548",
+   "sha256": "0bi2sh6901ylwgy9znv10j5vd3hgryvx3hc3yijs67n41qf4zryi"
   },
   "stable": {
    "version": [
     0,
-    34
+    37
    ],
    "deps": [
     "peg"
    ],
-   "commit": "0f20a0051ab898ea53903284c47a4703555380ca",
-   "sha256": "0ynv154yhb878aqcjg1fv7zfvfrp839n8ys4wqp7gqhdqdwrf68h"
+   "commit": "3d16f2e30e3dc2ec5c283d80f58730bc8ef4d6cf",
+   "sha256": "04zhy0wp6rk5x55ja5danyf3rpb59k35lpw7b07bn25rngmqjmid"
   }
  },
  {
@@ -96786,11 +97509,11 @@
   "repo": "emacs-php/php-mode",
   "unstable": {
    "version": [
-    20240118,
-    1458
+    20240621,
+    742
    ],
-   "commit": "f0a14387427244251883889ba616c7f042323f6d",
-   "sha256": "1r3vgzfrq87ffp7g0xx44iwjpakcp23fhd5cxbbnwvia0y49vv8l"
+   "commit": "4792988a120d6ac515ba16605278d04cb8be0d69",
+   "sha256": "0w9amslw2hpf0znfmn4cki3c6xqxjs11mayvzqiycfc6pabw4hzq"
   },
   "stable": {
    "version": [
@@ -96898,8 +97621,8 @@
   "repo": "emacs-php/phpactor.el",
   "unstable": {
    "version": [
-    20240407,
-    1500
+    20240527,
+    459
    ],
    "deps": [
     "async",
@@ -96907,8 +97630,8 @@
     "f",
     "php-runtime"
    ],
-   "commit": "1916e35e08d746a6ff8a2cd88ae43bdb6842feab",
-   "sha256": "0c9diqgy8v0bcx5011z2sd0q7s2xn2f4y7mpgv0x5fi0qh2a1mw1"
+   "commit": "6b5269ff82785a9bd1e648b2f91e5128353d5a67",
+   "sha256": "0ygnl1xpms8cnp5s7i9ng99azyzg0k3h830mazkhhpwlqhkjffyl"
   },
   "stable": {
    "version": [
@@ -96932,16 +97655,16 @@
   "repo": "emacs-php/phpstan.el",
   "unstable": {
    "version": [
-    20230417,
-    1142
+    20240527,
+    2142
    ],
    "deps": [
     "compat",
     "php-mode",
     "php-runtime"
    ],
-   "commit": "2dc25cb2f3d83484ea0eb063c9ffca8148828a2b",
-   "sha256": "0drsp230nxs336zzfy8gjr7r3p7m8w9rp4ih1zjwarzl1svpp7yp"
+   "commit": "6f1c7bb357b1eb90b10a081f1831c1c548c40456",
+   "sha256": "1hnnhbma3mgbralp1f5c1gvm9pfswzf5xzi2nr22rs5d9r0zk2fj"
   },
   "stable": {
    "version": [
@@ -97393,14 +98116,14 @@
   "repo": "Wilfred/pip-requirements.el",
   "unstable": {
    "version": [
-    20181027,
-    1629
+    20240621,
+    2151
    ],
    "deps": [
     "dash"
    ],
-   "commit": "216cd1690f80cc965d4ae47b8753fc185f778ff6",
-   "sha256": "0da3q0n5nn0l96kk49kanw5knx3jmga439zbmiii76na16bg5y3i"
+   "commit": "31e0dc62abb2d88fa765e0ea88b919d756cc0e4f",
+   "sha256": "08q225h8kahh632qkzpb1ih3jqg5imlzgrrh8ynkyxrr710madkl"
   },
   "stable": {
    "version": [
@@ -97581,11 +98304,11 @@
   "repo": "juergenhoetzel/pkgbuild-mode",
   "unstable": {
    "version": [
-    20220802,
-    1951
+    20240531,
+    1602
    ],
-   "commit": "9525be8ecbd3a0d0bc7cc27e6d0f403e111aa067",
-   "sha256": "03rhhmwwigvych4qfn0hly0z2hihs57yjapvfinbkrmw8ajgnl01"
+   "commit": "8ef396d8fa9187b65c065a6bc2ca15dfaf3255df",
+   "sha256": "1p5xgq0mnyqxjmapki60xv1jns0pxszd04r0c1kdyk1bcdcpjm93"
   },
   "stable": {
    "version": [
@@ -98115,8 +98838,8 @@
   "repo": "alphapapa/pocket-lib.el",
   "unstable": {
    "version": [
-    20240407,
-    2247
+    20240713,
+    1324
    ],
    "deps": [
     "dash",
@@ -98124,8 +98847,8 @@
     "plz",
     "s"
    ],
-   "commit": "b13c899223a15481738c3105f07ee2205dcc937c",
-   "sha256": "0b5451fwsjqb603mmgw6kpd8w4gvndg3fxbdb44ib2245ynr5mms"
+   "commit": "21f69179ad254ab64cb876115719e5d7d043f88d",
+   "sha256": "1hh987aflyjjddinx790g09c6l5yfd2wbihh83pvmrair6pj68rd"
   },
   "stable": {
    "version": [
@@ -98406,8 +99129,8 @@
   "repo": "mavit/poly-ansible",
   "unstable": {
    "version": [
-    20240520,
-    1500
+    20240626,
+    1320
    ],
    "deps": [
     "ansible",
@@ -98416,8 +99139,8 @@
     "polymode",
     "yaml-mode"
    ],
-   "commit": "187ad18b7c03eb2b286b4d49eb36572bb7847d57",
-   "sha256": "0980z444419pk7xgic6g5vvi30yibxfimd0rp0zznrshmc9xxra8"
+   "commit": "24a17c6b965a085c737bee857eff919dfd0f961d",
+   "sha256": "0k36pydhrrhzs46vcn5lsqxvz66j7nws5vfhwlh60vshkic2rfhx"
   },
   "stable": {
    "version": [
@@ -98720,15 +99443,15 @@
   "repo": "TatriX/pomidor",
   "unstable": {
    "version": [
-    20220714,
-    1932
+    20240601,
+    1617
    ],
    "deps": [
     "alert",
     "dash"
    ],
-   "commit": "394a52f95587b1d10d0c3bdca503d2cc876db35b",
-   "sha256": "1y64xs74p39rr1d4i1s0zjhqlcips9k11fr8z6wy1j7s9b142570"
+   "commit": "de71c34a1a9aff745181107094d3389816dbeca5",
+   "sha256": "00jh2hww8xpvnj9hqlgfg9rgqspwpp6nsqzjdsny96dps8myki1s"
   }
  },
  {
@@ -98739,16 +99462,16 @@
   "repo": "SqrtMinusOne/pomm.el",
   "unstable": {
    "version": [
-    20240130,
-    2126
+    20240709,
+    2156
    ],
    "deps": [
     "alert",
     "seq",
     "transient"
    ],
-   "commit": "a95343f643b5674ad7714dc62f8436ba87ad8335",
-   "sha256": "08g28lx8rqvcff7dhcgrxavx59hx507gn6flsx39v0b865i52bmv"
+   "commit": "ba0b30888614a8dc932bd0ab198e08f78950c0e1",
+   "sha256": "1zd351gx3k31vmrs4g4q8fcqdwxp8zlqch40z4vhqy80alzlg88g"
   },
   "stable": {
    "version": [
@@ -99177,8 +99900,8 @@
     4,
     7
    ],
-   "commit": "90a9babc829b298af36be695009894fc00a97935",
-   "sha256": "1k6r59jhbyiknhsl7df0zafyc4d9r3vk953x6sdxgz92kx6hxpfy"
+   "commit": "4889e08cf9077c8589ea6fea4e2ce558614dfcde",
+   "sha256": "0wnmh9a9ks0pmcjy9df5higfbz9gy1ydj4n8s84hkhd4wq4fndvv"
   }
  },
  {
@@ -99189,11 +99912,11 @@
   "repo": "tumashu/posframe",
   "unstable": {
    "version": [
-    20240507,
-    148
+    20240703,
+    359
    ],
-   "commit": "f4e9e509ba96ceb3c2b2b054957291607fb52651",
-   "sha256": "0hz7jgpsg3adgwg2qqgd9vy1mhbkr3c9rsy0zx5kmn42npdcf4az"
+   "commit": "493b17f74ad41104d0c4d648e8c96dc495279ac8",
+   "sha256": "1yjpkx5h8wm5hs448hri8zvhzq44g4qgb5g1ji6yj99x8vdpf5al"
   },
   "stable": {
    "version": [
@@ -99615,16 +100338,16 @@
   "repo": "jscheid/prettier.el",
   "unstable": {
    "version": [
-    20231002,
-    1153
+    20240601,
+    1316
    ],
    "deps": [
     "editorconfig",
     "iter2",
     "nvm"
    ],
-   "commit": "d6d7a6ac9e8a08ab497d2cf4d7e2317f6b93dfbf",
-   "sha256": "0612snvsf6y0g6qfirjvnxk0labnm35wgbxvidyy0rzsasfszl9l"
+   "commit": "53327f039f2d4f3fd1eabece190857059b3765b5",
+   "sha256": "09rxd93pg9lx2gidyy1bb91hfla3df29y7hl2p1l4pwbf1rgmim1"
   },
   "stable": {
    "version": [
@@ -99851,26 +100574,28 @@
   "repo": "alphapapa/prism.el",
   "unstable": {
    "version": [
-    20230524,
-    1130
+    20240611,
+    305
    ],
    "deps": [
+    "compat",
     "dash"
    ],
-   "commit": "169b49afa91e69d35b8756df49ed3ca06f418d35",
-   "sha256": "0n2gf7302hqdnhsax1y3ahksfmmpd8cmiv1zgb7rjg8qhcs0iqp2"
+   "commit": "73deba1a4a719f740827c000cf46bfecacb44adb",
+   "sha256": "1p0v2rd9wiz13ckwkj77v8bpzg01cjsgfqkqqyrf1hkv7b0ki2z9"
   },
   "stable": {
    "version": [
     0,
     3,
-    2
+    5
    ],
    "deps": [
+    "compat",
     "dash"
    ],
-   "commit": "169b49afa91e69d35b8756df49ed3ca06f418d35",
-   "sha256": "0n2gf7302hqdnhsax1y3ahksfmmpd8cmiv1zgb7rjg8qhcs0iqp2"
+   "commit": "3a61852dd01c738dc18b88a7be524db67a2d5520",
+   "sha256": "1p4vqyc4jm0pg4999i0k04pl0sa9nhrczxf4bng4id1r19sxm6dh"
   }
  },
  {
@@ -100678,8 +101403,8 @@
   "repo": "mohkale/projection",
   "unstable": {
    "version": [
-    20240517,
-    2023
+    20240707,
+    1857
    ],
    "deps": [
     "compat",
@@ -100687,8 +101412,8 @@
     "project",
     "s"
    ],
-   "commit": "c6df3b19204113642ee14a87598d65c03688f0fa",
-   "sha256": "1f78nq135waqgkr5z9m5gxhplb2spbkap0diykb6h9j8l6g8xij7"
+   "commit": "9ee93e65d987cfaecaf87e74a6716d84154a698c",
+   "sha256": "148gdrjv6swi8garawjb9w5mnif2agl4j5w3glrz13jmagxmmpb8"
   }
  },
  {
@@ -100912,11 +101637,11 @@
   "repo": "ProofGeneral/PG",
   "unstable": {
    "version": [
-    20240513,
-    720
+    20240708,
+    1525
    ],
-   "commit": "55e133360c1b66b834f9ae2c4478d2c81b2d33ef",
-   "sha256": "00r3zyrc08j5a5np0xc6jkzvlpjxnax7dg2br8h85hk3fml2gihf"
+   "commit": "eca47ea8afdfcd94b4c8d88ee640f6631cfe5c5d",
+   "sha256": "1vr8k4s7dk5y5c7rmnparrigsih6cz9w01d8z1gmfp55adhyjvli"
   },
   "stable": {
    "version": [
@@ -101024,11 +101749,11 @@
   },
   "stable": {
    "version": [
-    26,
-    1
+    27,
+    2
    ],
-   "commit": "2434ef2adf0c74149b9d547ac5fb545a1ff8b6b5",
-   "sha256": "1n7w40wypayplykxhknm6sljzbfbm64mg1zysrjidac3hwqkxh7n"
+   "commit": "63def39e881afa496502d9c410f4ea948e59490d",
+   "sha256": "0rbbwydw97gxbbq9gm32lp9rn44safqzywk4jjdmbrq19asdxazm"
   }
  },
  {
@@ -101197,15 +101922,15 @@
   "repo": "thierryvolpiatto/psession",
   "unstable": {
    "version": [
-    20240515,
-    1449
+    20240612,
+    1242
    ],
    "deps": [
     "async",
     "cl-lib"
    ],
-   "commit": "5a5b11df882339b4474ab0cc6dd847aaab6a84b6",
-   "sha256": "1cgx1k9vgq8avpjr1ig87wf6mv042504bf770x46dba3zswwy98z"
+   "commit": "cddba290ce39440a2e00bb92130030fe0f068f2c",
+   "sha256": "1z1kdgr3y5wgn8xqgr5ilpbzjqm54jz2icg34p6qc8d8s12chw8c"
   },
   "stable": {
    "version": [
@@ -101576,6 +102301,21 @@
    "sha256": "0c5q8qmbligzjsn05di4wh6ggpd3944j4yqb78vzd441b8ssq70i"
   }
  },
+ {
+  "ename": "puppet-ts-mode",
+  "commit": "bf4dcc1a451a3bf5908f4a3b6f9636b4b958a804",
+  "sha256": "1ppzzbkvcq2wf725cb3cxl47q3i87x6d7ph2hngh29nw707nn8jv",
+  "fetcher": "github",
+  "repo": "smoeding/puppet-ts-mode",
+  "unstable": {
+   "version": [
+    20240626,
+    646
+   ],
+   "commit": "9622188612f3be347bd92f5a195999b36f95f988",
+   "sha256": "0jrrmd77i5md8psxq313i8amw2f8hmmh518f1bsajm4wg46pfh3c"
+  }
+ },
  {
   "ename": "purescript-mode",
   "commit": "55462ed7e9bf353f26c5315015436b2a1b37f9bc",
@@ -102399,16 +103139,16 @@
   "repo": "wbolster/emacs-python-coverage",
   "unstable": {
    "version": [
-    20240509,
-    856
+    20240703,
+    917
    ],
    "deps": [
     "dash",
     "s",
     "xml+"
    ],
-   "commit": "7f130066460ab8a58c2667d9f76a3e2c168e0759",
-   "sha256": "0dxc09422nqpwdcvh90j41631198dxsxc6np1hhs5m6qf3fjsx1m"
+   "commit": "7077dabdee59efe1d7116149cdc0ef40e6816c2b",
+   "sha256": "0pf01b9xnzzibkbfx1l3i25ckljf73vr20fpnmfc9giaiz5lzl5l"
   }
  },
  {
@@ -102532,14 +103272,14 @@
   "repo": "jdtsmith/python-mls",
   "unstable": {
    "version": [
-    20230920,
-    1915
+    20240621,
+    2114
    ],
    "deps": [
     "compat"
    ],
-   "commit": "821b93ff7c94a13090598c22fd92bd19b5ad951b",
-   "sha256": "1p9dcjz8hgjb8gz742pxqdrjh68mnyr2hssy6glhd2qb78d4927y"
+   "commit": "3ebacc6c46e9f7de25279783001ca3fc8964d7a8",
+   "sha256": "0qspqx1jlpcq64d5j05xfn6xdfnxixb654pczilxp6bqhyca8ln4"
   },
   "stable": {
    "version": [
@@ -102586,17 +103326,16 @@
   "repo": "wbolster/emacs-python-pytest",
   "unstable": {
    "version": [
-    20240416,
-    1128
+    20240704,
+    1054
    ],
    "deps": [
     "dash",
-    "projectile",
     "s",
     "transient"
    ],
-   "commit": "9f850e22df93812a5b109968c549f9b3dd828ed1",
-   "sha256": "1f5b7ffcpmry2xiphclc4vv1zqva9rrhn08fgjq8qhdq3x0i5jah"
+   "commit": "1ecfb4461615374aac7786a07359c2d3d561f3c7",
+   "sha256": "1crdx42rdqyczccl5wqxnblqrs9ijskh5zj970800lk3xhsr4kql"
   },
   "stable": {
    "version": [
@@ -102727,6 +103466,21 @@
    "sha256": "0hbvy8wdi5dgxn86j8z54y2fhcvm605xxm6xv054nl6fw2hh2h5h"
   }
  },
+ {
+  "ename": "pythontest",
+  "commit": "cac44f0b664c362935aa1c6b6045a92721cda174",
+  "sha256": "0k2byrlr85phyy814dcd5fxpjs5pa716bd5w1kr50wfv58xayx4y",
+  "fetcher": "github",
+  "repo": "erickgnavar/pythontest.el",
+  "unstable": {
+   "version": [
+    20240610,
+    2226
+   ],
+   "commit": "5b46552a7afdd91070ac528909e032d0df5aa2da",
+   "sha256": "13x8gjc4zg7fwi8a7z3cwa1v5slwfw14wynkv1hdp8rmm4j5zvz3"
+  }
+ },
  {
   "ename": "pyvenv",
   "commit": "e37236b89b9705ba7a9d134b1fb2c3c003953a9b",
@@ -103218,6 +103972,24 @@
    "sha256": "1f752fsrk7z8q2dd40r46hzhhf1kyj0vid9g0vv5dkkzmabms59q"
   }
  },
+ {
+  "ename": "qwen-chat-shell",
+  "commit": "c20f88160b4caeed30a78ecddd738f18acae39ae",
+  "sha256": "17c7bi0yvmpz23qpdhw78dy566b0f5jzr49k65jaxjrb0820g02c",
+  "fetcher": "github",
+  "repo": "Pavinberg/qwen-chat-shell",
+  "unstable": {
+   "version": [
+    20240612,
+    343
+   ],
+   "deps": [
+    "shell-maker"
+   ],
+   "commit": "2d6562c8a75aebf7a59e554011571ba5883cf4fd",
+   "sha256": "1l43z5s3jfx6cxwf93yl6k9jpg7dlvlh3jmspa59jm5395cnvrh9"
+  }
+ },
  {
   "ename": "r-autoyas",
   "commit": "3a095d3a687055c6ac43a4338826542d14a25127",
@@ -103289,11 +104061,11 @@
   "repo": "greghendershott/racket-mode",
   "unstable": {
    "version": [
-    20240514,
-    1524
+    20240621,
+    1647
    ],
-   "commit": "d2cff2b7f210846108875c7eccb1b5ab98bceb74",
-   "sha256": "0gxjm594k1i0xiavmk27z9mv9qh5q4k5h3ih198pm637k31ziviy"
+   "commit": "40ecb87f409a9ef9a4e58c1e51243cce948ab3d7",
+   "sha256": "0g57p95zqyxcryrzcc16q6w5xv9i9y4dncqb4h7ixdgw6bcvlhqk"
   }
  },
  {
@@ -104513,11 +105285,11 @@
   "repo": "ideasman42/emacs-recomplete",
   "unstable": {
    "version": [
-    20240422,
-    15
+    20240616,
+    2345
    ],
-   "commit": "9b4ab842e37eed9b8314ba81b4eac49beeea8c1c",
-   "sha256": "1m9cz4g672wzsf2np7lzksgxl75bc790nq51gy97qrsjbwn6gj99"
+   "commit": "7a5c4c86cdbf8ba6b045d5ace466e5dcb2f10db0",
+   "sha256": "0j9ir47ny9m0kq4da7jvmv5qf282i0imm3xwfbjyxnhmmq5nj3zv"
   }
  },
  {
@@ -104628,14 +105400,14 @@
   "repo": "minad/recursion-indicator",
   "unstable": {
    "version": [
-    20240122,
-    2254
+    20240708,
+    2119
    ],
    "deps": [
     "compat"
    ],
-   "commit": "548838df2ef15fdd8e9d904d0a74182297e3383f",
-   "sha256": "1m9fxl405yprz0id18g7192h8sp51j07n8lc41lb3yn8vwl13g0l"
+   "commit": "e0eccd3b4b7d7bb162767d4c5a028e646437555c",
+   "sha256": "0pzwyrsdpsrrnchxk8qihqr8blx366yw9snrcy1l1fj9hhsks7bs"
   },
   "stable": {
    "version": [
@@ -104965,11 +105737,11 @@
   "repo": "alvarogonzalezsotillo/region-occurrences-highlighter",
   "unstable": {
    "version": [
-    20240417,
-    2146
+    20240626,
+    1101
    ],
-   "commit": "a1ade7985656faf00f8a6afda885e8bdf959d133",
-   "sha256": "01j8i1z6mf7c2g59yzx6hrd799pxk6rdq2dvsl1r0bppgi5kv8dy"
+   "commit": "55f9d100ef67f174c55209f8d4cef1962a9adfc2",
+   "sha256": "0cay4dsqrcpwml0bpsmpnx0mkprr8jj1m6a027m7dfpmhf2xlrmn"
   }
  },
  {
@@ -105052,6 +105824,21 @@
    "sha256": "1lm53zg30n96bq8z5g836dhk0y02njdyp8c6vjgsrcii4ff42jp5"
   }
  },
+ {
+  "ename": "regswap",
+  "commit": "ec1df4dd5d259b86ab7b726e482ad6ca7f0db63c",
+  "sha256": "0sh27hf69kqc34bb6syidk4x414h2liv3k0ilv976s3djs97wlf2",
+  "fetcher": "github",
+  "repo": "skitov/regswap",
+  "unstable": {
+   "version": [
+    20240602,
+    2051
+   ],
+   "commit": "65e2319e013c5d59f338edde12b98ef1c737e870",
+   "sha256": "0hbvf0f72a2icyi503iypqcy98pa5fkxxbv141r73xi53s1g2vqr"
+  }
+ },
  {
   "ename": "related",
   "commit": "555932a7b9cf11b50a61c2a9dd2636fd6844fac8",
@@ -106454,11 +107241,11 @@
   "repo": "jgkamat/rmsbolt",
   "unstable": {
    "version": [
-    20240507,
-    47
+    20240622,
+    1704
    ],
-   "commit": "32604147643dbfebe499ea8a4b139cc68acd2746",
-   "sha256": "07l5c1apdck8a73z4mh3r7jpwz1c97p4i6qz1lg5ygmr1wnhpncy"
+   "commit": "484d9c06f0544532336ad2ac2ddf46a1a81272ef",
+   "sha256": "1sky9qvrycqjmhlhrd3jn2mpdgii3m9m6r48nb6m6s7pshwlydw3"
   }
  },
  {
@@ -106523,11 +107310,11 @@
   "repo": "kopoli/robot-mode",
   "unstable": {
    "version": [
-    20231118,
-    826
+    20240711,
+    2007
    ],
-   "commit": "cb12e5adcba3379a67483e268229c152e0a8405f",
-   "sha256": "1a377lws4f0az2y1r3z2i3mghvg7a4094wkchvjvsl1nd6yxdxwa"
+   "commit": "03bd436ff88c41e9c4d6b1df865d5abb062f5e37",
+   "sha256": "056n3jwpnb3fgczn38hsg0vs6969rjz11dma38mip8icr20ysllb"
   },
   "stable": {
    "version": [
@@ -107322,16 +108109,16 @@
   "repo": "semenInRussia/emacs-run-command-recipes",
   "unstable": {
    "version": [
-    20231219,
-    1331
+    20240708,
+    1555
    ],
    "deps": [
     "dash",
     "f",
     "run-command"
    ],
-   "commit": "63405333f23b33ecda08e716eca8588c8950952d",
-   "sha256": "0wlg7qx7r94cnnrhp99wfiwna1zwccshg93r32zj2ah9j4mba500"
+   "commit": "5a249052933dfa5e8f768da6c73d926e167d6175",
+   "sha256": "0cpg31wm7r171ra86w3x2va08qx7b49mv397x13q7c1fkd3xxfx1"
   }
  },
  {
@@ -107498,29 +108285,29 @@
  },
  {
   "ename": "rustic",
-  "commit": "716c14a2ed8f5817c09c1ff530a4980c17b44bb3",
-  "sha256": "13bwrdqmm6xb34k8r72c0r3b9aym5dwsalp63bkfh9k9kq9hic0n",
+  "commit": "3cc337cbfdd1f09e6a18bbbe8f8cf470601a2db4",
+  "sha256": "1azn2m6vac8zinykzw8nhzmg16in3h4f0p6jl08sskgb6lc722kp",
   "fetcher": "github",
-  "repo": "brotzeit/rustic",
+  "repo": "emacs-rustic/rustic",
   "unstable": {
    "version": [
-    20230130,
-    912
+    20240708,
+    2105
    ],
    "deps": [
     "dash",
     "f",
+    "flycheck",
     "let-alist",
     "markdown-mode",
     "project",
     "rust-mode",
     "s",
-    "seq",
     "spinner",
     "xterm-color"
    ],
-   "commit": "a5fc66c8167a827a57c4426e4b8dbe717b3be43c",
-   "sha256": "1kg1brqy6bv8z2qw4q3f70az3mcz26pb387qrjlx2ik027zyr0ih"
+   "commit": "c1893528ad6b8e8ca795b547f326ec52dacf8728",
+   "sha256": "001iv1ymiz0bgq14nzysyzamw46zgiap0vgkj9a3rfi68cky524w"
   },
   "stable": {
    "version": [
@@ -108086,25 +108873,25 @@
   "repo": "openscad/emacs-scad-mode",
   "unstable": {
    "version": [
-    20240429,
-    1628
+    20240708,
+    2120
    ],
    "deps": [
     "compat"
    ],
-   "commit": "8b830727c343bf762d9469b413f0c2a4c1996fe2",
-   "sha256": "07rk69b0sbcwh4mjpapzv93awwl4w5n0q73915rrxifqf6n3bjsp"
+   "commit": "17a8158cc55fed473aa87d53f3f2b42e1c249d11",
+   "sha256": "13h58abcpyykv136pfn7735jhx73dni91smmk52rv0p5cf8rd3qk"
   },
   "stable": {
    "version": [
-    93,
-    3
+    94,
+    0
    ],
    "deps": [
     "compat"
    ],
-   "commit": "8d5650c5cfee96c42d64427bfcadb89f6bda66be",
-   "sha256": "08yia0q18b0w3lkr4wh1bd1v606cksi6hpz72nqjvv59qyjfmg01"
+   "commit": "3c32b141f083c31539bb24700eb0aa23ea55918c",
+   "sha256": "1fgnvshyyxyhp4qxc29iqdzvdg2cj2d94lbgsii2bby3k18fzqxc"
   }
  },
  {
@@ -108172,11 +108959,11 @@
   "repo": "KaranAhlawat/scala-ts-mode",
   "unstable": {
    "version": [
-    20240420,
-    1150
+    20240630,
+    1733
    ],
-   "commit": "d9424fa74acf930664c43d4c9f9625d8bfdd4d21",
-   "sha256": "0sc2sx3pgifcnd2zw7nvk3f8z3v1zh2q94d9rnlayvwr6y4cnlq4"
+   "commit": "8c4ace721fb525d1a790121a8625bc2623c9f207",
+   "sha256": "100zx8f57f8gdi8wmkcj38nannyzgpybc63jzs466c61f7li5wjg"
   }
  },
  {
@@ -108684,6 +109471,25 @@
    "sha256": "0r6sm7b15scmjcpdcqvm55hdsvyw5d2g7mrfhsx2hs8sqz64gkwc"
   }
  },
+ {
+  "ename": "sdml-mode",
+  "commit": "3ef7d39f3984edd3e50db8fe36ea496aec844648",
+  "sha256": "02ja7qa98r8azdkgbiqc8vg8lyba7qhqm2ng0aia739bpxqxac97",
+  "fetcher": "github",
+  "repo": "sdm-lang/emacs-sdml-mode",
+  "unstable": {
+   "version": [
+    20240708,
+    1403
+   ],
+   "deps": [
+    "tree-sitter",
+    "tree-sitter-indent"
+   ],
+   "commit": "33e44bfe8fddefc16538407d55da3ca85cfc1a6d",
+   "sha256": "1nv97ffwvaqgh2vycm0cgn1nra6qyajl25fwx1kl0psfb3k7kfiv"
+  }
+ },
  {
   "ename": "search-web",
   "commit": "1f1a3697649ccf69c8eb177c31ec4246b98f503b",
@@ -108944,14 +109750,11 @@
   "repo": "captainflasmr/selected-window-accent-mode",
   "unstable": {
    "version": [
-    20240427,
-    833
+    20240709,
+    1942
    ],
-   "deps": [
-    "visual-fill-column"
-   ],
-   "commit": "79397e634a89c5e16de1d317f735aafe75c78aea",
-   "sha256": "0dwb4j62n13dg8kl2maci1668v0nsnc55xfjfva3wm5singb72zl"
+   "commit": "0c09d2aeb778ac3a03f2c3d99dfada9ba67e40ae",
+   "sha256": "0mqjgdym0nqlzrjwjmm6qzbmd51kv0z7mxxacsl3fzbwyj364g19"
   },
   "stable": {
    "version": [
@@ -109104,15 +109907,15 @@
   "repo": "wanderlust/semi",
   "unstable": {
    "version": [
-    20231102,
-    1035
+    20240606,
+    1327
    ],
    "deps": [
     "apel",
     "flim"
    ],
-   "commit": "9063a4485b148a767ea924f0e7cc78d3524ba256",
-   "sha256": "18km8jdxjcqnh378xxd7ivvvcxzrif8zpq9zgki9i7f0q8lsx677"
+   "commit": "85a52b899ac89be504d9e38d8d406bba98f4b0b3",
+   "sha256": "13sfwv889i99l5zv10ibzm221wvwbp3m45nf4nsr0dhvln90zrjj"
   }
  },
  {
@@ -109881,11 +110684,11 @@
   "repo": "xenodium/chatgpt-shell",
   "unstable": {
    "version": [
-    20240227,
-    2310
+    20240623,
+    1713
    ],
-   "commit": "03afa7339930e5715c217455f3070c88a7fac55c",
-   "sha256": "1n6gpfyq13180k41jn3xnar0gz3a9qz08nz8v5xjj0qxdgml02g6"
+   "commit": "f3307e7ffac399e36cb70d7663181dd53caf712a",
+   "sha256": "1i0w4izfzggnhr99wy6nb9zkc5p31pfxn2s962kkba6r2zvv435y"
   }
  },
  {
@@ -110208,11 +111011,11 @@
   "repo": "emacs-w3m/emacs-w3m",
   "unstable": {
    "version": [
-    20240423,
-    31
+    20240712,
+    215
    ],
-   "commit": "1da8d4f11cc5f79bce124d0a32be59be18359373",
-   "sha256": "063klgl664n8qw82g7c31vsbw1npw7l2jc5n2g9bndhhq8hg5g2g"
+   "commit": "3c8530d29e54b64023d8c038e5046e085b052fa8",
+   "sha256": "1160a99djlixcxx1sh3jhpxxx96k9v2jnx7b67ar1rn5s2qc7dzb"
   }
  },
  {
@@ -110239,6 +111042,21 @@
    "sha256": "1vf766ja8f4xp1f5pmwgz6a85km0nxvc5dn571lwidfrrdbr9rkk"
   }
  },
+ {
+  "ename": "shortcuts-mode",
+  "commit": "e4c72fcc02373dab446c14eae1e518a4706bb993",
+  "sha256": "191s3r3ydl1mbchicq24vch2qcr57f480ypcy0zzrdjlw34jyl0n",
+  "fetcher": "github",
+  "repo": "tetron/shortcuts-mode",
+  "unstable": {
+   "version": [
+    20240707,
+    1606
+   ],
+   "commit": "a781ae97e33f5a0bf75058c21a7784032e22b28d",
+   "sha256": "1na0qmpq5z5fx3b84s9bxkfskny92bl7ny6lbmnbvhs3b0v84fk0"
+  }
+ },
  {
   "ename": "shoulda",
   "commit": "41497a876c80d81d9562ea4b2cc2a83dba98ae8a",
@@ -110398,15 +111216,15 @@
   "repo": "chenyanming/shrface",
   "unstable": {
    "version": [
-    20240401,
-    957
+    20240622,
+    712
    ],
    "deps": [
     "language-detection",
     "org"
    ],
-   "commit": "b82a174ee33f19ed96c7e8c85ec362eab147d4aa",
-   "sha256": "0qspg55r397p6p16c4cps547x2w7gdplshy3scr810iwphrzsvfy"
+   "commit": "a684fda3485684714a87b637c76b843fc15cecbb",
+   "sha256": "0x0x4plkmphz2qwxsv3vrgvhy2hcqbgs0aa03iqvxnyg22ih6pjk"
   },
   "stable": {
    "version": [
@@ -110608,14 +111426,14 @@
   "repo": "rnkn/side-hustle",
   "unstable": {
    "version": [
-    20240325,
-    205
+    20240625,
+    1228
    ],
    "deps": [
     "seq"
    ],
-   "commit": "903380cf9e08d98689c2c116965f8e47d002fad6",
-   "sha256": "0728k6dbx4435vnm0rfj2pw2kdp4f7j1pwqdmlwp8zf81i5bghzn"
+   "commit": "94450b58cec1b809afe08d0754a6662839efbc9d",
+   "sha256": "1lhvp1vqkkxrx1fl9xp1q0dvwgh8iidz6w0sznjvc0dbl15vx55q"
   },
   "stable": {
    "version": [
@@ -110626,7 +111444,7 @@
    "deps": [
     "seq"
    ],
-   "commit": "903380cf9e08d98689c2c116965f8e47d002fad6",
+   "commit": "0ac8dfa02ddd33cfa0e3cff834b68e32185db9ee",
    "sha256": "0728k6dbx4435vnm0rfj2pw2kdp4f7j1pwqdmlwp8zf81i5bghzn"
   }
  },
@@ -110638,11 +111456,11 @@
   "repo": "rnkn/side-notes",
   "unstable": {
    "version": [
-    20230814,
-    302
+    20240629,
+    1008
    ],
-   "commit": "fbe409066df83a7e64a6a9ddf6d99ce7177fcdbb",
-   "sha256": "14jmki9lrcf78g362sxjvs1a55cz99p2pvnrvvr0hnn7lh6rfd4l"
+   "commit": "96a142dfd5768d66b1d574027e13c572e4c82a87",
+   "sha256": "09nisfdlib6n94pv5axvj64znh77jsdifv55d69kb71azpjl7r68"
   },
   "stable": {
    "version": [
@@ -110650,7 +111468,7 @@
     4,
     1
    ],
-   "commit": "d41255fc2b8cadfc7882c617c7d1aff71524ed46",
+   "commit": "452378c68b7e95b9e8244d20ace073a0be27ccb2",
    "sha256": "0jsfa5dfs0kl9c7pjxi1niq1mknsxnqm9gs18l0lb9ipbzb949sr"
   }
  },
@@ -110677,14 +111495,14 @@
   "repo": "emacs-sideline/sideline",
   "unstable": {
    "version": [
-    20240521,
-    31
+    20240627,
+    47
    ],
    "deps": [
     "ht"
    ],
-   "commit": "31ef3c21d99785e7a066ad8c188ddcd2b478b5fe",
-   "sha256": "17qflpmc7kwn0cikysardxda25wanmax55hc6ifwgcp330wp4742"
+   "commit": "ba55945617f04763f9e93525fdf1e2826e4d667a",
+   "sha256": "1iizibw9aai04ni0g074a7yb5bidmwvq2ygw72gwxdg4v6h2wldy"
   },
   "stable": {
    "version": [
@@ -110736,16 +111554,16 @@
   "repo": "emacs-sideline/sideline-flycheck",
   "unstable": {
    "version": [
-    20240509,
-    742
+    20240629,
+    840
    ],
    "deps": [
     "flycheck",
     "ht",
     "sideline"
    ],
-   "commit": "f809e627e433bd9a58471e4dea1ed50305eef7f2",
-   "sha256": "0z0152cnkb8bwc3j0gi1zyasvwxc7anlrj2qr0zj6pbxyl61k5m3"
+   "commit": "4147f2754c353e0b7920caf385b8dccc5e6301f7",
+   "sha256": "1978b149d7mza2r2mknp01zvpf55sz49addaxd153fqdsmf8hxq8"
   },
   "stable": {
    "version": [
@@ -110946,14 +111764,14 @@
   "repo": "vapniks/simple-call-tree",
   "unstable": {
    "version": [
-    20210625,
-    2001
+    20240713,
+    1008
    ],
    "deps": [
     "anaphora"
    ],
-   "commit": "26de24bcde0eae911a0185bb5a6b74b9864fcfc3",
-   "sha256": "0589ns2v6jxyd7adjkj34zlcnnxbfs6c7hm56yskbs2s4qkkf369"
+   "commit": "90de7cb42e1dbfe295516e696df928966f1eede9",
+   "sha256": "19nbwrc2pg44qqryslm3mzjc3isxx1indmdxms39j71qzwgig6ad"
   }
  },
  {
@@ -111230,6 +112048,21 @@
    "sha256": "0ydgx94wxv6x81yqzy5bwrs06cx8hsrw2c1y4gw3awm953m9259g"
   }
  },
+ {
+  "ename": "sink",
+  "commit": "9f6b09154d54b3bfbc16ef606fc7dfefb4762014",
+  "sha256": "0wqxm6qs736q856w4niy7zfi2bvb31dg8zw24xr42qr07irk4x84",
+  "fetcher": "github",
+  "repo": "alcah/sink.el",
+  "unstable": {
+   "version": [
+    20240523,
+    747
+   ],
+   "commit": "a14e1cc0a051543723c043a5ece081ce9a567ddd",
+   "sha256": "17pk3zqy1zddcdhfm0ybff41l1plx4cypv9sxaydgl3yyi34zwkv"
+  }
+ },
  {
   "ename": "siri-shortcuts",
   "commit": "f3a67195c63059fbc2d2714b540505bb9cde49d1",
@@ -111592,14 +112425,14 @@
   "repo": "slime/slime",
   "unstable": {
    "version": [
-    20240516,
-    319
+    20240705,
+    2255
    ],
    "deps": [
     "macrostep"
    ],
-   "commit": "5ced74ab35d91f6be7d8fa10e1098aaae6b749e3",
-   "sha256": "0bq0vi22mr43l64q501hkv11sp58bmn8hgxmc61if0xc1rlcs68v"
+   "commit": "eb30f9f7bae4f8eed27a060390ff8aadcf69174e",
+   "sha256": "09wz5pdgdq2md0m1z6c47sab3xxvwl897mci1axw44ny8g914f9z"
   },
   "stable": {
    "version": [
@@ -112389,15 +113222,15 @@
   "repo": "Fuco1/smartparens",
   "unstable": {
    "version": [
-    20240416,
-    2253
+    20240713,
+    1002
    ],
    "deps": [
     "cl-lib",
     "dash"
    ],
-   "commit": "d3b616843167f04b8a9f53dd25e84818c9f6fbce",
-   "sha256": "04vv9swkn3l2lcdb4ncmc6vr3967mglfgiabn1978gyhv4xp9nwm"
+   "commit": "c7519a1b69f196050a13e2230b7532893b077086",
+   "sha256": "06bdr3vcywg6k89d5dmvj4sdxh95y0jgh5xlddvmv2x0i8d7g69b"
   },
   "stable": {
    "version": [
@@ -113421,23 +114254,20 @@
   "repo": "djgoku/sops",
   "unstable": {
    "version": [
-    20240315,
-    2226
+    20240621,
+    1919
    ],
-   "deps": [
-    "s"
-   ],
-   "commit": "9ed9f02ff83ab6e0cb0173f0578be1a5b71e3b66",
-   "sha256": "1120zfpnask7p3jspyk7yk1qq1g1m7vwp6kfxk7vd3yz9v732cds"
+   "commit": "2cb8621ed588c6f3e210c9e76d713e6dacc03030",
+   "sha256": "14pag50ky56wma1zcmsjy2270hvwwna2m85787r3cjkjkxhhhxmi"
   },
   "stable": {
    "version": [
     0,
     1,
-    0
+    4
    ],
-   "commit": "b7b6784fb53659c3e8d103dbb027b12cf4846d8c",
-   "sha256": "1bls67w733cgpnm3b3rrw93jpkckrc4g7a4pprgnm96b3w4qrrkp"
+   "commit": "2cb8621ed588c6f3e210c9e76d713e6dacc03030",
+   "sha256": "14pag50ky56wma1zcmsjy2270hvwwna2m85787r3cjkjkxhhhxmi"
   }
  },
  {
@@ -113466,11 +114296,11 @@
   "repo": "mssola/soria",
   "unstable": {
    "version": [
-    20230227,
-    1454
+    20240603,
+    903
    ],
-   "commit": "c5275d02fcc9f6af2cfebd69bcf69f8cdccbe3ab",
-   "sha256": "0zrz1n8b9hd6srwk1bjmb43y3cm9rvrkllv5030q43q0azjrhr81"
+   "commit": "c6dbabc1b4f956e19c7e80f16e69f3d6c57b84b4",
+   "sha256": "1zsazml4qsbvnqb418fiknpj3zcnicl6m6x65i29ipwrjsi41i6j"
   },
   "stable": {
    "version": [
@@ -113870,11 +114700,11 @@
   "repo": "nashamri/spacemacs-theme",
   "unstable": {
    "version": [
-    20230530,
-    1751
+    20240623,
+    2202
    ],
-   "commit": "319ad1cd6aa05dcb43e4edca50eca339892e0865",
-   "sha256": "1kmfmf7d5qw06y5hrfspzmds13r9ijvsh9f2fnahg1mr3a6g3bjl"
+   "commit": "7b06ef8fb26825e0035c70c81ac130b930d81bbc",
+   "sha256": "0idlbwnf4zk1sf0jqbx9r1m3j9bjsl1gzxmbsziz4xjp769y1z5b"
   },
   "stable": {
    "version": [
@@ -114013,11 +114843,11 @@
   "repo": "condy0919/spdx.el",
   "unstable": {
    "version": [
-    20240522,
-    104
+    20240629,
+    106
    ],
-   "commit": "448e0e5e491e2447da2590ff216675e083d910ff",
-   "sha256": "160h11025fkxg734ri944l2jndfpmg9mlar0jy8aqk3bys3mc85i"
+   "commit": "70aa416c65bb8487f3cee6dd170b451fc489e902",
+   "sha256": "1kzvav066mp5i4f5y8wc6c1zy6aa3zfhhamzlw7d26j378wcb5vv"
   }
  },
  {
@@ -114141,11 +114971,11 @@
   "repo": "ideasman42/emacs-spell-fu",
   "unstable": {
    "version": [
-    20240421,
-    2351
+    20240616,
+    2345
    ],
-   "commit": "7f9332a299b41e1fa4da9a82669f5981f6ffd3cc",
-   "sha256": "19155y36mxdqrrnqw62hmysprvw1dajap1y4rcx1nr7j9xkwjs6h"
+   "commit": "74d2701d78c1759074566f150d96a3596072359a",
+   "sha256": "1fg6nyfw1hwfx8gxwkqyyy4b6hhb4nhvxpzq2zv89zqwkvn0byhc"
   }
  },
  {
@@ -114287,6 +115117,30 @@
    "sha256": "1wkyvfqmf24c8kb162pwi6wcm88bzf0x9mxljzkx0s8bq9aliny6"
   }
  },
+ {
+  "ename": "splunk-mode",
+  "commit": "d1338dc75894d9494d769f220b836f98189b7254",
+  "sha256": "0k7vbcxwr4pfab8dh7kmnrqzbkfd5779icn8l5a3f8knzgs6w07r",
+  "fetcher": "github",
+  "repo": "jakewilliami/splunk-mode",
+  "unstable": {
+   "version": [
+    20240422,
+    828
+   ],
+   "commit": "3a9b114fdbabb6e7d6206b1863c54de438bf506b",
+   "sha256": "02xqingvciigy9bhl1348h0cidx09wcq6fi6rws71jsw99ppfls1"
+  },
+  "stable": {
+   "version": [
+    1,
+    1,
+    0
+   ],
+   "commit": "fbc0b5faa2f33a3656f7c549ed9f064a01530dc9",
+   "sha256": "1bwrq579jm6w23p8hblqm0yrgapqlh9zc63c8d1v5g6kv9hdblb9"
+  }
+ },
  {
   "ename": "spotify",
   "commit": "855ea20024b606314f8590129259747cac0bcc97",
@@ -114718,11 +115572,11 @@
   "repo": "emacsorphanage/sr-speedbar",
   "unstable": {
    "version": [
-    20161025,
-    831
+    20220705,
+    1231
    ],
-   "commit": "77a83fb50f763a465c021eca7343243f465b4a47",
-   "sha256": "0sd12555hk7z721y00kv3crdybvcn1i08wmd148z5imayzibj153"
+   "commit": "73ecfc21cf38f0cb1dfbbebebdc3cf573eccf7d2",
+   "sha256": "1f8gh4csg4p160r9rawm0m8xgdyskarhnmdsly46f6zci3yc35z3"
   },
   "stable": {
    "version": [
@@ -115056,8 +115910,8 @@
   "repo": "daanturo/starhugger.el",
   "unstable": {
    "version": [
-    20231202,
-    235
+    20240523,
+    326
    ],
    "deps": [
     "compat",
@@ -115065,8 +115919,8 @@
     "s",
     "spinner"
    ],
-   "commit": "1bb3464c3a198a4f5f2155817d6505c4bab7dc79",
-   "sha256": "1f6ixs708j9s1vcnw1xgl89xmsmv5c4lg8qlazk7cbrg034m9l9d"
+   "commit": "17c3847566447e2a860d5837d35380160276bed6",
+   "sha256": "0cx256mxn6s0nz7cgmc7iadqshj3flmhzc78v61ci21r999j3kpz"
   },
   "stable": {
    "version": [
@@ -116120,11 +116974,11 @@
   "repo": "matsl/sv-kalender-namnsdagar",
   "unstable": {
    "version": [
-    20190421,
-    1521
+    20240620,
+    1416
    ],
-   "commit": "fff970f49c77abfc69e37817f25a939818420971",
-   "sha256": "0c6xjw1wh94llwh8qkf3bfzx05ksk0lsdrqdfqn3qkjnf3bkbbh2"
+   "commit": "743aa9eec1364fa4194e11f7f10c29688cdd636b",
+   "sha256": "0mliqsd5s5vb229kn7813vq5crg1wlbbyjkkvq6841sk6y0x2mjn"
   }
  },
  {
@@ -116180,14 +117034,14 @@
   "repo": "rougier/svg-tag-mode",
   "unstable": {
    "version": [
-    20240429,
-    1052
+    20240624,
+    857
    ],
    "deps": [
     "svg-lib"
    ],
-   "commit": "a152bc90a7c9dc17112893a19ddf91078b909057",
-   "sha256": "12spnrblv3h7yzc0cpk0xj6sbcfcq2y4j3mg7a16m2nhafw2kn0y"
+   "commit": "ece58da9362d34be48ac658107bd9b99ac250162",
+   "sha256": "0d1bkdqwawscdi1xfh54rv19sxfdagnxy1gz0xqkq8lhgs6asdsy"
   }
  },
  {
@@ -116478,14 +117332,14 @@
   "repo": "swift-emacs/swift-mode",
   "unstable": {
    "version": [
-    20240217,
-    631
+    20240622,
+    935
    ],
    "deps": [
     "seq"
    ],
-   "commit": "25cf8237312bf5eddc2c90001feb8f73633ab523",
-   "sha256": "0p7rfzyysmxzwvy595b72jlbl2gjb4b6pgm21qdg9dg00hmf3c1n"
+   "commit": "b06c97b909418b5dca3d15351b2ce86a04df32fb",
+   "sha256": "03b7n4sw5q7dhl06bm9bkdzhlzn5kyvlsc149jplc4c9xxnvnki6"
   },
   "stable": {
    "version": [
@@ -116508,11 +117362,11 @@
   "repo": "rechsteiner/swift-ts-mode",
   "unstable": {
    "version": [
-    20240414,
-    949
+    20240603,
+    735
    ],
-   "commit": "a62f4d84b836fe208d912c26fb561c93a0c8e296",
-   "sha256": "0zzx8fg17vzh0r8ln884zg2kd7qj1bn9mnnvcr4fiv0x4dc16sgg"
+   "commit": "5e198d306bd4d49e4dddab39195fe99e1caf8892",
+   "sha256": "1amxdcy7f8ixs7wq5jrmd8kca5a5vdijfv9jlz6ffvl3wqb01c3k"
   }
  },
  {
@@ -116858,11 +117712,11 @@
   "repo": "liushihao456/symbols-outline.el",
   "unstable": {
    "version": [
-    20240517,
-    819
+    20240701,
+    849
    ],
-   "commit": "bfebe73b1322cdc32353375b55f5f56aad85fb57",
-   "sha256": "0gnmqw3gdgjqb0vfzl2vi3zvk89mnx2yxq8sdz7rn4y8hbyxsmh0"
+   "commit": "9664a1338b5755fe811eddd59f20a64a23da4063",
+   "sha256": "172hnb2jgc5z3c89sdb3jnif4lwisrj7yanr2kl418mg61ngm024"
   }
  },
  {
@@ -116899,8 +117753,8 @@
   "repo": "drym-org/symex.el",
   "unstable": {
    "version": [
-    20240418,
-    806
+    20240627,
+    419
    ],
    "deps": [
     "evil",
@@ -116913,8 +117767,8 @@
     "tree-sitter",
     "tsc"
    ],
-   "commit": "db8ac5b3039b91e28d4c403c98fcb799ec94369e",
-   "sha256": "065njm2610vhvsg1f0pm7ri51fp93f8234in1p791iqmmykdk7jx"
+   "commit": "6ef879ca83c111a0863c71dea29461138ae6331d",
+   "sha256": "0ypsk3k3s3y302zygm0im2g2cr7l753yn5ymr99rkzli629framz"
   },
   "stable": {
    "version": [
@@ -117572,8 +118426,8 @@
   "repo": "shuxiao9058/tabnine",
   "unstable": {
    "version": [
-    20240426,
-    516
+    20240629,
+    1347
    ],
    "deps": [
     "dash",
@@ -117582,8 +118436,8 @@
     "s",
     "transient"
    ],
-   "commit": "06804c5fea50d79de458a99699a16adaf3c52498",
-   "sha256": "1k9qv7w9065j4k601yy5jk0ypx5vk4ji6viv61ss9z1b1fq37yiq"
+   "commit": "64b1556e5acd165112827e4219d29cb0f5d24c7b",
+   "sha256": "1r7n1ksjvxi8gpk7a5s4vblxm6hrsc9s6gmfgn37wykxfmdad8yb"
   }
  },
  {
@@ -117716,11 +118570,11 @@
   "repo": "tmalsburg/tango-plus-theme",
   "unstable": {
    "version": [
-    20221011,
-    1012
+    20240703,
+    1443
    ],
-   "commit": "30495d1ab1df6213ecac008c599b91e6f9244c12",
-   "sha256": "1qdz7nf4wqv58ck02ralp7l4an1ashh1bnjgqkp444as3vyli2c4"
+   "commit": "e042de79ba009a55aeebe30aafed01234c925be2",
+   "sha256": "109g4w47bx17rpl4n96bcx254xiai89gbi4j89yhzf5cbldmj764"
   }
  },
  {
@@ -117761,11 +118615,11 @@
   "repo": "11111000000/tao-theme-emacs",
   "unstable": {
    "version": [
-    20240426,
-    439
+    20240615,
+    517
    ],
-   "commit": "af5926c53aebc591f1c77eb8ca8ff1ea9a73eaa5",
-   "sha256": "1jb2klplyngmv6pl6v39y0072hqgpgs22i7yk3097kbxv8llmk5c"
+   "commit": "cd8ac4aee9fff55bc092ce78d93bd40517fa2c2a",
+   "sha256": "1r27zvymbgq50akhj6l7s1aj0sz81a375lxdhl8cl9jg74w31i6i"
   },
   "stable": {
    "version": [
@@ -117800,11 +118654,11 @@
   "repo": "saf-dmitry/taskpaper-mode",
   "unstable": {
    "version": [
-    20240112,
-    1656
+    20240710,
+    1449
    ],
-   "commit": "70897b621ab541dc4b7874a55378aa5a75095e2e",
-   "sha256": "1g5lpl8jr58c225rhvjjzrnarv30n0f3xk58srrqwzrcdvqzywmm"
+   "commit": "db698431a55bb68b8d756de3be7fe4a235ccf55c",
+   "sha256": "1ndka7dmf5p01nwz72r4cs3npl7zv3hixz6kwyf324n9xfar79z4"
   },
   "stable": {
    "version": [
@@ -117991,16 +118845,16 @@
   "repo": "zevlg/telega.el",
   "unstable": {
    "version": [
-    20240515,
-    2217
+    20240527,
+    606
    ],
    "deps": [
     "rainbow-identifiers",
     "transient",
     "visual-fill-column"
    ],
-   "commit": "3d2e5ee323366906b00d8ed40e818d41e82b73e5",
-   "sha256": "117mck96hd0ai0ra7kv8kv78v88vms55ac64dqbrqndiwna4c6sl"
+   "commit": "58b4963b292ceb723d665df100b519eb5a99c676",
+   "sha256": "1q3ydbm0jhrsyvvdn0mpmxvskq0l53jkh40a5hlx7i3qkinbhbry"
   },
   "stable": {
    "version": [
@@ -118080,14 +118934,14 @@
   "repo": "caramelhooves/teleport.el",
   "unstable": {
    "version": [
-    20240501,
-    740
+    20240712,
+    1820
    ],
    "deps": [
     "dash"
    ],
-   "commit": "7a99ec17e5c1d3bab3bc842e045b06ea335c97b9",
-   "sha256": "15kns3478xvwnn0dl883swh7x7k043b71zrv3gk0jazh60vn3q6j"
+   "commit": "bfdeb5c5e89665cbce24a1d04fc6cf62835bd18f",
+   "sha256": "1as20k8fg4wspa4icfpx1mc76j9lgqdh7qvb0jwaikq9cm7s8ls7"
   }
  },
  {
@@ -118131,14 +118985,14 @@
   "repo": "minad/tempel",
   "unstable": {
    "version": [
-    20240216,
-    1543
+    20240708,
+    2120
    ],
    "deps": [
     "compat"
    ],
-   "commit": "bcc3185202edce67c7f7fc74287cc2ecbeef10c6",
-   "sha256": "004jwmfj7ymdaml8rdzn8fhki8x8n4d0ziq52wn4nqm5y8n90pz5"
+   "commit": "51eff558b986aa80e816bb00fbaf310f03f017c0",
+   "sha256": "18rbkzvd0c6dnbgggy6lvgv0baznkzviz2738ixa3y3b8mws4333"
   },
   "stable": {
    "version": [
@@ -118193,6 +119047,25 @@
    "sha256": "077hk4ssb1bvjxs6f7v78kyqiypx6rv00j3ij61an8z0l878p4yw"
   }
  },
+ {
+  "ename": "template-dumper",
+  "commit": "64632d1e754d4ad72db299a3e6f88b56091b9a9d",
+  "sha256": "0czf0cpszgpjbjpq56hmffhzkv3hbmg2q7nbfbp77s23v1wdfdln",
+  "fetcher": "github",
+  "repo": "natelastname/template-dumper",
+  "unstable": {
+   "version": [
+    20240630,
+    2236
+   ],
+   "deps": [
+    "f",
+    "yasnippet"
+   ],
+   "commit": "92fb170d572f044aaedaa2535990eba556347dfe",
+   "sha256": "1ai27rlll766vp1njwzhvayad4k386j9x1hx550j1a8in9kk3wbh"
+  }
+ },
  {
   "ename": "template-overlays",
   "commit": "8856e67aae1f623714bc2a61a7b4773ed1fb2934",
@@ -118213,10 +119086,10 @@
  },
  {
   "ename": "templatel",
-  "commit": "0e43ad23f7b58ddb82bc08066d8b48e04708b5ba",
-  "sha256": "10sx3kd22z4qa1g60c3fzxpc55xlddmb4iqqdbiqkn6bqzdzrslq",
+  "commit": "28df3fa5bb95c17d1423532e156025cd64b59151",
+  "sha256": "0016yv3vcjakqax3b2pf6h4a9pac3xnmqb72d3mc8z35xzr02pcs",
   "fetcher": "github",
-  "repo": "clarete/templatel",
+  "repo": "emacs-love/templatel",
   "unstable": {
    "version": [
     20210902,
@@ -118413,14 +119286,14 @@
   "repo": "colonelpanic8/term-manager",
   "unstable": {
    "version": [
-    20230727,
-    2308
+    20240602,
+    2356
    ],
    "deps": [
     "dash"
    ],
-   "commit": "31a3d16ba5a4f9e6f4bc52275eaedf55a96154a8",
-   "sha256": "1c2fxsqfvyh0g77vsjc7qmpfc8d5vnwlxkb1gah57i6sri5c8hj0"
+   "commit": "25353734c65cd5cc952e4893b552629ca1d0d37f",
+   "sha256": "1mik1cjy1mwqngawky3yp4jsl1d59bmvfaj1s2rg4gismjcg3n96"
   },
   "stable": {
    "version": [
@@ -118443,14 +119316,14 @@
   "repo": "colonelpanic8/term-manager",
   "unstable": {
    "version": [
-    20230727,
-    2308
+    20240602,
+    2356
    ],
    "deps": [
     "term-manager"
    ],
-   "commit": "31a3d16ba5a4f9e6f4bc52275eaedf55a96154a8",
-   "sha256": "1c2fxsqfvyh0g77vsjc7qmpfc8d5vnwlxkb1gah57i6sri5c8hj0"
+   "commit": "25353734c65cd5cc952e4893b552629ca1d0d37f",
+   "sha256": "1mik1cjy1mwqngawky3yp4jsl1d59bmvfaj1s2rg4gismjcg3n96"
   },
   "stable": {
    "version": [
@@ -118473,15 +119346,15 @@
   "repo": "colonelpanic8/term-manager",
   "unstable": {
    "version": [
-    20230727,
-    2308
+    20240602,
+    2356
    ],
    "deps": [
     "projectile",
     "term-manager"
    ],
-   "commit": "31a3d16ba5a4f9e6f4bc52275eaedf55a96154a8",
-   "sha256": "1c2fxsqfvyh0g77vsjc7qmpfc8d5vnwlxkb1gah57i6sri5c8hj0"
+   "commit": "25353734c65cd5cc952e4893b552629ca1d0d37f",
+   "sha256": "1mik1cjy1mwqngawky3yp4jsl1d59bmvfaj1s2rg4gismjcg3n96"
   },
   "stable": {
    "version": [
@@ -118829,15 +119702,15 @@
   "repo": "johannes-mueller/test-cockpit.el",
   "unstable": {
    "version": [
-    20240519,
-    1747
+    20240604,
+    1943
    ],
    "deps": [
     "projectile",
     "toml"
    ],
-   "commit": "2b836e5f954059210b6efaecebfe5fd7c72e726c",
-   "sha256": "0f62xly0pvsfqnkzm0yfflbd54mljbfc6jzp8kqk8w8598j548ak"
+   "commit": "068d3a393cebdc871236b8d1e45e06f997e2b0d0",
+   "sha256": "1dhnvymy00f2h039v1cp4fq8fxhybswwsx4qnpvdjilf1lbcvxiw"
   }
  },
  {
@@ -119322,21 +120195,21 @@
   "repo": "facebook/fbthrift",
   "unstable": {
    "version": [
-    20240519,
+    20240707,
     1631
    ],
-   "commit": "8baf3aed99934494267647ee8f309f9d712d4325",
-   "sha256": "0svd697slkv6k46byvca8b9l4vkxgikyxanik78iwpz52mmgpc88"
+   "commit": "537ed3d61b1aa7f93b5c890eed8f7f73cf59e003",
+   "sha256": "071hg88h5dvw0ksf0xiv5j97s212ybh1jy6v38qqjp746px465w2"
   },
   "stable": {
    "version": [
     2024,
-    5,
-    20,
+    7,
+    8,
     0
    ],
-   "commit": "8baf3aed99934494267647ee8f309f9d712d4325",
-   "sha256": "0svd697slkv6k46byvca8b9l4vkxgikyxanik78iwpz52mmgpc88"
+   "commit": "537ed3d61b1aa7f93b5c890eed8f7f73cf59e003",
+   "sha256": "071hg88h5dvw0ksf0xiv5j97s212ybh1jy6v38qqjp746px465w2"
   }
  },
  {
@@ -119587,6 +120460,21 @@
    "sha256": "0sxsvcvxrmyaqp4r5khqv29i7a61kxg4z439b5xc40sfxsljk9pp"
   }
  },
+ {
+  "ename": "timeout",
+  "commit": "2d6d0964343cd9e23babbcc71b1dee07ca1ccf4c",
+  "sha256": "1zna80pa1csnigkz2nfvwrjnqnji1cj8dmbgq4wkbjg66hk7fbmn",
+  "fetcher": "github",
+  "repo": "karthink/timeout",
+  "unstable": {
+   "version": [
+    20240623,
+    2023
+   ],
+   "commit": "d59ca149307182b20e9843db0dd1738e01504cf1",
+   "sha256": "1adbcam0cz7gkijjzgajybz9z2cfizxylfggamqp23w52c1nbrxm"
+  }
+ },
  {
   "ename": "timer-revert",
   "commit": "991e68c59d1fbaef06ba2583f07499ecad05586d",
@@ -120064,16 +120952,16 @@
   "repo": "abrochard/emacs-todoist",
   "unstable": {
    "version": [
-    20240113,
-    1729
+    20240624,
+    1512
    ],
    "deps": [
     "dash",
     "org",
     "transient"
    ],
-   "commit": "e756a345d213d93fbb965d1314c4dec62566c653",
-   "sha256": "18hnpmbbmn939s0z0ynjxl3fkgg9xzpj82rvks81xvv8nf19wfsx"
+   "commit": "205c730a4615dec20ea71ccd0a09479a420cb974",
+   "sha256": "11hgxg5q84ql9hhcz5wiqsx4hd6s2mrvzvl1axh6l7li8mji67r7"
   }
  },
  {
@@ -120139,6 +121027,21 @@
    "sha256": "1w1lmqgzn9bp59h9y9plv80y53k6qhjgfmnnlqyyqfl45z3si7kg"
   }
  },
+ {
+  "ename": "toggle-term",
+  "commit": "e93a5811bdce0beeacc539b702ca4afd53508fda",
+  "sha256": "1i37alcpsziyidxzm6dvcc29gd6fbminhj1sq7xmwrznpl4ja1m1",
+  "fetcher": "github",
+  "repo": "justinlime/toggle-term.el",
+  "unstable": {
+   "version": [
+    20240616,
+    722
+   ],
+   "commit": "d17596b8ed52e6a2f0c7f6754ee6fa233d28c146",
+   "sha256": "041p36p0g0qpdfhwh9b1zy0lp2m1w8f3zk9z7m8cpdj87ddqva45"
+  }
+ },
  {
   "ename": "toggle-test",
   "commit": "8ea51a54b745d9978c5177182cd8501912aa2d01",
@@ -120285,6 +121188,30 @@
    "sha256": "0pwbd5gzmpr6js20438870w605671930291070nhmhswvxfcdvay"
   }
  },
+ {
+  "ename": "tomorrow-night-deepblue-theme",
+  "commit": "5de4420ac32b3f10b7ab5a5dff2c6a7a8f22aeb2",
+  "sha256": "0bzg8m0bqmgvfhz4xcrpsiy7wfbls1sq6fjh2yj02nnfmkgzqcs1",
+  "fetcher": "github",
+  "repo": "jamescherti/tomorrow-night-deepblue-theme.el",
+  "unstable": {
+   "version": [
+    20240712,
+    1635
+   ],
+   "commit": "5359e32f641ba4f2d596999d32a702182a1add73",
+   "sha256": "166a7ch6xcl4sw7wj541y7vg962yzjwf8p4c3bajf6r24l6hnllp"
+  },
+  "stable": {
+   "version": [
+    1,
+    1,
+    2
+   ],
+   "commit": "5359e32f641ba4f2d596999d32a702182a1add73",
+   "sha256": "166a7ch6xcl4sw7wj541y7vg962yzjwf8p4c3bajf6r24l6hnllp"
+  }
+ },
  {
   "ename": "tongbu",
   "commit": "e97578be9aa9bdadc6bdf6c7105242ca9d23bf80",
@@ -120747,28 +121674,28 @@
   "repo": "magit/transient",
   "unstable": {
    "version": [
-    20240509,
-    1849
+    20240629,
+    1508
    ],
    "deps": [
     "compat",
     "seq"
    ],
-   "commit": "3d395d643b1476b07c6c3d7217f5b2ad2c0b425e",
-   "sha256": "1vrnxd95dmf6v6nzvzcf4nxz4sag9qwl1hj2ciiffl2d420shjsh"
+   "commit": "32b7a99bf25fbf43fcc6efb9712a2c0888edd3eb",
+   "sha256": "0xjasyipbw1sx1yy81ywdqmz8pmngmyc50n1pacyys771zd96dxq"
   },
   "stable": {
    "version": [
     0,
-    6,
-    0
+    7,
+    2
    ],
    "deps": [
     "compat",
     "seq"
    ],
-   "commit": "55d5d41b48d7f7bc1ecf1f90c012d7821dff5724",
-   "sha256": "1mdcph2g0nbava3npa7bz463jqrz8rp9zmjgx8rqk7bdz2gd2yai"
+   "commit": "2d6fae0ca232c2423facbbbf8ece18c856e7d31d",
+   "sha256": "0fkgl374jxar2fhpjn4j67r7qc71xlg15r968lk1bny3aj3wf989"
   }
  },
  {
@@ -121044,28 +121971,28 @@
   "repo": "tarsius/tray",
   "unstable": {
    "version": [
-    20240415,
-    1549
+    20240618,
+    1838
    ],
    "deps": [
     "compat",
     "transient"
    ],
-   "commit": "1ce8c7c74dec199e1045fec3c79cb9ff433b1735",
-   "sha256": "1b1i5hb9r8z6r1npbip8swgfizdkhwl1x5b6b9k9552i6gxm1qbz"
+   "commit": "90fd785e418c6ef95adce5491597f6af2c30b8ea",
+   "sha256": "18ykbcjmdqjrhzg2gg58njl1314hac2dwm0g30cbp72kfwpbwgqw"
   },
   "stable": {
    "version": [
     0,
     1,
-    2
+    3
    ],
    "deps": [
     "compat",
     "transient"
    ],
-   "commit": "b8d48c81de06261926420d75608cc69f99970563",
-   "sha256": "1l8jmkpdc9mc6z6znmxa7g5n6sgvpy78rgrpxfcafgjiki8lmqqr"
+   "commit": "90fd785e418c6ef95adce5491597f6af2c30b8ea",
+   "sha256": "18ykbcjmdqjrhzg2gg58njl1314hac2dwm0g30cbp72kfwpbwgqw"
   }
  },
  {
@@ -121205,14 +122132,14 @@
   "repo": "erickgnavar/tree-sitter-ispell.el",
   "unstable": {
    "version": [
-    20240522,
-    1356
+    20240610,
+    2252
    ],
    "deps": [
     "tree-sitter"
    ],
-   "commit": "960e68d6c4a296e5ecf10d27bfd8bac42ba4a2ed",
-   "sha256": "1v0v6m5g03ydv38a9465nx3i5qfi106macwd5s63rllx88m395xg"
+   "commit": "a06eff00affff85992d2a8ad0019034747ffeb70",
+   "sha256": "19x25a1plwnrc68hxvdnbra7djlikq8vz590bvyvwvq0g66khfpq"
   }
  },
  {
@@ -121223,26 +122150,26 @@
   "repo": "emacs-tree-sitter/tree-sitter-langs",
   "unstable": {
    "version": [
-    20240519,
-    717
+    20240707,
+    727
    ],
    "deps": [
     "tree-sitter"
    ],
-   "commit": "6ce3de71c21a55ffe33ecdead57fff290a5d07df",
-   "sha256": "1i36zfww14zjxlcq8gkwj5346356zfcx6ldi59bp9c7vvi2gavg8"
+   "commit": "b2739d07fadf45520a25862342a1790cd905cff9",
+   "sha256": "0fffai402f3s1zficblaavfchwi6y0bikkkf41gsm417myic91pk"
   },
   "stable": {
    "version": [
     0,
     12,
-    196
+    204
    ],
    "deps": [
     "tree-sitter"
    ],
-   "commit": "6ce3de71c21a55ffe33ecdead57fff290a5d07df",
-   "sha256": "1i36zfww14zjxlcq8gkwj5346356zfcx6ldi59bp9c7vvi2gavg8"
+   "commit": "b2739d07fadf45520a25862342a1790cd905cff9",
+   "sha256": "0fffai402f3s1zficblaavfchwi6y0bikkkf41gsm417myic91pk"
   }
  },
  {
@@ -121253,14 +122180,14 @@
   "repo": "purplg/treebundel",
   "unstable": {
    "version": [
-    20240210,
-    343
+    20240531,
+    2321
    ],
    "deps": [
     "compat"
    ],
-   "commit": "2d6c69cb7798a8cb7fcf9923c4580220dd48b3d4",
-   "sha256": "18winxkh1934jr19prp2yxlnl2vgh1yhrrvy1flg0l2r2pb5zrch"
+   "commit": "b0a5d1bf924d8cadde5bae50b8d9ac131279b828",
+   "sha256": "0smcnpmchm6kgxbdirfw6y17ad4innppab4xzpvvnixhnqbnr655"
   },
   "stable": {
    "version": [
@@ -121319,8 +122246,8 @@
   "repo": "Alexander-Miller/treemacs",
   "unstable": {
    "version": [
-    20240518,
-    932
+    20240613,
+    2014
    ],
    "deps": [
     "ace-window",
@@ -121332,8 +122259,8 @@
     "pfuture",
     "s"
    ],
-   "commit": "923fbbdea57b27ed3293079b13846206add85d9d",
-   "sha256": "1dw8igrag918c9s2pz80nmri09kxay10v617zafg91kdqzpnwgyy"
+   "commit": "54ef590b7621032a76f8f3e307032fc13c802371",
+   "sha256": "116qwsyvb105in31f62an3zvsfah8ncl8bwh2hw0kwbvnrm387vk"
   },
   "stable": {
    "version": [
@@ -121673,6 +122600,21 @@
    "sha256": "1a2d49chymhfbd9w0msksyyqgsywn17mkzqglaw0k794sb1gzx2q"
   }
  },
+ {
+  "ename": "treesit-ispell",
+  "commit": "08692fd0e799bbe2afe086e5fa146628cd97bdc1",
+  "sha256": "1dnzmw3vr59l7n2rryf6w4sfx9vay1626cb62yvk3zjxl2kpn0wj",
+  "fetcher": "github",
+  "repo": "erickgnavar/treesit-ispell.el",
+  "unstable": {
+   "version": [
+    20240611,
+    117
+   ],
+   "commit": "56740dccd5a72277fa05f19491e032e0c4701ad2",
+   "sha256": "162q3i1c8v6k8zzbwfm7h6yn4w0r1xvw9039pn3z7widpcz5mczw"
+  }
+ },
  {
   "ename": "treeview",
   "commit": "76e3235134af34a522b5bee69f0a16a54cbd9b52",
@@ -121708,6 +122650,29 @@
    "sha256": "0blbxjaddzhkvzlys46yrzszywmyjkmfhwks52v4laya76rgxm45"
   }
  },
+ {
+  "ename": "trimspace-mode",
+  "commit": "d960195dbd955244478aaac43db4ef924efb9b58",
+  "sha256": "016blxasn2ghrj49dq6bn8w1p8d3vglqf9f6bz74nq5iccy18kg4",
+  "fetcher": "sourcehut",
+  "repo": "bkhl/trimspace-mode",
+  "unstable": {
+   "version": [
+    20240629,
+    1843
+   ],
+   "commit": "68fb627ba552644ddee0cf9048b2fefd722a59fb",
+   "sha256": "1p86w9imcpmx1ck64782agrz6b00qm2w2h5xkg0kx2507l2zd3ci"
+  },
+  "stable": {
+   "version": [
+    1,
+    1
+   ],
+   "commit": "ea7dd0d4847e10c77d174f537051db70233ecf6e",
+   "sha256": "0jj3jj4wc48jf23qxc3avg9acmapi4gzhjpqdzi68y2mx3bdrrz4"
+  }
+ },
  {
   "ename": "trinary",
   "commit": "48fff02dde8a678e151f2765ea7c3a383912c68b",
@@ -122278,11 +123243,11 @@
   "repo": "emacs-typescript/typescript.el",
   "unstable": {
    "version": [
-    20240507,
-    617
+    20240603,
+    630
    ],
-   "commit": "1cf78d7ef8e0a1684a2cf265539c54ccff4068c0",
-   "sha256": "1f2sba6ld55w6mdbwwz4kqfp2rsgmbdm88apxjfglsa5nlh7g50b"
+   "commit": "5bb294411ff06ad40186bb7ca141fdbfff902e09",
+   "sha256": "1gspkch0dv9fx22n1sp0yq0qj61lg43hc1n5x0nz8mzy6bxc6bsx"
   },
   "stable": {
    "version": [
@@ -122612,14 +123577,14 @@
   "repo": "crmsnbleyd/uiua-mode",
   "unstable": {
    "version": [
-    20231219,
-    1706
+    20240711,
+    852
    ],
    "deps": [
     "reformatter"
    ],
-   "commit": "24115f187212a89e600dfb870fc34880355846ed",
-   "sha256": "11lagjk8vwbls5dxqfcrrljn82f0rbljn9x4fz0sf96svja8j2va"
+   "commit": "20344ddaa401ed172e4b3649076ae33c117918a0",
+   "sha256": "0qnnwkbgx013zfiihw5lfahmqbcp8ic8d03a7z1d3ic5lx439phh"
   }
  },
  {
@@ -122814,11 +123779,11 @@
   "repo": "ideasman42/emacs-undo-fu",
   "unstable": {
    "version": [
-    20240422,
-    6
+    20240707,
+    1410
    ],
-   "commit": "d935af2c57ecfa14248a70b3fe8a84fb78fef209",
-   "sha256": "1zy4sxllmh0qa876qnc4h89f5fda3vcrgs4xpy7y1bgbfcpwks0q"
+   "commit": "dbb3e4b699dd488497ef9b32a04b8e928a6bc8ef",
+   "sha256": "1f4vsg68fylcp2cqc74mbw4zls3n0zq8wvyd0vahy9km7fr753p4"
   }
  },
  {
@@ -122829,11 +123794,11 @@
   "repo": "ideasman42/emacs-undo-fu-session",
   "unstable": {
    "version": [
-    20240421,
-    834
+    20240709,
+    1418
    ],
-   "commit": "75d78310c86901f01b35d47f3ac1a5c8368abba4",
-   "sha256": "0ywyjg8zpa8dzz6sw5zvzfck44iapr0iymmpbxh4ymli663fmw9p"
+   "commit": "ae94c87b3f6f0ac0639005f506762866e65dcf9a",
+   "sha256": "1irqs9sl0lsjkwxknv54nkwcrq788hz1h4jmh2xx1xn25gfh7nmw"
   }
  },
  {
@@ -123548,6 +124513,35 @@
    "sha256": "1af8c7q3vxj23l2ah5waj9hn5pfp66834b4akm76jc5wqf0sr9j1"
   }
  },
+ {
+  "ename": "unspecified-theme",
+  "commit": "07bc4820654e760404593662ec75e5490b7e60e4",
+  "sha256": "0vh492v3hls2ahhwky7zi01blrkjpsfwi8ya9gjn1y55hmjicnr1",
+  "fetcher": "codeberg",
+  "repo": "mekeor/unspecified-theme",
+  "unstable": {
+   "version": [
+    20240620,
+    2310
+   ],
+   "deps": [
+    "most-faces"
+   ],
+   "commit": "822f461bb04b4f8751bc2431140197a077d6c4a6",
+   "sha256": "1haa2ikg71q3irf7vsm1kbxvkn24hkmws33ci2c5lm39f81rz7f0"
+  },
+  "stable": {
+   "version": [
+    0,
+    3
+   ],
+   "deps": [
+    "most-faces"
+   ],
+   "commit": "822f461bb04b4f8751bc2431140197a077d6c4a6",
+   "sha256": "1haa2ikg71q3irf7vsm1kbxvkn24hkmws33ci2c5lm39f81rz7f0"
+  }
+ },
  {
   "ename": "untappd",
   "commit": "0d7b1541a317cc253a55696d752ea57453475b8f",
@@ -124749,11 +125743,11 @@
   "repo": "federicotdn/verb",
   "unstable": {
    "version": [
-    20240426,
-    2014
+    20240708,
+    2311
    ],
-   "commit": "24784e7a81a937b4b294a2a57238999c53d6e5d1",
-   "sha256": "1z47qjhb427hrdmpxmjq4h5q20lzppy35im46dl5m3yzvx3k5aha"
+   "commit": "8a2d425ea7b2287090d6464c05f24b8894cfd09b",
+   "sha256": "1v9hsqnfah87zgxpl21867k1lh9ljazjsrdid60qr6s4hxjjn97m"
   },
   "stable": {
    "version": [
@@ -124944,14 +125938,14 @@
   "repo": "baron42bba/vertica-snippets",
   "unstable": {
    "version": [
-    20240327,
-    1013
+    20240625,
+    1023
    ],
    "deps": [
     "yasnippet"
    ],
-   "commit": "11dd101eb431b7fc7695e5ad3b2a6444ac49e7a4",
-   "sha256": "03zba07d7d1c96ygkw1779v9ybnaap2668ss5w92zfzc8b45yvdr"
+   "commit": "4d3019e72a62dcbfede3d4812c913d5e6210c488",
+   "sha256": "0kxx08nl39qs35i086lxmh8kw8ljl7npi86djpr7ksl6p3sx5m7k"
   }
  },
  {
@@ -124962,14 +125956,14 @@
   "repo": "minad/vertico",
   "unstable": {
    "version": [
-    20240511,
-    2047
+    20240708,
+    2157
    ],
    "deps": [
     "compat"
    ],
-   "commit": "ba650a7ab90d66686ba787937ac9e71f749c598e",
-   "sha256": "0cxaqlg0mllrnf7zx7j6rdmx3x42s9b2marisi7zwfiymsnbgarr"
+   "commit": "c971c5106b2ce001b0d263683aa51eaaf7606e10",
+   "sha256": "0pllcx67l5wmb8iyj6ilam3m26qdm9x7cpb7qygsdda3am3grn6h"
   },
   "stable": {
    "version": [
@@ -125251,6 +126245,30 @@
    "sha256": "1750gx65ymibam8ahx5blfv5jc26f3mzbklk1jrmfwpsalyghdd9"
   }
  },
+ {
+  "ename": "vim-tab-bar",
+  "commit": "bf6f8f47c5cab38b0cfb0a5bd3f4b02cc4968f3a",
+  "sha256": "0v103a25ilc3hkh5n15rw5a2gs6i3m35cazsw5fd77756s5ix44l",
+  "fetcher": "github",
+  "repo": "jamescherti/vim-tab-bar.el",
+  "unstable": {
+   "version": [
+    20240710,
+    1928
+   ],
+   "commit": "1fec194e7890135c5e06b61a31c78612eec3b546",
+   "sha256": "0gg6wc4cz6g49h356l3ks3hgx3pvlbf976gvl0585c88f4rwvg4p"
+  },
+  "stable": {
+   "version": [
+    1,
+    0,
+    5
+   ],
+   "commit": "ba0d914f725db86c67ddf0469d3f34fdd0f4f2aa",
+   "sha256": "0nahsm1pynsipq0ym2p73rxc90i0sxsj86an207h8d2ag7j37kc6"
+  }
+ },
  {
   "ename": "vimgolf",
   "commit": "1de0a1cdc8fd33601ecca982fa9aa66f4400843b",
@@ -125685,11 +126703,11 @@
   "repo": "emacs-vs/vs-dark-theme",
   "unstable": {
    "version": [
-    20240521,
-    2336
+    20240605,
+    134
    ],
-   "commit": "d0d9fb57582677fc1f9a4a1467ec3f6470aff0d6",
-   "sha256": "03qy8d7vbnkx2ssfby7kgdjmz691rqw4vlikhpb37xkmhsqa0w0d"
+   "commit": "351300bad1a28f5e86f39f6fae9ca5d8a0cfb24d",
+   "sha256": "1jhczlfnw00iqkyb0952fj330wn0ipa9hiyhjc7a3g1c2swp9mql"
   },
   "stable": {
    "version": [
@@ -125708,11 +126726,11 @@
   "repo": "emacs-vs/vs-light-theme",
   "unstable": {
    "version": [
-    20240521,
-    2340
+    20240605,
+    133
    ],
-   "commit": "bc0250f261c066f576fa13112dcfbb10a4e5c6ef",
-   "sha256": "1ys5xhll909zfx02hf2gqbwcf3jcq83b5xxvajrr6xxqwa4mk9h3"
+   "commit": "5eeb6e5df24172497c844da750697b2ca3b750fe",
+   "sha256": "19kizkrqpw7m18pmfr4gi3pzxmkf9vc900z10079crrdw90lqjs4"
   },
   "stable": {
    "version": [
@@ -125785,11 +126803,29 @@
   "repo": "akermu/emacs-libvterm",
   "unstable": {
    "version": [
-    20240520,
-    231
+    20240705,
+    1533
    ],
-   "commit": "df057b1af2bb89a1deb288086f13be296af42090",
-   "sha256": "11j89pldhmw9v2g1sqcg4piniijz4wzgmim1jv46iwnaiwzw20fi"
+   "commit": "d9ea29fb10aed20512bd95dc5b8c1a01684044b1",
+   "sha256": "1q62yav93i3485iy7d4v1y00s0zyc0r9v06xb9r49rw70j6x4vmf"
+  }
+ },
+ {
+  "ename": "vterm-hotkey",
+  "commit": "16c2db3a88115057c3ca6814046c3b63ef4fd00e",
+  "sha256": "1w0a7rzgws43i2hm2pgmcx5kzd7g4y531s7c761lb1dvf6a94s9d",
+  "fetcher": "github",
+  "repo": "rootatpixel/vterm-hotkey",
+  "unstable": {
+   "version": [
+    20240702,
+    1445
+   ],
+   "deps": [
+    "vterm"
+   ],
+   "commit": "039033a4c30dabca625d6924d1796bb9e13d85c7",
+   "sha256": "15xgb48q3jhhxn2il9bvldmsd8y0ffsc2ccjv1sf4xks7csj14l3"
   }
  },
  {
@@ -125929,8 +126965,8 @@
   "repo": "d12frosted/vulpea",
   "unstable": {
    "version": [
-    20231113,
-    717
+    20240712,
+    1635
    ],
    "deps": [
     "dash",
@@ -125938,8 +126974,8 @@
     "org-roam",
     "s"
    ],
-   "commit": "e1ea8480daf3e480effdd7ba3799126295a4a59a",
-   "sha256": "1xv394dx122np58p281nqgrfnp6zjwqbvmqnpjsn6vxl59rqq1c6"
+   "commit": "c9eadce7fc85eb170d6319088d021a07f1218521",
+   "sha256": "14c2dkwh3q4nkdk8g22hs0ija22546gx9gwi13mj6nmrc34dyba6"
   },
   "stable": {
    "version": [
@@ -126044,11 +127080,11 @@
   "repo": "emacs-w3m/emacs-w3m",
   "unstable": {
    "version": [
-    20231023,
-    653
+    20240712,
+    248
    ],
-   "commit": "55baf2bcb1a583d3baae1d37ad0e17b0480ffd02",
-   "sha256": "1vqr7bmairp70lrx9gm80w7qr2jxiijg5w1na36k7if4wikfg4kl"
+   "commit": "a3dd9b16224893ef1d75ee9bf0c2b088bc2a5d92",
+   "sha256": "1sb2p0gxb8z9im0h5pky0fhvcxjhajsyd1gicfnhl8cqxmjjf907"
   }
  },
  {
@@ -126121,11 +127157,11 @@
   "repo": "wakatime/wakatime-mode",
   "unstable": {
    "version": [
-    20240203,
-    1221
+    20240623,
+    653
    ],
-   "commit": "25fb775178d16decb818b75f32fd23301c0f5da0",
-   "sha256": "0l8y0xinbh3l7d7klwvxrrc6q9zp51x7p8brapx56knh819w1bvk"
+   "commit": "1c5b2254dd72f2ff504d6a6189a8c10be03a98d1",
+   "sha256": "00qv6b756qiaqrmfg1w03psnsdj0iaz3sp50ib4kmdm2g9vgxl1s"
   }
  },
  {
@@ -126803,14 +127839,14 @@
   "repo": "emacs-love/weblorg",
   "unstable": {
    "version": [
-    20230828,
-    150
+    20240711,
+    940
    ],
    "deps": [
     "templatel"
    ],
-   "commit": "a889b29fc6e0d06a1480b1bf524f06a5be2022d7",
-   "sha256": "1zgmb6sjba71l5pb8ajqnm1sjaav291y849l3mwc50pv7b7pzch6"
+   "commit": "0db218bd6b2e083546d3a69a022dfb1a08900acd",
+   "sha256": "0fijrzc96p3jkq53i65bzhmxqyg28a49n21glkzb5b21agy0cdqh"
   },
   "stable": {
    "version": [
@@ -127232,6 +128268,25 @@
    "sha256": "10396w84a22zfcgihqhpri5q2w7z0g4n08kbhg03v0zclfb5dgwz"
   }
  },
+ {
+  "ename": "whaler",
+  "commit": "b93a326420601a67a932315566b6bb6f25091800",
+  "sha256": "196qna6zrvsjy4x5f1i034a30b6935wmaklzdlgvadd1cz24nr94",
+  "fetcher": "github",
+  "repo": "SalOrak/whaler.el",
+  "unstable": {
+   "version": [
+    20240609,
+    1850
+   ],
+   "deps": [
+    "f",
+    "ivy"
+   ],
+   "commit": "18791f9b5cfa05f7eabd686d572fa37f210ebe85",
+   "sha256": "0gjc9hqq1wz2npk2gw8nfkg2ikfhl3bcmlc0d3jzlpizc9mk6w7f"
+  }
+ },
  {
   "ename": "what-the-commit",
   "commit": "9af2c90af887e37c080a4a70e84ec5691c599d94",
@@ -127255,11 +128310,11 @@
   "repo": "justbur/emacs-which-key",
   "unstable": {
    "version": [
-    20240501,
-    1251
+    20240620,
+    2145
    ],
-   "commit": "1e89fa000e9ba9549f15ef57abccd118d5f2fe1a",
-   "sha256": "01g5fgrbdgzh302ah7pqdrf98hxgah40140jjwfrx3mwcdicj7f1"
+   "commit": "ed389312170df955aaf10c2e120cc533ed5c509e",
+   "sha256": "084alfpigq5jdsdr7qh47xl3b8bwqv2ncm4df4gry1hxzpjrcjsw"
   },
   "stable": {
    "version": [
@@ -127462,14 +128517,11 @@
   "repo": "purcell/whole-line-or-region",
   "unstable": {
    "version": [
-    20201214,
-    650
+    20240630,
+    804
    ],
-   "deps": [
-    "cl-lib"
-   ],
-   "commit": "ba193b2034388bbc384cb04093150fca56f7e262",
-   "sha256": "0k6x3x9a9wgq94aiil4jdn84py2mqvmmwrjc1s0mx2qvhgwln2q1"
+   "commit": "f39fd03cf563ffdf57144a7586a5e845969fc641",
+   "sha256": "1l8xpfssvcfdm6q606h5sriais5i8a6j8s0i8gd6gjafby11s59y"
   },
   "stable": {
    "version": [
@@ -128082,26 +129134,26 @@
   "repo": "magit/with-editor",
   "unstable": {
    "version": [
-    20240415,
-    1558
+    20240702,
+    1952
    ],
    "deps": [
     "compat"
    ],
-   "commit": "1b4526453ef6bdee30635f469aa26085c02b1ac1",
-   "sha256": "1qv84lg4g4kihv53vrklm0rmh9hqiwk23bynldiwvmiq39fqasyw"
+   "commit": "6c9a51b72fa7f454a5a123f738a6a067972eca4e",
+   "sha256": "0y7k3qb53mcy24z3hdmkvnmy0fhnkmsli1b686bx605w2ilqqdif"
   },
   "stable": {
    "version": [
     3,
     3,
-    2
+    4
    ],
    "deps": [
     "compat"
    ],
-   "commit": "d5f3f06cb830311e60c58f656988ef37c05a99e0",
-   "sha256": "1wzzymlka4f798m75kizjh1yvnh49y8m029c7p5pg7gbv6d0wd8a"
+   "commit": "322ee26d3a7d3d67840293041837b7e70cffa8d1",
+   "sha256": "1jnjd2pzx03vzimsfdcaa3d11fiqiv6hi5nrk6wj2m9qz8alnj2b"
   }
  },
  {
@@ -128236,6 +129288,36 @@
    "sha256": "1wwj5pyhb3vxrpyqxrmfayjkyamf0v84jq6bb7j2kl90aa8b2m90"
   }
  },
+ {
+  "ename": "wiz",
+  "commit": "a197e0ebe77fc4d4b93bef2d92be41901eb7fba7",
+  "sha256": "0d5v4wrvy706pg8gkhijljhddpxxr69mlnd7an32ibw79zpbn19y",
+  "fetcher": "github",
+  "repo": "zonuexe/emacs-wiz",
+  "unstable": {
+   "version": [
+    20240629,
+    447
+   ],
+   "deps": [
+    "exec-path-from-shell"
+   ],
+   "commit": "4f48029d39b870c9e6545516af1be9764e08cccc",
+   "sha256": "1cq12w81gbw2gmv92y9grh7fbfwhab73z9gwxwycz300xzakzydz"
+  },
+  "stable": {
+   "version": [
+    0,
+    0,
+    5
+   ],
+   "deps": [
+    "exec-path-from-shell"
+   ],
+   "commit": "2c88a65205b11f97d20c3de907ccb19aa5830175",
+   "sha256": "0gi36imnx6gpv3jbjkd1dx2y7273cbn2a0lwzyczr17h6mq97h4r"
+  }
+ },
  {
   "ename": "wn-mode",
   "commit": "6213c01e6954985daff8cd1a5a3ef004431f0477",
@@ -129526,11 +130608,11 @@
   "repo": "canatella/xwwp",
   "unstable": {
    "version": [
-    20200917,
-    643
+    20240701,
+    1040
    ],
-   "commit": "f67e070a6e1b233e60274deb717274b000923231",
-   "sha256": "1ikhgi3gc86w7y3cjmw875c8ccsmj22yn1zm3abprdzbjqlyzhhg"
+   "commit": "0c875e460d1c0637766204dc289ffbd0f2284194",
+   "sha256": "0a5rl4p0kywzpwmawi8cwyk47nawblan0y01s6v6vbnyb8ylcgs3"
   }
  },
  {
@@ -129778,26 +130860,26 @@
   "repo": "zkry/yaml-pro",
   "unstable": {
    "version": [
-    20240520,
-    1215
+    20240623,
+    1904
    ],
    "deps": [
     "yaml"
    ],
-   "commit": "d57cbd84ad0afd0fd3168e3d0e6cb5969b610b39",
-   "sha256": "1h6a6na77xfm88qcly6nc1r6bmf5l9aihjdyajfagfdms1wh8qf3"
+   "commit": "5f06949e92dc19dcc48dc31662b2aa958fe33726",
+   "sha256": "0affakq60pyi649gnc7xvjcb7dg1h8rvmwbcpxd2zicj9np289h2"
   },
   "stable": {
    "version": [
     1,
-    1,
+    2,
     0
    ],
    "deps": [
     "yaml"
    ],
-   "commit": "d57cbd84ad0afd0fd3168e3d0e6cb5969b610b39",
-   "sha256": "1h6a6na77xfm88qcly6nc1r6bmf5l9aihjdyajfagfdms1wh8qf3"
+   "commit": "5f06949e92dc19dcc48dc31662b2aa958fe33726",
+   "sha256": "0affakq60pyi649gnc7xvjcb7dg1h8rvmwbcpxd2zicj9np289h2"
   }
  },
  {
@@ -130063,25 +131145,25 @@
   "repo": "AndreaCrotti/yasnippet-snippets",
   "unstable": {
    "version": [
-    20240507,
-    943
+    20240603,
+    757
+   ],
+   "deps": [
+    "yasnippet"
+   ],
+   "commit": "1bf034887c4048c38266842686b7f9c8384f72e7",
+   "sha256": "17r0p2yk0164i1sc4rl55sykpgk5f21kv958dqdhrf39r4gj0r4k"
+  },
+  "stable": {
+   "version": [
+    1,
+    1
    ],
    "deps": [
     "yasnippet"
    ],
    "commit": "6fafad13bb4689600285d9e38c61958dd63c356d",
    "sha256": "0p38k8a3l9vpph1g2a6wz40y30wb2nhp770rv8947bxzjc5xc0gf"
-  },
-  "stable": {
-   "version": [
-    1,
-    0
-   ],
-   "deps": [
-    "yasnippet"
-   ],
-   "commit": "c0ef1e8cfd05ef77b9240f3d9e8f0798bbcf9a58",
-   "sha256": "0m78jxhjyf4212ig2ncxr6bhhd6yx4c3nc8x4ylamzq21x4fl21r"
   }
  },
  {
@@ -130256,26 +131338,26 @@
   "url": "https://git.thanosapollo.org/yeetube",
   "unstable": {
    "version": [
-    20240411,
-    1328
+    20240708,
+    2037
    ],
    "deps": [
     "compat"
    ],
-   "commit": "dfcbb8498b30b83d6f97d5777603d5f2dce39298",
-   "sha256": "013j8nm736lpkp2ygmgwdfbrylmwvlsgbf6qmscpfvn01n6w9s37"
+   "commit": "bd5418635f3483930d267bcb44cd3744db4ea3ac",
+   "sha256": "0z6kdzgpri5qqxdpxdl8qb4rgv32557rc4wac8mrh5a0jf682p42"
   },
   "stable": {
    "version": [
     2,
     1,
-    4
+    7
    ],
    "deps": [
     "compat"
    ],
-   "commit": "f9feada5c09fa8245f0230696557f7e7ffa266f1",
-   "sha256": "1gpfm41d4wzk1i0hnmfn81xv05ida9ljibar7ji4d7nisjbd4vp9"
+   "commit": "5c0a3efd2fb5cc25a6a90741ad198e31fdb15640",
+   "sha256": "0a3pm8cz6yl5s2xnbnjvdwm8mf5hyman419xl4fyyfgwy6vrxp70"
   }
  },
  {
@@ -130654,11 +131736,11 @@
   "repo": "bbatsov/zenburn-emacs",
   "unstable": {
    "version": [
-    20240331,
-    1350
+    20240612,
+    1258
    ],
-   "commit": "14dda0596a7cd0750fc6566eacc203a126f136c2",
-   "sha256": "1cyspxwjjhflafkyb2mkcfc1227i8kzmxgz3yvrj3ykdsim9pjwy"
+   "commit": "15f48bfc6b52d112f3c3fd98e533bda9138ffdd2",
+   "sha256": "1nzqj55nc9klvgxhd20z1n1c06v453hjxf7s70gspa4v1pwgvjaz"
   },
   "stable": {
    "version": [
@@ -130779,26 +131861,58 @@
   "url": "https://gitlab.emacsos.com/sylecn/zero-el",
   "unstable": {
    "version": [
-    20200405,
-    1220
+    20240527,
+    728
    ],
    "deps": [
     "s"
    ],
-   "commit": "729da9f4b99acb744ee6974ed7f3d4e252fd19da",
-   "sha256": "1bcka4gzcb5r2y5g7a06l05n6ixvs7lm37w4ghvvq12ci2ypzp04"
+   "commit": "e87bbf24c1475a784ad9d1ba8447e038824d796b",
+   "sha256": "1p9mfmaq54jy0g1nwma46kq8562i3a5d6gfw5w3r53i9xd4vq0w3"
   },
   "stable": {
    "version": [
     2,
-    8,
-    0
+    10,
+    3
    ],
    "deps": [
     "s"
    ],
-   "commit": "729da9f4b99acb744ee6974ed7f3d4e252fd19da",
-   "sha256": "1bcka4gzcb5r2y5g7a06l05n6ixvs7lm37w4ghvvq12ci2ypzp04"
+   "commit": "e87bbf24c1475a784ad9d1ba8447e038824d796b",
+   "sha256": "1p9mfmaq54jy0g1nwma46kq8562i3a5d6gfw5w3r53i9xd4vq0w3"
+  }
+ },
+ {
+  "ename": "zero-input-panel-posframe",
+  "commit": "a5ac1339f742f8ccc36eaf9fde5085bbc2ab42a0",
+  "sha256": "104ccz5s49m6y5si4k8qs7vv4w7a1zahy0isvr104jwihjsdnvix",
+  "fetcher": "git",
+  "url": "https://gitlab.emacsos.com/sylecn/zero-input-panel-posframe.git",
+  "unstable": {
+   "version": [
+    20240526,
+    1604
+   ],
+   "deps": [
+    "posframe",
+    "zero-input"
+   ],
+   "commit": "714102090ba87b75a06b87792df696f6f48c2ea8",
+   "sha256": "0ffq6xi0spsy4rbksrbm5j2ny90szsklf3qymdxygp5kmc0ghia7"
+  },
+  "stable": {
+   "version": [
+    1,
+    0,
+    1
+   ],
+   "deps": [
+    "posframe",
+    "zero-input"
+   ],
+   "commit": "01d5a8f94b7936152ae719e25ffc19574f7b0cc5",
+   "sha256": "12rgfmcbikip97nqwmbj4wsjcb8yb9yh7iiqab4vbpm4la4j63ip"
   }
  },
  {
@@ -131106,8 +132220,8 @@
   "repo": "WillForan/zim-wiki-mode",
   "unstable": {
    "version": [
-    20230927,
-    1410
+    20240613,
+    8
    ],
    "deps": [
     "dokuwiki-mode",
@@ -131116,8 +132230,8 @@
     "link-hint",
     "pretty-hydra"
    ],
-   "commit": "7c62e0304750654709b4173bcc1e2681cf1fbe49",
-   "sha256": "1vfc48vz0ajcqcdx89wrwd3ksncwjlvi1via681d88y9in9bpbv4"
+   "commit": "11e077afbe21f2dd33fe7eae39c2a8345bb0b806",
+   "sha256": "0lc1rikrd5rhjy8p7ar649kxdv5slnkmkra6f7j00sbjwhw7bc89"
   }
  },
  {
@@ -131146,11 +132260,11 @@
   "repo": "localauthor/zk",
   "unstable": {
    "version": [
-    20240102,
-    1405
+    20240704,
+    910
    ],
-   "commit": "82f636c1edda416794c7115757ecded64f22afbf",
-   "sha256": "1rxrasmhk28h3z9iyssvnhf3a57y2xmfjbl4il3mfd98gg6mhb8i"
+   "commit": "225d2628025195283170908e81341e3a8d49b022",
+   "sha256": "0x0cc42r56mfwi9cbyaxlnjpjv7hpkhcvn4whx545hzyr51hr53v"
   },
   "stable": {
    "version": [
@@ -131200,14 +132314,14 @@
   "repo": "localauthor/zk",
   "unstable": {
    "version": [
-    20240102,
-    1405
+    20240704,
+    1102
    ],
    "deps": [
     "zk"
    ],
-   "commit": "82f636c1edda416794c7115757ecded64f22afbf",
-   "sha256": "1rxrasmhk28h3z9iyssvnhf3a57y2xmfjbl4il3mfd98gg6mhb8i"
+   "commit": "9a2ece35d2ecec20cc11e2888413a86d03beb40b",
+   "sha256": "14lxs2r8awp92k5ijsvw1fwiz95vc3p5md913cqka4l7hvw9x2cv"
   },
   "stable": {
    "version": [
@@ -131743,11 +132857,11 @@
   "repo": "pesterhazy/zprint-mode.el",
   "unstable": {
    "version": [
-    20240311,
-    941
+    20240619,
+    1639
    ],
-   "commit": "cd7ae7400177b3c233a77c2a46de818c72375362",
-   "sha256": "0dygbbasz8mxbz6n6zcsd1xj1n3ab35yxiabjwgi7zlikxigjipw"
+   "commit": "ac3b25e250c83aedc49d1eab508142e3060e3833",
+   "sha256": "19aan4a2vidlr2ahsjyrlx318zqd7yyblxsw34a2hzj2pjx45l59"
   }
  },
  {
@@ -131770,10 +132884,10 @@
  },
  {
   "ename": "zweilight-theme",
-  "commit": "6440f81aed1fcddcaf7afeedb74520e605211986",
-  "sha256": "1j8skn9hz1zkpdg7q0njv5b50cbvrixjjmkp43p58gx98q02p0kq",
+  "commit": "0dccf5900100571b3a17003dd471991463137c38",
+  "sha256": "1caqjq1ijjbnpa1jjs5am1vp9kpcfg17dbyswdfw64q698c50j3x",
   "fetcher": "github",
-  "repo": "philiparvidsson/Zweilight-Theme-for-Emacs",
+  "repo": "vexx9/Zweilight-Theme-for-Emacs",
   "unstable": {
    "version": [
     20170113,
diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/update-elpa b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/update-elpa
index ba2964b2ea..6cf3bafd24 100755
--- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/update-elpa
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/update-elpa-devel b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/update-elpa-devel
index b5af444247..356d93167a 100755
--- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/update-elpa-devel
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/update-from-overlay b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/update-from-overlay
index 1344bb380c..5879f4e3ea 100755
--- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/update-from-overlay
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/update-nongnu b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/update-nongnu
index dc43a86efb..9a4b20716c 100755
--- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/update-nongnu
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/update-nongnu-devel b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/update-nongnu-devel
new file mode 100755
index 0000000000..a1f5f950d4
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/updater-emacs.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/updater-emacs.nix
index 0f69da2384..f527e64f08 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/updater-emacs.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/updater-emacs.nix
@@ -3,27 +3,32 @@ let
 
   emacsEnv = pkgs.emacs.pkgs.withPackages (epkgs: let
 
-    promise = epkgs.trivialBuild {
+    promise = epkgs.melpaBuild {
       pname = "promise";
-      version = "1";
+      version = "0-unstable-2019-06-07";
+
       src = pkgs.fetchFromGitHub {
         owner = "bendlas";
         repo = "emacs-promise";
         rev = "4da97087c5babbd8429b5ce62a8323b9b03c6022";
-        sha256 = "0yin7kj69g4zxs30pvk47cnfygxlaw7jc7chr3b36lz51yqczjsy";
+        hash = "sha256-XsvPsA/lUzPWyJAdJg9XtD/vLDtk7guG7p+8ZOQ8Nno=";
       };
+
+      packageRequires = [ epkgs.async ];
     };
 
-    semaphore = epkgs.trivialBuild {
+    semaphore = epkgs.melpaBuild {
       pname = "semaphore";
-      version = "1";
-      packageRequires = [ promise ];
+      version = "0-unstable-2019-06-07";
+
       src = pkgs.fetchFromGitHub {
         owner = "webnf";
         repo = "semaphore.el";
         rev = "93802cb093073bc6a6ccd797328dafffcef248e0";
-        sha256 = "09pfyp27m35sv340xarhld7xx2vv5fs5xj4418709iw6l6hpk853";
+        hash = "sha256-o6B5oaGGxwQOCoTIXrQre4veT6Mwqw7I2LqMesT17iY=";
       };
+
+      packageRequires = [ promise ];
     };
 
   in [ promise semaphore ]);
diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/make-emacs.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/make-emacs.nix
index b460fad5bb..868079e037 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/emacs/make-emacs.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/make-emacs.nix
@@ -60,6 +60,7 @@
 , texinfo
 , webkitgtk
 , wrapGAppsHook3
+, zlib
 
 # Boolean flags
 , withNativeCompilation ? stdenv.buildPlatform.canExecute stdenv.hostPlatform
@@ -250,6 +251,7 @@ mkDerivation (finalAttrs: {
     glib-networking
   ] ++ lib.optionals withNativeCompilation [
     libgccjit
+    zlib
   ] ++ lib.optionals withImageMagick [
     imagemagick
   ] ++ lib.optionals withPgtk [
diff --git a/third_party/nixpkgs/pkgs/applications/editors/flpsed/default.nix b/third_party/nixpkgs/pkgs/applications/editors/flpsed/default.nix
index ae541b8dd7..09caf3a271 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/flpsed/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/editors/hexcurse/default.nix b/third_party/nixpkgs/pkgs/applications/editors/hexcurse/default.nix
index 17291a458a..a4d9905d6f 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/hexcurse/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/editors/ht/default.nix b/third_party/nixpkgs/pkgs/applications/editors/ht/default.nix
index 363466e160..a72bac0c27 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/ht/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/editors/kakoune/default.nix b/third_party/nixpkgs/pkgs/applications/editors/kakoune/default.nix
index b30e1f5976..317b2b6b87 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/kakoune/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/editors/kibi/default.nix b/third_party/nixpkgs/pkgs/applications/editors/kibi/default.nix
index 368249cc3f..33295cdc02 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/kibi/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/kibi/default.nix
@@ -8,7 +8,7 @@ rustPlatform.buildRustPackage rec {
   pname = "kibi";
   version = "0.2.2";
 
-  cargoSha256 = "sha256-ebUCkcUACganeq5U0XU4VIGClKDZGhUw6K3WBgTUUUw=";
+  cargoHash = "sha256-ebUCkcUACganeq5U0XU4VIGClKDZGhUw6K3WBgTUUUw=";
 
   src = fetchFromGitHub {
     owner = "ilai-deutel";
diff --git a/third_party/nixpkgs/pkgs/applications/editors/l3afpad/default.nix b/third_party/nixpkgs/pkgs/applications/editors/l3afpad/default.nix
index d2203a714c..bcf20e4af5 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/l3afpad/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/editors/vim/common.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/common.nix
index 50de9c6bfb..50857ed159 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/vim/common.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/vim/common.nix
@@ -1,6 +1,6 @@
 { lib, fetchFromGitHub }:
 rec {
-  version = "9.1.0509";
+  version = "9.1.0595";
 
   outputs = [ "out" "xxd" ];
 
@@ -8,7 +8,7 @@ rec {
     owner = "vim";
     repo = "vim";
     rev = "v${version}";
-    hash = "sha256-CATjUalRjvVjEfWT5evFAk//Oj4iB1fDBsRU5MhDyn4=";
+    hash = "sha256-v8xVP1WuvE9XdQl1LDIq3pjaKyqPWM0fsFKcpIwPbNA=";
   };
 
   enableParallelBuilding = true;
diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/macvim.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/macvim.nix
index bd526b8f6c..bf2fb1fb02 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/vim/macvim.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/deprecated.json b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/deprecated.json
index bc7c308387..e9c011490a 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/deprecated.json
+++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/deprecated.json
@@ -12,7 +12,7 @@
         "new": "vim-fern"
     },
     "gina-vim": {
-        "date": "2024-07-18",
+        "date": "2024-07-27",
         "new": "vim-gina"
     },
     "gist-vim": {
@@ -60,7 +60,7 @@
         "new": "vim-suda"
     },
     "vim-fsharp": {
-        "date": "2024-07-18",
+        "date": "2024-07-27",
         "new": "zarchive-vim-fsharp"
     },
     "vim-jade": {
diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/generated.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/generated.nix
index 114952110e..e5cc57ada8 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/generated.nix
@@ -65,12 +65,12 @@ final: prev:
 
   CopilotChat-nvim = buildVimPlugin {
     pname = "CopilotChat.nvim";
-    version = "2024-07-17";
+    version = "2024-07-26";
     src = fetchFromGitHub {
       owner = "CopilotC-Nvim";
       repo = "CopilotChat.nvim";
-      rev = "92bc7b5e564c23b12b2ed41dd7657fdafe39d95f";
-      sha256 = "05qb3817bp7mmqvaqhcy3cffqfbcmryymjd357vxqaw30b44rxmz";
+      rev = "f20a0425b33c1704133bdef5ec10c4e94f6efdc6";
+      sha256 = "0mqxhrc3bhw98dxqji3qpm7z1aqsi9zdlsm5mj9qkc1qn37af4m3";
     };
     meta.homepage = "https://github.com/CopilotC-Nvim/CopilotChat.nvim/";
   };
@@ -185,24 +185,24 @@ final: prev:
 
   LazyVim = buildVimPlugin {
     pname = "LazyVim";
-    version = "2024-07-18";
+    version = "2024-07-25";
     src = fetchFromGitHub {
       owner = "LazyVim";
       repo = "LazyVim";
-      rev = "d2483f19cee5234db1e010e6560d9aa9bb60bb30";
-      sha256 = "19rshs3zbmm8p76w4yzy426g2mw746qs5xs8aw9f5xvgkc90b0ri";
+      rev = "12818a6cb499456f4903c5d8e68af43753ebc869";
+      sha256 = "16zdahzb3mfjpr3s6lk9754a6nqq1kjcw5p3f0qh12h6zkb2w8v4";
     };
     meta.homepage = "https://github.com/LazyVim/LazyVim/";
   };
 
   LeaderF = buildVimPlugin {
     pname = "LeaderF";
-    version = "2024-07-12";
+    version = "2024-07-24";
     src = fetchFromGitHub {
       owner = "Yggdroot";
       repo = "LeaderF";
-      rev = "feb7ca9c6281ee6d2954d8de3455879a31389767";
-      sha256 = "1nk3dn4i0d6k52l823h3c9rj4gjg3wa2f2dhzs8fv8ywcz64kgh2";
+      rev = "b5f1990bd06dd376e46a906d383d1b8dc436b3fd";
+      sha256 = "0x6lycyy5184cq5ppw9a9923d208mxa0qchpiyjbyxlh0d5hlfm8";
     };
     meta.homepage = "https://github.com/Yggdroot/LeaderF/";
   };
@@ -329,12 +329,12 @@ final: prev:
 
   SchemaStore-nvim = buildVimPlugin {
     pname = "SchemaStore.nvim";
-    version = "2024-07-17";
+    version = "2024-07-25";
     src = fetchFromGitHub {
       owner = "b0o";
       repo = "SchemaStore.nvim";
-      rev = "57116dd9fd9ee4d73c1e9a1335d92b4c71851cf7";
-      sha256 = "1sms1wgxmsidrb5isxkn9wig0a9aa3ipl7zl9babs1adnbgkf8l8";
+      rev = "6eb8cee613518fb065d23a81d01eeb42365d59c1";
+      sha256 = "1cnd2wp67r71wkxf90hwiw0x9i27ap57wxihngasvnqn2swslm31";
     };
     meta.homepage = "https://github.com/b0o/SchemaStore.nvim/";
   };
@@ -401,12 +401,12 @@ final: prev:
 
   SpaceVim = buildVimPlugin {
     pname = "SpaceVim";
-    version = "2024-07-09";
+    version = "2024-07-27";
     src = fetchFromGitHub {
       owner = "SpaceVim";
       repo = "SpaceVim";
-      rev = "c11f86991cd935d79b46819a15c3569c48c22da4";
-      sha256 = "0wz5gdfj9nacf26435z412j1fys0fqxkdpiqpp4cp9a7i0zkqray";
+      rev = "28c3ff61930700f66e6865179cfade5dc78b5d1f";
+      sha256 = "1k4f9fkp5c6i2fhsjlxipdwgmqp6ifqvwgnjhicsn404b6ywgdxs";
     };
     meta.homepage = "https://github.com/SpaceVim/SpaceVim/";
   };
@@ -558,12 +558,12 @@ final: prev:
 
   aerial-nvim = buildVimPlugin {
     pname = "aerial.nvim";
-    version = "2024-07-16";
+    version = "2024-07-24";
     src = fetchFromGitHub {
       owner = "stevearc";
       repo = "aerial.nvim";
-      rev = "4e77964569ef47a70f9bb76c668dcfea2d089d5a";
-      sha256 = "0dbcks0v8awrpl1fbnk4zrkhsrvm8c8h6jfyphgj2vi37x72r5lz";
+      rev = "e75a3df2c20b3a98c786f5e61587d74a7a6b61d6";
+      sha256 = "06jg1z0lyvyq1k7hai059jj7h19r2psrya1n035ricj5j39n8i3x";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/stevearc/aerial.nvim/";
@@ -739,12 +739,12 @@ final: prev:
 
   astrotheme = buildVimPlugin {
     pname = "astrotheme";
-    version = "2024-07-15";
+    version = "2024-07-24";
     src = fetchFromGitHub {
       owner = "AstroNvim";
       repo = "astrotheme";
-      rev = "c52dad31bb0000524ca4003222c9ed0f4e8c3058";
-      sha256 = "1y3ak78663iv838la2cj0jv8lj0j8qf27fz7558008w88hlvcjmn";
+      rev = "41b7d8430a55fd771e41bd763af4c3fd1c2fc0b5";
+      sha256 = "0lp8wym0ck7jfdrhwymhh1g9cas5ljmlydggy0c9qa64ildyr5ab";
     };
     meta.homepage = "https://github.com/AstroNvim/astrotheme/";
   };
@@ -847,12 +847,12 @@ final: prev:
 
   asyncrun-vim = buildVimPlugin {
     pname = "asyncrun.vim";
-    version = "2024-07-01";
+    version = "2024-07-26";
     src = fetchFromGitHub {
       owner = "skywind3000";
       repo = "asyncrun.vim";
-      rev = "b0987750dddf0ee678d160fe50e3d5397cd0c9e9";
-      sha256 = "0ifnfif65ykpkavaajwiqc8pi38c0x7b709kx1gvn0z7nr8gxf7p";
+      rev = "641de260966924a8ddd280af1b30209408497b52";
+      sha256 = "1r5mz66qqq05wfrqg3jfd050j7flwg7gqwd03bxj4hr4dbvv0n4r";
     };
     meta.homepage = "https://github.com/skywind3000/asyncrun.vim/";
   };
@@ -883,12 +883,12 @@ final: prev:
 
   aurora = buildVimPlugin {
     pname = "aurora";
-    version = "2024-07-04";
+    version = "2024-07-21";
     src = fetchFromGitHub {
       owner = "ray-x";
       repo = "aurora";
-      rev = "a5337b52ab8c72ebba7785787b9eb0e66f887da1";
-      sha256 = "0yzf3nvx10f69mfjhpy7cxg310hj1843bqi1jfm8fcj6f0fkaajd";
+      rev = "af3e80a8ca4f9a6e3bd40e2ba12073c1d0041a81";
+      sha256 = "0kg6v5jg3am5www5pawv4y5m2h40njsi7mk8407alix2z19kp27n";
     };
     meta.homepage = "https://github.com/ray-x/aurora/";
   };
@@ -943,24 +943,24 @@ final: prev:
 
   auto-session = buildVimPlugin {
     pname = "auto-session";
-    version = "2024-07-15";
+    version = "2024-07-27";
     src = fetchFromGitHub {
       owner = "rmagatti";
       repo = "auto-session";
-      rev = "08c279882d4117a3e6ade1a014f7cf4af7c34fec";
-      sha256 = "03pyg708b3ad7kqc2m0nnvavbind245c4yzi01c1fpl420cdccfj";
+      rev = "d5553e7e0fc83a7296847ef8009b9b93a4191cdb";
+      sha256 = "18vqz7iiz8xqzbwmsxylhkm4j0f64dyqzxz0j17fsirysj29rvf5";
     };
     meta.homepage = "https://github.com/rmagatti/auto-session/";
   };
 
   autoclose-nvim = buildVimPlugin {
     pname = "autoclose.nvim";
-    version = "2024-02-23";
+    version = "2024-07-21";
     src = fetchFromGitHub {
       owner = "m4xshen";
       repo = "autoclose.nvim";
-      rev = "dc42806540dcf448ecb2bad6b67204410cfbe629";
-      sha256 = "03l4az5xccx941sbw2qx7s8aziydiad2pc75jki1mlbgs7sdbhwi";
+      rev = "b2077aa2c83df7ebc19b2a20a3a0654b24ae9c8f";
+      sha256 = "0qsaiwn3fznzzda9xw0v4ss6cyhladiwikslbnh0w29qz732g0lq";
     };
     meta.homepage = "https://github.com/m4xshen/autoclose.nvim/";
   };
@@ -1051,12 +1051,12 @@ final: prev:
 
   baleia-nvim = buildVimPlugin {
     pname = "baleia.nvim";
-    version = "2024-05-31";
+    version = "2024-07-24";
     src = fetchFromGitHub {
       owner = "m00qek";
       repo = "baleia.nvim";
-      rev = "4d3b27dbec65a44ceecd9306f605a980bcf4e9b1";
-      sha256 = "095jjam8x5xpr2q8xnvl479i4hc2s7zz2vqcgfk5mv60f52k35h0";
+      rev = "1b25eac3ac03659c3d3af75c7455e179e5f197f7";
+      sha256 = "194hg3habfymcbv8sg8pzv8ajniwaqc77kf6a128hz81f11mskdp";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/m00qek/baleia.nvim/";
@@ -1124,12 +1124,12 @@ final: prev:
 
   base46 = buildVimPlugin {
     pname = "base46";
-    version = "2024-07-07";
+    version = "2024-07-27";
     src = fetchFromGitHub {
       owner = "nvchad";
       repo = "base46";
-      rev = "b17df65f6d423055e9fdfa4e7f55967c03862f29";
-      sha256 = "13ic9gpqfllyac4q9yxc9giq5djxfdxm22v4ljx7i1p7w05fxxfx";
+      rev = "89cb656606a2f47ae9f814530c961be4cdb6e117";
+      sha256 = "06621y5ak8dzq1g6wcg32vbgirjn9qz8zml6l3k5irry83h1ayx4";
     };
     meta.homepage = "https://github.com/nvchad/base46/";
   };
@@ -1172,12 +1172,12 @@ final: prev:
 
   better-escape-nvim = buildVimPlugin {
     pname = "better-escape.nvim";
-    version = "2024-07-12";
+    version = "2024-07-27";
     src = fetchFromGitHub {
       owner = "max397574";
       repo = "better-escape.nvim";
-      rev = "62015330fc831306f5229f24b2db981d07f816c1";
-      sha256 = "0m0bg2d8b95mq665zab30kqvy70q9x2brfyrj1jbhqsx8q6dflkl";
+      rev = "f45b52f8f87792e8659526f23261ffe278a54be5";
+      sha256 = "1ddp41ydclihz2mgcxdv5dq0b4hng46az50hqwfr8ilvv7i3nwbk";
     };
     meta.homepage = "https://github.com/max397574/better-escape.nvim/";
   };
@@ -1232,12 +1232,12 @@ final: prev:
 
   bluloco-nvim = buildVimPlugin {
     pname = "bluloco.nvim";
-    version = "2024-07-09";
+    version = "2024-07-18";
     src = fetchFromGitHub {
       owner = "uloco";
       repo = "bluloco.nvim";
-      rev = "d5c046b705e9485737ebfca40824a8baca0d4e4c";
-      sha256 = "1ccyqxid41zvc83mjjb9la29pa27izhvr4hbj4lghbywb9glb021";
+      rev = "07f4b5cca8cfe31aad69ab5c1be0f6a0715a8d2e";
+      sha256 = "1z998g3b2gffbq1ykialcfc7w9giyljdnsxrm4ylifr0b0312sfg";
     };
     meta.homepage = "https://github.com/uloco/bluloco.nvim/";
   };
@@ -1328,12 +1328,12 @@ final: prev:
 
   bufferline-nvim = buildVimPlugin {
     pname = "bufferline.nvim";
-    version = "2024-07-17";
+    version = "2024-07-18";
     src = fetchFromGitHub {
       owner = "akinsho";
       repo = "bufferline.nvim";
-      rev = "2e3c8cc5a57ddd32f1edd2ffd2ccb10c09421f6c";
-      sha256 = "14n1pv8svb22hvcan8yyzqn8pgmf50yn47xmp98m05ap5zf42rj1";
+      rev = "0b2fd861eee7595015b6561dade52fb060be10c4";
+      sha256 = "068gg98w88q0j3c1wrlggsp0986yppa8vlbnzy7wy4g7kn0aqfsn";
     };
     meta.homepage = "https://github.com/akinsho/bufferline.nvim/";
   };
@@ -1412,12 +1412,12 @@ final: prev:
 
   chadtree = buildVimPlugin {
     pname = "chadtree";
-    version = "2024-07-15";
+    version = "2024-07-25";
     src = fetchFromGitHub {
       owner = "ms-jpq";
       repo = "chadtree";
-      rev = "2416f72fb17834a0dd0fe4ab8ccb0a1c1b6aaf0b";
-      sha256 = "0p8r5g77qd1riml9w4dwzk6lq9xx6w9yp8yp43221avj7imi35dn";
+      rev = "7334155c68acd932e275fbf203f05eebf7f741ed";
+      sha256 = "15ddriks3ffyz8q0g8nkb35dmm2apclw04dkivjbbm21dg5nym11";
     };
     meta.homepage = "https://github.com/ms-jpq/chadtree/";
   };
@@ -1460,12 +1460,12 @@ final: prev:
 
   cinnamon-nvim = buildVimPlugin {
     pname = "cinnamon.nvim";
-    version = "2024-07-17";
+    version = "2024-07-25";
     src = fetchFromGitHub {
       owner = "declancm";
       repo = "cinnamon.nvim";
-      rev = "d097999fb4230ead4774bee0f0542cac6d7bd94e";
-      sha256 = "0jy1p5axmdjq171ylqfvlnyrm4yri9zqflza5725zvs6d0nrycxz";
+      rev = "ecd211e46a1d4fb0efffbdb2c2bbd59785605870";
+      sha256 = "0pf9bx2xrv8kkg4339w7cqns4v8gkg4jppsccbymhbp4gj9xhw7s";
     };
     meta.homepage = "https://github.com/declancm/cinnamon.nvim/";
   };
@@ -1604,12 +1604,12 @@ final: prev:
 
   cmp-ai = buildVimPlugin {
     pname = "cmp-ai";
-    version = "2024-06-02";
+    version = "2024-07-24";
     src = fetchFromGitHub {
       owner = "tzachar";
       repo = "cmp-ai";
-      rev = "2b787129314c5fb8bfd41a6919d4889210e6b265";
-      sha256 = "sha256-ul2X6kIdreJ9dCQERw7C3l2dss7Mtcwtm7CGhAxjjvY=";
+      rev = "18bbd723a45b3f84bad8be58b86d8433e53f81c6";
+      sha256 = "0h5d16591x553vkj62l1s5cq7mklmcnpp1rj1kw7zfgnhgfn64cc";
     };
     meta.homepage = "https://github.com/tzachar/cmp-ai/";
   };
@@ -1747,12 +1747,12 @@ final: prev:
 
   cmp-dictionary = buildVimPlugin {
     pname = "cmp-dictionary";
-    version = "2024-07-15";
+    version = "2024-07-24";
     src = fetchFromGitHub {
       owner = "uga-rosa";
       repo = "cmp-dictionary";
-      rev = "42866957964aa698d53f222395dbd1e334e77fdd";
-      sha256 = "01p2xj1m6p18f40i8h88kcrmzzswrg1cr03p0wmsq9lmjnic6782";
+      rev = "c5ffc6afb7f3a68da981ed9c56f3d9d8f3d907b7";
+      sha256 = "1shxx5h0y7rjh6bam1cckrrrqjhb2mwr85pja39p9s4zpvj0r0am";
     };
     meta.homepage = "https://github.com/uga-rosa/cmp-dictionary/";
   };
@@ -2179,12 +2179,12 @@ final: prev:
 
   cobalt2-nvim = buildVimPlugin {
     pname = "cobalt2.nvim";
-    version = "2024-04-01";
+    version = "2024-07-25";
     src = fetchFromGitHub {
       owner = "lalitmee";
       repo = "cobalt2.nvim";
-      rev = "5ee85e0722ccdd8253b6119e7cdd9055010093d0";
-      sha256 = "0vxkdys6af38shv75laya871jb3jinhrfsdjm5wdxbxyl4lp39bx";
+      rev = "e55066223f56f864775832325d2f325ec9b083c9";
+      sha256 = "19n9l2xcn0sis5bs0rw9p4ivgfhsm830mjfs32r0wdn1pnm320xh";
     };
     meta.homepage = "https://github.com/lalitmee/cobalt2.nvim/";
   };
@@ -2587,12 +2587,12 @@ final: prev:
 
   conform-nvim = buildVimPlugin {
     pname = "conform.nvim";
-    version = "2024-07-18";
+    version = "2024-07-23";
     src = fetchFromGitHub {
       owner = "stevearc";
       repo = "conform.nvim";
-      rev = "acc7d93f4a080fec587a99fcb36cffa29adc4bad";
-      sha256 = "1qja8r6643kgj4x0rjbddkkfsrkhnv3361s8w7amkcv8qkm2s2m3";
+      rev = "25d48271e3d4404ba017cb92a37d3a681c1ad149";
+      sha256 = "0dbw1b25g83iy6yvc725k7il0l7yli4qd9s4wylcbqgacss2nz3h";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/stevearc/conform.nvim/";
@@ -2600,24 +2600,24 @@ final: prev:
 
   conjure = buildVimPlugin {
     pname = "conjure";
-    version = "2024-06-21";
+    version = "2024-07-19";
     src = fetchFromGitHub {
       owner = "Olical";
       repo = "conjure";
-      rev = "a81977726f726b21d4bd75cea5bbbb7022005507";
-      sha256 = "154bkh2cxar7ajyi8y4ym6ckp48b333cml73a52g6qfiggql5r33";
+      rev = "1157614e1c757cdbe062b08d617d162fb34ed3a3";
+      sha256 = "03rrfba6z47sy4x1a7wrmnlfysz20zn8z1wxinbf60dkaiyjsfgp";
     };
     meta.homepage = "https://github.com/Olical/conjure/";
   };
 
   context-vim = buildVimPlugin {
     pname = "context.vim";
-    version = "2024-07-10";
+    version = "2024-07-19";
     src = fetchFromGitHub {
       owner = "wellle";
       repo = "context.vim";
-      rev = "a021ba7030ccb1ef6be774f41bbf32b10605a949";
-      sha256 = "06bvzs9ykyakak7dw2xh9rlrrn8vz1y9w4y85gc8kh7qhhw1j64x";
+      rev = "82eb26de265292808917b82f3eda2725b53d785c";
+      sha256 = "0p4pwh3riyf5h57j05rkazzf5j2xd14mlsp3ifryw35irhm4ivwd";
     };
     meta.homepage = "https://github.com/wellle/context.vim/";
   };
@@ -2684,12 +2684,12 @@ final: prev:
 
   coq-thirdparty = buildVimPlugin {
     pname = "coq.thirdparty";
-    version = "2024-04-18";
+    version = "2024-07-25";
     src = fetchFromGitHub {
       owner = "ms-jpq";
       repo = "coq.thirdparty";
-      rev = "5f45777bcb0c14266a7e07ed474cb70c4e8b6397";
-      sha256 = "0h2rq7aqxrf58cgwh6iwm2gs2fghkipyz20gdwqcy5hqmy2l0mi1";
+      rev = "6a53363555bd483818ef2a3103db8ddc8d98a41d";
+      sha256 = "0c5l8zwrcyab36l3diwb6zpncisl0nn0d993vwrzf2430nak59cy";
     };
     meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/";
   };
@@ -2708,12 +2708,12 @@ final: prev:
 
   coq_nvim = buildVimPlugin {
     pname = "coq_nvim";
-    version = "2024-06-26";
+    version = "2024-07-26";
     src = fetchFromGitHub {
       owner = "ms-jpq";
       repo = "coq_nvim";
-      rev = "6b35465a58052f06b5ee0ca63606439ea7c862e8";
-      sha256 = "162xqsrdv9zpqhr723z5b4m1154ryvddbj5kyxsrwccgxj6q5irv";
+      rev = "bdcc65c4636a8894ad4c66aec3192d9da4ee760f";
+      sha256 = "0arq12fcr3yfnl8smk2klv3wf81bq4l8ban5rr0acsh03skpwajl";
     };
     meta.homepage = "https://github.com/ms-jpq/coq_nvim/";
   };
@@ -2756,12 +2756,12 @@ final: prev:
 
   crates-nvim = buildVimPlugin {
     pname = "crates.nvim";
-    version = "2024-07-01";
+    version = "2024-07-25";
     src = fetchFromGitHub {
       owner = "saecki";
       repo = "crates.nvim";
-      rev = "c3fd47391de6999f4c939af89494d08443f71916";
-      sha256 = "0vw47mbx7pw4zzrj70yli86nk407j05ll1lq7d4nb41vii3lnlyb";
+      rev = "a8f1f05fae1d0b74dd07d61a1f8eb023a67a3af4";
+      sha256 = "1p7j85zl77d9m2kfqjmlbcgsvazyf90b4rv2p9x41ac0ydr8hsa9";
     };
     meta.homepage = "https://github.com/saecki/crates.nvim/";
   };
@@ -2852,12 +2852,12 @@ final: prev:
 
   cyberdream-nvim = buildVimPlugin {
     pname = "cyberdream.nvim";
-    version = "2024-07-12";
+    version = "2024-07-27";
     src = fetchFromGitHub {
       owner = "scottmckendry";
       repo = "cyberdream.nvim";
-      rev = "d96290af1c2cffcfdadb266144097e5496d08fd3";
-      sha256 = "0h40diq1klsd96120ncg9w5h0p79gvczl4x74mjgd8b22gcx7m52";
+      rev = "f4551361685342cddea419c96eaa04fecb36ac57";
+      sha256 = "00qz8b1cjn20fnfjb3i9302s7sb9558v43xmjyvh2r8aw5xyj32j";
     };
     meta.homepage = "https://github.com/scottmckendry/cyberdream.nvim/";
   };
@@ -3008,12 +3008,12 @@ final: prev:
 
   denops-vim = buildVimPlugin {
     pname = "denops.vim";
-    version = "2024-06-28";
+    version = "2024-07-27";
     src = fetchFromGitHub {
       owner = "vim-denops";
       repo = "denops.vim";
-      rev = "09e64956c2946bba0a060d0a0aaddde106753bd9";
-      sha256 = "128z109hixhbn50aqgcdihdjc0i94sgqm95l8ra81cskhz1y00cc";
+      rev = "8c920ec6f190c5c77287f802884bc2004799d062";
+      sha256 = "1df2ifhrjjg9fl2vvfkky63l1vy8qw6ijlk2md6l95fnym4vapx5";
     };
     meta.homepage = "https://github.com/vim-denops/denops.vim/";
   };
@@ -3406,12 +3406,12 @@ final: prev:
 
   dropbar-nvim = buildVimPlugin {
     pname = "dropbar.nvim";
-    version = "2024-07-10";
+    version = "2024-07-25";
     src = fetchFromGitHub {
       owner = "Bekaboo";
       repo = "dropbar.nvim";
-      rev = "cab5e0226bc4f90a28cadcb0dc7341d550f1bdf0";
-      sha256 = "14548km67rn8rgpy529iihry8sh03wrl1j8pricqy94a1fjlmghh";
+      rev = "aa4c0ab1ade45ff9a3c5d4c06365c9b119f32d36";
+      sha256 = "0awd7qjnx6gnvisjagsm25fg5wl5kfzcxiqf2jvfs8i550rd54rk";
     };
     meta.homepage = "https://github.com/Bekaboo/dropbar.nvim/";
   };
@@ -3454,12 +3454,12 @@ final: prev:
 
   edgy-nvim = buildVimPlugin {
     pname = "edgy.nvim";
-    version = "2024-07-15";
+    version = "2024-07-22";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "edgy.nvim";
-      rev = "0e8bbab4eba9dab6c237e4a2e146dc0466897be6";
-      sha256 = "0qw0pm7rpd5g6lhmfkpbyjlg7rrwycqwzs73k7j0bdlz84v72zky";
+      rev = "ebb77fde6f5cb2745431c6c0fe57024f66471728";
+      sha256 = "1psavlldajgfvwx0jjhwdilccrhz38p880jsrddmrmfx9yq3yl5s";
     };
     meta.homepage = "https://github.com/folke/edgy.nvim/";
   };
@@ -3600,12 +3600,12 @@ final: prev:
 
   executor-nvim = buildVimPlugin {
     pname = "executor.nvim";
-    version = "2024-04-29";
+    version = "2024-07-23";
     src = fetchFromGitHub {
       owner = "google";
       repo = "executor.nvim";
-      rev = "cb60faf7486cd6edae884a58fb9c2793bc4e75ea";
-      sha256 = "0ifzy31m11spjkdi3xc42r1zp9si38zgmp43a0bdxznbm6ka5hm5";
+      rev = "5f3d7f9a986826f399128892f9519cc9507f419a";
+      sha256 = "0r2pjlzv1xldxsf40bs94xlr4mvbgjcncx45sjqjdgfgfqkbir5v";
     };
     meta.homepage = "https://github.com/google/executor.nvim/";
   };
@@ -3781,12 +3781,12 @@ final: prev:
 
   flash-nvim = buildVimPlugin {
     pname = "flash.nvim";
-    version = "2024-07-15";
+    version = "2024-07-22";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "flash.nvim";
-      rev = "25ba3f4d1e0b080213b39518ebcfbb693a23c957";
-      sha256 = "08qzxzxjr3v4djhrmgrfqsm9nznsq81p78001s1mlcbh9679qkpd";
+      rev = "34c7be146a91fec3555c33fe89c7d643f6ef5cf1";
+      sha256 = "04iqz3dlhpgqmnl31z8m4zpj6s2y51a2k8ji693s9d9fzj9y3kbl";
     };
     meta.homepage = "https://github.com/folke/flash.nvim/";
   };
@@ -3949,12 +3949,12 @@ final: prev:
 
   fugitive-gitlab-vim = buildVimPlugin {
     pname = "fugitive-gitlab.vim";
-    version = "2024-03-18";
+    version = "2024-07-25";
     src = fetchFromGitHub {
       owner = "shumphrey";
       repo = "fugitive-gitlab.vim";
-      rev = "e8dd4c9dfe8ce43503dd81286d4e80f65a978e71";
-      sha256 = "0g0mq8k8014slh9326c37fkhyx5ajmm3gzlf7aln6krqb6nh8vj5";
+      rev = "838d3a110836f511be099002ce1a71493c042615";
+      sha256 = "0v7x5df4w95qpxshbv81dglnhqgw0ind3c9zxzxf75ir8ry94g5n";
     };
     meta.homepage = "https://github.com/shumphrey/fugitive-gitlab.vim/";
   };
@@ -4033,24 +4033,24 @@ final: prev:
 
   fzf-lua = buildNeovimPlugin {
     pname = "fzf-lua";
-    version = "2024-07-17";
+    version = "2024-07-26";
     src = fetchFromGitHub {
       owner = "ibhagwan";
       repo = "fzf-lua";
-      rev = "023b95078f9cc28ce67d7a7a6b4ea1bc7cfa488d";
-      sha256 = "159xkgrvgp34446nyq5k8ngymk36mxdgrk0xy5yybbdxy90akmld";
+      rev = "769b6636af07ea4587e6c06067d8fe9fb0629390";
+      sha256 = "1q64s38vjsifc99vaa8la48wr9wd4w1gsmb2zgskpygha8fsgr1q";
     };
     meta.homepage = "https://github.com/ibhagwan/fzf-lua/";
   };
 
   fzf-vim = buildVimPlugin {
     pname = "fzf.vim";
-    version = "2024-06-06";
+    version = "2024-07-19";
     src = fetchFromGitHub {
       owner = "junegunn";
       repo = "fzf.vim";
-      rev = "279e1ec068f526e985ee7e3f62a71f083bbe0196";
-      sha256 = "11gxry27alq4fzynmzw0h2q3vjx5jc2krj1pq9q9xs7yc5fj46y5";
+      rev = "f7c7b44764a601e621432b98c85709c9a53a7be8";
+      sha256 = "11fq1c9lgkgzxxg70qd6jy8735dvbfcq9gc5bsn9xwy9yjjy03il";
     };
     meta.homepage = "https://github.com/junegunn/fzf.vim/";
   };
@@ -4225,12 +4225,12 @@ final: prev:
 
   gitsigns-nvim = buildNeovimPlugin {
     pname = "gitsigns.nvim";
-    version = "2024-07-16";
+    version = "2024-07-25";
     src = fetchFromGitHub {
       owner = "lewis6991";
       repo = "gitsigns.nvim";
-      rev = "f4928ba14eb6c667786ac7d69927f6aee6719f1e";
-      sha256 = "1pgj1dn4xdsf4rgv44n3j8rcg5rxp2f45sidzlmdrqnfp5vm6mc8";
+      rev = "f074844b60f9e151970fbcdbeb8a2cd52b6ef25a";
+      sha256 = "07q5mh82p9y6h047xifj0fpan6ny6cb56y4ghymrvq1ziahi0xcw";
     };
     meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/";
   };
@@ -4405,12 +4405,12 @@ final: prev:
 
   grug-far-nvim = buildVimPlugin {
     pname = "grug-far.nvim";
-    version = "2024-07-22";
+    version = "2024-07-26";
     src = fetchFromGitHub {
       owner = "MagicDuck";
       repo = "grug-far.nvim";
-      rev = "f9a8592b037b761fac6a327bc314e9e3eb47401e";
-      sha256 = "13aa8s9lxdjiyifj9vmbph6hl9px0spfm36my1j2h41biq5nsx5q";
+      rev = "6eb9d2a0621d6e2090de39c6f3305031d7029b93";
+      sha256 = "0dld4cbdn0y227ldrd3n2rhw1b3zm8ds84rkgxw3qqwndgh42qdl";
     };
     meta.homepage = "https://github.com/MagicDuck/grug-far.nvim/";
   };
@@ -4501,12 +4501,12 @@ final: prev:
 
   guard-nvim = buildVimPlugin {
     pname = "guard.nvim";
-    version = "2024-06-05";
+    version = "2024-07-21";
     src = fetchFromGitHub {
       owner = "nvimdev";
       repo = "guard.nvim";
-      rev = "b066152fe06122b047a6b3ce427a19d8b6e628ce";
-      sha256 = "0qcq5acnq6hgxpi9f3qsixsgvlzlaq1nmizwbanzkqgcj6ac4bzj";
+      rev = "29344aa846c793982c6fe29eee85137e3ca2c38b";
+      sha256 = "0bzglcfls8973zsip9jcfhqid0kjp1s0b03s5bdl3wqza5sac29m";
     };
     meta.homepage = "https://github.com/nvimdev/guard.nvim/";
   };
@@ -4561,12 +4561,12 @@ final: prev:
 
   hardtime-nvim = buildVimPlugin {
     pname = "hardtime.nvim";
-    version = "2024-06-10";
+    version = "2024-07-26";
     src = fetchFromGitHub {
       owner = "m4xshen";
       repo = "hardtime.nvim";
-      rev = "9a4e24fb40482dc85a93bf6cf344a030b9bf9a39";
-      sha256 = "01b34bmyw236xr8bcwwn40s6360ybmrd9lpbw0hnvkn4nsml6hi6";
+      rev = "91c6be1a54fa057002e21ae209a49436bd215355";
+      sha256 = "0i3ih3i162v6lkm9l3406j5322vyjilvhl1qvpc9d67ajs355cm4";
     };
     meta.homepage = "https://github.com/m4xshen/hardtime.nvim/";
   };
@@ -4618,18 +4618,6 @@ final: prev:
     meta.homepage = "https://github.com/mrcjkb/haskell-snippets.nvim/";
   };
 
-  haskell-tools-nvim = buildNeovimPlugin {
-    pname = "haskell-tools.nvim";
-    version = "2024-07-14";
-    src = fetchFromGitHub {
-      owner = "MrcJkb";
-      repo = "haskell-tools.nvim";
-      rev = "b003e20e99aa79bfec7c632e5ab817e1c10c8036";
-      sha256 = "18gjqnf66nxq76bcb0icihyplmzs0nwav6qpxmszqm05cm1m8l30";
-    };
-    meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/";
-  };
-
   haskell-vim = buildVimPlugin {
     pname = "haskell-vim";
     version = "2021-01-19";
@@ -5377,24 +5365,24 @@ final: prev:
 
   lazy-nvim = buildVimPlugin {
     pname = "lazy.nvim";
-    version = "2024-07-17";
+    version = "2024-07-25";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "lazy.nvim";
-      rev = "6ca90a21202808796418e46d3cebfbb5a44e54a2";
-      sha256 = "1xf02z09ah023yhzh4nzj7pvfhp5rbdyxw1zgidjyzs9yjr8xjyh";
+      rev = "077102c5bfc578693f12377846d427f49bc50076";
+      sha256 = "0yj0z62cr5ddzdl4ba2ppj1j102qfx1qfbwbh1z84p8x0zn6ppj5";
     };
     meta.homepage = "https://github.com/folke/lazy.nvim/";
   };
 
   lazydev-nvim = buildVimPlugin {
     pname = "lazydev.nvim";
-    version = "2024-07-15";
+    version = "2024-07-25";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "lazydev.nvim";
-      rev = "02f1055a777264d4b65896051ec28d0f322f7932";
-      sha256 = "0ic2ycmshr6gbl82sd0ccpnn9hkj3bi1isbyyzzncqrfsk3pkdyh";
+      rev = "491452cf1ca6f029e90ad0d0368848fac717c6d2";
+      sha256 = "1yc87wv6g19yj1gypfy4nl9irpb7zfqlw98vyaf8aqjgnpd0z60g";
     };
     meta.homepage = "https://github.com/folke/lazydev.nvim/";
   };
@@ -5413,12 +5401,12 @@ final: prev:
 
   lean-nvim = buildVimPlugin {
     pname = "lean.nvim";
-    version = "2024-07-10";
+    version = "2024-07-23";
     src = fetchFromGitHub {
       owner = "Julian";
       repo = "lean.nvim";
-      rev = "182703184edb866d7bfe878be358295e189c8223";
-      sha256 = "0ymkhg3hdk26i0if61l6vdmb3fy6xa7q635x8lnxi4a59f52bin8";
+      rev = "39f263d03812f557d34e00f0d64263a0b9cb9dd5";
+      sha256 = "1q8gjggxdikkm0gifvzdsnqa7qh45hixnglccvvvkzd44jxxi1y8";
     };
     meta.homepage = "https://github.com/Julian/lean.nvim/";
   };
@@ -5449,24 +5437,24 @@ final: prev:
 
   leap-nvim = buildVimPlugin {
     pname = "leap.nvim";
-    version = "2024-07-09";
+    version = "2024-07-25";
     src = fetchFromGitHub {
       owner = "ggandor";
       repo = "leap.nvim";
-      rev = "c099aecaf858574909bd38cbadb8543c4dd16611";
-      sha256 = "14yxi5axkgylrwkxfhfjcfvr3zy1vwa16pxafwa6mrampjqj6s68";
+      rev = "3b1d76ee9cd5a12a8f7a42f0e91124332860205c";
+      sha256 = "081ihmjqvc862hw8z2rgbj22hvm26fpigvm99f7f90si6swp1w29";
     };
     meta.homepage = "https://github.com/ggandor/leap.nvim/";
   };
 
   legendary-nvim = buildVimPlugin {
     pname = "legendary.nvim";
-    version = "2024-07-15";
+    version = "2024-07-26";
     src = fetchFromGitHub {
       owner = "mrjones2014";
       repo = "legendary.nvim";
-      rev = "0705f207ba79ee3c687fc77c451faeeb4828d5ad";
-      sha256 = "1szbymmh232fgrpccrjrjb5rzkhdg5lfigvxswhpw7b4nafvizky";
+      rev = "543bbbba4e7b54222362f312e1d2e3dac1eaae75";
+      sha256 = "0s85jl37znfc281fncsqrlrasbb121hzfqz89xi5ld46303rqzn6";
     };
     meta.homepage = "https://github.com/mrjones2014/legendary.nvim/";
   };
@@ -5809,12 +5797,12 @@ final: prev:
 
   lsp-zero-nvim = buildVimPlugin {
     pname = "lsp-zero.nvim";
-    version = "2024-06-29";
+    version = "2024-07-21";
     src = fetchFromGitHub {
       owner = "VonHeikemen";
       repo = "lsp-zero.nvim";
-      rev = "87701af045b3032515776abeb47eb8c2ddb5e679";
-      sha256 = "0ik2q2jz4ldyql3z64zr5dyi8i6qja6xsczv966fkdmsckk7r1zh";
+      rev = "56db3d5ce5476b183783160e6045f7337ba12b83";
+      sha256 = "0drk31bkws1bhjl0l2z7vmcqjn3y1bvhic78dr63j5j9wiyaxzvq";
     };
     meta.homepage = "https://github.com/VonHeikemen/lsp-zero.nvim/";
   };
@@ -5868,12 +5856,12 @@ final: prev:
 
   lspkind-nvim = buildVimPlugin {
     pname = "lspkind-nvim";
-    version = "2024-01-11";
+    version = "2024-07-25";
     src = fetchFromGitHub {
       owner = "onsails";
       repo = "lspkind.nvim";
-      rev = "1735dd5a5054c1fb7feaf8e8658dbab925f4f0cf";
-      sha256 = "0sjd244122q7hs3xaxzxhfcfpnzjz082rbnishq6khnr9w2xs0px";
+      rev = "cff4ae321a91ee3473a92ea1a8c637e3a9510aec";
+      sha256 = "0l66zyawfjy0r7rhi80skk6x156ybr72jlh4qxk0xd0l2hkbm8nl";
     };
     meta.homepage = "https://github.com/onsails/lspkind.nvim/";
   };
@@ -5953,12 +5941,12 @@ final: prev:
 
   lush-nvim = buildNeovimPlugin {
     pname = "lush.nvim";
-    version = "2024-07-09";
+    version = "2024-07-26";
     src = fetchFromGitHub {
       owner = "rktjmp";
       repo = "lush.nvim";
-      rev = "1b66ab197b177aabc2270a2c9cb8019fa5a367df";
-      sha256 = "13718awdgxas1rgxpipqk6ckjd41jf6s36f8sxn2kmqz8d07fcdd";
+      rev = "6a254139d077ad53be7e4f3602c8da0c84447fd9";
+      sha256 = "0skbhprgxc8mpny0gc6c97gz9ng65y6kcqv4qr1lnil9lpgnpsw2";
     };
     meta.homepage = "https://github.com/rktjmp/lush.nvim/";
   };
@@ -6062,12 +6050,12 @@ final: prev:
 
   mason-lspconfig-nvim = buildVimPlugin {
     pname = "mason-lspconfig.nvim";
-    version = "2024-06-12";
+    version = "2024-07-25";
     src = fetchFromGitHub {
       owner = "williamboman";
       repo = "mason-lspconfig.nvim";
-      rev = "37a336b653f8594df75c827ed589f1c91d91ff6c";
-      sha256 = "1xiv4km5m3y8znqq2a5f31fqw5aygcdr11lwpg0xrvf359z41g7i";
+      rev = "ba9c2f0b93deb48d0a99ae0e8d8dd36f7cc286d6";
+      sha256 = "1lmbd9zjc8l3210j3aq2vbqnbijydvdv8a4a85ml8f6xkzs98wz7";
     };
     meta.homepage = "https://github.com/williamboman/mason-lspconfig.nvim/";
   };
@@ -6218,12 +6206,12 @@ final: prev:
 
   mini-nvim = buildVimPlugin {
     pname = "mini.nvim";
-    version = "2024-07-15";
+    version = "2024-07-26";
     src = fetchFromGitHub {
       owner = "echasnovski";
       repo = "mini.nvim";
-      rev = "f20d8cd3a116ef65f022797de064a044b217ff53";
-      sha256 = "0caksw966j73dabxx97hyb1spfadkprc5ixrpg035i96d2hjk4m9";
+      rev = "e24ec1fcf885990fec1a993fe8304a033fd1806d";
+      sha256 = "10r0yl3gcvpa4bjb9f9r4wszf1nhf2mgarlgw4y270jvslgm2iwg";
     };
     meta.homepage = "https://github.com/echasnovski/mini.nvim/";
   };
@@ -6650,12 +6638,12 @@ final: prev:
 
   neoconf-nvim = buildVimPlugin {
     pname = "neoconf.nvim";
-    version = "2024-07-18";
+    version = "2024-07-27";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "neoconf.nvim";
-      rev = "9c9a02271a7ee2564a565a0459d5d6265fa63ade";
-      sha256 = "17x2f4w8qcdhgf521qg1s67z2626g2s37rjb60ndxhwidrylggch";
+      rev = "fa73db350690ede9ed0dab1a3d803d7d0406aa0e";
+      sha256 = "0lj79zykph3bmck0hw7bajvwkijy82k1r86xlvcx2ml1xfa39vw0";
     };
     meta.homepage = "https://github.com/folke/neoconf.nvim/";
   };
@@ -6698,36 +6686,36 @@ final: prev:
 
   neoformat = buildVimPlugin {
     pname = "neoformat";
-    version = "2024-05-30";
+    version = "2024-07-25";
     src = fetchFromGitHub {
       owner = "sbdchd";
       repo = "neoformat";
-      rev = "82864d6c7926c4f3b535a2fd7eab919b116fc969";
-      sha256 = "069bd2jh6z1yg14134s7rssnqhf5xii1knfzfn0jsd9riga5329h";
+      rev = "3d7718451514e068ae15c0fe3f6cf94ecf7fd0a4";
+      sha256 = "1bvybczfypaj74s9v8zb5qqnynanihkwiq5fy4g04q98yllajl9f";
     };
     meta.homepage = "https://github.com/sbdchd/neoformat/";
   };
 
   neogen = buildVimPlugin {
     pname = "neogen";
-    version = "2024-05-13";
+    version = "2024-07-23";
     src = fetchFromGitHub {
       owner = "danymat";
       repo = "neogen";
-      rev = "6de0add4805165317ab7d3d36b5cef48b1b865f3";
-      sha256 = "080pwb0bwnd12ypwaa5hsy7sf8ha791gic5wnq8nm8pzyxz2nbiv";
+      rev = "4a2f68d3eae0018b04132f1d4590e51484043354";
+      sha256 = "0bd6dy1fv2b18ckdvp6drlxgsdg6v5a1jwvcjwwi412ivj2jnc08";
     };
     meta.homepage = "https://github.com/danymat/neogen/";
   };
 
   neogit = buildVimPlugin {
     pname = "neogit";
-    version = "2024-07-17";
+    version = "2024-07-23";
     src = fetchFromGitHub {
       owner = "NeogitOrg";
       repo = "neogit";
-      rev = "af1d8d88f426a4da63c913f3b81a37350dbe8d02";
-      sha256 = "0210kgcdi9xpnbpmw7b6r26nhpjvj8qh4ml8w6kmswqj75vg7dqf";
+      rev = "2b74a777b963dfdeeabfabf84d5ba611666adab4";
+      sha256 = "1kbzw9z83rh210r7kgx9r6q0phji539zvrdj963g4gf438nrplib";
     };
     meta.homepage = "https://github.com/NeogitOrg/neogit/";
   };
@@ -6794,12 +6782,12 @@ final: prev:
 
   neorg = buildVimPlugin {
     pname = "neorg";
-    version = "2024-07-17";
+    version = "2024-07-25";
     src = fetchFromGitHub {
       owner = "nvim-neorg";
       repo = "neorg";
-      rev = "b04570a1bbbe80d226e459ed5f27f30fa1e2cd11";
-      sha256 = "1j3p371fcp4xvq91akwdmncmyrjwyjxp7ljnhg9p5yvcg15x9nwp";
+      rev = "1985f2d6f152622b0066f48ba8e39d157635dd38";
+      sha256 = "0r9v7djqhafnb638j5q49c9ff0b9ynsrijsxhk4zx6xrizl91jil";
     };
     meta.homepage = "https://github.com/nvim-neorg/neorg/";
   };
@@ -6915,12 +6903,12 @@ final: prev:
 
   neotest-dotnet = buildVimPlugin {
     pname = "neotest-dotnet";
-    version = "2024-06-01";
+    version = "2024-07-24";
     src = fetchFromGitHub {
       owner = "Issafalcon";
       repo = "neotest-dotnet";
-      rev = "caeb52b602fa8a5855c5839c338fb65b50a40ab3";
-      sha256 = "1w73kzljwkxdanvdqig96jmkfd2v2hjwbqn2h095dkwf71pygnbb";
+      rev = "03509791912eaeac9f993f7cf49e170eca06a8bc";
+      sha256 = "0kz7k26047mzyzsldm8ai1i4wyr7wx0rwpfqj3zh3nncns40b4nl";
     };
     meta.homepage = "https://github.com/Issafalcon/neotest-dotnet/";
   };
@@ -6964,12 +6952,12 @@ final: prev:
 
   neotest-golang = buildVimPlugin {
     pname = "neotest-golang";
-    version = "2024-07-17";
+    version = "2024-07-23";
     src = fetchFromGitHub {
       owner = "fredrikaverpil";
       repo = "neotest-golang";
-      rev = "f6657d875e9046e2f215c5480c62105dd8002f94";
-      sha256 = "1xsizbmryhac8iw7r8zs4mjycakzanq5bfdpfcl289d52rl92y0l";
+      rev = "41cf5e59ca132a5cad599867de3f154429e5c148";
+      sha256 = "18gd2ai0fnj4wvxqhik4j19fvg0ss3cwnrqx12djwpmf078cs6p0";
     };
     meta.homepage = "https://github.com/fredrikaverpil/neotest-golang/";
   };
@@ -7001,12 +6989,12 @@ final: prev:
 
   neotest-haskell = buildVimPlugin {
     pname = "neotest-haskell";
-    version = "2024-07-01";
+    version = "2024-07-21";
     src = fetchFromGitHub {
       owner = "MrcJkb";
       repo = "neotest-haskell";
-      rev = "f5614c9cf7a056f791565183f216401b28438818";
-      sha256 = "0jli4pp124ils5kxrzdba7w49jsw823rqvkjib382xa2mp5n9f3i";
+      rev = "2ba3ed5f053694e5c831922b58abec412b22539a";
+      sha256 = "1czk8m62ww8vw397dk6cz18426ibbgv56qybh34vnl9s5pqkxddd";
     };
     meta.homepage = "https://github.com/MrcJkb/neotest-haskell/";
   };
@@ -7181,12 +7169,12 @@ final: prev:
 
   neovim-ayu = buildVimPlugin {
     pname = "neovim-ayu";
-    version = "2024-06-30";
+    version = "2024-07-24";
     src = fetchFromGitHub {
       owner = "Shatur";
       repo = "neovim-ayu";
-      rev = "d64a8b7e8730095ff634e6586584e8543043e986";
-      sha256 = "0ikam4lmbi1541sy8sqbc4psblhizf40mspnwcag6q4w7g5pswh4";
+      rev = "6993189dd0ee38299879a1a0064718a8392e8713";
+      sha256 = "1fj0k6fkyk73jdjps8660nsvplwj2wasf302rbwbpbzmdvw46q6v";
     };
     meta.homepage = "https://github.com/Shatur/neovim-ayu/";
   };
@@ -7241,12 +7229,12 @@ final: prev:
 
   nerdtree = buildVimPlugin {
     pname = "nerdtree";
-    version = "2024-05-14";
+    version = "2024-07-20";
     src = fetchFromGitHub {
       owner = "preservim";
       repo = "nerdtree";
-      rev = "fbb71fcd90602e3ec77f40b864b5f9b437c496c5";
-      sha256 = "1x6gixsq9yn3afsj05wacxgh6ih00mdimjhlx8jn9cwjaxmg70v5";
+      rev = "9b465acb2745beb988eff3c1e4aa75f349738230";
+      sha256 = "1j9b7f1b1pdb2v7z0b4mnfvcir4z1ycs3l2xh4rvrl7gzhlc56y5";
     };
     meta.homepage = "https://github.com/preservim/nerdtree/";
   };
@@ -7301,12 +7289,12 @@ final: prev:
 
   nfnl = buildVimPlugin {
     pname = "nfnl";
-    version = "2024-06-22";
+    version = "2024-07-26";
     src = fetchFromGitHub {
       owner = "Olical";
       repo = "nfnl";
-      rev = "9f8fb93c70e9d759d849b45859f017b348618299";
-      sha256 = "03bhns205gd4hwwzcs094fczxwf9bzixn15lixw257579s1bh6hn";
+      rev = "608d39bb102e6bdda76ee450b042f74668184ad7";
+      sha256 = "07k0z08gq7pyadqxh2lwk3zgvxwnr7m4mgag9z2ys25449c18qkp";
     };
     meta.homepage = "https://github.com/Olical/nfnl/";
   };
@@ -7337,12 +7325,12 @@ final: prev:
 
   nightfox-nvim = buildVimPlugin {
     pname = "nightfox.nvim";
-    version = "2024-04-28";
+    version = "2024-07-22";
     src = fetchFromGitHub {
       owner = "EdenEast";
       repo = "nightfox.nvim";
-      rev = "df75a6a94910ae47854341d6b5a6fd483192c0eb";
-      sha256 = "0x58pn7lg2l1nm24ry3a42l6vpi6inf1srbanwya01x0yrm74bwp";
+      rev = "d3e8b1acc095baf57af81bb5e89fe7c4359eb619";
+      sha256 = "0z81af970w1rllh2abdvlyx63z4xkcf5jw3wy4xv99gvqa1fxryr";
     };
     meta.homepage = "https://github.com/EdenEast/nightfox.nvim/";
   };
@@ -7385,12 +7373,12 @@ final: prev:
 
   nlsp-settings-nvim = buildVimPlugin {
     pname = "nlsp-settings.nvim";
-    version = "2024-07-16";
+    version = "2024-07-25";
     src = fetchFromGitHub {
       owner = "tamago324";
       repo = "nlsp-settings.nvim";
-      rev = "8d4d994fde7d2645d74be0ed3a7411d9270d0eb4";
-      sha256 = "1fcsbmr1xw7fdgkgri890v414wpl1xy4a4hif6gjhbzl9wirg3hs";
+      rev = "46fdb3cd2dfed2b640fe3885f1fe83d91f5b0302";
+      sha256 = "07sbrr6c41dclgrqgfd1bxrzb5zjxxacmpy1qddhkv86qjn3r4rj";
     };
     meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/";
   };
@@ -7409,12 +7397,12 @@ final: prev:
 
   no-clown-fiesta-nvim = buildVimPlugin {
     pname = "no-clown-fiesta.nvim";
-    version = "2024-07-09";
+    version = "2024-07-22";
     src = fetchFromGitHub {
       owner = "aktersnurra";
       repo = "no-clown-fiesta.nvim";
-      rev = "b164c148d497b843ad7c5255fee58ea8b6c5dd41";
-      sha256 = "0dfxksaj0gn7x84nb4aqk0fvlb2j5wf5zxr310idsflhr10a35gi";
+      rev = "b63937a5ebba1ece32f56256c46d166e62aca7fc";
+      sha256 = "07h118j4y34bb8hpljrd9n6v2iz0n0vp8ijy2vfpkm4jnm1bh02b";
     };
     meta.homepage = "https://github.com/aktersnurra/no-clown-fiesta.nvim/";
   };
@@ -7445,24 +7433,24 @@ final: prev:
 
   noice-nvim = buildVimPlugin {
     pname = "noice.nvim";
-    version = "2024-07-17";
+    version = "2024-07-25";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "noice.nvim";
-      rev = "daa5f6908e97c89ca3e9861e03bdf356ea48cc72";
-      sha256 = "0qfzkpwxlzb87h4nnl5i90039dip576pz3j4wb127f30f3dh8yfg";
+      rev = "448bb9c524a7601035449210838e374a30153172";
+      sha256 = "1pxnfgcqh6b14z699akvzbq2vcvk4glfjpk5d5hybfn6fnbidapk";
     };
     meta.homepage = "https://github.com/folke/noice.nvim/";
   };
 
   none-ls-nvim = buildVimPlugin {
     pname = "none-ls.nvim";
-    version = "2024-07-17";
+    version = "2024-07-26";
     src = fetchFromGitHub {
       owner = "nvimtools";
       repo = "none-ls.nvim";
-      rev = "8b5d4170a602d7b257704eef77b0539ddfd02589";
-      sha256 = "0n99bi5pvc4jlij21nf2mlq4bv87mmfs2lyygpifxfplsikdhswl";
+      rev = "a8594ef3dabb484adabc0ebbf5800be1b807c9e7";
+      sha256 = "0gvay7gq5579iwsqd30lh38l4vyzxn5wmsprg10dpq9j3ghs4rma";
     };
     meta.homepage = "https://github.com/nvimtools/none-ls.nvim/";
   };
@@ -7553,12 +7541,12 @@ final: prev:
 
   nvchad = buildVimPlugin {
     pname = "nvchad";
-    version = "2024-07-16";
+    version = "2024-07-22";
     src = fetchFromGitHub {
       owner = "nvchad";
       repo = "nvchad";
-      rev = "b657b0ef84a6aa9a86ac05341d1bc1ab5f037ee7";
-      sha256 = "18vdqfs36cpbrjr53khx4d118i6b9f19dqhhwpnawx6fkpl5vwfs";
+      rev = "85b9f5686991a8b98c4980747f484ce155c959d0";
+      sha256 = "1kvz89x58yh10dab890bw9w6kpg9jx27b9zwljylcdkf72gp4sdj";
     };
     meta.homepage = "https://github.com/nvchad/nvchad/";
   };
@@ -7601,12 +7589,12 @@ final: prev:
 
   nvim-autopairs = buildVimPlugin {
     pname = "nvim-autopairs";
-    version = "2024-07-07";
+    version = "2024-07-23";
     src = fetchFromGitHub {
       owner = "windwp";
       repo = "nvim-autopairs";
-      rev = "78a4507bb9ffc9b00f11ae0ac48243d00cb9194d";
-      sha256 = "1fdk1l449hsshj9g02kqw30rv4ab664prnhcc9gnr6zsad65cprg";
+      rev = "e38c5d837e755ce186ae51d2c48e1b387c4425c6";
+      sha256 = "16wm535ihr8gxngx6a5xj4phz6qjshxi4nrcx2ks4bmd815gdsnv";
     };
     meta.homepage = "https://github.com/windwp/nvim-autopairs/";
   };
@@ -7709,12 +7697,12 @@ final: prev:
 
   nvim-colorizer-lua = buildVimPlugin {
     pname = "nvim-colorizer.lua";
-    version = "2024-07-16";
+    version = "2024-07-24";
     src = fetchFromGitHub {
       owner = "nvchad";
       repo = "nvim-colorizer.lua";
-      rev = "08bd34bf0ed79723f62764c7f9ca70516d461d0d";
-      sha256 = "11shpnmnlsawmqwszbdqravp9yg20hd6yid9mjnf8njdh78rzk6x";
+      rev = "194ec600488f7c7229668d0e80bd197f3a2b84ff";
+      sha256 = "19142fnhvmdaasmxjgh9bksg6c5kq71w816zjzkfwdrpydqwh3j3";
     };
     meta.homepage = "https://github.com/nvchad/nvim-colorizer.lua/";
   };
@@ -7805,12 +7793,12 @@ final: prev:
 
   nvim-dap-go = buildVimPlugin {
     pname = "nvim-dap-go";
-    version = "2024-07-04";
+    version = "2024-07-19";
     src = fetchFromGitHub {
       owner = "leoluz";
       repo = "nvim-dap-go";
-      rev = "3999f0744e80d2dba5775189fc7c7a5e9846053e";
-      sha256 = "1m77vqhpd0q3nqia42i3j7cpzjp83hr5fg46mqb3apak6b0mwmlq";
+      rev = "5030d53097fed7b75524a04048d8dbf417fa0140";
+      sha256 = "1s1g9s2gyfy3s4xnrzd980qpjigzdf4l9dp11kzlk7h26h5mhmqr";
     };
     meta.homepage = "https://github.com/leoluz/nvim-dap-go/";
   };
@@ -7853,12 +7841,12 @@ final: prev:
 
   nvim-dbee = buildVimPlugin {
     pname = "nvim-dbee";
-    version = "2024-07-06";
+    version = "2024-07-26";
     src = fetchFromGitHub {
       owner = "kndndrj";
       repo = "nvim-dbee";
-      rev = "5062efbe5dfa3c0c6a51f5112c671f6625053f39";
-      sha256 = "1d90f9562n9yv71xwksfy6rq4qasgbsmrh11pym264bzv7a2jjkr";
+      rev = "21d2cc0844a16262bb6ea93ab3d0a0f20bd87853";
+      sha256 = "10xplksglyd8af8q1cl2lxcpn52b766g87gva9fd3l66idxsds00";
     };
     meta.homepage = "https://github.com/kndndrj/nvim-dbee/";
   };
@@ -7925,12 +7913,12 @@ final: prev:
 
   nvim-genghis = buildVimPlugin {
     pname = "nvim-genghis";
-    version = "2024-07-09";
+    version = "2024-07-27";
     src = fetchFromGitHub {
       owner = "chrisgrieser";
       repo = "nvim-genghis";
-      rev = "8b10f06735e1ecef93be61347e6c083d5263b331";
-      sha256 = "1kgaf7knjjgjnx9sgnhcgc8bdcp5kjcmqgjzs7k4flc3n740bh9j";
+      rev = "8df00d9ec00e31a2280a3cfb795a30f85d1a5c2e";
+      sha256 = "0synn533v1zy87gk8762p8j9hdica9jyg9rgmwamx5yd5zg8xgcb";
     };
     meta.homepage = "https://github.com/chrisgrieser/nvim-genghis/";
   };
@@ -7961,12 +7949,12 @@ final: prev:
 
   nvim-highlite = buildVimPlugin {
     pname = "nvim-highlite";
-    version = "2024-07-09";
+    version = "2024-07-23";
     src = fetchFromGitHub {
       owner = "Iron-E";
       repo = "nvim-highlite";
-      rev = "83a6fcc41eb55db93eee37199600b547638d3a28";
-      sha256 = "0bc5i88ggpr92ar6rz352psbf9xn3n87qm3yp650yssgyg8x0sqz";
+      rev = "31f52d52a618aa16d2576da85992ee9b2d10babb";
+      sha256 = "10hm4xv9kds9sxz9302mg6ik4dhsxfzvhwm0w2qqq0y8smrnjgy7";
     };
     meta.homepage = "https://github.com/Iron-E/nvim-highlite/";
   };
@@ -8116,12 +8104,12 @@ final: prev:
 
   nvim-lspconfig = buildVimPlugin {
     pname = "nvim-lspconfig";
-    version = "2024-07-16";
+    version = "2024-07-26";
     src = fetchFromGitHub {
       owner = "neovim";
       repo = "nvim-lspconfig";
-      rev = "01e08d4bf1c35e5126b2ad5209725e4c552289ab";
-      sha256 = "1h7cri2jprb8y8hr5lrl4rqyjj02zzjhf64wfgn752dq3iwbrrwn";
+      rev = "f95d371c1a274f60392edfd8ea5121b42dca736e";
+      sha256 = "0h93s14vqrwg7gkqji1pc3p3h72niy1hdjd387mz5j62h7k6h74h";
     };
     meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
   };
@@ -8380,12 +8368,12 @@ final: prev:
 
   nvim-scrollview = buildVimPlugin {
     pname = "nvim-scrollview";
-    version = "2024-07-06";
+    version = "2024-07-21";
     src = fetchFromGitHub {
       owner = "dstein64";
       repo = "nvim-scrollview";
-      rev = "afc67708a5a5585553dee132ffbc4761bb135faf";
-      sha256 = "14qb97g5zcdvby9w8i0mqmnhcxx23d82kjf0r6hrkmpmfwxkrhnv";
+      rev = "401c0498689dcaa54b2e7483d823e33cdc051e72";
+      sha256 = "1j6y0mv56ykip6cf9n4pragqxbcb73p3zmj6n7h3ppsncs5993ma";
     };
     meta.homepage = "https://github.com/dstein64/nvim-scrollview/";
   };
@@ -8464,12 +8452,12 @@ final: prev:
 
   nvim-spider = buildVimPlugin {
     pname = "nvim-spider";
-    version = "2024-07-09";
+    version = "2024-07-21";
     src = fetchFromGitHub {
       owner = "chrisgrieser";
       repo = "nvim-spider";
-      rev = "c0f757f63da340636ff2be53e39eabc42f5fa727";
-      sha256 = "1wf43gzp2z6i42v14mhqx9yqlj1qml2n1la9y4c8sfkahdp3xxdx";
+      rev = "508b3504a350fb9a93bd0b7c0d41b8b5fc732b5e";
+      sha256 = "0bgz7jgjwv08c48fb3blzqxi68lhhj8qpw60pipcapzjhv6qxds5";
     };
     meta.homepage = "https://github.com/chrisgrieser/nvim-spider/";
   };
@@ -8524,24 +8512,24 @@ final: prev:
 
   nvim-tree-lua = buildVimPlugin {
     pname = "nvim-tree.lua";
-    version = "2024-07-11";
+    version = "2024-07-27";
     src = fetchFromGitHub {
       owner = "nvim-tree";
       repo = "nvim-tree.lua";
-      rev = "f9ff00bc06d7cb70548a3847d7a2a05e928bc988";
-      sha256 = "10vvshhl3c9vda8giqlsz3jqzn7xx8ca9c698h7q4rnbbz7s97nj";
+      rev = "82ba116bbd0cc5f0482783d67ea969595e2b381b";
+      sha256 = "0wkvzasa2bhy2wymc7v419nlz5wdsf96scnd2c3ksxgrfjq42jsc";
     };
     meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/";
   };
 
   nvim-treesitter = buildVimPlugin {
     pname = "nvim-treesitter";
-    version = "2024-07-17";
+    version = "2024-07-27";
     src = fetchFromGitHub {
       owner = "nvim-treesitter";
       repo = "nvim-treesitter";
-      rev = "0758155d4dfacfa959ad82ffa3879cb69c82e719";
-      sha256 = "04x3da891mdv5bf5nq17lwd3j8bprfj4j1q88l9hb4gydabjxzni";
+      rev = "2b4881286ad73c9ece7e5e4da130b2e4726c09fc";
+      sha256 = "0phg5vmgaiig8y15gnlklvrsfafrldsa3g84ahd0927a4yb52rw0";
     };
     meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
   };
@@ -8620,12 +8608,12 @@ final: prev:
 
   nvim-ts-autotag = buildVimPlugin {
     pname = "nvim-ts-autotag";
-    version = "2024-07-16";
+    version = "2024-07-23";
     src = fetchFromGitHub {
       owner = "windwp";
       repo = "nvim-ts-autotag";
-      rev = "1624866a1379fc1861797f0ed05899a9c1d2ff61";
-      sha256 = "1fi5df9qml6kxkv8hx2i88b9365m4r3zj7vbnml3p7qdry99yb9a";
+      rev = "dc5e1687ab76ee02e0f11c5ce137f530b36e98b3";
+      sha256 = "0x39c86cf84ap4zmk5lb1bflcrq2zqr2p3pcfd2mjbslzcdqkasp";
     };
     meta.homepage = "https://github.com/windwp/nvim-ts-autotag/";
   };
@@ -8668,12 +8656,12 @@ final: prev:
 
   nvim-web-devicons = buildVimPlugin {
     pname = "nvim-web-devicons";
-    version = "2024-06-09";
+    version = "2024-07-27";
     src = fetchFromGitHub {
       owner = "nvim-tree";
       repo = "nvim-web-devicons";
-      rev = "c0cfc1738361b5da1cd0a962dd6f774cc444f856";
-      sha256 = "1fwc0xrg07cr7x8cgksckqlkwbjl3nh0qvailp89zd35al9pzw4g";
+      rev = "a2af6aa13a2ad3ad361d562a319a91bcd68c43a4";
+      sha256 = "12q6cinxavsspc3xpir5dd6nxl7r3pqw7krpnv4i79ji1imsfq26";
     };
     meta.homepage = "https://github.com/nvim-tree/nvim-web-devicons/";
   };
@@ -8752,12 +8740,12 @@ final: prev:
 
   obsidian-nvim = buildVimPlugin {
     pname = "obsidian.nvim";
-    version = "2024-07-17";
+    version = "2024-07-26";
     src = fetchFromGitHub {
       owner = "epwalsh";
       repo = "obsidian.nvim";
-      rev = "ee298fd2136612a4ca6a745a4aec3f49ce6f94b0";
-      sha256 = "12r068x6llcf3nwwn7kwab61ihlxbc7746bw1455za2lrmbhj47g";
+      rev = "c87db615d1bcf298848a25571a659283595c62c1";
+      sha256 = "0sapas3br40vx5xbfxsps2acfhyi3w1njpi22bfjrgwg079bsdaq";
     };
     meta.homepage = "https://github.com/epwalsh/obsidian.nvim/";
   };
@@ -8800,12 +8788,12 @@ final: prev:
 
   oil-nvim = buildVimPlugin {
     pname = "oil.nvim";
-    version = "2024-07-15";
+    version = "2024-07-23";
     src = fetchFromGitHub {
       owner = "stevearc";
       repo = "oil.nvim";
-      rev = "9e5eb2fcd1dfee2ff30c89273ffff179e42034b9";
-      sha256 = "0887k1sk74mgcsr5kdbn19bl8s3slyf918684mbsl0qrsnd1m1sm";
+      rev = "71c972fbd218723a3c15afcb70421f67340f5a6d";
+      sha256 = "0cap7h95qkf34bq2abjl4l6ai28c1lwqc7g1qplga72hd1c1l48z";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/stevearc/oil.nvim/";
@@ -8981,12 +8969,12 @@ final: prev:
 
   orgmode = buildVimPlugin {
     pname = "orgmode";
-    version = "2024-07-14";
+    version = "2024-07-24";
     src = fetchFromGitHub {
       owner = "nvim-orgmode";
       repo = "orgmode";
-      rev = "85c1b443387ec4dd4eee5f7e2d837c13dd82d452";
-      sha256 = "14kwq9bll98nvmbd5mjy5rqjicjlzq1hpnrx1jrjafbvqj810qp1";
+      rev = "ab24c847538f3c36cbc0da33210cb3eba32e69b9";
+      sha256 = "15mvvi0l6cxjyy74rdkpnb1hpv21204slz11vp8g89pfvis4h38d";
     };
     meta.homepage = "https://github.com/nvim-orgmode/orgmode/";
   };
@@ -9005,12 +8993,12 @@ final: prev:
 
   otter-nvim = buildVimPlugin {
     pname = "otter.nvim";
-    version = "2024-07-16";
+    version = "2024-07-22";
     src = fetchFromGitHub {
       owner = "jmbuhr";
       repo = "otter.nvim";
-      rev = "0cd6d5a3c04a2aec73899f68fb75dfee3225499a";
-      sha256 = "087f465szjag0vp3ws97q36hw1y9bp29qbq58xdl05l38dr3v6l6";
+      rev = "837f258040d0174ff8495584088046f98499b1ac";
+      sha256 = "00hfsnpzc9lkxb35grlxf7xzh4m3v83n8am32g2mb8qn1xa9l1cy";
     };
     meta.homepage = "https://github.com/jmbuhr/otter.nvim/";
   };
@@ -9029,12 +9017,12 @@ final: prev:
 
   overseer-nvim = buildVimPlugin {
     pname = "overseer.nvim";
-    version = "2024-07-15";
+    version = "2024-07-23";
     src = fetchFromGitHub {
       owner = "stevearc";
       repo = "overseer.nvim";
-      rev = "87526babdb563b9e2f0646b420359389732326dc";
-      sha256 = "1n1g0smrv07vr91j6ldzl3pi3gw42009276knrygs4qxsbbcfald";
+      rev = "cbcdcbae3704c21d3ff96a1927d952b8a966b08a";
+      sha256 = "0fn57csqmj946rjr5dypcngbpbjh0pay1b1ncc7ij310invgf7kq";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/stevearc/overseer.nvim/";
@@ -9174,12 +9162,12 @@ final: prev:
 
   persistence-nvim = buildVimPlugin {
     pname = "persistence.nvim";
-    version = "2024-07-15";
+    version = "2024-07-22";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "persistence.nvim";
-      rev = "40a137dd9240c9c6760c53df48d2b155f52c252b";
-      sha256 = "0ygr5f3zj1gmmr50aagr88hd46jr22bz4b3dhz6bfgv1pa60bgyw";
+      rev = "f6aad7dde7fcf54148ccfc5f622c6d5badd0cc3d";
+      sha256 = "01sm0dyq3k939qf91hx8nldpj9kik4s6s2z6mahmqjh5ghday6a1";
     };
     meta.homepage = "https://github.com/folke/persistence.nvim/";
   };
@@ -9246,12 +9234,12 @@ final: prev:
 
   plantuml-syntax = buildVimPlugin {
     pname = "plantuml-syntax";
-    version = "2024-06-24";
+    version = "2024-07-25";
     src = fetchFromGitHub {
       owner = "aklt";
       repo = "plantuml-syntax";
-      rev = "1592944444513c208ab5a087397ba987932af750";
-      sha256 = "0j45p1f8kxgmbw8kmcvvyby082vk8dgyb2q7vscsy8zvmqszcm24";
+      rev = "8fb95a3ae4354ca2322ef24803d8960fce519eb0";
+      sha256 = "1wgr7847fhhq5m062cprdxpnbq3ldsywysa3hbsrvs36r63cxvm5";
     };
     meta.homepage = "https://github.com/aklt/plantuml-syntax/";
   };
@@ -9560,23 +9548,23 @@ final: prev:
 
   rainbow = buildVimPlugin {
     pname = "rainbow";
-    version = "2022-10-08";
+    version = "2024-07-27";
     src = fetchFromGitHub {
       owner = "luochen1990";
       repo = "rainbow";
-      rev = "61f719aebe0dc5c3048330c50db72cfee1afdd34";
-      sha256 = "0q6ynkv08b4rlns6gzrkwxrihykpadcrln8ckbcwmsv97injhxws";
+      rev = "76ca1a20aa42edb5c65c19029968aad4625790dc";
+      sha256 = "0wa4ayv7j68mighx9gacqrmxv131c21cqngr4f0qffnxrl0y04bl";
     };
     meta.homepage = "https://github.com/luochen1990/rainbow/";
   };
 
   rainbow-delimiters-nvim = buildVimPlugin {
     pname = "rainbow-delimiters.nvim";
-    version = "2024-07-07";
+    version = "2024-07-25";
     src = fetchgit {
       url = "https://gitlab.com/HiPhish/rainbow-delimiters.nvim";
-      rev = "b29da4a6061a88270e875b38367d82c04c856128";
-      sha256 = "0iy1vjp2a9w46q5cwswv8j5j06fz8898f2bh4zc8n14i2acxp1w1";
+      rev = "960cce4eba798748baff3892a62f2c2b210fb76b";
+      sha256 = "0zc59s3sviskzjym9pxjirahjy92mb2amx2maili2sy5x9b7r46f";
     };
     meta.homepage = "https://gitlab.com/HiPhish/rainbow-delimiters.nvim";
   };
@@ -9655,12 +9643,12 @@ final: prev:
 
   refactoring-nvim = buildVimPlugin {
     pname = "refactoring.nvim";
-    version = "2024-07-05";
+    version = "2024-07-26";
     src = fetchFromGitHub {
       owner = "theprimeagen";
       repo = "refactoring.nvim";
-      rev = "d07218748c48e756c27aa6859bfa6e62a3d271af";
-      sha256 = "14ckyn81czdiymsk8gvjjpaz10ny9232qb118fdl311q1ln794fk";
+      rev = "274fdd505ea19a10d14b7564b6d293408845091b";
+      sha256 = "0qwj904137qmiwzbyx73h45hhdi4yb5164a40jdysxz50nkch8fb";
     };
     meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/";
   };
@@ -10064,12 +10052,12 @@ final: prev:
 
   smart-splits-nvim = buildVimPlugin {
     pname = "smart-splits.nvim";
-    version = "2024-07-15";
+    version = "2024-07-26";
     src = fetchFromGitHub {
       owner = "mrjones2014";
       repo = "smart-splits.nvim";
-      rev = "44145a4b37217348293fe457992cc38cf3b19f33";
-      sha256 = "1xaycgpfq5l3bfks7fw1s5cci9raaama3jj3dfgym4qslff7iykn";
+      rev = "209c136a5bee236094245196986ce94920dd3fdf";
+      sha256 = "1iwmadjdp0h8j32dh16qz95mhphs095h5q2jbr7r88i5gdhhfn3r";
     };
     meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/";
   };
@@ -10280,12 +10268,12 @@ final: prev:
 
   splitjoin-vim = buildVimPlugin {
     pname = "splitjoin.vim";
-    version = "2024-03-17";
+    version = "2024-07-19";
     src = fetchFromGitHub {
       owner = "AndrewRadev";
       repo = "splitjoin.vim";
-      rev = "9b0c30f61f13ba4800a11107648bdd748ad511ba";
-      sha256 = "15a3ib947yihdbc9i2i1a8ml4vhfff26lj5y0z7192g8qhw58qlh";
+      rev = "dfd979d34d29e49478562f599609a12ae3b15fd4";
+      sha256 = "0h882vg2qq66lnr6cz8kdh3f3sfzjf58c2phwvzy5wl933wh41sl";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/";
@@ -10425,12 +10413,12 @@ final: prev:
 
   styler-nvim = buildVimPlugin {
     pname = "styler.nvim";
-    version = "2024-07-15";
+    version = "2024-07-22";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "styler.nvim";
-      rev = "6a119fa1104b5fb1d6f768e2d4b5d10efb3ee3e5";
-      sha256 = "1wb06dypm85l15ybfmp4vxwi7qjpk64yjyns2mjwbg43ki22jyy5";
+      rev = "cd616580f206d929a319987f8f9aa7e0bd6f11ef";
+      sha256 = "1m2g22csdz89l1yz1wjralrd9dljmms0zjwvan9ib1dil54l82jg";
     };
     meta.homepage = "https://github.com/folke/styler.nvim/";
   };
@@ -10691,12 +10679,12 @@ final: prev:
 
   tagbar = buildVimPlugin {
     pname = "tagbar";
-    version = "2024-06-06";
+    version = "2024-07-24";
     src = fetchFromGitHub {
       owner = "preservim";
       repo = "tagbar";
-      rev = "0815b5455c792a610d28ff3e7981642c9cf05d62";
-      sha256 = "1vdj7ardgbmpj9qjfb5r2yp5avscny6v14p6552jphbyqkczd9pb";
+      rev = "1690b19ea62a8c9fef68a2c35896910338a1dfe5";
+      sha256 = "0w0z2wxcskxqkikml7667qx8pqnm3ggrvf3r1gwkg7rkvwnacm3j";
     };
     meta.homepage = "https://github.com/preservim/tagbar/";
   };
@@ -10824,24 +10812,24 @@ final: prev:
 
   telescope-file-browser-nvim = buildVimPlugin {
     pname = "telescope-file-browser.nvim";
-    version = "2024-06-09";
+    version = "2024-07-21";
     src = fetchFromGitHub {
       owner = "nvim-telescope";
       repo = "telescope-file-browser.nvim";
-      rev = "a7ab9a957b17199183388c6f357d614fcaa508e5";
-      sha256 = "0g3wh4bspjwmzrd0gl5wwkm6lscbaih8jqzhxzlnbbxk8aky75fr";
+      rev = "8574946bf6d0d820d7f600f3db808f5900a2ae23";
+      sha256 = "145jssc1agd8cw49p3l781lsphym74gn3kjlfl35c6j7bhkhmyvc";
     };
     meta.homepage = "https://github.com/nvim-telescope/telescope-file-browser.nvim/";
   };
 
   telescope-frecency-nvim = buildVimPlugin {
     pname = "telescope-frecency.nvim";
-    version = "2024-07-15";
+    version = "2024-07-26";
     src = fetchFromGitHub {
       owner = "nvim-telescope";
       repo = "telescope-frecency.nvim";
-      rev = "bb2c63ee5375ede81c1945b58638412af42b2d62";
-      sha256 = "0slkmdwqrfmzg1n6xfbnac9xglbqi6bkp3fwm70sr12nsmkph3qv";
+      rev = "cef01dee8bd07540216c4e4bf429565a86f68d6d";
+      sha256 = "0wx1kmdxpfy6iyypq4pjig4bsq8vmjkzvax4l23mwz4h9nr7kj84";
     };
     meta.homepage = "https://github.com/nvim-telescope/telescope-frecency.nvim/";
   };
@@ -10921,12 +10909,12 @@ final: prev:
 
   telescope-manix = buildNeovimPlugin {
     pname = "telescope-manix";
-    version = "2024-07-01";
+    version = "2024-07-21";
     src = fetchFromGitHub {
       owner = "MrcJkb";
       repo = "telescope-manix";
-      rev = "d2c8fee183d6b414128acf376f5c8d3c250ae225";
-      sha256 = "1awha1dscjjxf10nha3i8mmmv44m1b99k77ap9p33s4whrmxfd2h";
+      rev = "836c9690b1ec6b09d0eebc43e2f2b88561191648";
+      sha256 = "1ydvlvvr0ph1qd8lad41gw8dcm769wsa65gyy1ybsys92yzlbn2q";
     };
     meta.homepage = "https://github.com/MrcJkb/telescope-manix/";
   };
@@ -11078,12 +11066,12 @@ final: prev:
 
   telescope-nvim = buildNeovimPlugin {
     pname = "telescope.nvim";
-    version = "2024-07-01";
+    version = "2024-07-26";
     src = fetchFromGitHub {
       owner = "nvim-telescope";
       repo = "telescope.nvim";
-      rev = "bfcc7d5c6f12209139f175e6123a7b7de6d9c18a";
-      sha256 = "1ysbn67rlf2p63pp8155198a5v0hv5cn2bbhdjz9r5255y5f19sk";
+      rev = "10b8a82b042caf50b78e619d92caf0910211973d";
+      sha256 = "0i6znzbcv5m87nakhqdqn5cfkghdhbfww5avd0x8m25a2lkgl77g";
     };
     meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/";
   };
@@ -11198,12 +11186,12 @@ final: prev:
 
   text-case-nvim = buildVimPlugin {
     pname = "text-case.nvim";
-    version = "2024-07-16";
+    version = "2024-07-25";
     src = fetchFromGitHub {
       owner = "johmsalas";
       repo = "text-case.nvim";
-      rev = "13daf28a829e6d0646904c94214cb289bb0c6f34";
-      sha256 = "15i74y64vdr6q5jq40p8n0mfp5xacb8dc9ar51vfcmzv6m3awv42";
+      rev = "629d4a2f8377505ebc75a275d6319202c0b74385";
+      sha256 = "15dcf2rpgc0hpnjd9n5qy5i98nabn3nk5j4y7r3zhdiap675y24k";
     };
     meta.homepage = "https://github.com/johmsalas/text-case.nvim/";
   };
@@ -11306,12 +11294,12 @@ final: prev:
 
   todo-comments-nvim = buildVimPlugin {
     pname = "todo-comments.nvim";
-    version = "2024-07-15";
+    version = "2024-07-22";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "todo-comments.nvim";
-      rev = "96fee098a90e7c09c9811aa7df71d773ba8b9b53";
-      sha256 = "1xc4y7fa8ax1affyqkdil2lbdhbwvfnfpv3ykjcdzcgy23i13n8g";
+      rev = "8f45f353dc3649cb9b44cecda96827ea88128584";
+      sha256 = "0f6ranmfx33cvymigxyvrz4f8jb8k2k9mhlq7fqi5bl1ash0add7";
     };
     meta.homepage = "https://github.com/folke/todo-comments.nvim/";
   };
@@ -11343,12 +11331,12 @@ final: prev:
 
   tokyonight-nvim = buildVimPlugin {
     pname = "tokyonight.nvim";
-    version = "2024-07-18";
+    version = "2024-07-24";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "tokyonight.nvim";
-      rev = "2e41c5fe8a399868b73080d0efa15af2836fcaf7";
-      sha256 = "1w5sqs7fg6i93j9qb4kk6g99w1yj8ax832g63i5973ix8c0k2pq8";
+      rev = "b0e7c7382a7e8f6456f2a95655983993ffda745e";
+      sha256 = "0l61q9mardc0p0pg6vrmp08man2mah385ldq1kpkc19y7s9s85hp";
     };
     meta.homepage = "https://github.com/folke/tokyonight.nvim/";
   };
@@ -11440,12 +11428,12 @@ final: prev:
 
   trouble-nvim = buildVimPlugin {
     pname = "trouble.nvim";
-    version = "2024-07-15";
+    version = "2024-07-22";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "trouble.nvim";
-      rev = "bf99ea71a39e322336b7f8be965f86dbf5c65540";
-      sha256 = "0s3y90pvf1k6zkvar9rc7276h1ic6400ziry9dnmzdqxm1ay1y26";
+      rev = "6efc446226679fda0547c0fd6a7892fd5f5b15d8";
+      sha256 = "0s0b462qzhsamnhvxnzm9lj1fxp0q28w94aa34hf9ayarn4fpgvm";
     };
     meta.homepage = "https://github.com/folke/trouble.nvim/";
   };
@@ -11476,12 +11464,12 @@ final: prev:
 
   ts-comments-nvim = buildVimPlugin {
     pname = "ts-comments.nvim";
-    version = "2024-07-15";
+    version = "2024-07-24";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "ts-comments.nvim";
-      rev = "80eec3b9663ac3c4743b584f361099b061d0a9e5";
-      sha256 = "0ax5sgpqimsnh852y0g8v870kvwdra369nsb7p4xzsja4wyjyddl";
+      rev = "98d7d4dec0af1312d38e288f800bbf6ff562b6ab";
+      sha256 = "12g6rwrj67wk4fxxl31rsras5jw6a73xngrazlw095xhz6sd9l71";
     };
     meta.homepage = "https://github.com/folke/ts-comments.nvim/";
   };
@@ -11512,12 +11500,12 @@ final: prev:
 
   twilight-nvim = buildVimPlugin {
     pname = "twilight.nvim";
-    version = "2024-07-15";
+    version = "2024-07-22";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "twilight.nvim";
-      rev = "38dc017474ef05605ca14a2577e01e09f0db7133";
-      sha256 = "1vrwh70jz0f0rxb4i2wfmjdhb3xpc4bhqxivld8q6cp2x3k4k2vf";
+      rev = "1584c0b0a979b71fd86b18d302ba84e9aba85b1b";
+      sha256 = "16j4psdap33dlamnjn8895bqn92rlbzm1c9gpv3yihqh15546bxh";
     };
     meta.homepage = "https://github.com/folke/twilight.nvim/";
   };
@@ -11572,12 +11560,12 @@ final: prev:
 
   ultimate-autopair-nvim = buildVimPlugin {
     pname = "ultimate-autopair.nvim";
-    version = "2024-06-10";
+    version = "2024-07-24";
     src = fetchFromGitHub {
       owner = "altermo";
       repo = "ultimate-autopair.nvim";
-      rev = "035d92eab05ac1390afef7204e3fcad9a50fa443";
-      sha256 = "086lmfrllhnlx5c6ksi0lx287zfi86vlazy69sqb0876d0lfn2gs";
+      rev = "0a501a22b587cc98531fcb617bf8cda29cb2dc11";
+      sha256 = "1c58y7w6wils78lqf3csgghdkhh5249zgri3n9cicdm8f499zgl6";
     };
     meta.homepage = "https://github.com/altermo/ultimate-autopair.nvim/";
   };
@@ -11608,24 +11596,24 @@ final: prev:
 
   unicode-vim = buildVimPlugin {
     pname = "unicode.vim";
-    version = "2023-09-20";
+    version = "2024-07-23";
     src = fetchFromGitHub {
       owner = "chrisbra";
       repo = "unicode.vim";
-      rev = "bc20d0fb3331a7b41708388c56bb8221c2104da7";
-      sha256 = "1nrx791gj66sky9bb039n7hwkvcic7wr1nrrb1vrx1sgqmwfpy6f";
+      rev = "9da92ffe08b90200dcb499fdfecb234326f5514c";
+      sha256 = "0bnnhbf006jwzzn9j08swgn16sd8qh669kzm7272mywl60s0q3hx";
     };
     meta.homepage = "https://github.com/chrisbra/unicode.vim/";
   };
 
   unison = buildVimPlugin {
     pname = "unison";
-    version = "2024-07-16";
+    version = "2024-07-26";
     src = fetchFromGitHub {
       owner = "unisonweb";
       repo = "unison";
-      rev = "525e923467a7ce0c3cd07bc1341e093ddf44f053";
-      sha256 = "1ljclhw5imhjxwzrgiw8yipfmc8bc1fi3rh0705rv3mrn5bxky91";
+      rev = "f5595763db4bc931f851a8139009009a1ffd04b1";
+      sha256 = "1937mziylksh6fnisk0hq07d4570fyimhj0czf6pm10dxm19d74a";
     };
     meta.homepage = "https://github.com/unisonweb/unison/";
   };
@@ -11740,12 +11728,12 @@ final: prev:
 
   vim-CtrlXA = buildVimPlugin {
     pname = "vim-CtrlXA";
-    version = "2024-06-07";
+    version = "2024-07-21";
     src = fetchFromGitHub {
       owner = "Konfekt";
       repo = "vim-CtrlXA";
-      rev = "afab3d2479bcf97f4c4cadf72db7e28a4db56873";
-      sha256 = "1bfwggqm33a9jg8q2yzljjcjypgwpwkf3v0ip96m7q4hg65wvbma";
+      rev = "084d00284f532eab511a771f21a184d2024a9e46";
+      sha256 = "197a13nnvq4w81l0c2bimfgwxdxxsqjzghmh901z1665y919fc5m";
     };
     meta.homepage = "https://github.com/Konfekt/vim-CtrlXA/";
   };
@@ -12076,12 +12064,12 @@ final: prev:
 
   vim-airline = buildVimPlugin {
     pname = "vim-airline";
-    version = "2024-06-16";
+    version = "2024-07-23";
     src = fetchFromGitHub {
       owner = "vim-airline";
       repo = "vim-airline";
-      rev = "02894b6ef4752afd8579fc837aec5fb4f62409f7";
-      sha256 = "07jxqibg8zdir3w5lq2ibjvf6zw9b9386y9pwybgzg91c9pvd9xk";
+      rev = "d25c049e617775eb2eb26c580e5dec591c94d480";
+      sha256 = "0pq63f30cqsbq4q669h6ps64hxz05a2b7z3i09lfj0fpa1a27p0h";
     };
     meta.homepage = "https://github.com/vim-airline/vim-airline/";
   };
@@ -12796,24 +12784,24 @@ final: prev:
 
   vim-dadbod-completion = buildVimPlugin {
     pname = "vim-dadbod-completion";
-    version = "2024-07-15";
+    version = "2024-07-27";
     src = fetchFromGitHub {
       owner = "kristijanhusak";
       repo = "vim-dadbod-completion";
-      rev = "c3a56c652af9367c5a7b658ed7ed4dc494f430b0";
-      sha256 = "02h30qsciyb2slsff4zyddgzskccai9afrg0sx67pkbbhsf90nmm";
+      rev = "7204845f9c4bbd60a77ae40375661819b764020b";
+      sha256 = "0cyin1p0n8m3qlhz3w7c60sh8x4pwpza5ff6zmkrgf1r75ksqy7c";
     };
     meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-completion/";
   };
 
   vim-dadbod-ui = buildVimPlugin {
     pname = "vim-dadbod-ui";
-    version = "2024-07-15";
+    version = "2024-07-22";
     src = fetchFromGitHub {
       owner = "kristijanhusak";
       repo = "vim-dadbod-ui";
-      rev = "954877c3396ad4bf5624fcbe7b5673ac43cd0928";
-      sha256 = "1hd0ckq5rq28i1fi0wl0vf1an8am6wvv538bbp86bwi4a9qrcflc";
+      rev = "0f51d8de368c8c6220973e8acd156d17da746f4c";
+      sha256 = "1pb61wwm7vma4dilxryyf1bzq05yh35chlnqfng0wxr9b9hj8r7r";
     };
     meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-ui/";
   };
@@ -13036,12 +13024,12 @@ final: prev:
 
   vim-elixir = buildVimPlugin {
     pname = "vim-elixir";
-    version = "2024-07-09";
+    version = "2024-07-22";
     src = fetchFromGitHub {
       owner = "elixir-editors";
       repo = "vim-elixir";
-      rev = "84a0de7f53d80dc01f63fd6819e412d061e6a67c";
-      sha256 = "1zv3xy3p0315nwnliyr06p03ghpmygf5af5n6psrz57m7czlb2s7";
+      rev = "753fc863e488bd09580221d7829c3e4735a99fdb";
+      sha256 = "0bzhbsnpabln2p6r1ns6dmxb6x01jy002y60w8ah49qjn6qnmk1n";
     };
     meta.homepage = "https://github.com/elixir-editors/vim-elixir/";
   };
@@ -13204,12 +13192,12 @@ final: prev:
 
   vim-fetch = buildVimPlugin {
     pname = "vim-fetch";
-    version = "2023-05-29";
+    version = "2024-07-26";
     src = fetchFromGitHub {
       owner = "wsdjeg";
       repo = "vim-fetch";
-      rev = "bbb75c3172f766d1a62832df0ec7674c69a560ad";
-      sha256 = "1mcn4a7n1318sgi3dd062sh1sy2b8sa4inwklcz2gh095lr9i323";
+      rev = "db3fd95eb0cf7e7e9effa1338b286db33e4a36c1";
+      sha256 = "1br13ih1ybx5dnj8aax6lf0s970vy43s9swwrxqn411ihcrclqz6";
     };
     meta.homepage = "https://github.com/wsdjeg/vim-fetch/";
   };
@@ -13300,12 +13288,12 @@ final: prev:
 
   vim-flog = buildVimPlugin {
     pname = "vim-flog";
-    version = "2024-06-13";
+    version = "2024-07-25";
     src = fetchFromGitHub {
       owner = "rbong";
       repo = "vim-flog";
-      rev = "255631abf7ea132393fc7dd745d6911c37ac6a4c";
-      sha256 = "0k92fs7wq1yhbwgf29awv70k06nb36x375b4rjwc4sf559i223mc";
+      rev = "83cd74b03d1b2a7122334e277b7a3a188686a59c";
+      sha256 = "04s4zhnls4v0dj7njg8mr73ln5kiv48whrbf865kq71kfvmjcjqd";
     };
     meta.homepage = "https://github.com/rbong/vim-flog/";
   };
@@ -13360,12 +13348,12 @@ final: prev:
 
   vim-fugitive = buildVimPlugin {
     pname = "vim-fugitive";
-    version = "2024-07-05";
+    version = "2024-07-18";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-fugitive";
-      rev = "8c8cdf4405cb8bdb70dd9812a33bb52363a87dbc";
-      sha256 = "1njc46mdvpipci7l2gcljsi0nxxjzwjr7s8pfkvr2l25bi3irz09";
+      rev = "0444df68cd1cdabc7453d6bd84099458327e5513";
+      sha256 = "0sx67lwz1f6kd2751qbbzpgq0hjik1g8x4svp788yvzbjdgdmc9l";
     };
     meta.homepage = "https://github.com/tpope/vim-fugitive/";
   };
@@ -13552,12 +13540,12 @@ final: prev:
 
   vim-graphql = buildVimPlugin {
     pname = "vim-graphql";
-    version = "2024-07-11";
+    version = "2024-07-18";
     src = fetchFromGitHub {
       owner = "jparise";
       repo = "vim-graphql";
-      rev = "278526b656404903d64d39f129284e421cc1bdad";
-      sha256 = "0rsgmpimcbm6f9cp113acvfz0wg4ignyc2ayllr11668k9naqndr";
+      rev = "e1576c481d3102d7d30e131c73d15c4baac2cfa2";
+      sha256 = "0v9piz33p336rk9lar4ghlphwxan71ibsxdrbc20b4r1vhfcivpf";
     };
     meta.homepage = "https://github.com/jparise/vim-graphql/";
   };
@@ -14118,12 +14106,12 @@ final: prev:
 
   vim-just = buildVimPlugin {
     pname = "vim-just";
-    version = "2024-07-15";
+    version = "2024-07-18";
     src = fetchFromGitHub {
       owner = "NoahTheDuke";
       repo = "vim-just";
-      rev = "5dd22247ea21fa0d7d7bc258ade827c5c777b716";
-      sha256 = "1m8m01gc19rm2bjfwg1svx9xahx2g9kd93qlrdh5qxf6vilhg41g";
+      rev = "3143de2ee5b784d99e5322fd3382823ce8eb845c";
+      sha256 = "1fykswvc2qparxzyvyikm7px6z5k1nppp40jwx1zlmc2q11sjpjf";
     };
     meta.homepage = "https://github.com/NoahTheDuke/vim-just/";
   };
@@ -14346,12 +14334,12 @@ final: prev:
 
   vim-lsp = buildVimPlugin {
     pname = "vim-lsp";
-    version = "2024-06-20";
+    version = "2024-07-20";
     src = fetchFromGitHub {
       owner = "prabirshrestha";
       repo = "vim-lsp";
-      rev = "a8f244a4e9527992acd89c578933ad1d3940d276";
-      sha256 = "1xxgyawfr3lw5qqgkalajmnanz4n1dmbw1fyv362b72jg7h19fh5";
+      rev = "6b7aabde99c409a3c04e1a7d80bbd1b0000c4158";
+      sha256 = "0zz9g1wbz6391ilr7xdpknn132p9vx7nyn6pp89jg8h6jr8f44lv";
     };
     meta.homepage = "https://github.com/prabirshrestha/vim-lsp/";
   };
@@ -14382,12 +14370,12 @@ final: prev:
 
   vim-lsp-settings = buildVimPlugin {
     pname = "vim-lsp-settings";
-    version = "2024-07-14";
+    version = "2024-07-25";
     src = fetchFromGitHub {
       owner = "mattn";
       repo = "vim-lsp-settings";
-      rev = "4bb4c92db42ff9f96868578195af6726c92d5126";
-      sha256 = "14ysapcq9bnv6k4qhcz31zfra41c0s89xm7lx4ymr3h9ymdj2sgb";
+      rev = "65749446c8c8556d0c287bcd724084a625913d02";
+      sha256 = "1lzxbb8yz92h3fkbsc9ccim6pdnjfj4hdxs6b0iiqi8qq7a87wf1";
     };
     meta.homepage = "https://github.com/mattn/vim-lsp-settings/";
   };
@@ -15007,12 +14995,12 @@ final: prev:
 
   vim-pandoc = buildVimPlugin {
     pname = "vim-pandoc";
-    version = "2023-12-18";
+    version = "2024-07-22";
     src = fetchFromGitHub {
       owner = "vim-pandoc";
       repo = "vim-pandoc";
-      rev = "fae27ec62606b6b914de5270985a69d1b5da1287";
-      sha256 = "139lg369mrh0zkk3bh1fgp2iz54m8fjp7rgyy3j25ivylna5lzn8";
+      rev = "bd11902651edc18076f90ed291581d785be52311";
+      sha256 = "0aj0gsn2q5dqx9faky7fpqz93h6yih46dn7mn9gm80sdlv575gix";
     };
     meta.homepage = "https://github.com/vim-pandoc/vim-pandoc/";
   };
@@ -15595,12 +15583,12 @@ final: prev:
 
   vim-sentence-chopper = buildVimPlugin {
     pname = "vim-sentence-chopper";
-    version = "2024-03-08";
+    version = "2024-07-23";
     src = fetchFromGitHub {
       owner = "Konfekt";
       repo = "vim-sentence-chopper";
-      rev = "b1394d3dbc3675324b2735c12f0df99395d9d7ba";
-      sha256 = "12llyn54qmbwzvn3m08r8k1fp6xwqp71sbbkp9j587kd4d6y5kps";
+      rev = "0657aaa3f3b1acffde94f6eb6b08b106d8cf8162";
+      sha256 = "1yk56gnljl7356m3vi6r0vvxzs0clpivdhs7kbc3x982jhm96vv2";
     };
     meta.homepage = "https://github.com/Konfekt/vim-sentence-chopper/";
   };
@@ -16544,12 +16532,12 @@ final: prev:
 
   vim-wakatime = buildVimPlugin {
     pname = "vim-wakatime";
-    version = "2024-04-29";
+    version = "2024-07-20";
     src = fetchFromGitHub {
       owner = "wakatime";
       repo = "vim-wakatime";
-      rev = "3cb40867cb5a3120f9bef76eff88edc7f1dc1a23";
-      sha256 = "0cikyb55z31jnh3zvm3xf8skfqdvdg3ihhb1z8xc1cxhx9gyc4hz";
+      rev = "53bba6bb8342de9cbdafc82142a9b5e82008d858";
+      sha256 = "02q2fyinapfr8y0fndv3q7x6ri42nlvpy6qc7cklszx77q4y0a89";
     };
     meta.homepage = "https://github.com/wakatime/vim-wakatime/";
   };
@@ -16856,12 +16844,12 @@ final: prev:
 
   vimspector = buildVimPlugin {
     pname = "vimspector";
-    version = "2024-06-09";
+    version = "2024-07-24";
     src = fetchFromGitHub {
       owner = "puremourning";
       repo = "vimspector";
-      rev = "ee3bd0120525978521168eda1c3a64ef24e3cb86";
-      sha256 = "0g2zxgafxr90cmc8anvr0d5wkvzbpba8b6jblsdnq93648p38qx8";
+      rev = "5b98bc8cf8341bf18c553cdfe71a711f900009ab";
+      sha256 = "1z1hhdvnw6ny87hz9xpl66nb9lz2ggw9dwqr4gv01b38wpkwysm8";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/puremourning/vimspector/";
@@ -16869,12 +16857,12 @@ final: prev:
 
   vimtex = buildVimPlugin {
     pname = "vimtex";
-    version = "2024-07-12";
+    version = "2024-07-24";
     src = fetchFromGitHub {
       owner = "lervag";
       repo = "vimtex";
-      rev = "80c9bc179784c30192d482741a43f176c859daa1";
-      sha256 = "0kkmyh51x5rfi1yrdl7cw5b4g3y6066kb01kjqmq08wf22zlldk3";
+      rev = "5ac62e0315c6f54f53a7d6da7c485cf8e9cf7240";
+      sha256 = "0kj1nc86qib6n58ds18aiszbnfgqbjk92d5lcpypf1fcfjvyvv84";
     };
     meta.homepage = "https://github.com/lervag/vimtex/";
   };
@@ -17013,12 +17001,12 @@ final: prev:
 
   which-key-nvim = buildVimPlugin {
     pname = "which-key.nvim";
-    version = "2024-07-17";
+    version = "2024-07-24";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "which-key.nvim";
-      rev = "ed5f7622771d0b5c0ac3a5e286ec6cd17b6be131";
-      sha256 = "0qas00zikybrkp0js9r4vgx7p2znpilsflfjy144baw9fh44bij6";
+      rev = "6c1584eb76b55629702716995cca4ae2798a9cca";
+      sha256 = "0qwwj4r5hvsmsjz352aqa4hv3f9pms6r67c4yh5imn5iyvinrzwy";
     };
     meta.homepage = "https://github.com/folke/which-key.nvim/";
   };
@@ -17049,12 +17037,12 @@ final: prev:
 
   wiki-vim = buildVimPlugin {
     pname = "wiki.vim";
-    version = "2024-07-10";
+    version = "2024-07-24";
     src = fetchFromGitHub {
       owner = "lervag";
       repo = "wiki.vim";
-      rev = "d65fcef243d273787106a1328ff5cad5b1e2a918";
-      sha256 = "0lmz6q9h68zsbgz8nmmlkhbdvhxcdcki8hmk75mzcj7w20vdy6p4";
+      rev = "574f3a3075aa7013160bef3e44489454ce768ba7";
+      sha256 = "1q0dyrx8scpgaibi65dfl3d0zq4wpjgz9kkjacwqwsaziiyjxf1i";
     };
     meta.homepage = "https://github.com/lervag/wiki.vim/";
   };
@@ -17242,13 +17230,12 @@ final: prev:
 
   yazi-nvim = buildVimPlugin {
     pname = "yazi.nvim";
-    version = "2024-07-17";
+    version = "2024-07-27";
     src = fetchFromGitHub {
       owner = "mikavilpas";
       repo = "yazi.nvim";
-      rev = "6d572672311e612a982e95617e6f507b6ec11555";
-      sha256 = "020avafa96rqgakk85nbq5zjg7yc1pgmrgdlgmkhm0z4ny3b4miz";
-      fetchSubmodules = true;
+      rev = "3a556935ed83de2a9e5a9c81446c7983b9248f9a";
+      sha256 = "1nmg6mnp7xj9zwss3qyhjrqw60cxivj5v8rs1g48l0ls9yqmlrz1";
     };
     meta.homepage = "https://github.com/mikavilpas/yazi.nvim/";
   };
@@ -17303,12 +17290,12 @@ final: prev:
 
   zen-mode-nvim = buildVimPlugin {
     pname = "zen-mode.nvim";
-    version = "2024-07-15";
+    version = "2024-07-22";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "zen-mode.nvim";
-      rev = "a31cf7113db34646ca320f8c2df22cf1fbfc6f2a";
-      sha256 = "0g862r4k0qqb5h8gxd9ys1n2ksdzwg375l6p69qw4h3k17f7dbzc";
+      rev = "29b292bdc58b76a6c8f294c961a8bf92c5a6ebd6";
+      sha256 = "0cbdj5wwx582yqlpjdfg1snxxx3z2wn6v2gzvyling5ma6faqwc8";
     };
     meta.homepage = "https://github.com/folke/zen-mode.nvim/";
   };
@@ -17351,24 +17338,24 @@ final: prev:
 
   zig-vim = buildVimPlugin {
     pname = "zig.vim";
-    version = "2023-10-10";
+    version = "2024-07-24";
     src = fetchFromGitHub {
       owner = "ziglang";
       repo = "zig.vim";
-      rev = "54c216e5306a5c3878a60596aacb94dca8652ab9";
-      sha256 = "1nxwjyn3ps3c2abffai5cql3czl4kah4cin0g30damy1k99ypncb";
+      rev = "ad75bb5752f3556d8bde5b0e69cb69a98058030e";
+      sha256 = "0wgjasakkcdzr5zv553gc2x2kzg0778y6qi7rswqbfxxadlkl5xj";
     };
     meta.homepage = "https://github.com/ziglang/zig.vim/";
   };
 
   zk-nvim = buildVimPlugin {
     pname = "zk-nvim";
-    version = "2024-06-27";
+    version = "2024-07-23";
     src = fetchFromGitHub {
       owner = "zk-org";
       repo = "zk-nvim";
-      rev = "15e24e96cb90889ebd12b5dbe800a958c716f520";
-      sha256 = "1sjnwjv4spa2cn54mv2cndirypkzhm81zxjz0v7kb5pf39rlq03c";
+      rev = "dbf4eeab55b08856c9d6b6722dbff39630bb35eb";
+      sha256 = "1d6qz2yi4d0ccpibjh3c366qh32hd9r646m1b99vy16r27ydffcs";
     };
     meta.homepage = "https://github.com/zk-org/zk-nvim/";
   };
@@ -17399,12 +17386,12 @@ final: prev:
 
   catppuccin-nvim = buildVimPlugin {
     pname = "catppuccin-nvim";
-    version = "2024-07-11";
+    version = "2024-07-25";
     src = fetchFromGitHub {
       owner = "catppuccin";
       repo = "nvim";
-      rev = "7946d1a195c66fed38b3e34f9fa8e0c5a2da0700";
-      sha256 = "15cpz3jy97lkpdq32ypbk6wa29vplx9y42ic35ygc15ikxp470s7";
+      rev = "10eda02ea4faa7d1f94e77a3410a4ae91c25c5f5";
+      sha256 = "1isl44p5z8ynmc7v75154wxc3xkk7i351k4164br6gpm49dwlvp3";
     };
     meta.homepage = "https://github.com/catppuccin/nvim/";
   };
@@ -17423,12 +17410,12 @@ final: prev:
 
   dracula-vim = buildVimPlugin {
     pname = "dracula-vim";
-    version = "2024-06-13";
+    version = "2024-07-26";
     src = fetchFromGitHub {
       owner = "dracula";
       repo = "vim";
-      rev = "ada471d684d4acfe803c4e033d7c3ae5d7252db6";
-      sha256 = "1w1bxg532l1khgb285xs4y6l40bj4dq0kdh6iwfihw6x0mqsrv1j";
+      rev = "65f4225e0526516a67d56c8ac09925a209138e53";
+      sha256 = "0jp54l8k40mij0mkavsxzv2kipvzzvy211d6hyvq6ry9liqkl7b8";
     };
     meta.homepage = "https://github.com/dracula/vim/";
   };
@@ -17495,12 +17482,12 @@ final: prev:
 
   nightfly = buildVimPlugin {
     pname = "nightfly";
-    version = "2024-07-08";
+    version = "2024-07-25";
     src = fetchFromGitHub {
       owner = "bluz71";
       repo = "vim-nightfly-colors";
-      rev = "17016f9e7d2cfb64e94e091d4748463b09936d7a";
-      sha256 = "05kvnx4c5sm80l5qs2lhcgi9f5zs8g9kz7zw8bjjcr8h5ij7jw9n";
+      rev = "19efaf31cbe15a429cb3ca6ac9c9fce13275045b";
+      sha256 = "1kpg8bkjdcna8327pb212dgh5rxij0ahvc30qn7bb5cwjcrfzbp5";
     };
     meta.homepage = "https://github.com/bluz71/vim-nightfly-colors/";
   };
@@ -17519,12 +17506,12 @@ final: prev:
 
   nvchad-ui = buildVimPlugin {
     pname = "nvchad-ui";
-    version = "2024-07-17";
+    version = "2024-07-27";
     src = fetchFromGitHub {
       owner = "nvchad";
       repo = "ui";
-      rev = "e03c638950dbc31fa0dd65c3b56495976d8420a4";
-      sha256 = "15cnyz3x989djxhr98vnh95xid5vsvf11myz1p71ifb0ngkfyyxs";
+      rev = "7c5aa0a71d1d782d1cc80b130603b7e6bf8d2fd9";
+      sha256 = "1yz6mrq591bq6wjihglaj9p9jhpibwb361n0kf68glb2qv70aiw0";
     };
     meta.homepage = "https://github.com/nvchad/ui/";
   };
@@ -17555,12 +17542,12 @@ final: prev:
 
   render-markdown = buildVimPlugin {
     pname = "render-markdown";
-    version = "2024-07-17";
+    version = "2024-07-27";
     src = fetchFromGitHub {
       owner = "MeanderingProgrammer";
       repo = "markdown.nvim";
-      rev = "4ab835985de62b46b6785ae160f5f709b77a0f92";
-      sha256 = "08awhqsvjmq6hnlk0367817wxv6f2i8xf8dawd0n4z4pl5xmcrf6";
+      rev = "b75f681d675e21b5a09909997e9fffa6313c946e";
+      sha256 = "1g129sl3v13i2lnrvhagpf5nc99yi3wxy41x5797il06w08cis2j";
     };
     meta.homepage = "https://github.com/MeanderingProgrammer/markdown.nvim/";
   };
@@ -17579,12 +17566,12 @@ final: prev:
 
   rose-pine = buildVimPlugin {
     pname = "rose-pine";
-    version = "2024-07-15";
+    version = "2024-07-25";
     src = fetchFromGitHub {
       owner = "rose-pine";
       repo = "neovim";
-      rev = "9e4320d0bab7f261921d6af7d1c1bbc1a1e3dc67";
-      sha256 = "11ksc6k5fg8nxb3sk40d06lrk8ycsss76q2w4lba6b6bph7b6l21";
+      rev = "e4b08d74b7272cb21e4e9c71b8b9e0830fd722fe";
+      sha256 = "1wlr2hm8818f5cdy757kir6vwnh777vrji4hsnzhbbdj3zk9w115";
     };
     meta.homepage = "https://github.com/rose-pine/neovim/";
   };
diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
index 58692ae3bd..bf55c4b71f 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
@@ -27,12 +27,12 @@
   };
   angular = buildGrammar {
     language = "angular";
-    version = "0.0.0+rev=b96a0d1";
+    version = "0.0.0+rev=31182d4";
     src = fetchFromGitHub {
       owner = "dlvandenberg";
       repo = "tree-sitter-angular";
-      rev = "b96a0d1605da3492f6474245098b6f0c503e596d";
-      hash = "sha256-M2eDOlxHb0bjm3SfjE84M9ByVevApMqfoauKYdDG6s4=";
+      rev = "31182d43b062a350d4bd2449f2fc0d5654972be9";
+      hash = "sha256-E+MrOQJIUsAGPMIIM43gROs1yIiokCHXJB2pmWGe0i0=";
     };
     meta.homepage = "https://github.com/dlvandenberg/tree-sitter-angular";
   };
@@ -127,12 +127,12 @@
   };
   beancount = buildGrammar {
     language = "beancount";
-    version = "0.0.0+rev=c25f803";
+    version = "0.0.0+rev=384c55e";
     src = fetchFromGitHub {
       owner = "polarmutex";
       repo = "tree-sitter-beancount";
-      rev = "c25f8034c977681653a8acd541c8b4877a58f474";
-      hash = "sha256-j+TyGT5FycEj+E6si7GSKUauvXNvl1L2NEw98jU7jns=";
+      rev = "384c55ede2a1f13e83d8e18dbef8f11304c379c2";
+      hash = "sha256-OEfiJWF3+wxwaqk4kyMSvJG9c6NbyphHG2hnf7fCiOQ=";
     };
     meta.homepage = "https://github.com/polarmutex/tree-sitter-beancount";
   };
@@ -191,14 +191,25 @@
     };
     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=deca017";
+    version = "0.0.0+rev=be23d2c";
     src = fetchFromGitHub {
       owner = "tree-sitter";
       repo = "tree-sitter-c";
-      rev = "deca017a554045b4c203e7ddff39ae64ff05e071";
-      hash = "sha256-uvvARjD4729GO8vpmrhAzheEQ3oz7LYmF8awdyS2/Rw=";
+      rev = "be23d2c9d8e5b550e713ef0f86126a248462ca6e";
+      hash = "sha256-6R9bx0UMjln8W1DrHG1AyA+Ziq9XGuLti2m/bC6lPgg=";
     };
     meta.homepage = "https://github.com/tree-sitter/tree-sitter-c";
   };
@@ -325,12 +336,12 @@
   };
   cpp = buildGrammar {
     language = "cpp";
-    version = "0.0.0+rev=7ce8946";
+    version = "0.0.0+rev=0b4aa47";
     src = fetchFromGitHub {
       owner = "tree-sitter";
       repo = "tree-sitter-cpp";
-      rev = "7ce8946cae4bb25adebe5b50394f702beb007026";
-      hash = "sha256-haU0fXNwYh3YaP8VMY1krRHxrGvNkDV4hMcxp5z9TVA=";
+      rev = "0b4aa47f07d958a49260aadc87e8474b03897c23";
+      hash = "sha256-z2cG/woWbpvLJdmlN7ZuPiDwWhHnmwr3speMDFz3cEk=";
     };
     meta.homepage = "https://github.com/tree-sitter/tree-sitter-cpp";
   };
@@ -359,12 +370,12 @@
   };
   cuda = buildGrammar {
     language = "cuda";
-    version = "0.0.0+rev=b93070b";
+    version = "0.0.0+rev=07f2f15";
     src = fetchFromGitHub {
       owner = "theHamsta";
       repo = "tree-sitter-cuda";
-      rev = "b93070b5a91ee9537d45e59d741737b1289c5dcc";
-      hash = "sha256-IINYPEysz5bI2cmFY6eNCR86b0OfBIqws5a61UxCfg4=";
+      rev = "07f2f157d484a27dc91c04cc116f94f6fd4fc654";
+      hash = "sha256-GWiSQzMHtXd0EESjC1a0l0O8Q7zx3gjvNy8YZw/U/Bk=";
     };
     meta.homepage = "https://github.com/theHamsta/tree-sitter-cuda";
   };
@@ -447,12 +458,12 @@
   };
   djot = buildGrammar {
     language = "djot";
-    version = "0.0.0+rev=87bf828";
+    version = "0.0.0+rev=886601b";
     src = fetchFromGitHub {
       owner = "treeman";
       repo = "tree-sitter-djot";
-      rev = "87bf82874c86dcf563f5521069d603ed50e5f0cc";
-      hash = "sha256-abAEVbS9hqc1uHx6NxXRBA2SLrCL3gBBPLgAK9Tz3G4=";
+      rev = "886601b67d1f4690173a4925c214343c30704d32";
+      hash = "sha256-uh41umECO8mIgML4JV5yz2iaNy6h5uLQWodcXvhI/MM=";
     };
     meta.homepage = "https://github.com/treeman/tree-sitter-djot";
   };
@@ -526,12 +537,12 @@
   };
   editorconfig = buildGrammar {
     language = "editorconfig";
-    version = "0.0.0+rev=c5f8368";
+    version = "0.0.0+rev=fd0d64d";
     src = fetchFromGitHub {
       owner = "ValdezFOmar";
       repo = "tree-sitter-editorconfig";
-      rev = "c5f83685a64117872ae750ce14333a7a1dddcf0b";
-      hash = "sha256-kmQ3+QTwWd/92wL6YS6UchI819eLnD9YfT5TPANvCXA=";
+      rev = "fd0d64d2fc91eab903bed4c11ce280b62e46f16e";
+      hash = "sha256-7Q8+XEGWqOnkLW7b9Vnubr2LhvdTK48at45k/Gsm9Us=";
     };
     meta.homepage = "https://github.com/ValdezFOmar/tree-sitter-editorconfig";
   };
@@ -614,12 +625,12 @@
   };
   erlang = buildGrammar {
     language = "erlang";
-    version = "0.0.0+rev=19ca500";
+    version = "0.0.0+rev=8f41b58";
     src = fetchFromGitHub {
       owner = "WhatsApp";
       repo = "tree-sitter-erlang";
-      rev = "19ca500fa5a17ab58dc18aa03b50e2db305e7a8a";
-      hash = "sha256-5WUuy8+O9yujzoAjO2sNGM1+IEnaS7HEphTKcvFJJNo=";
+      rev = "8f41b588fe38b981156651ef56b192ed3d158efd";
+      hash = "sha256-B/SF86W+0t6rVzo/QpQ6QQPsD7pH5dHGLCqxzoIhNTg=";
     };
     meta.homepage = "https://github.com/WhatsApp/tree-sitter-erlang";
   };
@@ -713,12 +724,12 @@
   };
   fortran = buildGrammar {
     language = "fortran";
-    version = "0.0.0+rev=dde9829";
+    version = "0.0.0+rev=6b63343";
     src = fetchFromGitHub {
       owner = "stadelmanma";
       repo = "tree-sitter-fortran";
-      rev = "dde9829554b831cf6cbf927294f22dfb9a8f0419";
-      hash = "sha256-QvEKisBE4Qrnv1CjeCMhIt/L1BdXEJLCprw/hJoAE20=";
+      rev = "6b633433fb3f132f21250cf8e8be76d5a6389b7e";
+      hash = "sha256-0P3fY7DVnBqzBIg+e5E5i80jZl/GEYO8SIdxf/ZdkfI=";
     };
     meta.homepage = "https://github.com/stadelmanma/tree-sitter-fortran";
   };
@@ -790,12 +801,12 @@
   };
   git_rebase = buildGrammar {
     language = "git_rebase";
-    version = "0.0.0+rev=274e27e";
+    version = "0.0.0+rev=bff4b66";
     src = fetchFromGitHub {
       owner = "the-mikedavis";
       repo = "tree-sitter-git-rebase";
-      rev = "274e27ea0f09371122ab55b8a812a32d6ef644e8";
-      hash = "sha256-W0aDOZ2uPXHGAbt/p3slyotw4dPsmgADnRAH3e9NT1Y=";
+      rev = "bff4b66b44b020d918d67e2828eada1974a966aa";
+      hash = "sha256-k4C7dJUkvQxIxcaoVmG2cBs/CeYzVqrip2+2mRvHtZc=";
     };
     meta.homepage = "https://github.com/the-mikedavis/tree-sitter-git-rebase";
   };
@@ -834,12 +845,12 @@
   };
   gleam = buildGrammar {
     language = "gleam";
-    version = "0.0.0+rev=02a17bf";
+    version = "0.0.0+rev=426e670";
     src = fetchFromGitHub {
       owner = "gleam-lang";
       repo = "tree-sitter-gleam";
-      rev = "02a17bf9d0553406268cdbf466d57808ae712bf3";
-      hash = "sha256-rZPe7rrnPa4QGnFUjwoaj/7HJzNDSigc7w4gJEFXZD4=";
+      rev = "426e67087fd62be5f4533581b5916b2cf010fb5b";
+      hash = "sha256-SI3/gUksiRgUpCabsll6g0mUcm5iiNMTzxlxQxCujpY=";
     };
     meta.homepage = "https://github.com/gleam-lang/tree-sitter-gleam";
   };
@@ -856,12 +867,12 @@
   };
   glsl = buildGrammar {
     language = "glsl";
-    version = "0.0.0+rev=3736dfc";
+    version = "0.0.0+rev=ddc3137";
     src = fetchFromGitHub {
       owner = "theHamsta";
       repo = "tree-sitter-glsl";
-      rev = "3736dfc811c07fa749ca818f94c9a3977734dd26";
-      hash = "sha256-BIEM9i7GItQZmOcJDMHm2yY+4xeL5x9BzZORtYOxr28=";
+      rev = "ddc3137a2d775aca93084ff997fa13cc1691058a";
+      hash = "sha256-q1xL3/4W442z1wjYL0HQNdz4sPZqqEijyLSvECHugXw=";
     };
     meta.homepage = "https://github.com/theHamsta/tree-sitter-glsl";
   };
@@ -988,12 +999,12 @@
   };
   groovy = buildGrammar {
     language = "groovy";
-    version = "0.0.0+rev=f361500";
+    version = "0.0.0+rev=3912291";
     src = fetchFromGitHub {
       owner = "murtaza64";
       repo = "tree-sitter-groovy";
-      rev = "f3615006429251a966d7452bd46a0171364bcb7b";
-      hash = "sha256-n3haDlldeFk9FzHY7k5zhzDNHA6TzjncZpsQuHl/Q00=";
+      rev = "391229139d9f79879ccc84cb271889c9240c28a1";
+      hash = "sha256-AtA6249CHaOYQGgYfaECFESmJi9Wq+iFC58rHSh5x9M=";
     };
     meta.homepage = "https://github.com/murtaza64/tree-sitter-groovy";
   };
@@ -1065,12 +1076,12 @@
   };
   heex = buildGrammar {
     language = "heex";
-    version = "0.0.0+rev=b5ad6e3";
+    version = "0.0.0+rev=6dd0303";
     src = fetchFromGitHub {
       owner = "connorlay";
       repo = "tree-sitter-heex";
-      rev = "b5ad6e34eea18a15bbd1466ca707a17f9bff7b93";
-      hash = "sha256-o0ArFfBJTrEQVXVet+AIDPCB/b9KKvOYrrtMGyLgtM8=";
+      rev = "6dd0303acf7138dd2b9b432a229e16539581c701";
+      hash = "sha256-VakMZtWQ/h7dNy5ehk2Bh14a5s878AUgwY3Ipq8tPec=";
     };
     meta.homepage = "https://github.com/connorlay/tree-sitter-heex";
   };
@@ -1198,12 +1209,12 @@
   };
   idl = buildGrammar {
     language = "idl";
-    version = "0.0.0+rev=556f287";
+    version = "0.0.0+rev=1a6683f";
     src = fetchFromGitHub {
       owner = "cathaysia";
       repo = "tree-sitter-idl";
-      rev = "556f2878db1c26da33a921df8226f3268fadef75";
-      hash = "sha256-WXF+Opb5GrMqRErJvmPgzTrVnHfstfZKZ+4tWbULLGo=";
+      rev = "1a6683f6809f7bc630f10fcad7d9ac6471deb706";
+      hash = "sha256-eDoERNfSMzpbccX438H2c1AWQMXNm9tJBnCREYqMvic=";
     };
     meta.homepage = "https://github.com/cathaysia/tree-sitter-idl";
   };
@@ -1242,12 +1253,12 @@
   };
   janet_simple = buildGrammar {
     language = "janet_simple";
-    version = "0.0.0+rev=3b08641";
+    version = "0.0.0+rev=ea842cb";
     src = fetchFromGitHub {
       owner = "sogaiu";
       repo = "tree-sitter-janet-simple";
-      rev = "3b08641373cb3e37bc531e6e3cdb85d02b454702";
-      hash = "sha256-0bCagqSY/MFAqJNajkaR8Y6J2YiXzOF249cm0pFjTfs=";
+      rev = "ea842cb57a90865c8f50bcb4499de1a94860f3a4";
+      hash = "sha256-0gy4kylOoaC5BigpppAN1va3eRZaS6UmxNcQkbxz1Ag=";
     };
     meta.homepage = "https://github.com/sogaiu/tree-sitter-janet-simple";
   };
@@ -1429,12 +1440,12 @@
   };
   latex = buildGrammar {
     language = "latex";
-    version = "0.0.0+rev=08d8b88";
+    version = "0.0.0+rev=f074e14";
     src = fetchFromGitHub {
       owner = "latex-lsp";
       repo = "tree-sitter-latex";
-      rev = "08d8b885a3fa67a6e8aa8edd8988eaa55db46ba4";
-      hash = "sha256-QOlnE5JnJHdupL12YMT6cIRcP/2GKsewPkRuWwAwliI=";
+      rev = "f074e142ade9cdc292346d0484be27f9ebdbc4ea";
+      hash = "sha256-t6P+5RW426enWVFB/SPFHIIhXqshjKzmKQpOWfu0eQg=";
     };
     generate = true;
     meta.homepage = "https://github.com/latex-lsp/tree-sitter-latex";
@@ -1551,12 +1562,12 @@
   };
   m68k = buildGrammar {
     language = "m68k";
-    version = "0.0.0+rev=9e082a2";
+    version = "0.0.0+rev=e128454";
     src = fetchFromGitHub {
       owner = "grahambates";
       repo = "tree-sitter-m68k";
-      rev = "9e082a2253c50eb3d80e84bbd635e57cfb1476a2";
-      hash = "sha256-QJZDozY0UO7tWemKGk3MjDrM/bjpbwCJbWXY0fTL9fQ=";
+      rev = "e128454c2210c0e0c10b68fe45ddb8fee80182a3";
+      hash = "sha256-g7SZ/TrTaaeGDNOqId4eom9R/5gOyXcmmhWY4WW0fF4=";
     };
     meta.homepage = "https://github.com/grahambates/tree-sitter-m68k";
   };
@@ -1597,12 +1608,12 @@
   };
   matlab = buildGrammar {
     language = "matlab";
-    version = "0.0.0+rev=2825fb5";
+    version = "0.0.0+rev=821f7bd";
     src = fetchFromGitHub {
       owner = "acristoffers";
       repo = "tree-sitter-matlab";
-      rev = "2825fb578325ac308945318881445a89ea06e0f6";
-      hash = "sha256-M7dECDfpRZHlkjCNvQcAneKR9KHf6HwtoHADZRjIB/Y=";
+      rev = "821f7bdf9d922822302a0170c2f157e36ffb7a94";
+      hash = "sha256-oaq1b/yBH+EOQZ8IW7j2f1nz66RFjXT45IGXz7B8pnY=";
     };
     meta.homepage = "https://github.com/acristoffers/tree-sitter-matlab";
   };
@@ -1876,35 +1887,35 @@
   };
   perl = buildGrammar {
     language = "perl";
-    version = "0.0.0+rev=309cb8d";
+    version = "0.0.0+rev=7581cbf";
     src = fetchFromGitHub {
       owner = "tree-sitter-perl";
       repo = "tree-sitter-perl";
-      rev = "309cb8d33bcfd0a81050b21be08f9eb3f2fe2138";
-      hash = "sha256-eMmU6qkg9ZVjtxaW1tSPhqsPe2WX3/frPfqMxXCziyo=";
+      rev = "7581cbf8fb793bce94d0241c89fe49b01b1477f9";
+      hash = "sha256-iBr2KbfJWohjHXlFUGvVMg3xUAy78zPk2Kr3UsqXtUs=";
     };
     meta.homepage = "https://github.com/tree-sitter-perl/tree-sitter-perl";
   };
   php = buildGrammar {
     language = "php";
-    version = "0.0.0+rev=575a080";
+    version = "0.0.0+rev=c07d697";
     src = fetchFromGitHub {
       owner = "tree-sitter";
       repo = "tree-sitter-php";
-      rev = "575a0801f430c8672db70b73493c033a9dcfc328";
-      hash = "sha256-lvgxProv6EYBSFqMuQZh3nzC9ayjBQeafOECrRHzYtU=";
+      rev = "c07d69739ba71b5a449bdbb7735991f8aabf8546";
+      hash = "sha256-It3UC98PZn1jXJ/LQfPdJ5e/dRdADPMgAawBzvlJfQE=";
     };
     location = "php";
     meta.homepage = "https://github.com/tree-sitter/tree-sitter-php";
   };
   php_only = buildGrammar {
     language = "php_only";
-    version = "0.0.0+rev=575a080";
+    version = "0.0.0+rev=c07d697";
     src = fetchFromGitHub {
       owner = "tree-sitter";
       repo = "tree-sitter-php";
-      rev = "575a0801f430c8672db70b73493c033a9dcfc328";
-      hash = "sha256-lvgxProv6EYBSFqMuQZh3nzC9ayjBQeafOECrRHzYtU=";
+      rev = "c07d69739ba71b5a449bdbb7735991f8aabf8546";
+      hash = "sha256-It3UC98PZn1jXJ/LQfPdJ5e/dRdADPMgAawBzvlJfQE=";
     };
     location = "php_only";
     meta.homepage = "https://github.com/tree-sitter/tree-sitter-php";
@@ -1975,6 +1986,17 @@
     };
     meta.homepage = "https://github.com/amaanq/tree-sitter-pony";
   };
+  powershell = buildGrammar {
+    language = "powershell";
+    version = "0.0.0+rev=804d86f";
+    src = fetchFromGitHub {
+      owner = "airbus-cert";
+      repo = "tree-sitter-powershell";
+      rev = "804d86fd4ad286bd0cc1c1f0f7b28bd7af6755ad";
+      hash = "sha256-W+v+Gj1KViIF+8wd9auy448hyxz0Uam5FpIpdjCzF/k=";
+    };
+    meta.homepage = "https://github.com/airbus-cert/tree-sitter-powershell";
+  };
   printf = buildGrammar {
     language = "printf";
     version = "0.0.0+rev=0e0acea";
@@ -2376,12 +2398,12 @@
   };
   scala = buildGrammar {
     language = "scala";
-    version = "0.0.0+rev=599d12b";
+    version = "0.0.0+rev=a13f2d1";
     src = fetchFromGitHub {
       owner = "tree-sitter";
       repo = "tree-sitter-scala";
-      rev = "599d12b59fed092f5a3d4a7019fd85d90cb39ec1";
-      hash = "sha256-OIMrIuN5lE1VBGRhIb2B52VYaihQ/sjYkf8oiqpsXCw=";
+      rev = "a13f2d1ee9609cc5c4c8ffce9640c353b77a24d8";
+      hash = "sha256-KaELrU+4XMHsSacNZnPlWvfNcQRZizQNhxfbsFpsBdw=";
     };
     meta.homepage = "https://github.com/tree-sitter/tree-sitter-scala";
   };
@@ -2432,12 +2454,12 @@
   };
   slint = buildGrammar {
     language = "slint";
-    version = "0.0.0+rev=d82ab8c";
+    version = "0.0.0+rev=4a0558c";
     src = fetchFromGitHub {
       owner = "slint-ui";
       repo = "tree-sitter-slint";
-      rev = "d82ab8c19ea1b60ff570256eaef7d137cc5ecb63";
-      hash = "sha256-NFKh3Z9vU1KImjU4Yd/Bnxq3E8kz8k/w2TzEvAtffnY=";
+      rev = "4a0558cc0fcd7a6110815b9bbd7cc12d7ab31e74";
+      hash = "sha256-F+DtGNXc00lv08EnR6sQgTQVYkttgf/xw3bq3IdsQMA=";
     };
     meta.homepage = "https://github.com/slint-ui/tree-sitter-slint";
   };
@@ -2465,12 +2487,12 @@
   };
   snakemake = buildGrammar {
     language = "snakemake";
-    version = "0.0.0+rev=5a7b140";
+    version = "0.0.0+rev=46d4de8";
     src = fetchFromGitHub {
       owner = "osthomas";
       repo = "tree-sitter-snakemake";
-      rev = "5a7b14074bca95b25935e865ca8f1efad32317e4";
-      hash = "sha256-mYqftgJOnlWgQZrXaNtFXvjRQgC14PXYyruTVw5J8Zg=";
+      rev = "46d4de8e6cfca8a97c0489aea936bb15beeaf666";
+      hash = "sha256-MNJLveFI5oybM9QE8wgYT7k3GK1E4lIOm3xWJmJazls=";
     };
     meta.homepage = "https://github.com/osthomas/tree-sitter-snakemake";
   };
@@ -2511,12 +2533,12 @@
   };
   sourcepawn = buildGrammar {
     language = "sourcepawn";
-    version = "0.0.0+rev=645d093";
+    version = "0.0.0+rev=6b9bf9c";
     src = fetchFromGitHub {
       owner = "nilshelmig";
       repo = "tree-sitter-sourcepawn";
-      rev = "645d093763bcaaf7535edbdf6575a5c978b16491";
-      hash = "sha256-P5l0jaDsPXFenVaoLeeGSp6firHpeNM4/v93eshd8l0=";
+      rev = "6b9bf9cbab91443380d2ca8a2f6c491cc7fac5bf";
+      hash = "sha256-2DjGCZ701c2rMxQZM4YF61rZokZUov4ECb0gwAmyuVk=";
     };
     meta.homepage = "https://github.com/nilshelmig/tree-sitter-sourcepawn";
   };
@@ -2533,12 +2555,12 @@
   };
   sql = buildGrammar {
     language = "sql";
-    version = "0.0.0+rev=89fd00d";
+    version = "0.0.0+rev=a966446";
     src = fetchFromGitHub {
       owner = "derekstride";
       repo = "tree-sitter-sql";
-      rev = "89fd00d0aff3bc9985ac37caf362ec4fd9b2ba1d";
-      hash = "sha256-QTKggsvVWhszlcYS/WOPkykUyTDgwV1yVJ7jADA/5SM=";
+      rev = "a9664463580473e92d8f5e29fa06fb1be88752af";
+      hash = "sha256-0SY6dOofB+zv4xa7oXabEoUZd5NUV1NHhB+Jx6m137I=";
     };
     meta.homepage = "https://github.com/derekstride/tree-sitter-sql";
   };
@@ -2621,23 +2643,23 @@
   };
   svelte = buildGrammar {
     language = "svelte";
-    version = "0.0.0+rev=7218cf6";
+    version = "0.0.0+rev=7ab8221";
     src = fetchFromGitHub {
       owner = "tree-sitter-grammars";
       repo = "tree-sitter-svelte";
-      rev = "7218cf622b057ae9c530e1f0a7a3ce49806ca55e";
-      hash = "sha256-mS4KxJXXb/EzQB5H+Pj+/SEbCTerGFjKiJah8oAGA8c=";
+      rev = "7ab8221e3f378a3b04b4b488f07c1f408c5bd0d8";
+      hash = "sha256-ooeQNwFgDZrn+Vj6nFOS8TJMknl/DgbEghfm0e1EJDE=";
     };
     meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-svelte";
   };
   swift = buildGrammar {
     language = "swift";
-    version = "0.0.0+rev=9653f29";
+    version = "0.0.0+rev=b3dc8cc";
     src = fetchFromGitHub {
       owner = "alex-pinkus";
       repo = "tree-sitter-swift";
-      rev = "9653f291ab2179185dc3703672d9fbbd29e80cfb";
-      hash = "sha256-apboik9JCxFFvPu6wjZnwm2K21KLvmhm8iesDMbsBl4=";
+      rev = "b3dc8cc5c266effd7bcfde01aa086b83927f2eda";
+      hash = "sha256-GtOE80hjFsyFEVkpuxbpNt9vCHrbw2+WnQgyCKAU0jQ=";
     };
     generate = true;
     meta.homepage = "https://github.com/alex-pinkus/tree-sitter-swift";
@@ -2666,12 +2688,12 @@
   };
   systemverilog = buildGrammar {
     language = "systemverilog";
-    version = "0.0.0+rev=a478beb";
+    version = "0.0.0+rev=4f897d5";
     src = fetchFromGitHub {
       owner = "zhangwwpeng";
       repo = "tree-sitter-systemverilog";
-      rev = "a478beb76be72fa8f305f5fe9cc6141ac91b91a4";
-      hash = "sha256-pgZDu2tSgTtE80VXL1T+zAq2dl3B1DoEY/zzxLvqNvM=";
+      rev = "4f897d5e3f0e38bf8fbb55e8f39dc97d2bc2229e";
+      hash = "sha256-guNdS07QqbqegFICNHP1ECX9bc+ZCW9li3ILIZVHRwM=";
     };
     meta.homepage = "https://github.com/zhangwwpeng/tree-sitter-systemverilog";
   };
@@ -2845,12 +2867,12 @@
   };
   tsx = buildGrammar {
     language = "tsx";
-    version = "0.0.0+rev=e45cb32";
+    version = "0.0.0+rev=198d035";
     src = fetchFromGitHub {
       owner = "tree-sitter";
       repo = "tree-sitter-typescript";
-      rev = "e45cb3225bf47a04da827e4575b9791523d953fd";
-      hash = "sha256-7xP8ufPV/ndKmi8gfDYpHSY6D6lfsR0/YXfq3/RT8x0=";
+      rev = "198d03553f43a45b92ac5d0ee167db3fec6a6fd6";
+      hash = "sha256-U597+o8gakd4nU9H2FE2aVhGqSG/eRh6BUhtEmwMzrU=";
     };
     location = "tsx";
     meta.homepage = "https://github.com/tree-sitter/tree-sitter-typescript";
@@ -2879,12 +2901,12 @@
   };
   typescript = buildGrammar {
     language = "typescript";
-    version = "0.0.0+rev=e45cb32";
+    version = "0.0.0+rev=198d035";
     src = fetchFromGitHub {
       owner = "tree-sitter";
       repo = "tree-sitter-typescript";
-      rev = "e45cb3225bf47a04da827e4575b9791523d953fd";
-      hash = "sha256-7xP8ufPV/ndKmi8gfDYpHSY6D6lfsR0/YXfq3/RT8x0=";
+      rev = "198d03553f43a45b92ac5d0ee167db3fec6a6fd6";
+      hash = "sha256-U597+o8gakd4nU9H2FE2aVhGqSG/eRh6BUhtEmwMzrU=";
     };
     location = "typescript";
     meta.homepage = "https://github.com/tree-sitter/tree-sitter-typescript";
@@ -2913,12 +2935,12 @@
   };
   typst = buildGrammar {
     language = "typst";
-    version = "0.0.0+rev=90f6af2";
+    version = "0.0.0+rev=abe60cb";
     src = fetchFromGitHub {
       owner = "uben0";
       repo = "tree-sitter-typst";
-      rev = "90f6af21271dee246a9cafe109e2b456c5bc10a6";
-      hash = "sha256-53BCAdQLpeV2l6kmfllrCU186svZ4RE/2+VVrWuFV8Y=";
+      rev = "abe60cbed7986ee475d93f816c1be287f220c5d8";
+      hash = "sha256-hwM1oEzABe9sqY0mpDXSfwT+tQsLV5ZNSG8yJhES6Qg=";
     };
     meta.homepage = "https://github.com/uben0/tree-sitter-typst";
   };
@@ -3023,6 +3045,17 @@
     };
     meta.homepage = "https://github.com/tree-sitter/tree-sitter-verilog";
   };
+  vhdl = buildGrammar {
+    language = "vhdl";
+    version = "0.0.0+rev=4ab3e25";
+    src = fetchFromGitHub {
+      owner = "jpt13653903";
+      repo = "tree-sitter-vhdl";
+      rev = "4ab3e251eae8890a020d083d00acd1b8c2653c07";
+      hash = "sha256-egNgZ1GgRNvIdH08cf6V83bMeOECs23yiV5RzcXZENg=";
+    };
+    meta.homepage = "https://github.com/jpt13653903/tree-sitter-vhdl";
+  };
   vhs = buildGrammar {
     language = "vhs";
     version = "0.0.0+rev=90028bb";
diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/overrides.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/overrides.nix
index b4826109a7..133200a982 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -15,7 +15,9 @@
 , python3
 , rustPlatform
 , # Misc dependencies
-  Cocoa
+  arrow-cpp
+, Cocoa
+, coc-diagnostic
 , code-minimap
 , dasht
 , deno
@@ -335,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;
@@ -417,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";
@@ -430,7 +437,7 @@
 
         sourceRoot = "${src.name}/generator";
 
-        cargoHash = "sha256-E8EywpyRSoknXSebnvqP178ZgAIahJeD5siD46KM/Mc=";
+        cargoHash = "sha256-u0NvChN50LIxUhmsT4mvWs5xB/TwJkMabggFePA/b1E=";
 
         nativeBuildInputs = [
           pkg-config
@@ -563,7 +570,7 @@
         pname = "cord.nvim-rust";
         inherit version src;
 
-        cargoSha256 = "sha256-6FYf4pHEPxvhKHHPmkjQ40zPxaiypnpDxF8kNH+h+tg=";
+        cargoHash = "sha256-6FYf4pHEPxvhKHHPmkjQ40zPxaiypnpDxF8kNH+h+tg=";
 
         installPhase = let
           cargoTarget = stdenv.hostPlatform.rust.cargoShortTarget;
@@ -844,6 +851,8 @@
     dependencies = with self; [ nvim-treesitter ];
   };
 
+  haskell-tools-nvim = neovimUtils.buildNeovimPlugin { luaAttr = "haskell-tools-nvim"; };
+
   hex-nvim = super.hex-nvim.overrideAttrs {
     postPatch = ''
       substituteInPlace lua/hex.lua --replace xxd ${xxd}/bin/xxd
@@ -925,7 +934,7 @@
         inherit version;
         src = LanguageClient-neovim-src;
 
-        cargoSha256 = "H34UqJ6JOwuSABdOup5yKeIwFrGc83TUnw1ggJEx9o4=";
+        cargoHash = "sha256-H34UqJ6JOwuSABdOup5yKeIwFrGc83TUnw1ggJEx9o4=";
         buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ];
 
         # FIXME: Use impure version of CoreFoundation because of missing symbols.
@@ -1198,8 +1207,11 @@
         dbee-go = buildGoModule {
           name = "nvim-dbee";
           src = "${oa.src}/dbee";
-          vendorHash = "sha256-AItvgOehVskGLARJWDnJLtWM5YHKN/zn/FnZQ0evAtI=";
-          buildInputs = [ duckdb ];
+          vendorHash = "sha256-U/3WZJ/+Bm0ghjeNUILsnlZnjIwk3ySaX3Rd4L9Z62A=";
+          buildInputs = [
+            arrow-cpp
+            duckdb
+          ];
         };
       in {
     dependencies = [ self.nui-nvim ];
@@ -1431,12 +1443,12 @@
 
   sniprun =
     let
-      version = "1.3.14";
+      version = "1.3.15";
       src = fetchFromGitHub {
         owner = "michaelb";
         repo = "sniprun";
         rev = "refs/tags/v${version}";
-        hash = "sha256-9vglmQ9sy0aCbj4H81ublHclpoSfOA7ss5CNdoX54sY=";
+        hash = "sha256-8N+KUawQ6RI6sG8m9wpvJTMQyJ5j/43PRkrTPrWAREQ=";
       };
       sniprun-bin = rustPlatform.buildRustPackage {
         pname = "sniprun-bin";
@@ -1446,7 +1458,7 @@
           darwin.apple_sdk.frameworks.Security
         ];
 
-        cargoHash = "sha256-p4rZBgB3xQC14hRRTjNZT1G1gbaKydlKu6MYNSLk6iA=";
+        cargoHash = "sha256-bLki+6uMKJtk/bu+LNf2E1m/HpEG8zmnM3JI89IjmNs=";
 
         nativeBuildInputs = [ makeWrapper ];
 
@@ -1895,7 +1907,7 @@
       vim-markdown-composer-bin = rustPlatform.buildRustPackage {
         pname = "vim-markdown-composer-bin";
         inherit (super.vim-markdown-composer) src version;
-        cargoSha256 = "sha256-Vie8vLTplhaVU4E9IohvxERfz3eBpd62m8/1Ukzk8e4=";
+        cargoHash = "sha256-Vie8vLTplhaVU4E9IohvxERfz3eBpd62m8/1Ukzk8e4=";
         # tests require network access
         doCheck = false;
       };
@@ -2112,7 +2124,6 @@
       "coc-clangd"
       "coc-cmake"
       "coc-css"
-      "coc-diagnostic"
       "coc-docker"
       "coc-emmet"
       "coc-eslint"
diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-clap/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-clap/default.nix
index 4ace5711cd..fc02ebb8d7 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-clap/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-plugin-names b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-plugin-names
index 6e9e858c56..c9224e059b 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/third_party/nixpkgs/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -386,7 +386,6 @@ https://github.com/ThePrimeagen/harpoon/,master,
 https://github.com/ThePrimeagen/harpoon/,harpoon2,harpoon2
 https://github.com/kiyoon/haskell-scope-highlighting.nvim/,HEAD,
 https://github.com/mrcjkb/haskell-snippets.nvim/,HEAD,
-https://github.com/MrcJkb/haskell-tools.nvim/,HEAD,
 https://github.com/neovimhaskell/haskell-vim/,,
 https://github.com/wenzel-hoffman/haskell-with-unicode.vim/,HEAD,
 https://github.com/travitch/hasksyn/,,
diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/README.md b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/README.md
index 12ac4f5f5b..09de650067 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/README.md
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix
index 3d2342d99f..daef61950c 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/third_party/nixpkgs/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";
@@ -1782,8 +1799,8 @@ let
         mktplcRef = {
           name = "dependi";
           publisher = "fill-labs";
-          version = "0.7.4";
-          hash = "sha256-6nU0bVAe/vwq43ECLwypIkMAG/q5+P2bE1RPAjeTCX4=";
+          version = "0.7.5";
+          hash = "sha256-troydfNj88c8A24ZtaCToE231VWzcCiQVLTSdVPM/XE=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/fill-labs.dependi/changelog";
@@ -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/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix
index c6124344a7..8d665025bb 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix
index 2cbfa504f4..9c26f92ca9 100644
--- a/third_party/nixpkgs/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/emulators/box86/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/box86/default.nix
new file mode 100644
index 0000000000..961188b2df
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/emulators/darling/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/darling/default.nix
index a5fe1021e9..3d396e07e3 100644
--- a/third_party/nixpkgs/pkgs/applications/emulators/darling/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/emulators/darling/default.nix
@@ -38,7 +38,7 @@
 
 , xdg-user-dirs
 
-, addOpenGLRunpath
+, addDriverRunpath
 
 # Whether to pre-compile Python 2 bytecode for performance.
 , compilePy2Bytecode ? false
@@ -217,7 +217,7 @@ in stdenv.mkDerivation {
       exit 1
     fi
 
-    patchelf --add-rpath "${lib.makeLibraryPath wrappedLibs}:${addOpenGLRunpath.driverLink}/lib" \
+    patchelf --add-rpath "${lib.makeLibraryPath wrappedLibs}:${addDriverRunpath.driverLink}/lib" \
       $out/libexec/darling/usr/libexec/darling/mldr
   '';
 
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/firebird-emu/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/firebird-emu/default.nix
index 9fd9901461..48f3647514 100644
--- a/third_party/nixpkgs/pkgs/applications/emulators/firebird-emu/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/emulators/firebird-emu/default.nix
@@ -19,9 +19,6 @@ stdenv.mkDerivation rec {
     hash = "sha256-ZptjlnOiF+hKuKYvBFJL95H5YQuR99d4biOco/MVEmE=";
   };
 
-  # work around https://github.com/NixOS/nixpkgs/issues/19098
-  env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.cc.isClang && stdenv.isDarwin) "-fno-lto";
-
   nativeBuildInputs = [ wrapQtAppsHook qmake ];
 
   buildInputs = [ qtbase qtdeclarative qtquickcontrols ];
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/hatari/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/hatari/default.nix
index de98278b83..a7519eb49e 100644
--- a/third_party/nixpkgs/pkgs/applications/emulators/hatari/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/emulators/simplenes/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/simplenes/default.nix
index 57748a04da..061717d5c6 100644
--- a/third_party/nixpkgs/pkgs/applications/emulators/simplenes/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/emulators/wine/sources.nix b/third_party/nixpkgs/pkgs/applications/emulators/wine/sources.nix
index 8082194500..2448d5048f 100644
--- a/third_party/nixpkgs/pkgs/applications/emulators/wine/sources.nix
+++ b/third_party/nixpkgs/pkgs/applications/emulators/wine/sources.nix
@@ -69,9 +69,9 @@ in rec {
 
   unstable = fetchurl rec {
     # NOTE: Don't forget to change the hash for staging as well.
-    version = "9.12";
+    version = "9.14";
     url = "https://dl.winehq.org/wine/source/9.x/wine-${version}.tar.xz";
-    hash = "sha256-CRRa5yCy+fGBh5cLoGQLvzztWujceK8dfVf1B37CavY=";
+    hash = "sha256-JFcvSc80c/ye8qGtHN31Ec4O9D2qVUE7RyCmw+PInqY=";
     inherit (stable) patches;
 
     ## see http://wiki.winehq.org/Gecko
@@ -117,7 +117,7 @@ in rec {
   staging = fetchFromGitLab rec {
     # https://gitlab.winehq.org/wine/wine-staging
     inherit (unstable) version;
-    hash = "sha256-lvjuohEo4pwCAd1KmLjUBakS5gSN+Ic6+QQ18sS3axw=";
+    hash = "sha256-IvT56lWULfA5MFLEjnpnNX4OhjQwR6XqBGJ3i4nqJrk=";
     domain = "gitlab.winehq.org";
     owner = "wine";
     repo = "wine-staging";
diff --git a/third_party/nixpkgs/pkgs/applications/emulators/wine/staging.nix b/third_party/nixpkgs/pkgs/applications/emulators/wine/staging.nix
index 56525d4fa0..4a9bfb6c32 100644
--- a/third_party/nixpkgs/pkgs/applications/emulators/wine/staging.nix
+++ b/third_party/nixpkgs/pkgs/applications/emulators/wine/staging.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, callPackage, autoconf, hexdump, perl, python3, wineUnstable }:
+{ lib, stdenv, callPackage, autoconf, hexdump, perl, python3, wineUnstable, gitMinimal }:
 
 with callPackage ./util.nix {};
 
@@ -9,7 +9,7 @@ in assert lib.versions.majorMinor wineUnstable.version == lib.versions.majorMino
 
 (wineUnstable.override { wineRelease = "staging"; }).overrideAttrs (self: {
   buildInputs = build-inputs ([ "perl" "autoconf" "gitMinimal" ] ++ lib.optional stdenv.isLinux "util-linux") self.buildInputs;
-  nativeBuildInputs = [ autoconf hexdump perl python3 ] ++ self.nativeBuildInputs;
+  nativeBuildInputs = [ autoconf hexdump perl python3 gitMinimal ] ++ self.nativeBuildInputs;
 
   prePatch = self.prePatch or "" + ''
     patchShebangs tools
diff --git a/third_party/nixpkgs/pkgs/applications/file-managers/xfe/default.nix b/third_party/nixpkgs/pkgs/applications/file-managers/xfe/default.nix
index 7b5c4340ed..0b09d6ea9e 100644
--- a/third_party/nixpkgs/pkgs/applications/file-managers/xfe/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/gis/grass/default.nix b/third_party/nixpkgs/pkgs/applications/gis/grass/default.nix
index 41d560a4eb..fd26e49fdb 100644
--- a/third_party/nixpkgs/pkgs/applications/gis/grass/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/gis/grass/default.nix
@@ -5,17 +5,22 @@
 , makeWrapper
 , wrapGAppsHook3
 
+, withOpenGL ? true
+
 , bison
 , blas
 , cairo
 , ffmpeg
 , fftw
 , flex
+, freetype
 , gdal
 , geos
+, lapack
+, libGLU
 , libiconv
-, libmysqlclient
 , libpng
+, libsvm
 , libtiff
 , libxml2
 , netcdf
@@ -33,16 +38,17 @@
 
 let
   pyPackages = python311Packages;
+
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "grass";
-  version = "8.3.2";
+  version = "8.4.0";
 
   src = fetchFromGitHub {
     owner = "OSGeo";
     repo = "grass";
     rev = finalAttrs.version;
-    hash = "sha256-loeg+7h676d2WdYOMcJFyzeEZcxjBynir6Hz0J/GBns=";
+    hash = "sha256-NKMshd6pr2O62ZjmQ/oPttmeVBYVD0Nqhh3SwQrhZf8=";
   };
 
   nativeBuildInputs = [
@@ -53,7 +59,6 @@ stdenv.mkDerivation (finalAttrs: {
     flex
     gdal # for `gdal-config`
     geos # for `geos-config`
-    libmysqlclient # for `mysql_config`
     netcdf # for `nc-config`
     pkg-config
   ] ++ (with pyPackages; [ python-dateutil numpy wxpython ]);
@@ -63,12 +68,14 @@ stdenv.mkDerivation (finalAttrs: {
     cairo
     ffmpeg
     fftw
+    freetype
     gdal
     geos
-    libmysqlclient
+    lapack
     libpng
+    libsvm
     libtiff
-    libxml2
+    (libxml2.override { enableHttp = true; })
     netcdf
     pdal
     postgresql
@@ -78,7 +85,8 @@ stdenv.mkDerivation (finalAttrs: {
     wxGTK32
     zlib
     zstd
-  ] ++ lib.optionals stdenv.isDarwin [ libiconv ];
+  ] ++ lib.optionals withOpenGL [ libGLU ]
+  ++ lib.optionals stdenv.isDarwin [ libiconv ];
 
   strictDeps = true;
 
@@ -87,26 +95,30 @@ stdenv.mkDerivation (finalAttrs: {
     ./clang-integer-conversion.patch
   ];
 
-  # Correct mysql_config query
-  postPatch = ''
-    substituteInPlace configure --replace "--libmysqld-libs" "--libs"
-  '';
-
   configureFlags = [
     "--with-blas"
+    "--with-cairo-ldflags=-lfontconfig"
+    "--with-cxx"
+    "--with-fftw"
+    "--with-freetype"
     "--with-geos"
-    # It complains about missing libmysqld but doesn't really seem to need it
-    "--with-mysql"
-    "--with-mysql-includes=${lib.getDev libmysqlclient}/include/mysql"
-    "--with-mysql-libs=${libmysqlclient}/lib/mysql"
-    "--with-netcdf"
+    "--with-gdal"
+    "--with-lapack"
+    "--with-libsvm"
+    "--with-nls"
+    "--with-openmp"
+    "--with-pdal"
     "--with-postgres"
     "--with-postgres-libs=${postgresql.lib}/lib/"
     "--with-proj-includes=${proj.dev}/include"
     "--with-proj-libs=${proj}/lib"
     "--with-proj-share=${proj}/share/proj"
-    "--with-pthread"
-    "--with-readline"
+    "--with-sqlite"
+    "--with-zstd"
+    "--without-bzlib"
+    "--without-mysql"
+    "--without-odbc"
+  ] ++ lib.optionals (! withOpenGL) [
     "--without-opengl"
   ] ++ lib.optionals stdenv.isDarwin [
     "--without-cairo"
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/6.x.nix b/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/6.x.nix
index 722363a9b0..dac185e3d3 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/6.x.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/graphics/comical/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/comical/default.nix
index 208c0ea821..d8e8693166 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/comical/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/comical/default.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
     description = "Viewer of CBR and CBZ files, often used to store scanned comics";
     homepage = "https://comical.sourceforge.net/";
     license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [ viric wegank ];
+    maintainers = with lib.maintainers; [ wegank ];
     platforms = with lib.platforms; unix;
     mainProgram = "comical";
   };
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/darktable/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/darktable/default.nix
index 518dee06aa..4d4f004976 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/darktable/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/darktable/default.nix
@@ -53,15 +53,17 @@
 , libaom
 , portmidi
 , lua
+, dav1d
+, libyuv
 }:
 
 stdenv.mkDerivation rec {
-  version = "4.8.0";
+  version = "4.8.1";
   pname = "darktable";
 
   src = fetchurl {
     url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz";
-    sha256 = "sha256-QZhJ6QFScOQHXyNBxrVTLT0czMz6jxlZLLLqOtF/klU=";
+    sha256 = "sha256-kBsOLK7Tb7hhn99MYO37jTETS5R9MFS1xm/VXDivWZE=";
   };
 
   nativeBuildInputs = [ cmake ninja llvmPackages.llvm pkg-config intltool perl desktop-file-utils wrapGAppsHook3 ];
@@ -106,6 +108,8 @@ stdenv.mkDerivation rec {
     libaom
     portmidi
     lua
+    dav1d
+    libyuv
   ] ++ lib.optionals stdenv.isLinux [
     colord
     colord-gtk
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/epick/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/epick/default.nix
index f33eee5c97..ca93a5f579 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/epick/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/epick/default.nix
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-k0WQu1n1sAHVor58jr060vD5/2rDrt1k5zzJlrK9WrU=";
   };
 
-  cargoSha256 = "sha256-OQZPOiMTpoWabxHa3TJG8L3zq8WxMeFttw8xggSXsMA=";
+  cargoHash = "sha256-OQZPOiMTpoWabxHa3TJG8L3zq8WxMeFttw8xggSXsMA=";
 
   nativeBuildInputs = lib.optionals stdenv.isLinux [
     pkg-config
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/f3d/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/f3d/default.nix
index ee6a830246..5daaf0e10e 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/f3d/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/f3d/default.nix
@@ -12,6 +12,9 @@
 , Cocoa
 , OpenGL
 , python3Packages
+, opencascade-occt
+, assimp
+, fontconfig
 , withManual ? !stdenv.isDarwin
 , withPythonBinding ? false
 }:
@@ -42,6 +45,9 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     vtk_9
+    opencascade-occt
+    assimp
+    fontconfig
   ] ++ lib.optionals stdenv.isDarwin [
     Cocoa
     OpenGL
@@ -58,6 +64,8 @@ stdenv.mkDerivation rec {
     "-DCMAKE_INSTALL_INCLUDEDIR=include"
     "-DCMAKE_INSTALL_BINDIR=bin"
     "-DF3D_MODULE_EXTERNAL_RENDERING=ON"
+    "-DF3D_PLUGIN_BUILD_ASSIMP=ON"
+    "-DF3D_PLUGIN_BUILD_OCCT=ON"
   ] ++ lib.optionals withManual [
     "-DF3D_LINUX_GENERATE_MAN=ON"
   ] ++ lib.optionals withPythonBinding [
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/feh/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/feh/default.nix
index bc27d93db6..56f4936cef 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/feh/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/feh/default.nix
@@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
     # released under a variant of the MIT license
     # https://spdx.org/licenses/MIT-feh.html
     license = licenses.mit-feh;
-    maintainers = with maintainers; [ gepbird globin viric willibutz ];
+    maintainers = with maintainers; [ gepbird globin willibutz ];
     platforms = platforms.unix;
     mainProgram = "feh";
   };
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/gcolor3/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/gcolor3/default.nix
index 38c38143ff..cf823398a4 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/gcolor3/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/graphics/gimp/plugins/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/gimp/plugins/default.nix
index 0a63d82b1b..667a1d5057 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/gimp/plugins/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/graphics/gqview/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/gqview/default.nix
index 89b86bf24b..b3556cf278 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/gqview/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/graphics/hydrus/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/hydrus/default.nix
index 7da1858cb5..51a11528cb 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/hydrus/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/hydrus/default.nix
@@ -82,9 +82,6 @@ python3Packages.buildPythonPackage rec {
     twisted
   ];
 
-  # tests rely on nose
-  doCheck = pythonOlder "3.12";
-
   nativeCheckInputs = with python3Packages; [
     nose
     mock
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/image-roll/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/image-roll/default.nix
index 2c142b7bbb..2c1e86f22c 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/image-roll/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/image-roll/default.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-CC40TU38bJFnbJl2EHqeB9RBvbVUrBmRdZVS2GxqGu4=";
   };
 
-  cargoSha256 = "sha256-cUE2IZOunR/NIo/qytORRfNqCsf87LfpKA8o/v4Nkhk=";
+  cargoHash = "sha256-cUE2IZOunR/NIo/qytORRfNqCsf87LfpKA8o/v4Nkhk=";
 
   nativeBuildInputs = [ glib pkg-config wrapGAppsHook4 ];
 
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/kgraphviewer/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/kgraphviewer/default.nix
index 3758c091a8..c7cbf22e01 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/kgraphviewer/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/graphics/lazpaint/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/lazpaint/default.nix
index 7fcfebe11d..308538f5d6 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/lazpaint/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/graphics/menyoki/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/menyoki/default.nix
index 800ede30be..8d965fe7b1 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/menyoki/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/menyoki/default.nix
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-owP3G1Rygraifdc4iPURQ1Es0msNhYZIlfrtj0CSU6Y=";
   };
 
-  cargoSha256 = "sha256-NtXjlGkX8AzSw98xHPymzdnTipMIunyDbpSr4eVowa0=";
+  cargoHash = "sha256-NtXjlGkX8AzSw98xHPymzdnTipMIunyDbpSr4eVowa0=";
 
   nativeBuildInputs = [ installShellFiles ]
     ++ lib.optional stdenv.isLinux pkg-config;
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/meshlab/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/meshlab/default.nix
index 549780a8ac..658e4b4e9c 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/meshlab/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/meshlab/default.nix
@@ -95,7 +95,7 @@ mkDerivation rec {
     mainProgram = "meshlab";
     homepage = "https://www.meshlab.net/";
     license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ viric ];
+    maintainers = [ ];
     platforms = with lib.platforms; linux;
   };
 }
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/minidjvu/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/minidjvu/default.nix
index ca9e77391e..a8d3db4d0a 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/minidjvu/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/minidjvu/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     homepage = "https://djvu.sourceforge.net/djview4.html";
     description = "Black-and-white djvu page encoder and decoder that use interpage information";
     license = lib.licenses.gpl2Plus;
-    maintainers = [ lib.maintainers.viric ];
+    maintainers = [ ];
     platforms = lib.platforms.unix;
     mainProgram = "minidjvu";
   };
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/panotools/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/panotools/default.nix
index 365996aaf5..c7e7b7d07f 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/panotools/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/panotools/default.nix
@@ -22,13 +22,13 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [
     cmake
+    perl
   ];
 
   buildInputs = [
     libjpeg
     libpng
     libtiff
-    perl
   ] ++ lib.optionals stdenv.isDarwin [
     darwin.apple_sdk.frameworks.Carbon
   ];
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/rapid-photo-downloader/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/rapid-photo-downloader/default.nix
index 494815ac93..8b952ab79d 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/rapid-photo-downloader/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/graphics/rx/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/rx/default.nix
index 77ed3f4911..c2561ed82a 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/rx/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/rx/default.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-LTpaV/fgYUgA2M6Wz5qLHnTNywh13900g+umhgLvciM=";
   };
 
-  cargoSha256 = "sha256-4hi1U4jl6QA7H8AKHlU+Hqz5iKGYHRXHDsrcqY7imkU=";
+  cargoHash = "sha256-4hi1U4jl6QA7H8AKHlU+Hqz5iKGYHRXHDsrcqY7imkU=";
 
   nativeBuildInputs = [ cmake pkg-config makeWrapper ];
 
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/scantailor/advanced.nix b/third_party/nixpkgs/pkgs/applications/graphics/scantailor/advanced.nix
index b83b9df83b..b85e0bdc60 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/scantailor/advanced.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/graphics/seamly2d/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/seamly2d/default.nix
index 7c161d0345..b25c9b6dac 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/seamly2d/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/seamly2d/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, qtbase, wrapQtAppsHook, fetchFromGitHub,
-  addOpenGLRunpath, poppler_utils, qtxmlpatterns, qtsvg, mesa, xvfb-run,
+  addDriverRunpath, poppler_utils, qtxmlpatterns, qtsvg, mesa, xvfb-run,
   fontconfig, freetype, xorg, qmake, python3, qttools, git
 }:
 let
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
   ];
 
   nativeBuildInputs = [
-    addOpenGLRunpath
+    addDriverRunpath
     xvfb-run
     fontconfig
     wrapQtAppsHook
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/smartdeblur/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/smartdeblur/default.nix
index 592244455e..db2dd60214 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/smartdeblur/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/graphics/tesseract/tesseract3.nix b/third_party/nixpkgs/pkgs/applications/graphics/tesseract/tesseract3.nix
index d796e506a8..5ee965a25e 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/tesseract/tesseract3.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/tesseract/tesseract3.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
     description = "OCR engine";
     homepage = "https://github.com/tesseract-ocr/tesseract";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ viric erikarvstedt ];
+    maintainers = with lib.maintainers; [ erikarvstedt ];
     platforms = with lib.platforms; linux ++ darwin;
     mainProgram = "tesseract";
   };
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/tesseract/tesseract4.nix b/third_party/nixpkgs/pkgs/applications/graphics/tesseract/tesseract4.nix
index bfee4bdb27..e73e237cfe 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/tesseract/tesseract4.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/tesseract/tesseract4.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
     description = "OCR engine";
     homepage = "https://github.com/tesseract-ocr/tesseract";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ viric erikarvstedt ];
+    maintainers = with lib.maintainers; [ erikarvstedt ];
     platforms = with lib.platforms; linux ++ darwin;
     mainProgram = "tesseract";
   };
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/tev/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/tev/default.nix
index ba4df38ab0..6ab953020c 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/tev/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/graphics/wings/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/wings/default.nix
index 87e0a47cc5..85237c9484 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/wings/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/graphics/wings/default.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
     homepage = "http://www.wings3d.com/";
     description = "Subdivision modeler inspired by Nendo and Mirai from Izware";
     license = lib.licenses.tcltk;
-    maintainers = with lib.maintainers; [ viric ];
+    maintainers = [ ];
     platforms = with lib.platforms; linux;
     mainProgram = "wings";
   };
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/xpano/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/xpano/default.nix
index cd6f5ff850..01501e9757 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/xpano/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/graphics/yacreader/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/yacreader/default.nix
index d3cead3671..e0fa8cc64d 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/yacreader/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/kde/alligator.nix b/third_party/nixpkgs/pkgs/applications/kde/alligator.nix
index 78263cb73b..cf178e3fe4 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/alligator.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/kde/audiotube.nix b/third_party/nixpkgs/pkgs/applications/kde/audiotube.nix
index 58d188d486..2f9937f106 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/audiotube.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/kde/calindori.nix b/third_party/nixpkgs/pkgs/applications/kde/calindori.nix
index c1e9f4d59b..d7d508f55b 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/calindori.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/kde/kalk.nix b/third_party/nixpkgs/pkgs/applications/kde/kalk.nix
index d88741d179..dd4be365d7 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/kalk.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/kde/kasts.nix b/third_party/nixpkgs/pkgs/applications/kde/kasts.nix
index 87136676df..00e87c05a4 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/kasts.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/kde/kclock.nix b/third_party/nixpkgs/pkgs/applications/kde/kclock.nix
index d97ad54177..678c5ad628 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/kclock.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/kde/kde-inotify-survey.nix b/third_party/nixpkgs/pkgs/applications/kde/kde-inotify-survey.nix
index 470e225ea0..9adbbe3a08 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/kde-inotify-survey.nix
+++ b/third_party/nixpkgs/pkgs/applications/kde/kde-inotify-survey.nix
@@ -26,6 +26,6 @@ mkDerivation {
     mainProgram = "kde-inotify-survey";
     homepage = "https://invent.kde.org/system/kde-inotify-survey";
     license = lib.licenses.gpl2Plus;
-    maintainers = [];
+    maintainers = [ ];
   };
 }
diff --git a/third_party/nixpkgs/pkgs/applications/kde/kdenlive/default.nix b/third_party/nixpkgs/pkgs/applications/kde/kdenlive/default.nix
index d5d465b8c4..13a208fd99 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/kdenlive/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/kde/kdenlive/default.nix
@@ -82,7 +82,6 @@ mkDerivation {
     kpurpose
     kdeclarative
     wrapGAppsHook3
-    glaxnimate
   ];
 
   # Both MLT and FFMpeg paths must be set or Kdenlive will complain that it
diff --git a/third_party/nixpkgs/pkgs/applications/kde/kmahjongg.nix b/third_party/nixpkgs/pkgs/applications/kde/kmahjongg.nix
index 1c2e46c211..6b089aa156 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/kmahjongg.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/kde/koko.nix b/third_party/nixpkgs/pkgs/applications/kde/koko.nix
index d47734b94e..4ea96c995b 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/koko.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/kde/kongress.nix b/third_party/nixpkgs/pkgs/applications/kde/kongress.nix
index 5738569bae..f5bfa9f919 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/kongress.nix
+++ b/third_party/nixpkgs/pkgs/applications/kde/kongress.nix
@@ -31,6 +31,6 @@ mkDerivation {
     description = "Companion application for conferences";
     homepage = "https://apps.kde.org/kongress/";
     license = lib.licenses.gpl3;
-    maintainers = [];
+    maintainers = [ ];
   };
 }
diff --git a/third_party/nixpkgs/pkgs/applications/kde/konquest.nix b/third_party/nixpkgs/pkgs/applications/kde/konquest.nix
index 41ca056f8a..ca5be592af 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/konquest.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/kde/krecorder.nix b/third_party/nixpkgs/pkgs/applications/kde/krecorder.nix
index d6bdfcc4d3..78c8e9ebb7 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/krecorder.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/kde/ksudoku.nix b/third_party/nixpkgs/pkgs/applications/kde/ksudoku.nix
index 64567ad9d8..8771c87832 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/ksudoku.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/kde/ktrip.nix b/third_party/nixpkgs/pkgs/applications/kde/ktrip.nix
index 8780a64d51..fd30379465 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/ktrip.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/kde/kweather.nix b/third_party/nixpkgs/pkgs/applications/kde/kweather.nix
index 5c2f244fae..6e2d3047d0 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/kweather.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/kde/libkdegames.nix b/third_party/nixpkgs/pkgs/applications/kde/libkdegames.nix
index ec53fa9b05..89d9626363 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/libkdegames.nix
+++ b/third_party/nixpkgs/pkgs/applications/kde/libkdegames.nix
@@ -20,6 +20,6 @@ mkDerivation {
   ];
   meta = {
     license = with lib.licenses; [ gpl2 ];
-    maintainers = with lib.maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/third_party/nixpkgs/pkgs/applications/kde/libkmahjongg.nix b/third_party/nixpkgs/pkgs/applications/kde/libkmahjongg.nix
index 6fe8c55004..1b202b6148 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/libkmahjongg.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/kde/telly-skout.nix b/third_party/nixpkgs/pkgs/applications/kde/telly-skout.nix
index 7c249c99f9..00df33583f 100644
--- a/third_party/nixpkgs/pkgs/applications/kde/telly-skout.nix
+++ b/third_party/nixpkgs/pkgs/applications/kde/telly-skout.nix
@@ -20,6 +20,6 @@ mkDerivation {
     mainProgram = "telly-skout";
     homepage = "https://apps.kde.org/telly-skout/";
     license = lib.licenses.gpl2Plus;
-    maintainers = [];
+    maintainers = [ ];
   };
 }
diff --git a/third_party/nixpkgs/pkgs/applications/logging/sosreport/default.nix b/third_party/nixpkgs/pkgs/applications/logging/sosreport/default.nix
index 53c071dcc4..6a5e3f8781 100644
--- a/third_party/nixpkgs/pkgs/applications/logging/sosreport/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/default.nix
index ce23bd8ee3..bc2b92843c 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/default.nix
@@ -11,13 +11,13 @@
 buildDotnetModule rec {
   pname = "ArchiSteamFarm";
   # nixpkgs-update: no auto update
-  version = "6.0.3.4";
+  version = "6.0.4.4";
 
   src = fetchFromGitHub {
     owner = "JustArchiNET";
     repo = "ArchiSteamFarm";
     rev = version;
-    hash = "sha256-qYB94SJYCwcUrXdKtD+ZdiPRpwXg3rOHVmFWD+Y1ZXg=";
+    hash = "sha256-5jV+EJDZ90qtYF8w7RW8jGiy36nPYsLfoOVM35ilVvw=";
   };
 
   dotnet-runtime = dotnetCorePackages.aspnetcore_8_0;
diff --git a/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/deps.nix b/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/deps.nix
index 79ed6cdf62..170e10fbeb 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/deps.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/deps.nix
@@ -2,153 +2,147 @@
 # Please dont edit it manually, your changes might get overwritten!
 
 { fetchNuGet }: [
-  (fetchNuGet { pname = "AngleSharp"; version = "1.1.2"; sha256 = "0rfild46lmqhxkfh6nhy7a9m8zzv25lj29riav5j6dmzw07l7wif"; })
-  (fetchNuGet { pname = "AngleSharp.XPath"; version = "2.0.4"; sha256 = "0cqgabpjc7pwhlix5j43x6ppj21qnsc7nswn3zm6z004vcggfwf3"; })
-  (fetchNuGet { pname = "ConfigureAwaitChecker.Analyzer"; version = "5.0.0.1"; sha256 = "01llfwhra5m3jj1qpa4rj1hbh01drirakzjc2963vkl9iwrzscyl"; })
-  (fetchNuGet { pname = "CryptSharpStandard"; version = "1.0.0"; sha256 = "0nikzb92z4a2n969sz747ginwxsbrap5741bcwwxr4r6m2na9jz7"; })
-  (fetchNuGet { pname = "Humanizer"; version = "2.14.1"; sha256 = "18cycx9gvbc3735chdi2r583x73m2fkz1ws03yi3g640j9zv00fp"; })
-  (fetchNuGet { pname = "Humanizer.Core"; version = "2.14.1"; sha256 = "1ai7hgr0qwd7xlqfd92immddyi41j3ag91h3594yzfsgsy6yhyqi"; })
-  (fetchNuGet { pname = "Humanizer.Core.af"; version = "2.14.1"; sha256 = "197lsky6chbmrixgsg6dvxbdbbpis0an8mn6vnwjcydhncis087h"; })
-  (fetchNuGet { pname = "Humanizer.Core.ar"; version = "2.14.1"; sha256 = "03rz12mxrjv5afm1hn4rrpimkkb8wdzp17634dcq10fhpbwhy6i5"; })
-  (fetchNuGet { pname = "Humanizer.Core.az"; version = "2.14.1"; sha256 = "138kdhy86afy5n72wy12qlb25q4034z73lz5nbibmkixxdnj9g5r"; })
-  (fetchNuGet { pname = "Humanizer.Core.bg"; version = "2.14.1"; sha256 = "0scwzrvv8332prijkbp4y11n172smjb4sf7ygia6bi3ibhzq7zjy"; })
-  (fetchNuGet { pname = "Humanizer.Core.bn-BD"; version = "2.14.1"; sha256 = "1322kn7ym46mslh32sgwkv07l3jkkx7cw5wjphql2ziphxw536p8"; })
-  (fetchNuGet { pname = "Humanizer.Core.cs"; version = "2.14.1"; sha256 = "1zl3vsdd2pw3nm05qpnr6c75y7gacgaghg9sj07ksvsjmklgqqih"; })
-  (fetchNuGet { pname = "Humanizer.Core.da"; version = "2.14.1"; sha256 = "10rmrvzwp212fpxv0sdq8f0sjymccsdn71k99f845kz0js83r70s"; })
-  (fetchNuGet { pname = "Humanizer.Core.de"; version = "2.14.1"; sha256 = "0j7kld0jdiqwin83arais9gzjj85mpshmxls64yi58qhl7qjzk0j"; })
-  (fetchNuGet { pname = "Humanizer.Core.el"; version = "2.14.1"; sha256 = "143q1321qh5506wwvcpy0fj7hpbd9i1k75247mqs2my05x9vc8n0"; })
-  (fetchNuGet { pname = "Humanizer.Core.es"; version = "2.14.1"; sha256 = "011kscy671mgyx412h55b0x9a1ngmdsgqzqq1w0l10xhf90y4hc8"; })
-  (fetchNuGet { pname = "Humanizer.Core.fa"; version = "2.14.1"; sha256 = "184dxwkf251c27h7gg9y5zciixgcwy1cmdrs0bqrph7gg69kp6yq"; })
-  (fetchNuGet { pname = "Humanizer.Core.fi-FI"; version = "2.14.1"; sha256 = "144jlnlipr3pnbcyhbgrd2lxibx8vy00lp2zn60ihxppgbisircc"; })
-  (fetchNuGet { pname = "Humanizer.Core.fr"; version = "2.14.1"; sha256 = "0klnfy8n659sp8zngd87gy7qakd56dwr1axjjzk0zph1zvww09jq"; })
-  (fetchNuGet { pname = "Humanizer.Core.fr-BE"; version = "2.14.1"; sha256 = "0b70illi4m58xvlqwcvar0smh6292zadzk2r8c25ryijh6d5a9qv"; })
-  (fetchNuGet { pname = "Humanizer.Core.he"; version = "2.14.1"; sha256 = "08xkiv88qqd1b0frpalb2npq9rvz2q1yz48k6dikrjvy6amggirh"; })
-  (fetchNuGet { pname = "Humanizer.Core.hr"; version = "2.14.1"; sha256 = "12djmwxfg03018j2bqq5ikwkllyma8k7zmvpw61vxs7cv4izc6wh"; })
-  (fetchNuGet { pname = "Humanizer.Core.hu"; version = "2.14.1"; sha256 = "0lw13p9b2kbqf96lif5kx59axxiahd617h154iswjfka9kxdw65x"; })
-  (fetchNuGet { pname = "Humanizer.Core.hy"; version = "2.14.1"; sha256 = "1bgm0yabhvsv70amzmkvf3mls32lvd7yyr59yxf3xc96msqczgjh"; })
-  (fetchNuGet { pname = "Humanizer.Core.id"; version = "2.14.1"; sha256 = "1w0bnyac46f2321l09ckb6vz66s1bxl27skfww1iwrmf03i7m2cw"; })
-  (fetchNuGet { pname = "Humanizer.Core.is"; version = "2.14.1"; sha256 = "10w1fprlhxm1qy3rh0qf6z86ahrv8fcza3wrsx55idlmar1x9jyz"; })
-  (fetchNuGet { pname = "Humanizer.Core.it"; version = "2.14.1"; sha256 = "1msrmih8cp7r4yj7r85kr0l5h4yln80450mivliy1x322dav8xz2"; })
-  (fetchNuGet { pname = "Humanizer.Core.ja"; version = "2.14.1"; sha256 = "04ry6z0v85y4y5vzbqlbxppfdm04i02dxbxaaykbps09rwqaa250"; })
-  (fetchNuGet { pname = "Humanizer.Core.ko-KR"; version = "2.14.1"; sha256 = "156641v0ilrpbzprscvbzfha57pri4y1i66n9v056nc8bm10ggbg"; })
-  (fetchNuGet { pname = "Humanizer.Core.ku"; version = "2.14.1"; sha256 = "1scz21vgclbm1xhaw89f0v8s0vx46yv8yk3ij0nr6shsncgq9f7h"; })
-  (fetchNuGet { pname = "Humanizer.Core.lv"; version = "2.14.1"; sha256 = "1909dsbxiv2sgj6myfhn8lbbmvkp2hjahj0knawypyq3jw9sq86g"; })
-  (fetchNuGet { pname = "Humanizer.Core.ms-MY"; version = "2.14.1"; sha256 = "1dmjrxb0kb297ycr8xf7ni3l7y4wdqrdhqbhy8xnm8dx90nmj9x5"; })
-  (fetchNuGet { pname = "Humanizer.Core.mt"; version = "2.14.1"; sha256 = "0b183r1apzfa1hasimp2f27yfjkfp87nfbd8qdyrqdigw6nzcics"; })
-  (fetchNuGet { pname = "Humanizer.Core.nb"; version = "2.14.1"; sha256 = "12rd75f83lv6z12b5hbwnarv3dkk29pvc836jpg2mzffm0g0kxj2"; })
-  (fetchNuGet { pname = "Humanizer.Core.nb-NO"; version = "2.14.1"; sha256 = "1n033yfw44sjf99mv51c53wggjdffz8b9wv7gwm3q7i6g7ck4vv1"; })
-  (fetchNuGet { pname = "Humanizer.Core.nl"; version = "2.14.1"; sha256 = "0q4231by40bsr6mjy93n0zs365pz6da32pwkxcz1cc2hfdlkn0vd"; })
-  (fetchNuGet { pname = "Humanizer.Core.pl"; version = "2.14.1"; sha256 = "0h2wbwrlcmjk8b2mryyd8rbb1qmripvg0zyg61gg0hifiqfg3cr2"; })
-  (fetchNuGet { pname = "Humanizer.Core.pt"; version = "2.14.1"; sha256 = "0pg260zvyhqz8h1c96px1vs9q5ywvd0j2ixsq21mj96dj7bl5fay"; })
-  (fetchNuGet { pname = "Humanizer.Core.ro"; version = "2.14.1"; sha256 = "04mr28bjcb9hs0wmpb4nk2v178i0fjr0ymc78dv9bbqkmrzfsmcn"; })
-  (fetchNuGet { pname = "Humanizer.Core.ru"; version = "2.14.1"; sha256 = "060abvk7mrgawipjgw0h4hrvizby7acmj58w2g35fv54g43isgcl"; })
-  (fetchNuGet { pname = "Humanizer.Core.sk"; version = "2.14.1"; sha256 = "182xiqf71kiqp42b8yqrag6z57wzqraqi10bnhx0crrc1gxq8v0j"; })
-  (fetchNuGet { pname = "Humanizer.Core.sl"; version = "2.14.1"; sha256 = "12ygvzyqa0km7a0wz42zssq8qqakvghh96x1ng7qvwcrna3v2rdi"; })
-  (fetchNuGet { pname = "Humanizer.Core.sr"; version = "2.14.1"; sha256 = "1ggj15qksyr16rilq2w76x38bxp6a6z75b30c9b7w5ni88nkgc7x"; })
-  (fetchNuGet { pname = "Humanizer.Core.sr-Latn"; version = "2.14.1"; sha256 = "0lwr0gnashirny8lgaw0qnbb7x0qrjg8fs11594x8l7li3mahzz3"; })
-  (fetchNuGet { pname = "Humanizer.Core.sv"; version = "2.14.1"; sha256 = "1c7yx59haikdqx7k7vqll6223jjmikgwbl3dzmrcs3laywgfnmgn"; })
-  (fetchNuGet { pname = "Humanizer.Core.th-TH"; version = "2.14.1"; sha256 = "0kyyi5wc23i2lcag3zvrhga9gsnba3ahl4kdlaqvvg2jhdfarl4m"; })
-  (fetchNuGet { pname = "Humanizer.Core.tr"; version = "2.14.1"; sha256 = "0rdvp0an263b2nj3c5v11hvdwgmj86ljf2m1h3g1x28pygbcx6am"; })
-  (fetchNuGet { pname = "Humanizer.Core.uk"; version = "2.14.1"; sha256 = "0a2p6mhh0ajn0y7x98zbfasln1l04iiknd50sgf3svna99wybnxd"; })
-  (fetchNuGet { pname = "Humanizer.Core.uz-Cyrl-UZ"; version = "2.14.1"; sha256 = "1jfzfgnk6wz5na2md800vq0djm6z194x618yvwxbnk2c7wikbjj2"; })
-  (fetchNuGet { pname = "Humanizer.Core.uz-Latn-UZ"; version = "2.14.1"; sha256 = "0vimhw500rq60naxfari8qm6gjmjm8h9j6c04k67fs447djy8ndi"; })
-  (fetchNuGet { pname = "Humanizer.Core.vi"; version = "2.14.1"; sha256 = "1yr0l73cy2qypkssmmjwfbbqgdplam62dqnzk9vx6x47dzpys077"; })
-  (fetchNuGet { pname = "Humanizer.Core.zh-CN"; version = "2.14.1"; sha256 = "1k6nnawd016xpwgzdzy84z1lcv2vc1cygcksw19wbgd8dharyyk7"; })
-  (fetchNuGet { pname = "Humanizer.Core.zh-Hans"; version = "2.14.1"; sha256 = "0zn99311zfn602phxyskfjq9vly0w5712z6fly8r4q0h94qa8c85"; })
-  (fetchNuGet { pname = "Humanizer.Core.zh-Hant"; version = "2.14.1"; sha256 = "0qxjnbdj645l5sd6y3100yyrq1jy5misswg6xcch06x8jv7zaw1p"; })
-  (fetchNuGet { pname = "JetBrains.Annotations"; version = "2023.3.0"; sha256 = "0vp4mpn6gfckn8grzjm1jxlbqiq2fglm2rk9wq787adw7rxs8k7w"; })
-  (fetchNuGet { pname = "Markdig.Signed"; version = "0.37.0"; sha256 = "0pcysg74pvhqs13087dh5r90xnixklmnz7bwv02304927mkv5345"; })
-  (fetchNuGet { pname = "Microsoft.ApplicationInsights"; version = "2.22.0"; sha256 = "0h5qkhmazlvwvjmxxj9pp2404rmvk55yf6npwcmlskv9mgfkli4r"; })
-  (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-arm64"; version = "8.0.0"; sha256 = "05y1xb5fw8lzvb4si77a5qwfwfz1855crqbphrwky6x9llivbhkx"; })
-  (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "8.0.0"; sha256 = "18zdbcb2bn7wy1dp14z5jyqiiwr9rkad1lcb158r5ikjfq1rg5iw"; })
-  (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-arm64"; version = "8.0.0"; sha256 = "1nbxzmj6cnccylxis67c54c0ik38ma4rwdvgg6sxd6r04219maqm"; })
-  (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "8.0.0"; sha256 = "1wqkbjd1ywv9w397l7rsb89mijc5n0hv7jq9h09xfz6wn9qsp152"; })
-  (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; sha256 = "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3"; })
-  (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.10.0"; sha256 = "0s0v7jmrq85n356xv7zixvwa4z94fszjcr5vll8x4im1a2lp00f9"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.ApiDescription.Server"; version = "6.0.5"; sha256 = "1pi2bm3cm0a7jzqzmfc2r7bpcdkmk3hhjfvb2c81j7wl7xdw3624"; })
-  (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.DependencyInjection"; version = "8.0.0"; sha256 = "0i7qziz0iqmbk8zzln7kx9vd0lbx1x3va0yi3j1bgkjir13h78ps"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "8.0.0"; sha256 = "1zw0bpp5742jzx03wvqc8csnvsbgdqi0ls9jfc5i2vd3cl8b74pg"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.Diagnostics.Abstractions"; version = "8.0.0"; sha256 = "15m4j6w9n8h0mj7hlfzb83hd3wn7aq1s7fxbicm16slsjfwzj82i"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; version = "8.0.0"; sha256 = "1idq65fxwcn882c06yci7nscy9i0rgw6mqjrl7362prvvsd9f15r"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.Hosting.Abstractions"; version = "8.0.0"; sha256 = "00d5dwmzw76iy8z40ly01hy9gly49a7rpf7k7m99vrid1kxp346h"; })
-  (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "8.0.0"; sha256 = "0nppj34nmq25gnrg0wh1q22y4wdqbih4ax493f226azv8mkp9s1i"; })
-  (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.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.IdentityModel.Abstractions"; version = "7.6.0"; sha256 = "18g4j9n47387k4ym3kl2dzhhhs6fs5rq96757fc4lcdql2rpkmp0"; })
-  (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "7.6.0"; sha256 = "11znwbbg44hhz3ly6j6q81qz83yqf97jj5zhpldng5zq0h791srl"; })
-  (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "7.6.0"; sha256 = "1slkzygcn4abpqip4rmi73h9096ihjkkaiwgmkaiba9pidn9lzlx"; })
-  (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "7.6.0"; sha256 = "1blj1ayw9qpjpsnb4k95s03pdkin0032mxgznfaw1z1qhhiqdnsi"; })
-  (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.10.0"; sha256 = "13g8fwl09li8fc71nk13dgkb7gahd4qhamyg2xby7am63nlchhdf"; })
-  (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-arm64"; version = "8.0.0"; sha256 = "0gwqmkmr7jy3sjh9gha82amlry41gp8nwswy2iqfw54f28db63n7"; })
-  (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "8.0.0"; sha256 = "042cjvnwrrjs3mw5q8q5kinh0cwkks33i3n1vyifaid2jbr3wlc0"; })
-  (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-arm64"; version = "8.0.0"; sha256 = "06ndp4wh1cap01dql3nixka4g56bf6ipmqys7xaxvg4xisf79x8d"; })
-  (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "8.0.0"; sha256 = "1kh5bnaf6h9mr4swcalrp304625frjiw6mlz1052rxwzsdq98a96"; })
-  (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; })
-  (fetchNuGet { pname = "Microsoft.OpenApi"; version = "1.6.14"; sha256 = "1wr8crmjg4gznm3jqgz9s9p285vrwb8a6baqc6gz3b58rn4m88km"; })
-  (fetchNuGet { pname = "Microsoft.Testing.Extensions.Telemetry"; version = "1.2.1"; sha256 = "1a6hyd3szjjpjkbr0ncfria0x2qijv3lwr4drhxm15xamfy23azw"; })
-  (fetchNuGet { pname = "Microsoft.Testing.Extensions.TrxReport.Abstractions"; version = "1.2.1"; sha256 = "19309m0b9cjy1642m99ipjvr6gxq6qb008bam3l10m1mz8m81j31"; })
-  (fetchNuGet { pname = "Microsoft.Testing.Extensions.VSTestBridge"; version = "1.2.1"; sha256 = "1bly8375zng21yjbfdi08c14lgapngv06p1dlzbryimxicqzxixx"; })
-  (fetchNuGet { pname = "Microsoft.Testing.Platform"; version = "1.2.1"; sha256 = "0zlbqmvdb1vxnvmxh6lk65mz57c7mz6dqb1s8in0cfww8kxg058k"; })
-  (fetchNuGet { pname = "Microsoft.Testing.Platform.MSBuild"; version = "1.2.1"; sha256 = "07674xnhc84h36pvzswx6ibjy0bgfi2bxhqm1zyq9fidmim0ch07"; })
-  (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.10.0"; sha256 = "07j69cw8r39533w4p39mnj00kahazz38760in3jfc45kmlcdb26x"; })
-  (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.5.0"; sha256 = "0qkjyf3ky6xpjg5is2sdsawm99ka7fzgid2bvpglwmmawqgm8gls"; })
-  (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.10.0"; sha256 = "1bl471s7fx9jycr0cc8rylwf34mrvlg9qn1an6l86nisavfcyb7v"; })
-  (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"; })
-  (fetchNuGet { pname = "MSTest"; version = "3.4.3"; sha256 = "070avma2zdxdpn23a9chgz9n1kglxh8nbb1g2ggzk3xxi5sdjj0n"; })
-  (fetchNuGet { pname = "MSTest.Analyzers"; version = "3.4.3"; sha256 = "14a6rzh4cvaf9bw63qlxw242fbmk4agyx9qgl19swpciqcaq7pxi"; })
-  (fetchNuGet { pname = "MSTest.TestAdapter"; version = "3.4.3"; sha256 = "0hsslndnfyb6shgkmgy10f1c9p6b47ry20zr2l1msagmkrk49s5q"; })
-  (fetchNuGet { pname = "MSTest.TestFramework"; version = "3.4.3"; sha256 = "0hviglzfv16dd3aczny455sy1k0rikzd5w34smfpjyxc0wqx6xvp"; })
-  (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; })
-  (fetchNuGet { pname = "Nito.AsyncEx.Coordination"; version = "5.1.2"; sha256 = "0sxvmqnv8a94k3pq1w3lh1vgjb8l62h1qamxcjl3pkq634h2fwrl"; })
-  (fetchNuGet { pname = "Nito.AsyncEx.Tasks"; version = "5.1.2"; sha256 = "11wp47kc69sjdxrbg5pgx0wlffqlp0x5kr54ggnz2v19kmjz362v"; })
-  (fetchNuGet { pname = "Nito.Collections.Deque"; version = "1.1.1"; sha256 = "152564q3s0n5swfv5p5rx0ghn2sm0g2xsnbd7gv8vb9yfklv7yg8"; })
-  (fetchNuGet { pname = "Nito.Disposables"; version = "2.2.1"; sha256 = "1hx5k8497j34kxxgh060bvij0vfnraw90dmm3h9bmamcdi8wp80l"; })
-  (fetchNuGet { pname = "NLog"; version = "5.3.2"; sha256 = "01qnzmwvc93yywhvy5g29fb8jnalfi82az7296nblyqjalhbzz3g"; })
-  (fetchNuGet { pname = "NLog.Extensions.Logging"; version = "5.3.11"; sha256 = "0j276q0a14qk9nc3f03265jl5wp38bnm7dyyx0s4kxkyb3kx3z8c"; })
-  (fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "5.3.11"; sha256 = "17xvaj54liyk9zq0f80z1ai6wq4rgj6xy93znvsdcnldmin1icz9"; })
-  (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.11.0"; sha256 = "0wv26gq39hfqw9md32amr5771s73f5zn1z9vs4y77cgynxr73s4z"; })
-  (fetchNuGet { pname = "OpenTelemetry"; version = "1.7.0-rc.1"; sha256 = "0y16qp3xrypk48f27pfvccic47p9wpl4qx8mar4rf2b78ca21c9p"; })
-  (fetchNuGet { pname = "OpenTelemetry"; version = "1.8.1"; sha256 = "1slyjdzbiv179sq91bq6bhbqw20jmk6j9x1g5fhvnqsymfqmnmq2"; })
-  (fetchNuGet { pname = "OpenTelemetry.Api"; version = "1.7.0-rc.1"; sha256 = "1i09vjjrimg0bwraamsjdqx886apscwj72skds3ysvc9c7n0hpl2"; })
-  (fetchNuGet { pname = "OpenTelemetry.Api"; version = "1.8.0"; sha256 = "0s402mz4gz1chlg29159awawpi6ms4ln5gdds01y38wx6cia6lb9"; })
-  (fetchNuGet { pname = "OpenTelemetry.Api"; version = "1.8.1"; sha256 = "0c2dvnnnizn5g50js336lkgfxh6klcdb0h8pppf68v3liwlhxly5"; })
-  (fetchNuGet { pname = "OpenTelemetry.Api.ProviderBuilderExtensions"; version = "1.7.0-rc.1"; sha256 = "1ayy2q9cg6482ahvz3cx7a3cikjrnmr5kr7yk9qnbbwy0wfmb6gw"; })
-  (fetchNuGet { pname = "OpenTelemetry.Api.ProviderBuilderExtensions"; version = "1.8.0"; sha256 = "1vhl02w068ynhpak0pyjn2xmrnisl9m73lmsckwkncrhinplw7hz"; })
-  (fetchNuGet { pname = "OpenTelemetry.Api.ProviderBuilderExtensions"; version = "1.8.1"; sha256 = "0lys1l0qsna2h82j2rbxi5fc8barrq43fs0lradr85r7sy3x91cg"; })
-  (fetchNuGet { pname = "OpenTelemetry.Exporter.Prometheus.AspNetCore"; version = "1.7.0-rc.1"; sha256 = "1777nbj78yppmqmwvv0bsl4l0vp8lfc5fpsdmknf6wl354f0z1f8"; })
-  (fetchNuGet { pname = "OpenTelemetry.Extensions.Hosting"; version = "1.8.1"; sha256 = "01vi9sqb2j25i6926c581w067nadf4q4hs0hkwjg8wpzhxz0n3xq"; })
-  (fetchNuGet { pname = "OpenTelemetry.Instrumentation.AspNetCore"; version = "1.8.1"; sha256 = "0s5kxqjhmwm2p2sblmmsavvmknqb8yr0b07ngq8hk0w8b48kyc0h"; })
-  (fetchNuGet { pname = "OpenTelemetry.Instrumentation.Http"; version = "1.8.1"; sha256 = "0p3mw08vi9ljf06239n8b1hfj0cqqb198qn89sf39mdjsy13ca95"; })
-  (fetchNuGet { pname = "OpenTelemetry.Instrumentation.Runtime"; version = "1.8.1"; sha256 = "0j2i01378848nvib1krk948lp74x8ykgspka05g37a3s284p1nyd"; })
-  (fetchNuGet { pname = "protobuf-net"; version = "3.2.30"; sha256 = "08bjdn8dbqpzn5c9fw89y5766irwplgyzhyxcrjzpywkwpj75r4i"; })
-  (fetchNuGet { pname = "protobuf-net.Core"; version = "3.2.30"; sha256 = "01mgw4s0b2vxf55v6fa3n5l9jwk6bkl60aaqv7azl198wwslkjhq"; })
-  (fetchNuGet { pname = "SteamKit2"; version = "3.0.0-alpha.1"; sha256 = "01lrbkbpfqdkhba9hsfg9fqyh1sa9r2cp54r2wlb83zfr3f5q8l8"; })
-  (fetchNuGet { pname = "Swashbuckle.AspNetCore"; version = "6.6.2"; sha256 = "0lq774iggpvsmykbrplvv2a5z2ylsslv5wynmvpnlznd4lvgxb4h"; })
-  (fetchNuGet { pname = "Swashbuckle.AspNetCore.Annotations"; version = "6.6.2"; sha256 = "1snz71ws87kr8pz4c3zcla51mqbly015ib6b0y20xvkj25qx7gl8"; })
-  (fetchNuGet { pname = "Swashbuckle.AspNetCore.Swagger"; version = "6.6.2"; sha256 = "0j93y0krn5fzvji0k7g4cxi22b7j8n3brxw4698pjq2pqqf2d8qy"; })
-  (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerGen"; version = "6.6.2"; sha256 = "00lar7246mncidflm15xz5b9hpni9bf8wj37dc0l2sj3hhv9nvwj"; })
-  (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerUI"; version = "6.6.2"; sha256 = "0w0h2cs8n5avczzm5plzmkvkc6xn0pj425f4400fk21h8ysvhg8h"; })
-  (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.7.1"; sha256 = "1nh4nlxfc7lbnbl86wwk1a3jwl6myz5j6hvgh5sp4krim9901hsq"; })
-  (fetchNuGet { pname = "System.Collections.Immutable"; version = "7.0.0"; sha256 = "1n9122cy6v3qhsisc9lzwa1m1j62b8pi2678nsmnlyvfpk0zdagm"; })
-  (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.Diagnostics.DiagnosticSource"; version = "5.0.0"; sha256 = "0phd2qizshjvglhzws1jd0cq4m54gscz4ychzr3x6wbgl4vvfrga"; })
-  (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "8.0.0"; sha256 = "0nzra1i0mljvmnj1qqqg37xs7bl71fnpl68nwmdajchh65l878zr"; })
-  (fetchNuGet { pname = "System.IO.Hashing"; version = "8.0.0"; sha256 = "1hg5i9hiihj9x4d0mlvhfddmivzrhzz83dyh26fqw1nd8jvqccxk"; })
-  (fetchNuGet { pname = "System.Linq.Async"; version = "6.0.1"; sha256 = "10ira8hmv0i54yp9ggrrdm1c06j538sijfjpn1kmnh9j2xk5yzmq"; })
-  (fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.6.0"; sha256 = "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4"; })
-  (fetchNuGet { pname = "System.Security.AccessControl"; version = "5.0.0"; sha256 = "17n3lrrl6vahkqmhlpn3w20afgz09n7i6rv0r3qypngwi7wqdr5r"; })
-  (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "8.0.0"; sha256 = "1ysjx3b5ips41s32zacf4vs7ig41906mxrsbmykdzi0hvdmjkgbx"; })
-  (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; sha256 = "1mpk7xj76lxgz97a5yg93wi8lj0l8p157a5d50mmjy3gbz1904q8"; })
-  (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "8.0.0"; sha256 = "1lgdd78cik4qyvp2fggaa0kzxasw6kc9a6cjqw46siagrm0qnc3y"; })
+  (fetchNuGet { pname = "AngleSharp"; version = "1.1.2"; hash = "sha256-LvJDD+C/NiPLVjEnIWkR+39UkzoeWgPd7BBXakij0WU="; })
+  (fetchNuGet { pname = "AngleSharp.XPath"; version = "2.0.4"; hash = "sha256-w3H3HtsEgG/qH5Zre5i2OAh5r+mDyNIjhfweJu9SDzM="; })
+  (fetchNuGet { pname = "ConfigureAwaitChecker.Analyzer"; version = "5.0.0.1"; hash = "sha256-1DP9M4+Jzj1MEkz+qXLMLQC4YJCZqIuDlKMWlSF3lAY="; })
+  (fetchNuGet { pname = "CryptSharpStandard"; version = "1.0.0"; hash = "sha256-58ukrKgmk9w5ZyuQU67KS3du4zvkfJ1MskKRL9L6M1o="; })
+  (fetchNuGet { pname = "Humanizer"; version = "3.0.0-beta.54"; hash = "sha256-QIQFZYsW58l1xi9iw5VyAzo9bCCAojHQKXi0+dMH86Y="; })
+  (fetchNuGet { pname = "Humanizer.Core"; version = "3.0.0-beta.54"; hash = "sha256-KQdtkJ1uqstncqPmvWNW/PwMenyw1bW54P9unDVtO0Y="; })
+  (fetchNuGet { pname = "Humanizer.Core.af"; version = "3.0.0-beta.54"; hash = "sha256-b2F23Ntez1spMh+H90P1yIMzTghyLSw6SoQgSoH7MGI="; })
+  (fetchNuGet { pname = "Humanizer.Core.ar"; version = "3.0.0-beta.54"; hash = "sha256-deIHuegZjN178w9bHU3QgG5wUSm3ZeepyHihBdiXbtQ="; })
+  (fetchNuGet { pname = "Humanizer.Core.az"; version = "3.0.0-beta.54"; hash = "sha256-jFMlxjSVIz2Qiv4DSHK2U8OqyBWL9juQOlB2xrC84YE="; })
+  (fetchNuGet { pname = "Humanizer.Core.bg"; version = "3.0.0-beta.54"; hash = "sha256-MfCHFo3SjU3QScfD/TQuV7FdR18i6EQVb/ophQY/6Yk="; })
+  (fetchNuGet { pname = "Humanizer.Core.bn-BD"; version = "3.0.0-beta.54"; hash = "sha256-lBSo0VFbuIagbznWWK7U+ecr3jz7dBGwFvCx3ligXsk="; })
+  (fetchNuGet { pname = "Humanizer.Core.cs"; version = "3.0.0-beta.54"; hash = "sha256-mhD6davLTy+v1tatG7wBYQdpo204hTKureuVpx8E7MA="; })
+  (fetchNuGet { pname = "Humanizer.Core.da"; version = "3.0.0-beta.54"; hash = "sha256-5mE9JXGhBichj39Ds8ue4NOymzUQIjjJnSO84fZKK+c="; })
+  (fetchNuGet { pname = "Humanizer.Core.de"; version = "3.0.0-beta.54"; hash = "sha256-AknBQzk94LVu2NY2QYJqjCI11pfpLXi2pLgelZCpvds="; })
+  (fetchNuGet { pname = "Humanizer.Core.el"; version = "3.0.0-beta.54"; hash = "sha256-O8XR1zUP1lk3OFFI1vtwvzXOoLQfN7LxQlR6MEumPKM="; })
+  (fetchNuGet { pname = "Humanizer.Core.es"; version = "3.0.0-beta.54"; hash = "sha256-Mp5SZwO5TOhK+wghOxEoKySlH19xx2Vs80pD8zJuWQU="; })
+  (fetchNuGet { pname = "Humanizer.Core.fa"; version = "3.0.0-beta.54"; hash = "sha256-ONY2tAvoVpGbR3rFUsNfN3ldkjb9okH6GNTN72P983Y="; })
+  (fetchNuGet { pname = "Humanizer.Core.fi-FI"; version = "3.0.0-beta.54"; hash = "sha256-NgdDNR8qtQYFx8qBcy3ybPqWRBqKy4w7xrL4F/79SvI="; })
+  (fetchNuGet { pname = "Humanizer.Core.fr"; version = "3.0.0-beta.54"; hash = "sha256-/aGQGAB4FIZ9P6ah+weq39XOC0MZMGOvhgainLIYvk4="; })
+  (fetchNuGet { pname = "Humanizer.Core.fr-BE"; version = "3.0.0-beta.54"; hash = "sha256-bLNidoLR5tZASSP85DCX2QjTPTgqoFZDLsZXov3ec8Q="; })
+  (fetchNuGet { pname = "Humanizer.Core.he"; version = "3.0.0-beta.54"; hash = "sha256-Ef0yaO9mbcHqpUhruZpWZgGcLtEZEu4yRC0nvujTOKQ="; })
+  (fetchNuGet { pname = "Humanizer.Core.hr"; version = "3.0.0-beta.54"; hash = "sha256-Loifax8U+8ho/Gyw2NcwNFywleKYNB1Hr9waTHGjmrg="; })
+  (fetchNuGet { pname = "Humanizer.Core.hu"; version = "3.0.0-beta.54"; hash = "sha256-tPgZGD2AE68c67Rrpo5PK15q9ZXP7RwttaGwGfUp4lU="; })
+  (fetchNuGet { pname = "Humanizer.Core.hy"; version = "3.0.0-beta.54"; hash = "sha256-YWwDuwrilm22gzCMui+u71Q+FVg/kMxVa8xCX2v+isU="; })
+  (fetchNuGet { pname = "Humanizer.Core.id"; version = "3.0.0-beta.54"; hash = "sha256-SZYleWmQ10OguOylRlgct7TVN8Sc2vrs4g492fteghM="; })
+  (fetchNuGet { pname = "Humanizer.Core.is"; version = "3.0.0-beta.54"; hash = "sha256-7xIFwbQqqcFZhJFgQGgcDj0aS9GCkzk5hoxpUSPVfG0="; })
+  (fetchNuGet { pname = "Humanizer.Core.it"; version = "3.0.0-beta.54"; hash = "sha256-ckKN4D4Ae/TsxytAeqznNMgzT+Jv82x2MQSnZJMios4="; })
+  (fetchNuGet { pname = "Humanizer.Core.ja"; version = "3.0.0-beta.54"; hash = "sha256-kHZAfhn8FXJTND/09ue7wpD7WpGxCWHHpn0CgypJLqw="; })
+  (fetchNuGet { pname = "Humanizer.Core.ko-KR"; version = "3.0.0-beta.54"; hash = "sha256-zLT2nlRba85r85s2Bt9WSJwuueYSr3xLwJHOW8Soy20="; })
+  (fetchNuGet { pname = "Humanizer.Core.ku"; version = "3.0.0-beta.54"; hash = "sha256-Ef+QUC0b3kE6HmTa8CQinsHyd+ehpFlFxtmr5A/E9dE="; })
+  (fetchNuGet { pname = "Humanizer.Core.lb"; version = "3.0.0-beta.54"; hash = "sha256-5hP1M9H+6uo7inDJMYNAjo0r/V3lIPb3mnmUKFe+CCw="; })
+  (fetchNuGet { pname = "Humanizer.Core.lt"; version = "3.0.0-beta.54"; hash = "sha256-SVDSW5CLqGL0SzqIJF+LbPuKmD/92CA/xjgsDXucNc8="; })
+  (fetchNuGet { pname = "Humanizer.Core.lv"; version = "3.0.0-beta.54"; hash = "sha256-idNNH20jP++HlWli9FAcNoDsGz4Tc5UST4gxlb/ZvJA="; })
+  (fetchNuGet { pname = "Humanizer.Core.ms-MY"; version = "3.0.0-beta.54"; hash = "sha256-aOrRmEDXCbN9Fmf0uUFn2zFePDT1uC6/gvqEThH4Frg="; })
+  (fetchNuGet { pname = "Humanizer.Core.mt"; version = "3.0.0-beta.54"; hash = "sha256-B5mZrT0iTnfcxAOWNXt+SOXYi1klCqjPiP58p05gfFs="; })
+  (fetchNuGet { pname = "Humanizer.Core.nb"; version = "3.0.0-beta.54"; hash = "sha256-+vGxff/C9l6P40MCy24ZEcS+GwlYQoBCjOv1TgX7ZZ0="; })
+  (fetchNuGet { pname = "Humanizer.Core.nb-NO"; version = "3.0.0-beta.54"; hash = "sha256-PdAieSuOp883+5fQY4OQYhMXgclTaX7RYSRQgmJcuWM="; })
+  (fetchNuGet { pname = "Humanizer.Core.nl"; version = "3.0.0-beta.54"; hash = "sha256-hwpUHNioWLXOAPePZ6atdfm9B2mrv3YDUinxtp5l5cQ="; })
+  (fetchNuGet { pname = "Humanizer.Core.pl"; version = "3.0.0-beta.54"; hash = "sha256-MTxJ+XGfR/ShDV5HlI5iOQ8fJpwhLuk+ELwipgz/SYM="; })
+  (fetchNuGet { pname = "Humanizer.Core.pt"; version = "3.0.0-beta.54"; hash = "sha256-cshgIqnIU+28cIKiGX4aojdDdAVu0Y3oTo9LPfuuxmk="; })
+  (fetchNuGet { pname = "Humanizer.Core.ro"; version = "3.0.0-beta.54"; hash = "sha256-1RsFju1P3XCi+12zWH9jVhp3iQ1htPCq4A3DIE/dErI="; })
+  (fetchNuGet { pname = "Humanizer.Core.ru"; version = "3.0.0-beta.54"; hash = "sha256-c5Ll2kUZm1vhDfkIblW2yi+MmQTSCrDmjaS9FkC63nc="; })
+  (fetchNuGet { pname = "Humanizer.Core.sk"; version = "3.0.0-beta.54"; hash = "sha256-MeFFOBinomAJ1aooldh2BfFi2jKl4gsf3rF6sqHiRRE="; })
+  (fetchNuGet { pname = "Humanizer.Core.sl"; version = "3.0.0-beta.54"; hash = "sha256-ggOLhhI8RcjmG4nG6vJVK4EbubN/Mw1l1n8CchgMZJc="; })
+  (fetchNuGet { pname = "Humanizer.Core.sr"; version = "3.0.0-beta.54"; hash = "sha256-05yA3P0VMmRFfq0v0hCItNuYt++LDkBCk7ScYa3UOXw="; })
+  (fetchNuGet { pname = "Humanizer.Core.sr-Latn"; version = "3.0.0-beta.54"; hash = "sha256-62kozBOCEdLM1W1AzqsoMHGtU3S3msK2uGTm7qxCf5Q="; })
+  (fetchNuGet { pname = "Humanizer.Core.sv"; version = "3.0.0-beta.54"; hash = "sha256-g+t6p+0AqyptEHkc+a1HKm77vBggMTNeqQf6KjeuygU="; })
+  (fetchNuGet { pname = "Humanizer.Core.th-TH"; version = "3.0.0-beta.54"; hash = "sha256-mGYaSb8TaThiJc+iJ1mj6zjzQOjQSbTlaGs4mZyAiQA="; })
+  (fetchNuGet { pname = "Humanizer.Core.tr"; version = "3.0.0-beta.54"; hash = "sha256-NOeZorj9vNpsImBcUjqlc7bN1bugS1rS1/4QVV8oYMk="; })
+  (fetchNuGet { pname = "Humanizer.Core.uk"; version = "3.0.0-beta.54"; hash = "sha256-fY/xIRXhIWofcCQg3aBJ9Jue0A8p1K7qEZjwGsJKpQ4="; })
+  (fetchNuGet { pname = "Humanizer.Core.uz-Cyrl-UZ"; version = "3.0.0-beta.54"; hash = "sha256-vnFy9SKfYZXM0o824X1/bgoux+r0zCbblcYx7yj0PQU="; })
+  (fetchNuGet { pname = "Humanizer.Core.uz-Latn-UZ"; version = "3.0.0-beta.54"; hash = "sha256-5xUO7jqWUeq5OSNiiORBf/5Wa9faV8e0D0NQahGn4S4="; })
+  (fetchNuGet { pname = "Humanizer.Core.vi"; version = "3.0.0-beta.54"; hash = "sha256-rcCMfEmpjuUTF5rOG0mAoq8JtV5Rk4QNxAvaW+TD9O4="; })
+  (fetchNuGet { pname = "Humanizer.Core.zh-CN"; version = "3.0.0-beta.54"; hash = "sha256-fh4CRrhOAkuY89dtwHCkbclG8AxjizRQSJCLJvpRGyo="; })
+  (fetchNuGet { pname = "Humanizer.Core.zh-Hans"; version = "3.0.0-beta.54"; hash = "sha256-0BXsdNBRWTqaloHdCCpVjAyU9IHz5FtweHjqvzpwW4Q="; })
+  (fetchNuGet { pname = "Humanizer.Core.zh-Hant"; version = "3.0.0-beta.54"; hash = "sha256-lemSDWy2Jz6gg8+ObqC3uyw846yghzmVUeakNZj7prg="; })
+  (fetchNuGet { pname = "JetBrains.Annotations"; version = "2023.3.0"; hash = "sha256-/Eykez68qYMO5mlmUelzAke8aJehyp8fspO5Z+yt5G4="; })
+  (fetchNuGet { pname = "Markdig.Signed"; version = "0.37.0"; hash = "sha256-hYyyZz0iETAE2HydbyudPdoOUi6wHQRG0BjuS87Tnl0="; })
+  (fetchNuGet { pname = "Microsoft.ApplicationInsights"; version = "2.22.0"; hash = "sha256-mUQ63atpT00r49ca50uZu2YCiLg3yd6r3HzTryqcuEA="; })
+  (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; hash = "sha256-49+H/iFwp+AfCICvWcqo9us4CzxApPKC37Q5Eqrw+JU="; })
+  (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.10.0"; hash = "sha256-yQFwqVChRtIRpbtkJr92JH2i+O7xn91NGbYgnKs8G2g="; })
+  (fetchNuGet { pname = "Microsoft.Extensions.ApiDescription.Server"; version = "6.0.5"; hash = "sha256-RJjBWz+UHxkQE2s7CeGYdTZ218mCufrxl0eBykZdIt4="; })
+  (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.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.Diagnostics.Abstractions"; version = "8.0.0"; hash = "sha256-USD5uZOaahMqi6u7owNWx/LR4EDrOwqPrAAim7iRpJY="; })
+  (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; version = "8.0.0"; hash = "sha256-uQSXmt47X2HGoVniavjLICbPtD2ReQOYQMgy3l0xuMU="; })
+  (fetchNuGet { pname = "Microsoft.Extensions.Hosting.Abstractions"; version = "8.0.0"; hash = "sha256-0JBx+wwt5p1SPfO4m49KxNOXPAzAU0A+8tEc/itvpQE="; })
+  (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "8.0.0"; hash = "sha256-Meh0Z0X7KyOEG4l0RWBcuHHihcABcvCyfUXgasmQ91o="; })
+  (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.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.IdentityModel.Abstractions"; version = "7.6.2"; hash = "sha256-Ipd8+JFpj44vqouRGO8YvxzVyjKOeFXczTeKguxdcgs="; })
+  (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "7.6.2"; hash = "sha256-lHzkMQIlbSwmetyGLbtuptHZP+HgG8n2aLtBDqDr1S4="; })
+  (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "7.6.2"; hash = "sha256-hNIbOZ6leANvh+i1I2ZXS35+yXUmhTlyomkA8PbF++w="; })
+  (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "7.6.2"; hash = "sha256-P0lN2+Die2ftnJh43A3X3CR207vvzfCCJjlow6yweVs="; })
+  (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.10.0"; hash = "sha256-rkHIqB2mquNXF89XBTFpUL2z5msjTBsOcyjSBCh36I0="; })
+  (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; hash = "sha256-LIcg1StDcQLPOABp4JRXIs837d7z0ia6+++3SF3jl1c="; })
+  (fetchNuGet { pname = "Microsoft.OpenApi"; version = "1.6.14"; hash = "sha256-dSJUic2orPGfYVgto9DieRckbtLpPyxHtf+RJ2tmKPM="; })
+  (fetchNuGet { pname = "Microsoft.Testing.Extensions.Telemetry"; version = "1.2.1"; hash = "sha256-/KshvKuql1A7zI1kTseWEYsOVMyOWZDXlFfKr0fz0Kg="; })
+  (fetchNuGet { pname = "Microsoft.Testing.Extensions.TrxReport.Abstractions"; version = "1.2.1"; hash = "sha256-YciAKvo1VBDoqGohABY2uD+Tt7wxpSqICV6ytEBNYKQ="; })
+  (fetchNuGet { pname = "Microsoft.Testing.Extensions.VSTestBridge"; version = "1.2.1"; hash = "sha256-vcf+MYu9Rp/Xpy1cA/azVz1KAkMgNrekD+LZX85Anq4="; })
+  (fetchNuGet { pname = "Microsoft.Testing.Platform"; version = "1.2.1"; hash = "sha256-ExXw+kScOwZsRDos3Myvh53yazGTGtjrtn2H1XbFi34="; })
+  (fetchNuGet { pname = "Microsoft.Testing.Platform.MSBuild"; version = "1.2.1"; hash = "sha256-B0AGaqwtuoT9DxXDvkR0bwEvVzSd67+vGZAgBm0nxxw="; })
+  (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.10.0"; hash = "sha256-3YjVGK2zEObksBGYg8b/CqoJgLQ1jUv4GCWNjDhLRh4="; })
+  (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.5.0"; hash = "sha256-mj5UH+aqVk7f3Uu0+L47aqZUudJNCx3Lk7cbP4fzcmI="; })
+  (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.10.0"; hash = "sha256-+yzP3FY6WoOosSpYnB7duZLhOPUZMQYy8zJ1d3Q4hK4="; })
+  (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; hash = "sha256-9kylPGfKZc58yFqNKa77stomcoNnMeERXozWJzDcUIA="; })
+  (fetchNuGet { pname = "MSTest"; version = "3.4.3"; hash = "sha256-FkjZdIm9j/nfEy+sZRHs9M1g03+QJTWEva23L1TdChw="; })
+  (fetchNuGet { pname = "MSTest.Analyzers"; version = "3.4.3"; hash = "sha256-sd+DFcORXa5ToA+n7p8isy4niOCd4mH4Sk5tRuDPRpE="; })
+  (fetchNuGet { pname = "MSTest.TestAdapter"; version = "3.4.3"; hash = "sha256-uOhEZp71KV0DFfkD4fMhy9zEggPBvzof1GZ5Z5ulWkM="; })
+  (fetchNuGet { pname = "MSTest.TestFramework"; version = "3.4.3"; hash = "sha256-d3fTMQese3ld1WTw0v6MGczgdSnE28/UaM2E7T59cUM="; })
+  (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; hash = "sha256-K2tSVW4n4beRPzPu3rlVaBEMdGvWSv/3Q1fxaDh4Mjo="; })
+  (fetchNuGet { pname = "Nito.AsyncEx.Coordination"; version = "5.1.2"; hash = "sha256-NHMnIBkGzzuoZL0qHKAwFC35doB08IDvmCQptC2uu2s="; })
+  (fetchNuGet { pname = "Nito.AsyncEx.Tasks"; version = "5.1.2"; hash = "sha256-W5jxZZ0pbPHte6TkWTq4FDtHOejvlrdyb1Inw+Yhl4c="; })
+  (fetchNuGet { pname = "Nito.Collections.Deque"; version = "1.1.1"; hash = "sha256-6Pmz6XQ+rY32O21Z3cUDVQsLH+i53LId18UCPTAxRZQ="; })
+  (fetchNuGet { pname = "Nito.Disposables"; version = "2.2.1"; hash = "sha256-FKDLUWysqroSHLU2kLjK1m0g417AAPh6n2TIkwiapcM="; })
+  (fetchNuGet { pname = "NLog"; version = "5.3.2"; hash = "sha256-b/y/IFUSe7qsSeJ8JVB0VFmJlkviFb8h934ktnn9Fgc="; })
+  (fetchNuGet { pname = "NLog.Extensions.Logging"; version = "5.3.11"; hash = "sha256-DP3R51h+9kk06N63U+1C4/JCZTFiADeYTROToAA2R0g="; })
+  (fetchNuGet { pname = "NLog.Web.AspNetCore"; version = "5.3.11"; hash = "sha256-6bMYbKyNWtb0tn8k3418mWBuogofIAfwT9NHSopUu58="; })
+  (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.11.0"; hash = "sha256-n+hxcrf+sXM80Tv9YH9x4+hwTslVidFq4tjBNPAzYnM="; })
+  (fetchNuGet { pname = "OpenTelemetry"; version = "1.7.0-rc.1"; hash = "sha256-N7EgFENnCZdJVhV1TOjl6R7CImPb3SMcIvP63MfFJng="; })
+  (fetchNuGet { pname = "OpenTelemetry"; version = "1.9.0"; hash = "sha256-QVV6ecnVk73bvi4Lw1RnTsaEUH/6CT0/zIJkYdg6CGg="; })
+  (fetchNuGet { pname = "OpenTelemetry.Api"; version = "1.7.0-rc.1"; hash = "sha256-gl4I7GGJbe2HblOLIznTVxmEOm5SV6UyX+DVmKXcCcQ="; })
+  (fetchNuGet { pname = "OpenTelemetry.Api"; version = "1.9.0"; hash = "sha256-raXpHi2DZ3mSLn9dnJYF64XaP23epdfu8zgagSpm8+4="; })
+  (fetchNuGet { pname = "OpenTelemetry.Api.ProviderBuilderExtensions"; version = "1.7.0-rc.1"; hash = "sha256-/JlVHQeer2Vxmv7kWXK1Wc7Ihjqdjb+hEoiYxxIW3qs="; })
+  (fetchNuGet { pname = "OpenTelemetry.Api.ProviderBuilderExtensions"; version = "1.9.0"; hash = "sha256-Yy3EcKBW7XH7nhLcvwQB0NIfxiGChuy6UPc7MJpxEbE="; })
+  (fetchNuGet { pname = "OpenTelemetry.Exporter.Prometheus.AspNetCore"; version = "1.7.0-rc.1"; hash = "sha256-yIUPHCmDcuPsrE1fV5ij6G5ACdUL7M0rrvd6dOSy55w="; })
+  (fetchNuGet { pname = "OpenTelemetry.Extensions.Hosting"; version = "1.9.0"; hash = "sha256-vvIrTeDGzgz8dI7/SkLL0ZrV+9u3e9uhvW6VVdsd6Ps="; })
+  (fetchNuGet { pname = "OpenTelemetry.Instrumentation.AspNetCore"; version = "1.9.0"; hash = "sha256-XYqa7kV4rhHPCgHsjQtMvyKCemW1OvQd/23QhjquYR4="; })
+  (fetchNuGet { pname = "OpenTelemetry.Instrumentation.Http"; version = "1.9.0"; hash = "sha256-y/UbDt6n6heD+ayzv0xPurXLFNL+eSldwqoyGpvCg7o="; })
+  (fetchNuGet { pname = "OpenTelemetry.Instrumentation.Runtime"; version = "1.9.0"; hash = "sha256-Xov89h4Py7MCz6SAOjV0tjtZvvjHbx7NyPXZsY1PZhk="; })
+  (fetchNuGet { pname = "protobuf-net"; version = "3.2.30"; hash = "sha256-keRy5OWT+/tlZt3D7x+9PEdjTvEJcZdYsf/i1ZBtciE="; })
+  (fetchNuGet { pname = "protobuf-net.Core"; version = "3.2.30"; hash = "sha256-GMpJNecoBfrV2VgpYOhcZnKZaLFDObNLcX2LBTThrwY="; })
+  (fetchNuGet { pname = "SteamKit2"; version = "3.0.0-alpha.1"; hash = "sha256-iCJc3MjuD7QoF5mUy0ROSgfosUvPaZjUgrNhd9dcmQY="; })
+  (fetchNuGet { pname = "Swashbuckle.AspNetCore"; version = "6.6.2"; hash = "sha256-kKz+NiXNfmrvrtbzsqnW1ItflNib3rymr3rf9yI5B1M="; })
+  (fetchNuGet { pname = "Swashbuckle.AspNetCore.Annotations"; version = "6.6.2"; hash = "sha256-iL7TcRFy7g6EB8usWALwdOEaiqLsD0b+RXkepHk43+o="; })
+  (fetchNuGet { pname = "Swashbuckle.AspNetCore.Swagger"; version = "6.6.2"; hash = "sha256-HqMmHMZXYHlRMoT3vIZF8iwhYmfknQmi3N8VmyfwI0k="; })
+  (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerGen"; version = "6.6.2"; hash = "sha256-km+bNoRDakEBa2dIjtxK0V6YVvm9hEpdi8xWQ8TJigI="; })
+  (fetchNuGet { pname = "Swashbuckle.AspNetCore.SwaggerUI"; version = "6.6.2"; hash = "sha256-ED24tUcwiOkAIMQVQeQFths296yf3lL/Z1sVizQTEHA="; })
+  (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.7.1"; hash = "sha256-WMMAUqoxT3J1gW9DI8v31VAuhwqTc4Posose5jq1BNo="; })
+  (fetchNuGet { pname = "System.Collections.Immutable"; version = "7.0.0"; hash = "sha256-9an2wbxue2qrtugYES9awshQg+KfJqajhnhs45kQIdk="; })
+  (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.Diagnostics.DiagnosticSource"; version = "5.0.0"; hash = "sha256-6mW3N6FvcdNH/pB58pl+pFSCGWgyaP4hfVtC/SMWDV4="; })
+  (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "8.0.0"; hash = "sha256-+aODaDEQMqla5RYZeq0Lh66j+xkPYxykrVvSCmJQ+Vs="; })
+  (fetchNuGet { pname = "System.IO.Hashing"; version = "8.0.0"; hash = "sha256-szOGt0TNBo6dEdC3gf6H+e9YW3Nw0woa6UnCGGGK5cE="; })
+  (fetchNuGet { pname = "System.Linq.Async"; version = "6.0.1"; hash = "sha256-uH5fZhcyQVtnsFc6GTUaRRrAQm05v5euJyWCXSFSOYI="; })
+  (fetchNuGet { pname = "System.Memory"; version = "4.5.5"; hash = "sha256-EPQ9o1Kin7KzGI5O3U3PUQAZTItSbk9h/i4rViN3WiI="; })
+  (fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.6.0"; hash = "sha256-JJfgaPav7UfEh4yRAQdGhLZF1brr0tUWPl6qmfNWq/E="; })
+  (fetchNuGet { pname = "System.Security.AccessControl"; version = "5.0.0"; hash = "sha256-ueSG+Yn82evxyGBnE49N4D+ngODDXgornlBtQ3Omw54="; })
+  (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "8.0.0"; hash = "sha256-fb0pa9sQxN+mr0vnXg1Igbx49CaOqS+GDkTfWNboUvs="; })
+  (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "5.0.0"; hash = "sha256-CBOQwl9veFkrKK2oU8JFFEiKIh/p+aJO+q9Tc2Q/89Y="; })
+  (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "8.0.0"; hash = "sha256-fjCLQc1PRW0Ix5IZldg0XKv+J1DqPSfu9pjMyNBp7dE="; })
+  (fetchNuGet { pname = "System.ValueTuple"; version = "4.5.0"; hash = "sha256-niH6l2fU52vAzuBlwdQMw0OEoRS/7E1w5smBFoqSaAI="; })
 ]
diff --git a/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix
index 004aadbe78..b1da7708bf 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/ArchiSteamFarm/web-ui/default.nix
@@ -2,7 +2,7 @@
 
 buildNpmPackage rec {
   pname = "asf-ui";
-  version = "78188871dfce90fb04096e9fd0b6ce2411312dae";
+  version = "3ae4df4206a3f5fbbe582403403df848fd29847f";
 
   src = fetchFromGitHub {
     owner = "JustArchiNET";
@@ -10,10 +10,10 @@ buildNpmPackage rec {
     # updated by the update script
     # this is always the commit that should be used with asf-ui from the latest asf version
     rev = version;
-    hash = "sha256-NBxN3pQFiDsRYp2Ro0WwWdGzKVjPTKx4/xWQrMNuv0M=";
+    hash = "sha256-81PESllqRmtfdYFda1fBRZMczlWQq2xSPWELIOIpi3s=";
   };
 
-  npmDepsHash = "sha256-9pLbSOMfKwkWtzmKNmeKNrgdtzh3riWWJlrbuoDRUrw=";
+  npmDepsHash = "sha256-OIkT5XMWcVRbCemaC+hkHkZACCzNedJKHLvGmNXEye4=";
 
   installPhase = ''
     runHook preInstall
diff --git a/third_party/nixpkgs/pkgs/applications/misc/audio/soxr/default.nix b/third_party/nixpkgs/pkgs/applications/misc/audio/soxr/default.nix
index f469ef5f0f..a76b30492a 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/audio/soxr/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/misc/bikeshed/default.nix b/third_party/nixpkgs/pkgs/applications/misc/bikeshed/default.nix
index 5b51a8324e..244632521b 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/bikeshed/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/bikeshed/default.nix
@@ -73,6 +73,6 @@ buildPythonApplication rec {
     '';
     homepage = "https://tabatkins.github.io/bikeshed/";
     license = licenses.cc0;
-    maintainers = [];
+    maintainers = [ ];
   };
 }
diff --git a/third_party/nixpkgs/pkgs/applications/misc/blender/default.nix b/third_party/nixpkgs/pkgs/applications/misc/blender/default.nix
index 481cf9b24f..d400dd1eba 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/blender/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/blender/default.nix
@@ -5,7 +5,7 @@
   OpenAL,
   OpenGL,
   SDL,
-  addOpenGLRunpath,
+  addDriverRunpath,
   alembic,
   blender,
   boost,
@@ -220,7 +220,7 @@ stdenv.mkDerivation (finalAttrs: {
       python3Packages.wrapPython
     ]
     ++ lib.optionals cudaSupport [
-      addOpenGLRunpath
+      addDriverRunpath
       cudaPackages.cuda_nvcc
     ]
     ++ lib.optionals waylandSupport [ pkg-config ];
@@ -344,7 +344,7 @@ stdenv.mkDerivation (finalAttrs: {
     lib.optionalString cudaSupport ''
       for program in $out/bin/blender $out/bin/.blender-wrapped; do
         isELF "$program" || continue
-        addOpenGLRunpath "$program"
+        addDriverRunpath "$program"
       done
     ''
     + lib.optionalString stdenv.isDarwin ''
diff --git a/third_party/nixpkgs/pkgs/applications/misc/calibre/default.nix b/third_party/nixpkgs/pkgs/applications/misc/calibre/default.nix
index 96c99bb086..4b1c2657ab 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/calibre/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/calibre/default.nix
@@ -21,7 +21,7 @@
 , qmake
 , qtbase
 , qtwayland
-, speechd
+, speechd-minimal
 , sqlite
 , wrapQtAppsHook
 , xdg-utils
@@ -132,7 +132,7 @@ stdenv.mkDerivation (finalAttrs: {
       ] ++ lib.optional (unrarSupport) unrardll)
     )
     xdg-utils
-  ] ++ lib.optional (speechSupport) speechd;
+  ] ++ lib.optional (speechSupport) speechd-minimal;
 
   installPhase = ''
     runHook preInstall
diff --git a/third_party/nixpkgs/pkgs/applications/misc/cherrytree/default.nix b/third_party/nixpkgs/pkgs/applications/misc/cherrytree/default.nix
index d74f67b6cc..69b457a4f0 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/cherrytree/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/misc/colorstorm/default.nix b/third_party/nixpkgs/pkgs/applications/misc/colorstorm/default.nix
index 63014eb51e..da612b33c2 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/colorstorm/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/misc/cum/default.nix b/third_party/nixpkgs/pkgs/applications/misc/cum/default.nix
index 5431dab2cf..e1ea239b43 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/cum/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/misc/dbx/default.nix b/third_party/nixpkgs/pkgs/applications/misc/dbx/default.nix
index 95fd50b1e2..21f9e52ff8 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/dbx/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/dbx/default.nix
@@ -50,8 +50,7 @@ python.pkgs.buildPythonApplication rec {
       tenacity
       typer
       watchdog
-    ]
-    ++ typer.optional-dependencies.all;
+    ];
 
   passthru.optional-dependencies = with python3.pkgs; {
     aws = [ boto3 ];
diff --git a/third_party/nixpkgs/pkgs/applications/misc/dict-cc-py/default.nix b/third_party/nixpkgs/pkgs/applications/misc/dict-cc-py/default.nix
index 9d4c40084f..6742d020cd 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/dict-cc-py/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/misc/diffpdf/default.nix b/third_party/nixpkgs/pkgs/applications/misc/diffpdf/default.nix
index 4792003b79..98f8580780 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/diffpdf/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/misc/doctave/default.nix b/third_party/nixpkgs/pkgs/applications/misc/doctave/default.nix
index 487d834026..6b54636488 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/doctave/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/doctave/default.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   # Cargo.lock is outdated
   cargoPatches = [ ./cargo-lock.patch ];
 
-  cargoSha256 = "sha256-keLcNttdM9JUnn3qi/bWkcObIHl3MRACDHKPSZuScOc=";
+  cargoHash = "sha256-keLcNttdM9JUnn3qi/bWkcObIHl3MRACDHKPSZuScOc=";
 
   buildInputs = lib.optionals stdenv.isDarwin [
     CoreServices
diff --git a/third_party/nixpkgs/pkgs/applications/misc/dotfiles/default.nix b/third_party/nixpkgs/pkgs/applications/misc/dotfiles/default.nix
index 017d18b0bc..655aa60b27 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/dotfiles/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/dotfiles/default.nix
@@ -2,11 +2,11 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "dotfiles";
-  version = "0.6.4";
+  version = "0.6.5";
 
   src = fetchPypi {
     inherit version pname;
-    sha256 = "03qis6m9r2qh00sqbgwsm883s4bj1ibwpgk86yh4l235mdw8jywv";
+    sha256 = "sha256-fke8lNjyYts6cIrONAFd5r2wAlpWqJhd+usFAPCO5J4=";
   };
 
   # No tests in archive
diff --git a/third_party/nixpkgs/pkgs/applications/misc/eureka-ideas/default.nix b/third_party/nixpkgs/pkgs/applications/misc/eureka-ideas/default.nix
index 45e3601090..f8f24fa635 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/eureka-ideas/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/eureka-ideas/default.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-NJ1O8+NBG0y39bMOZeah2jSZlvnPrtpCtXrgAYmVrAc=";
   };
 
-  cargoSha256 = "sha256-tNUWW0HgXl+tM9uciApLSkLDDkzrvAiWmiYs2y/dEOM=";
+  cargoHash = "sha256-tNUWW0HgXl+tM9uciApLSkLDDkzrvAiWmiYs2y/dEOM=";
 
   nativeBuildInputs = [ pkg-config ];
 
diff --git a/third_party/nixpkgs/pkgs/applications/misc/ff2mpv/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ff2mpv/default.nix
index c21b071819..27fd0ce892 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/ff2mpv/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/misc/filet/default.nix b/third_party/nixpkgs/pkgs/applications/misc/filet/default.nix
index d9f7bd91ab..4ced9fc7b0 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/filet/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/misc/findex/default.nix b/third_party/nixpkgs/pkgs/applications/misc/findex/default.nix
index 891ac66414..20187d5263 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/findex/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/findex/default.nix
@@ -39,6 +39,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/mdgaziur/findex";
     license = licenses.gpl3Only;
     platforms = platforms.linux;
-    maintainers = [];
+    maintainers = [ ];
   };
 }
diff --git a/third_party/nixpkgs/pkgs/applications/misc/firestarter/default.nix b/third_party/nixpkgs/pkgs/applications/misc/firestarter/default.nix
index a8372b643b..8eb001e9c9 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/firestarter/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/firestarter/default.nix
@@ -2,7 +2,7 @@
 , lib
 , fetchFromGitHub
 , fetchzip
-, addOpenGLRunpath
+, addDriverRunpath
 , cmake
 , glibc_multi
 , glibc
@@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
     git
     pkg-config
   ] ++ lib.optionals withCuda [
-    addOpenGLRunpath
+    addDriverRunpath
   ];
 
   buildInputs = [ hwloc ] ++ (if withCuda then
@@ -95,7 +95,7 @@ stdenv.mkDerivation rec {
   '';
 
   postFixup = lib.optionalString withCuda ''
-    addOpenGLRunpath $out/bin/FIRESTARTER_CUDA
+    addDriverRunpath $out/bin/FIRESTARTER_CUDA
   '';
 
   meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/applications/misc/gmrun/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gmrun/default.nix
index e71b1a6484..aa1a3cd46b 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/gmrun/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/gmrun/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = "https://sourceforge.net/projects/gmrun/";
     license = licenses.gpl2;
-    maintainers = [];
+    maintainers = [ ];
     platforms = platforms.all;
     mainProgram = "gmrun";
   };
diff --git a/third_party/nixpkgs/pkgs/applications/misc/gopacked/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gopacked/default.nix
index 6b0eaeff65..1ce8d1cb4e 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/gopacked/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/misc/gpu-burn/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gpu-burn/default.nix
index eaf0fc44d2..97d6b674d5 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/gpu-burn/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/gpu-burn/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, addOpenGLRunpath, cudatoolkit }:
+{ lib, stdenv, fetchFromGitHub, addDriverRunpath, cudatoolkit }:
 
 stdenv.mkDerivation {
   pname = "gpu-burn";
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
 
   buildInputs = [ cudatoolkit ];
 
-  nativeBuildInputs = [ addOpenGLRunpath ];
+  nativeBuildInputs = [ addDriverRunpath ];
 
   makeFlags = [ "CUDAPATH=${cudatoolkit}" ];
 
@@ -32,7 +32,7 @@ stdenv.mkDerivation {
   '';
 
   postFixup = ''
-    addOpenGLRunpath $out/bin/gpu_burn
+    addDriverRunpath $out/bin/gpu_burn
   '';
 
   meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/applications/misc/harsh/default.nix b/third_party/nixpkgs/pkgs/applications/misc/harsh/default.nix
index e7e654321e..a2ba9a1bfd 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/harsh/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/misc/hcl2json/default.nix b/third_party/nixpkgs/pkgs/applications/misc/hcl2json/default.nix
index e8d90c9e16..d5b20e6646 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/hcl2json/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/misc/heimer/default.nix b/third_party/nixpkgs/pkgs/applications/misc/heimer/default.nix
index 7f9b1ae96b..ada6d8cdc6 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/heimer/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/misc/inherd-quake/default.nix b/third_party/nixpkgs/pkgs/applications/misc/inherd-quake/default.nix
index df47036b2d..4f9c748730 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/inherd-quake/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/inherd-quake/default.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-HKAR4LJm0lrQgTOCqtYIRFbO3qHtPbr4Fpx2ek1oJ4Q=";
   };
 
-  cargoSha256 = "sha256-svvtZyfN91OT3yqxH6TgFhGYg9drpXsts4p2WqSHG8w=";
+  cargoHash = "sha256-svvtZyfN91OT3yqxH6TgFhGYg9drpXsts4p2WqSHG8w=";
 
   nativeBuildInputs = [ pkg-config ];
 
diff --git a/third_party/nixpkgs/pkgs/applications/misc/jekyll/default.nix b/third_party/nixpkgs/pkgs/applications/misc/jekyll/default.nix
index 8eaf05298e..263acefe7c 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/jekyll/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/misc/joplin-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/misc/joplin-desktop/default.nix
index 77fcf75128..2118d623cd 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/joplin-desktop/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/joplin-desktop/default.nix
@@ -2,7 +2,7 @@
 
 let
   pname = "joplin-desktop";
-  version = "3.0.12";
+  version = "3.0.13";
 
   inherit (stdenv.hostPlatform) system;
   throwSystem = throw "Unsupported system: ${system}";
@@ -16,7 +16,7 @@ let
   src = fetchurl {
     url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}${suffix}";
     sha256 = {
-      x86_64-linux = "sha256-vMz+ZeBHP+9Ugy8KO8lbp8zqC8VHtf1TWw10YytQFSs=";
+      x86_64-linux = "sha256-/B7udtkRP8rOYzXupWSEGg0FrJoRJ63l4uLtQWe2CZ8=";
       x86_64-darwin = "sha256-XZN1jTv/FhJXuFxZ6D6h/vFMdKi84Z9UWfj2CrMgBBA=";
       aarch64-darwin = "sha256-lsODOBkZ4+x5D6Er2/paTzAMKZvqIBVkKrWHh5iRvrk=";
     }.${system} or throwSystem;
diff --git a/third_party/nixpkgs/pkgs/applications/misc/junction/default.nix b/third_party/nixpkgs/pkgs/applications/misc/junction/default.nix
index 66658cfe74..cf03a315b2 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/junction/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/misc/keylight-controller-mschneider82/default.nix b/third_party/nixpkgs/pkgs/applications/misc/keylight-controller-mschneider82/default.nix
index 0ae96fcf61..bbccddbadb 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/keylight-controller-mschneider82/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/misc/kiwix/default.nix b/third_party/nixpkgs/pkgs/applications/misc/kiwix/default.nix
index 1c338a7f58..3b9d4f83f5 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/kiwix/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/misc/kondo/default.nix b/third_party/nixpkgs/pkgs/applications/misc/kondo/default.nix
index eba5799a91..03fc56ceb0 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/kondo/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/misc/lemonade/default.nix b/third_party/nixpkgs/pkgs/applications/misc/lemonade/default.nix
index c9ca92d364..012020c176 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/lemonade/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/misc/librecad/default.nix b/third_party/nixpkgs/pkgs/applications/misc/librecad/default.nix
index 3ce387c410..ae1f5c9813 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/librecad/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/librecad/default.nix
@@ -72,7 +72,7 @@ mkDerivation rec {
     description = "2D CAD package based on Qt";
     homepage = "https://librecad.org";
     license = licenses.gpl2Only;
-    maintainers = with maintainers; [ viric ];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/third_party/nixpkgs/pkgs/applications/misc/loxodo/default.nix b/third_party/nixpkgs/pkgs/applications/misc/loxodo/default.nix
index 2623b9f027..34612e6dd3 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/loxodo/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/misc/lyx/default.nix b/third_party/nixpkgs/pkgs/applications/misc/lyx/default.nix
index dc79cc5922..bf3c3b06dc 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/lyx/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/misc/madonctl/default.nix b/third_party/nixpkgs/pkgs/applications/misc/madonctl/default.nix
index 203d71a6cc..775bff23c1 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/madonctl/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/misc/maliit-framework/default.nix b/third_party/nixpkgs/pkgs/applications/misc/maliit-framework/default.nix
index f730e9265d..3407af8df3 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/maliit-framework/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/misc/maliit-keyboard/default.nix b/third_party/nixpkgs/pkgs/applications/misc/maliit-keyboard/default.nix
index c315b5251c..108137188b 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/maliit-keyboard/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/misc/minigalaxy/default.nix b/third_party/nixpkgs/pkgs/applications/misc/minigalaxy/default.nix
index b8cdab22e8..d98ecb21da 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/minigalaxy/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/minigalaxy/default.nix
@@ -1,14 +1,13 @@
 { lib
 , fetchFromGitHub
-, docutils
-, gettext
 , glibcLocales
 , glib-networking
 , gobject-introspection
 , gtk3
-, python3
+, libnotify
 , python3Packages
 , steam-run
+, substituteAll
 , unzip
 , webkitgtk
 , wrapGAppsHook3
@@ -16,23 +15,29 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "minigalaxy";
-  version = "1.2.2";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "sharkwouter";
-    repo = pname;
+    repo = "minigalaxy";
     rev = "refs/tags/${version}";
-    sha256 = "sha256-bpNtdMYBl2dJ4PQsxkhm/Y+3A0dD/Y2XC0VaUYyRhvM=";
+    hash = "sha256-CMPBKnNrcjHVpsbBjY97FiygEJNG9jKHR/LoVMfuxG4=";
   };
 
-  checkPhase = ''
-    runHook preCheck
-    env HOME=$PWD LC_ALL=en_US.UTF-8 pytest
-    runHook postCheck
+  patches = [
+    (substituteAll {
+      src = ./inject-launcher-steam-run.diff;
+      steamrun = lib.getExe steam-run;
+     })
+  ];
+
+  postPatch = ''
+    substituteInPlace minigalaxy/installer.py \
+      --replace-fail '"unzip"' "\"${lib.getExe unzip}\"" \
+      --replace-fail "'unzip'" "\"${lib.getExe unzip}\""
   '';
 
   nativeBuildInputs = [
-    gettext
     wrapGAppsHook3
     gobject-introspection
   ];
@@ -40,29 +45,29 @@ python3Packages.buildPythonApplication rec {
   buildInputs = [
     glib-networking
     gtk3
+    libnotify
   ];
 
   nativeCheckInputs = with python3Packages; [
     glibcLocales
-    pytest
-    tox
+    pytestCheckHook
+    simplejson
   ];
 
+  preCheck = ''
+    export HOME=$(mktemp -d)
+  '';
+
   pythonPath = [
-    docutils
-    python3.pkgs.pygobject3
-    python3.pkgs.requests
-    python3.pkgs.setuptools
-    python3.pkgs.simplejson
-    steam-run
-    unzip
+    python3Packages.pygobject3
+    python3Packages.requests
     webkitgtk
   ];
 
-  # Run Linux games using the Steam Runtime by using steam-run in the wrapper
-  # FIXME: not working with makeBinaryWrapper
-  postFixup = ''
-    sed -e 's#exec -a "$0"#exec -a "$0" ${steam-run}/bin/steam-run#' -i $out/bin/minigalaxy
+  dontWrapGApps = true;
+
+  preFixup = ''
+    makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
   '';
 
   meta = with lib; {
@@ -71,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/third_party/nixpkgs/pkgs/applications/misc/minigalaxy/inject-launcher-steam-run.diff b/third_party/nixpkgs/pkgs/applications/misc/minigalaxy/inject-launcher-steam-run.diff
new file mode 100644
index 0000000000..44850e9fbc
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/misc/minigalaxy/inject-launcher-steam-run.diff
@@ -0,0 +1,32 @@
+diff --git a/minigalaxy/launcher.py b/minigalaxy/launcher.py
+index 641db77..712c55b 100644
+--- a/minigalaxy/launcher.py
++++ b/minigalaxy/launcher.py
+@@ -77,6 +77,7 @@ def get_execute_command(game) -> list:
+     if game.get_info("use_mangohud") is True:
+         exe_cmd.insert(0, "mangohud")
+         exe_cmd.insert(1, "--dlsym")
++    exe_cmd.insert(0, "@steamrun@")
+     exe_cmd = get_exe_cmd_with_var_command(game, exe_cmd)
+     logger.info("Launch command for %s: %s", game.name, " ".join(exe_cmd))
+     return exe_cmd
+diff --git a/tests/test_installer.py b/tests/test_installer.py
+index 8e6cb76..a9d9f46 100644
+--- a/tests/test_installer.py
++++ b/tests/test_installer.py
+@@ -296,13 +296,13 @@ def test_get_exec_line(self, mock_list_dir, mock_which):
+         mock_list_dir.return_value = ["data", "docs", "scummvm", "support", "beneath.ini", "gameinfo", "start.sh"]
+ 
+         result1 = installer.get_exec_line(game1)
+-        self.assertEqual(result1, "scummvm -c beneath.ini")
++        self.assertEqual(result1, "@steamrun@ scummvm -c beneath.ini")
+ 
+         game2 = Game("Blocks That Matter", install_dir="/home/test/GOG Games/Blocks That Matter", platform="linux")
+         mock_list_dir.return_value = ["data", "docs", "support", "gameinfo", "start.sh"]
+ 
+         result2 = installer.get_exec_line(game2)
+-        self.assertEqual(result2, "./start.sh")
++        self.assertEqual(result2, "@steamrun@ ./start.sh")
+ 
+     @mock.patch('os.path.getsize')
+     @mock.patch('os.listdir')
diff --git a/third_party/nixpkgs/pkgs/applications/misc/moonlight-embedded/default.nix b/third_party/nixpkgs/pkgs/applications/misc/moonlight-embedded/default.nix
index a7ca6dce63..e00be02e6f 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/moonlight-embedded/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/moonlight-embedded/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     description = "Open source implementation of NVIDIA's GameStream";
     homepage = "https://github.com/moonlight-stream/moonlight-embedded";
     license = licenses.gpl3Plus;
-    maintainers = [];
+    maintainers = [ ];
     mainProgram = "moonlight";
     platforms = platforms.linux;
   };
diff --git a/third_party/nixpkgs/pkgs/applications/misc/mozphab/default.nix b/third_party/nixpkgs/pkgs/applications/misc/mozphab/default.nix
index a19297acbc..4c7bd07f6e 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/mozphab/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/misc/mysql-workbench/default.nix b/third_party/nixpkgs/pkgs/applications/misc/mysql-workbench/default.nix
index 23b982be53..5591fa9b45 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/mysql-workbench/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/mysql-workbench/default.nix
@@ -105,7 +105,7 @@ stdenv.mkDerivation (finalAttrs: {
     antlr4_12.runtime.cpp
     python3
     mysql
-    libxml2
+    (libxml2.override { enableHttp = true; })
     libmysqlconnectorcpp
     vsqlite
     gdal
diff --git a/third_party/nixpkgs/pkgs/applications/misc/notable/default.nix b/third_party/nixpkgs/pkgs/applications/misc/notable/default.nix
index 4dde27827c..cccb55f5e5 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/notable/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/misc/nwg-launchers/default.nix b/third_party/nixpkgs/pkgs/applications/misc/nwg-launchers/default.nix
index d3e11493fa..4e2447379b 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/nwg-launchers/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/misc/ola/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ola/default.nix
index 2d28d8138c..8d4d4df4ef 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/ola/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/misc/openrgb/default.nix b/third_party/nixpkgs/pkgs/applications/misc/openrgb/default.nix
index 7ac9f63985..5c158d7ab7 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/openrgb/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/misc/parsec/bin.nix b/third_party/nixpkgs/pkgs/applications/misc/parsec/bin.nix
index 436822aa2b..3bd2734597 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/parsec/bin.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/parsec/bin.nix
@@ -16,7 +16,7 @@
 , libXfixes
 , libpulseaudio
 , libva
-, ffmpeg_5
+, ffmpeg_4
 , libpng
 , libjpeg8
 , curl
@@ -57,7 +57,7 @@ stdenvNoCC.mkDerivation {
     alsa-lib
     libpulseaudio
     libva
-    ffmpeg_5
+    ffmpeg_4
     libpng
     libjpeg8
     curl
diff --git a/third_party/nixpkgs/pkgs/applications/misc/pastel/default.nix b/third_party/nixpkgs/pkgs/applications/misc/pastel/default.nix
index 69e6a53758..f77bf332b5 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/pastel/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/pastel/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-uK4HWC+uGiey+K0p8+Wi+Pi+U7b4k09b8iKF9BmTPcc=";
   };
 
-  cargoSha256 = "sha256-5paHSrqU8tItD/CAbauj6KcW/mKsveOAfXjD/NUuFAc=";
+  cargoHash = "sha256-5paHSrqU8tItD/CAbauj6KcW/mKsveOAfXjD/NUuFAc=";
 
   buildInputs = lib.optional stdenv.isDarwin Security;
 
diff --git a/third_party/nixpkgs/pkgs/applications/misc/pipr/default.nix b/third_party/nixpkgs/pkgs/applications/misc/pipr/default.nix
index f7aeb09b1f..466451443e 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/pipr/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/pipr/default.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-6jtUNhib6iveuZ7qUKK7AllyMKFpZ8OUUaIieFqseY8=";
   };
 
-  cargoSha256 = "sha256-SLOiX8z8LuQ9VA/lg0lOhqs85MGs0vmeP74cS6sgghI=";
+  cargoHash = "sha256-SLOiX8z8LuQ9VA/lg0lOhqs85MGs0vmeP74cS6sgghI=";
 
   nativeBuildInputs = [ makeWrapper ];
   postFixup = ''
diff --git a/third_party/nixpkgs/pkgs/applications/misc/pomodoro/default.nix b/third_party/nixpkgs/pkgs/applications/misc/pomodoro/default.nix
index 35244bf041..77774b5343 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/pomodoro/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/pomodoro/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-ZA1q1YVJcdSUF9NTikyT3vrRnqbsu5plzRI2gMu+qnQ=";
   };
 
-  cargoSha256 = "sha256-6ZhWStZebXSwrej36DXifrsrmR1SWW3PwGUX0hqPwE4=";
+  cargoHash = "sha256-6ZhWStZebXSwrej36DXifrsrmR1SWW3PwGUX0hqPwE4=";
   buildInputs = lib.optionals stdenv.isDarwin [ Foundation ];
 
   meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/applications/misc/pop-launcher/default.nix b/third_party/nixpkgs/pkgs/applications/misc/pop-launcher/default.nix
index b8ba513390..b8e614485a 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/pop-launcher/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/pop-launcher/default.nix
@@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec {
         --replace '/usr/bin/gnome-terminal' 'gnome-terminal'
   '';
 
-  cargoSha256 = "sha256-cTvrq0fH057UIx/O9u8zHMsg+psMGg1q9klV5OMxtok=";
+  cargoHash = "sha256-cTvrq0fH057UIx/O9u8zHMsg+psMGg1q9klV5OMxtok=";
 
   cargoBuildFlags = [ "--package" "pop-launcher-bin" ];
 
diff --git a/third_party/nixpkgs/pkgs/applications/misc/process-viewer/default.nix b/third_party/nixpkgs/pkgs/applications/misc/process-viewer/default.nix
index 8b3b9acae7..ef2b9fec3a 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/process-viewer/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/process-viewer/default.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-mEmtLCtHlrCurjKKJ3vEtEkLBik4LwuUED5UeQ1QLws=";
   };
 
-  cargoSha256 = "sha256-lgVByl+mpCDbhwlC1Eiw9ZkHIDYJsOR06Ds790pXOMc=";
+  cargoHash = "sha256-lgVByl+mpCDbhwlC1Eiw9ZkHIDYJsOR06Ds790pXOMc=";
 
   nativeBuildInputs = [ pkg-config ];
 
diff --git a/third_party/nixpkgs/pkgs/applications/misc/pwsafe/default.nix b/third_party/nixpkgs/pkgs/applications/misc/pwsafe/default.nix
index f752052da2..dc2de8b0cd 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/pwsafe/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/pwsafe/default.nix
@@ -44,6 +44,7 @@ stdenv.mkDerivation rec {
     gettext
     perl
     pkg-config
+    wxGTK32
     zip
   ];
 
diff --git a/third_party/nixpkgs/pkgs/applications/misc/reddsaver/default.nix b/third_party/nixpkgs/pkgs/applications/misc/reddsaver/default.nix
index 1c6202eb0d..b737716ed5 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/reddsaver/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/reddsaver/default.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "07xsrc0w0z7w2w0q44aqnn1ybf9vqry01v3xr96l1xzzc5mkqdzf";
   };
 
-  cargoSha256 = "0y94dywligcsqs01d228w454ssrzg31p4j8mni9flcr4v29z3rwp";
+  cargoHash = "sha256-l+fxk9gkM+pStBVJcsN4P2tNCuFIiBaAxpq9SLlvJHk=";
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ openssl ]
diff --git a/third_party/nixpkgs/pkgs/applications/misc/redshift/default.nix b/third_party/nixpkgs/pkgs/applications/misc/redshift/default.nix
index 5943050c00..4546883b2b 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/redshift/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/misc/rescuetime/default.nix b/third_party/nixpkgs/pkgs/applications/misc/rescuetime/default.nix
index 615fa2c10f..41988c2829 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/rescuetime/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/misc/resp-app/default.nix b/third_party/nixpkgs/pkgs/applications/misc/resp-app/default.nix
index 902eef4cb1..18e7a1c722 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/resp-app/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/misc/rofi-menugen/default.nix b/third_party/nixpkgs/pkgs/applications/misc/rofi-menugen/default.nix
index 569ae6ef4c..7d5cb9f3eb 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/rofi-menugen/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/misc/rusty-psn/default.nix b/third_party/nixpkgs/pkgs/applications/misc/rusty-psn/default.nix
index 2a80091004..ecd5948b4d 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/rusty-psn/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/rusty-psn/default.nix
@@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec {
 
   cargoPatches = [ ./fix-cargo-lock.patch ];
 
-  cargoSha256 = "sha256-8J92WtMmCTnghPqSmNYhG3IVdmpHsHEH7Fkod0UYKJU=";
+  cargoHash = "sha256-8J92WtMmCTnghPqSmNYhG3IVdmpHsHEH7Fkod0UYKJU=";
 
   # Tests require network access
   doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/applications/misc/scli/default.nix b/third_party/nixpkgs/pkgs/applications/misc/scli/default.nix
index 4c11333a4a..47ff2d588b 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/scli/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/misc/shell-genie/default.nix b/third_party/nixpkgs/pkgs/applications/misc/shell-genie/default.nix
index df4833199d..60b3ce9548 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/shell-genie/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/shell-genie/default.nix
@@ -32,7 +32,7 @@ buildPythonPackage rec {
     rich
     shellingham
     typer
-  ] ++ typer.optional-dependencies.all;
+  ];
 
   # No tests available
   doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/applications/misc/siglo/default.nix b/third_party/nixpkgs/pkgs/applications/misc/siglo/default.nix
index 2aeedcc25b..4825b00c89 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/siglo/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/misc/spotify-tray/default.nix b/third_party/nixpkgs/pkgs/applications/misc/spotify-tray/default.nix
index 04e1b5d2ea..7eb84702be 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/spotify-tray/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/misc/stork/default.nix b/third_party/nixpkgs/pkgs/applications/misc/stork/default.nix
index ab851363d3..0de395549b 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/stork/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/stork/default.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-qGcEhoytkCkcaA5eHc8GVgWvbOIyrO6BCp+EHva6wTw=";
   };
 
-  cargoSha256 = "sha256-a7ADTJ0VmKiZBr951JIAOSPWucsBl5JnM8eQHWssRM4=";
+  cargoHash = "sha256-a7ADTJ0VmKiZBr951JIAOSPWucsBl5JnM8eQHWssRM4=";
 
   checkFlags = [
     # Fails for 1.6.0, but binary works fine
diff --git a/third_party/nixpkgs/pkgs/applications/misc/surface-control/default.nix b/third_party/nixpkgs/pkgs/applications/misc/surface-control/default.nix
index 77f3954ed0..6c82c6efe9 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/surface-control/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/misc/swaynag-battery/default.nix b/third_party/nixpkgs/pkgs/applications/misc/swaynag-battery/default.nix
index ee39266d99..cbcb5d9026 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/swaynag-battery/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/misc/tdrop/default.nix b/third_party/nixpkgs/pkgs/applications/misc/tdrop/default.nix
index 5f43956d8a..bc9966ab2b 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/tdrop/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/misc/terminal-notifier/default.nix b/third_party/nixpkgs/pkgs/applications/misc/terminal-notifier/default.nix
index 19370fae01..e2bd8dd2f9 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/terminal-notifier/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/misc/thokr/default.nix b/third_party/nixpkgs/pkgs/applications/misc/thokr/default.nix
index 94363083ab..a0045ffb51 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/thokr/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/thokr/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0aryfx9qlnjdq3iq2d823c82fhkafvibmbz58g48b8ah5x5fv3ir";
   };
 
-  cargoSha256 = "sha256-gEpmXyLmw6bX3enA3gNVtXNMlkQl6J/8AwJQSY0RtFw=";
+  cargoHash = "sha256-gEpmXyLmw6bX3enA3gNVtXNMlkQl6J/8AwJQSY0RtFw=";
 
   meta = with lib; {
     description = "Typing tui with visualized results and historical logging";
diff --git a/third_party/nixpkgs/pkgs/applications/misc/topydo/default.nix b/third_party/nixpkgs/pkgs/applications/misc/topydo/default.nix
index 39a3c7013b..92411687ac 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/topydo/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/misc/tpmmanager/default.nix b/third_party/nixpkgs/pkgs/applications/misc/tpmmanager/default.nix
index 90d1cc01ff..763cd75ffd 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/tpmmanager/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/misc/tuckr/default.nix b/third_party/nixpkgs/pkgs/applications/misc/tuckr/default.nix
index d660248dee..46dcf25f08 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/tuckr/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/tuckr/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "tuckr";
-  version = "0.8.1";
+  version = "0.9.0";
 
   src = fetchFromGitHub {
     owner = "RaphGL";
     repo = "Tuckr";
     rev = version;
-    hash = "sha256-oQSuR0Zt1T8YU3O2Dq/qHl4ysVDl+3EVvp9r2mD3hRA=";
+    hash = "sha256-cIyqka/+CrO9RuKr7tI79QvpPA0mDL/YzWWWrcwin8E=";
   };
 
-  cargoHash = "sha256-ESDfUZsoqwBurXuwNIRSqxoDWnA2VpDZ9Q9GGaV8B4Y=";
+  cargoHash = "sha256-5Z7UpkLlNMW8prtdJO+Xr45fpacjhDBoD/RFv/H44t0=";
 
   doCheck = false; # test result: FAILED. 5 passed; 3 failed;
 
diff --git a/third_party/nixpkgs/pkgs/applications/misc/tuxclocker/default.nix b/third_party/nixpkgs/pkgs/applications/misc/tuxclocker/default.nix
index 7a47e571ce..8f1cdde3d7 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/tuxclocker/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/tuxclocker/default.nix
@@ -27,10 +27,6 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-QLKLqTCpVMWxlDINa8Bo1vgCDcjwovoaXUs/PdMnxv0=";
   };
 
-  # Meson doesn't find boost without these
-  BOOST_INCLUDEDIR = "${lib.getDev boost}/include";
-  BOOST_LIBRARYDIR = "${lib.getLib boost}/lib";
-
   nativeBuildInputs = [
     git
     makeWrapper
diff --git a/third_party/nixpkgs/pkgs/applications/misc/udict/default.nix b/third_party/nixpkgs/pkgs/applications/misc/udict/default.nix
index 62d698cc3a..24424c1017 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/udict/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/misc/valentina/default.nix b/third_party/nixpkgs/pkgs/applications/misc/valentina/default.nix
index 525a3a5399..18109f9691 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/valentina/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/misc/volnoti/default.nix b/third_party/nixpkgs/pkgs/applications/misc/volnoti/default.nix
index f03de6d9e6..560b9cce3f 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/volnoti/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/volnoti/default.nix
@@ -33,6 +33,6 @@ stdenv.mkDerivation {
     homepage = "https://github.com/davidbrazdil/volnoti";
     license = licenses.gpl3;
     platforms = platforms.linux;
-    maintainers = [];
+    maintainers = [ ];
   };
 }
diff --git a/third_party/nixpkgs/pkgs/applications/misc/wofi/default.nix b/third_party/nixpkgs/pkgs/applications/misc/wofi/default.nix
index c6ad0199e5..4809462740 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/wofi/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/misc/xdgmenumaker/default.nix b/third_party/nixpkgs/pkgs/applications/misc/xdgmenumaker/default.nix
index fc63ef02bc..52a7b95bb8 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/xdgmenumaker/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/misc/xfontsel/default.nix b/third_party/nixpkgs/pkgs/applications/misc/xfontsel/default.nix
index 5bfdb209c1..203b94b084 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/xfontsel/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/xfontsel/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     description = "Allows testing the fonts available in an X server";
     mainProgram = "xfontsel";
     license = with licenses; [ x11 smlnj mit ];
-    maintainers = with maintainers; [ viric ];
+    maintainers = [ ];
     platforms = platforms.unix;
   };
 }
diff --git a/third_party/nixpkgs/pkgs/applications/misc/xpdf/default.nix b/third_party/nixpkgs/pkgs/applications/misc/xpdf/default.nix
index 38b92eb77b..2315810e03 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/xpdf/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/xpdf/default.nix
@@ -76,26 +76,14 @@ stdenv.mkDerivation rec {
     platforms = platforms.unix;
     maintainers = with maintainers; [ sikmir ];
     knownVulnerabilities = [
-      "CVE-2019-9587: loop in PDF objects"
-      "CVE-2019-9588: loop in PDF objects"
-      "CVE-2019-16088: loop in PDF objects"
-      "CVE-2022-38334"
-      "CVE-2022-38928"
-      "CVE-2022-41842"
-      "CVE-2022-41843"
-      "CVE-2022-43071"
-      "CVE-2022-43295"
-      "CVE-2022-45586"
-      "CVE-2022-45587"
       "CVE-2023-26930"
-      "CVE-2023-26931"
-      "CVE-2023-26934"
-      "CVE-2023-26935"
-      "CVE-2023-26936"
-      "CVE-2023-26937"
-      "CVE-2023-26938"
-      "CVE-2023-27655"
-      "CVE-2023-31557"
+      "CVE-2024-2971"
+      "CVE-2024-3247"
+      "CVE-2024-3248"
+      "CVE-2024-3900"
+      "CVE-2024-4141"
+      "CVE-2024-4568"
+      "CVE-2024-4976"
     ];
   };
 }
diff --git a/third_party/nixpkgs/pkgs/applications/misc/zathura/djvu/default.nix b/third_party/nixpkgs/pkgs/applications/misc/zathura/djvu/default.nix
index c7b3c3e52c..00d3563d5b 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/zathura/djvu/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/misc/zathura/pdf-mupdf/default.nix b/third_party/nixpkgs/pkgs/applications/misc/zathura/pdf-mupdf/default.nix
index b7eff35913..b3b5d514a8 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/zathura/pdf-mupdf/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/misc/zathura/pdf-poppler/default.nix b/third_party/nixpkgs/pkgs/applications/misc/zathura/pdf-poppler/default.nix
index 1c4ba79ee9..7119acd037 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/zathura/pdf-poppler/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/misc/zathura/ps/default.nix b/third_party/nixpkgs/pkgs/applications/misc/zathura/ps/default.nix
index 63b9cedd7a..54202f9196 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/zathura/ps/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/misc/zktree/default.nix b/third_party/nixpkgs/pkgs/applications/misc/zktree/default.nix
index 82b93763ed..71b8806ae0 100644
--- a/third_party/nixpkgs/pkgs/applications/misc/zktree/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/misc/zktree/default.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "11w86k1w5zryiq6bqr98pjhffd3l76377yz53qx0n76vc5374fk9";
   };
 
-  cargoSha256 = "18v7agm39acnblc703278cn8py5971hm8p5kxmznpw119fjp36s5";
+  cargoHash = "sha256-RZtxpUsh8Gt/7bNcVGE4qfiLLENHDHAYXZapNOpTZ6M=";
 
   meta = with lib; {
     description = "Small tool to display Znodes in Zookeeper in tree structure";
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/asuka/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/asuka/default.nix
index f36cf28b2d..1451e4bbaa 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/asuka/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/asuka/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-+rj6P3ejc4Qb/uqbf3N9MqyqDT7yg9JFE0yfW/uzd6M=";
   };
 
-  cargoSha256 = "sha256-XrFpvH3qiMvpgbH7Q+KC1zFAqJT4rjxux6Q5KLY2ufI=";
+  cargoHash = "sha256-XrFpvH3qiMvpgbH7Q+KC1zFAqJT4rjxux6Q5KLY2ufI=";
 
   nativeBuildInputs = [ pkg-config ];
 
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/make-brave.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/make-brave.nix
index 01458f7001..0a4345593b 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/make-brave.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/make-brave.nix
@@ -62,7 +62,7 @@
 
 # For Vulkan support (--enable-features=Vulkan); disabled by default as it seems to break VA-API
 , vulkanSupport ? false
-, addOpenGLRunpath
+, addDriverRunpath
 , enableVulkan ? vulkanSupport
 }:
 
@@ -187,7 +187,7 @@ stdenv.mkDerivation {
       ''}
       --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto}}"
       ${optionalString vulkanSupport ''
-      --prefix XDG_DATA_DIRS  : "${addOpenGLRunpath.driverLink}/share"
+      --prefix XDG_DATA_DIRS  : "${addDriverRunpath.driverLink}/share"
       ''}
       --add-flags ${escapeShellArg commandLineArgs}
     )
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/castor/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/castor/default.nix
index 78e2791c1b..b3f7abedba 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/castor/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/castor/default.nix
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-yYLDbxmUR86fdpbHQQTiHVUbicnOD75cl3Vhofw5qr0=";
   };
 
-  cargoSha256 = "sha256-AHhKfy2AAcDBcknzNb8DAzm51RQqFQDuWN+Hp5731Yk=";
+  cargoHash = "sha256-AHhKfy2AAcDBcknzNb8DAzm51RQqFQDuWN+Hp5731Yk=";
 
   nativeBuildInputs = [
     pkg-config
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix
index 8275a28745..a3333b7b59 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix
@@ -35,7 +35,7 @@
 , glib, gtk3, dbus-glib
 , libXScrnSaver, libXcursor, libXtst, libxshmfence, libGLU, libGL
 , mesa
-, pciutils, protobuf, speechd, libXdamage, at-spi2-core
+, pciutils, protobuf, speechd-minimal, libXdamage, at-spi2-core
 , pipewire
 , libva
 , libdrm, wayland, libxkbcommon # Ozone
@@ -196,7 +196,7 @@ let
       glib gtk3 dbus-glib
       libXScrnSaver libXcursor libXtst libxshmfence libGLU libGL
       mesa # required for libgbm
-      pciutils protobuf speechd libXdamage at-spi2-core
+      pciutils protobuf speechd-minimal libXdamage at-spi2-core
       pipewire
       libva
       libdrm wayland libxkbcommon
@@ -224,7 +224,7 @@ let
       glib gtk3 dbus-glib
       libXScrnSaver libXcursor libXtst libxshmfence libGLU libGL
       mesa # required for libgbm
-      pciutils protobuf speechd libXdamage at-spi2-core
+      pciutils protobuf speechd-minimal libXdamage at-spi2-core
       pipewire
       libva
       libdrm wayland libxkbcommon
@@ -388,6 +388,10 @@ let
       find . -type f -perm -0100 -exec sed -i -e '$a\' {} +
 
       patchShebangs .
+    '' + lib.optionalString (ungoogled) ''
+      # Prune binaries (ungoogled only) *before* linking our own binaries:
+      ${ungoogler}/utils/prune_binaries.py . ${ungoogler}/pruning.list || echo "some errors"
+    '' + ''
       # Link to our own Node.js and Java (required during the build):
       mkdir -p third_party/node/linux/node-linux-x64/bin
       ln -s${lib.optionalString (chromiumVersionAtLeast "127") "f"} "${pkgsBuildHost.nodejs}/bin/node" third_party/node/linux/node-linux-x64/bin/node
@@ -400,7 +404,6 @@ let
       substituteInPlace build/toolchain/linux/BUILD.gn \
         --replace 'toolprefix = "aarch64-linux-gnu-"' 'toolprefix = ""'
     '' + lib.optionalString ungoogled ''
-      ${ungoogler}/utils/prune_binaries.py . ${ungoogler}/pruning.list || echo "some errors"
       ${ungoogler}/utils/patches.py . ${ungoogler}/patches
       ${ungoogler}/utils/domain_substitution.py apply -r ${ungoogler}/domain_regex.list -f ${ungoogler}/domain_substitution.list -c ./ungoogled-domsubcache.tar.gz .
     '';
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.nix
index 4d04fec278..0129b89e3c 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.nix
@@ -21,17 +21,17 @@
   ungoogled-chromium = {
     deps = {
       gn = {
-        hash = "sha256-mNoQeHSSM+rhR0UHrpbyzLJC9vFqfxK1SD0X8GiRsqw=";
-        rev = "df98b86690c83b81aedc909ded18857296406159";
+        hash = "sha256-vzZu/Mo4/xATSD9KgKcRuBKVg9CoRZC9i0PEajYr4UM=";
+        rev = "b3a0bff47dd81073bfe67a402971bad92e4f2423";
         url = "https://gn.googlesource.com/gn";
-        version = "2024-05-13";
+        version = "2024-06-06";
       };
       ungoogled-patches = {
-        hash = "sha256-jDWL4gXcWF6GMlFJ/sua4dfVURs9vWYXRMjnYNqESWc=";
-        rev = "126.0.6478.182-1";
+        hash = "sha256-IBdOV+eFJWD+kCxnhSWWjiBgMbP/DxF+gUVIIpWf4rc=";
+        rev = "127.0.6533.72-1";
       };
     };
-    hash = "sha256-vZ7P8+vHTMCo6lXkV84ENqRZVG3/fDEwl+BTNJTGMn4=";
-    version = "126.0.6478.182";
+    hash = "sha256-m99HaGCuIihDdbVnmu6xatnC/QDxgLVby2TWY/L+RHk=";
+    version = "127.0.6533.72";
   };
 }
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix
index 79df553d3a..24319ea1a4 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix
@@ -17,7 +17,7 @@
 , pciutils
 , sndio
 , libjack2
-, speechd
+, speechd-minimal
 , removeReferencesTo
 }:
 
@@ -98,7 +98,7 @@ let
             ++ lib.optional sndioSupport sndio
             ++ lib.optional jackSupport libjack2
             ++ lib.optional smartcardSupport opensc
-            ++ lib.optional (cfg.speechSynthesisSupport or true) speechd
+            ++ lib.optional (cfg.speechSynthesisSupport or true) speechd-minimal
             ++ pkcs11Modules
             ++ gtk_modules;
       gtk_modules = [ libcanberra-gtk3 ];
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/floorp/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/floorp/default.nix
index 67edb1657a..130fca5f2a 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/floorp/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/browsers/librewolf/src.json b/third_party/nixpkgs/pkgs/applications/networking/browsers/librewolf/src.json
index bb84c00147..5099dd93c3 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/librewolf/src.json
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/browsers/lynx/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/lynx/default.nix
index 88eb19146e..1cad8d5777 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/lynx/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/browsers/polypane/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/polypane/default.nix
index 06391355db..4cd667083e 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/polypane/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/polypane/default.nix
@@ -2,12 +2,12 @@
 
 let
   pname = "polypane";
-  version = "20.0.0";
+  version = "20.1.1";
 
   src = fetchurl {
     url = "https://github.com/firstversionist/${pname}/releases/download/v${version}/${pname}-${version}.AppImage";
     name = "${pname}-${version}.AppImage";
-    sha256 = "sha256-2fzxEqOGPZnA+nizLUq73f18bKDpDNglUt4RIz+VnS8=";
+    sha256 = "sha256-2bofd/2Eu2jpyvp5l1/Q6QIY2t7xaIV+ZhneGG38dA0=";
   };
 
   appimageContents = appimageTools.extractType2 {
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/vimb/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/vimb/default.nix
index 1c15d89ede..e76b79f9d0 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/vimb/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/vimb/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = "https://fanglingsu.github.io/vimb/";
     license = lib.licenses.gpl3;
-    maintainers = [];
+    maintainers = [ ];
     platforms = with lib.platforms; linux;
   };
 }
diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix
index 3eccc3e016..33ef7b5196 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/vivaldi/default.nix
@@ -24,7 +24,7 @@ let
   vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi";
 in stdenv.mkDerivation rec {
   pname = "vivaldi";
-  version = "6.8.3381.46";
+  version = "6.8.3381.48";
 
   suffix = {
     aarch64-linux = "arm64";
@@ -34,8 +34,8 @@ in stdenv.mkDerivation rec {
   src = fetchurl {
     url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}-1_${suffix}.deb";
     hash = {
-      aarch64-linux = "sha256-OR79+Y2z9b8aE5WecIlbJsJx6wdMDnlWjCE9HYmOfn0=";
-      x86_64-linux = "sha256-F8HibI1fWI0nPWaXDNgrSHcp2iTuC9LZhble877zrMg=";
+      aarch64-linux = "sha256-VLX2nWcpwWqI5QtBFyXRieaO+kLXMeeyWwFIVgz8XIo=";
+      x86_64-linux = "sha256-ZlrL4eOQnQjIBzOiLLDHZFjf6nr9KiyapZmqJFkDqX8=";
     }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
   };
 
diff --git a/third_party/nixpkgs/pkgs/applications/networking/circumflex/default.nix b/third_party/nixpkgs/pkgs/applications/networking/circumflex/default.nix
index 8fce759acf..354bc38327 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/circumflex/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/circumflex/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "circumflex";
-  version = "3.6";
+  version = "3.7";
 
   src = fetchFromGitHub {
     owner = "bensadeh";
     repo = "circumflex";
     rev = version;
-    hash = "sha256-FzJUmF2X4Iyf83cIEa8b8EFCcWUyYEZBVyvXuhiaaWM=";
+    hash = "sha256-jjtjOT8lFPsk300Q9EtsX/w8Bck0pwrS/GyouoBsZ+0=";
   };
 
-  vendorHash = "sha256-x/NgcodS/hirXJHxBHeUP9MgOBHq1yQWHprMrlpqsas=";
+  vendorHash = "sha256-Nlv8H5YqHrqACW2kEXg+mkc3bCgXVudrSNfyu+xeFBA=";
 
   nativeBuildInputs = [ makeWrapper ];
 
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix
index 9432bdd29f..f526225917 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "argocd";
-  version = "2.11.5";
+  version = "2.11.7";
 
   src = fetchFromGitHub {
     owner = "argoproj";
     repo = "argo-cd";
     rev = "v${version}";
-    hash = "sha256-0Td4TMi9HTvf+GeW2f/ufRW0Y3KBrBSDWhgPW4noXi4=";
+    hash = "sha256-/gbclPcYSDobwftFi0CECgBp6PNqxHW9svP3A5y8eEY=";
   };
 
   proxyVendor = true; # darwin/linux hash mismatch
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/atmos/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/atmos/default.nix
index 03d181325a..ab481ba74c 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/atmos/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/cluster/civo/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/civo/default.nix
index 0c676bed1c..9892010ef7 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/civo/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/cluster/cni/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/cni/default.nix
index 3cc2673508..7710490816 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/cni/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/cluster/glooctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/glooctl/default.nix
index 6f74be61c4..a695f261ef 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/glooctl/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/cluster/kn/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kn/default.nix
index 5f7f7ad160..8fbf21bb2d 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kn/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kn/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "kn";
-  version = "1.14.0";
+  version = "1.15.0";
 
   src = fetchFromGitHub {
     owner = "knative";
     repo = "client";
     rev = "knative-v${version}";
-    sha256 = "sha256-sUMQrBAOhpMxMawOdvLFSUrcU9od6pmT7NabSywoQn8=";
+    sha256 = "sha256-bXICU1UBNPVIumzRPSOWa1I5hUYWEvo6orBpUvbPEvg=";
   };
 
   vendorHash = null;
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubelogin/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubelogin/default.nix
index d9e25fc9b7..243495dd6a 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubelogin/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubelogin/default.nix
@@ -23,6 +23,6 @@ buildGoModule rec {
     mainProgram = "kubelogin";
     inherit (src.meta) homepage;
     license = licenses.mit;
-    maintainers = [];
+    maintainers = [ ];
   };
 }
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeshark/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeshark/default.nix
index 37c0bb3b74..4736141606 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeshark/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/cluster/linkerd/edge.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/linkerd/edge.nix
index 7c02bedbd1..518037d607 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/linkerd/edge.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/linkerd/edge.nix
@@ -2,7 +2,7 @@
 
 (callPackage ./generic.nix { }) {
   channel = "edge";
-  version = "24.7.2";
-  sha256 = "1kl1ik1w0j3m0qlfbdagzjgd67kabx358xaa2rn0clg8jk43nk3n";
-  vendorHash = "sha256-/dYLPoPg3Oac4W1eLytJJiP7kzK4PTSjh8BRKjJAnU0=";
+  version = "24.7.5";
+  sha256 = "03hsz87vpysw4y45afsbr3amkrqnank1zcclfh6qj0yf98ymxxbn";
+  vendorHash = "sha256-0NKoQICbKM3UA62LNySqu5pS2bPuuEfmOEukxB/6Ges=";
 }
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/nixops/plugins/nixops-digitalocean.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/nixops/plugins/nixops-digitalocean.nix
index 8a0d2d4c49..a78d4d2cfd 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/nixops/plugins/nixops-digitalocean.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/cluster/nixops/plugins/nixops-encrypted-links.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/nixops/plugins/nixops-encrypted-links.nix
index 817da055d6..8b890157a2 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/nixops/plugins/nixops-encrypted-links.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/cluster/nixops/plugins/nixos-modules-contrib.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/nixops/plugins/nixos-modules-contrib.nix
index 494208d347..a3039482c8 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/nixops/plugins/nixos-modules-contrib.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/nixops/plugins/nixos-modules-contrib.nix
@@ -40,6 +40,6 @@ buildPythonPackage {
     description = "Useful NixOS modules which may not belong in the Nixpkgs repository itself";
     homepage = "https://github.com/nix-community/nixos-modules-contrib";
     license = licenses.lgpl3;
-    maintainers = [];
+    maintainers = [ ];
   };
 }
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad-autoscaler/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad-autoscaler/default.nix
index 5199400cae..6a232472f6 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad-autoscaler/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/cluster/opentofu/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/opentofu/default.nix
index 2b61a146d9..d278663f72 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/opentofu/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/cluster/rke2/update-script.sh b/third_party/nixpkgs/pkgs/applications/networking/cluster/rke2/update-script.sh
index 608f49bb64..029933b8f8 100755
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/rke2/update-script.sh
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/cluster/roxctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/roxctl/default.nix
index 6584230191..bcfbf11b0d 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/roxctl/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/roxctl/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "roxctl";
-  version = "4.4.4";
+  version = "4.5.0";
 
   src = fetchFromGitHub {
     owner = "stackrox";
     repo = "stackrox";
     rev = version;
-    sha256 = "sha256-1eu7khgs6nzp+d1Gtz2DggD2Gie08auw1XxSZsnRdaM=";
+    sha256 = "sha256-DX7q8TgCJuM4G/gYnh+ZhbaGFO4BezRShZyNqZ2VRMg=";
   };
 
-  vendorHash = "sha256-j/ouxh4nMg5hyzT2RuP+hJrAeK7+PleT2W0DWxxjOfA=";
+  vendorHash = "sha256-K1jtwrfzRpzMApDW0WPmIZaJ5hADlMjEkFDWFmzmDc0=";
 
   nativeBuildInputs = [ installShellFiles ];
 
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/temporal/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/temporal/default.nix
index 3b23b75086..1b81c59e71 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/temporal/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 167e52e2a7..02865985be 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/cluster/terraspace/Gemfile b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraspace/Gemfile
index 7a6bbf7cc9..3e9579dd75 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraspace/Gemfile
+++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraspace/Gemfile
@@ -1,2 +1,2 @@
 source "https://rubygems.org"
-gem "terraspace", '~> 2.2.8'
+gem "terraspace"
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraspace/Gemfile.lock b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraspace/Gemfile.lock
index 4fce1f8196..aa9e160019 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraspace/Gemfile.lock
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/cluster/terraspace/gemset.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraspace/gemset.nix
index a4e082c6d0..606e450c42 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraspace/gemset.nix
+++ b/third_party/nixpkgs/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.18.1";
+    version = "5.24.1";
+  };
+  mutex_m = {
+    groups = ["default"];
+    platforms = [];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1ma093ayps1m92q845hmpk0dmadicvifkbf05rpq9pifhin0rvxn";
+      type = "gem";
+    };
+    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/third_party/nixpkgs/pkgs/applications/networking/cluster/weave-gitops/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/weave-gitops/default.nix
index 4591b0946d..f26371d647 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/cluster/weave-gitops/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/coreth/default.nix b/third_party/nixpkgs/pkgs/applications/networking/coreth/default.nix
index f00d66ed14..b98e308f6b 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/coreth/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/coreth/default.nix
@@ -5,19 +5,19 @@
 
 buildGoModule rec {
   pname = "coreth";
-  version = "0.13.5";
+  version = "0.13.7";
 
   src = fetchFromGitHub {
     owner = "ava-labs";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-cnxNIFf0zCpbUg9G+bHNoApxB31O7RH5BVgprYN2GYk=";
+    hash = "sha256-ZWM45RoGfGd9mRQkQ/Hz7MGlYq4X26J/QV7FWDjMVrk=";
   };
 
   # go mod vendor has a bug, see: golang/go#57529
   proxyVendor = true;
 
-  vendorHash = "sha256-IVmz+2pWHsiZOhHKEK9GW9zZq8m1IH5lpfKeClnmc3o=";
+  vendorHash = "sha256-KSBoqp56n/b9zk5elEWsv7EAv3oyVhmc7hjyudicTWs=";
 
   ldflags = [
     "-s"
diff --git a/third_party/nixpkgs/pkgs/applications/networking/drive/default.nix b/third_party/nixpkgs/pkgs/applications/networking/drive/default.nix
index e8b62033f3..c28b48bba1 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/drive/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/errbot/default.nix b/third_party/nixpkgs/pkgs/applications/networking/errbot/default.nix
index 994118a143..cf8897b444 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/errbot/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/firewalld/default.nix b/third_party/nixpkgs/pkgs/applications/networking/firewalld/default.nix
index 9c0053051d..308fd0c2e5 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/firewalld/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/gopher/phetch/default.nix b/third_party/nixpkgs/pkgs/applications/networking/gopher/phetch/default.nix
index d8c30a9e6a..9f835c8535 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/gopher/phetch/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/gopher/phetch/default.nix
@@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-J+ka7/B37WzVPPE2Krkd/TIiVwuKfI2QYWmT0JHgBGQ=";
   };
 
-  cargoSha256 = "sha256-y3Y5PnZ51Zc3LmVTijUGnb0KaGm28sWOSYxjuM3A1Zk=";
+  cargoHash = "sha256-y3Y5PnZ51Zc3LmVTijUGnb0KaGm28sWOSYxjuM3A1Zk=";
 
   nativeBuildInputs = [ installShellFiles pkg-config scdoc which ];
   buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ];
diff --git a/third_party/nixpkgs/pkgs/applications/networking/ids/zeek/broker/default.nix b/third_party/nixpkgs/pkgs/applications/networking/ids/zeek/broker/default.nix
index 4c0b673c09..49a13cdb26 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/ids/zeek/broker/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/ids/zeek/broker/default.nix
@@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
     substituteInPlace bindings/python/CMakeLists.txt --replace " -u -r" ""
   '';
 
-  nativeBuildInputs = [ cmake ];
+  nativeBuildInputs = [ cmake python3 ];
   buildInputs = [ openssl python3.pkgs.pybind11 ];
   propagatedBuildInputs = [ caf' ];
 
diff --git a/third_party/nixpkgs/pkgs/applications/networking/ids/zeek/default.nix b/third_party/nixpkgs/pkgs/applications/networking/ids/zeek/default.nix
index 6beba3f4c6..e1ac462330 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/ids/zeek/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/ids/zeek/default.nix
@@ -45,6 +45,7 @@ stdenv.mkDerivation rec {
     file
     flex
     python
+    swig
   ];
 
   buildInputs = [
@@ -55,7 +56,6 @@ stdenv.mkDerivation rec {
     libpcap
     ncurses
     openssl
-    swig
     zlib
     python
   ] ++ lib.optionals stdenv.isLinux [
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/alfaview/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/alfaview/default.nix
index a338bb8d5e..be04282fcb 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/alfaview/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/bluejeans/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/bluejeans/default.nix
index e1bc3b3b56..732f121f9d 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/bluejeans/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix
index 43a18d775f..bd17cd2a12 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix
index 0f14d131ac..6826a5f834 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/default.nix
@@ -2,7 +2,7 @@
 let
   versions =
     if stdenv.isLinux then {
-      stable = "0.0.60";
+      stable = "0.0.61";
       ptb = "0.0.95";
       canary = "0.0.455";
       development = "0.0.24";
@@ -17,7 +17,7 @@ let
     x86_64-linux = {
       stable = fetchurl {
         url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz";
-        hash = "sha256-hu1+/z/ZtHoobjHF+pgNm040r4LQJUTnpZ06RNERFr8=";
+        hash = "sha256-jJapVZ67nqLSNhti7LkfsGNV3JzglZjQkHhTwJvPO98=";
       };
       ptb = fetchurl {
         url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz";
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/linux.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/linux.nix
index eb3f29cf2a..e0375ecf7b 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/linux.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/discord/linux.nix
@@ -6,7 +6,7 @@
 , libXi, libXrandr, libXrender, libXtst, libxcb, libxshmfence, mesa, nspr, nss
 , pango, systemd, libappindicator-gtk3, libdbusmenu, writeScript, python3, runCommand
 , libunity
-, speechd
+, speechd-minimal
 , wayland
 , branch
 , withOpenASAR ? false, openasar
@@ -91,7 +91,7 @@ stdenv.mkDerivation rec {
     libappindicator-gtk3
     libdbusmenu
     wayland
-  ] ++ lib.optional withTTS speechd);
+  ] ++ lib.optional withTTS speechd-minimal);
 
   installPhase = ''
     runHook preInstall
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/feishu/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/feishu/default.nix
index e5e7f897ec..776e4db734 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/feishu/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/feishu/default.nix
@@ -1,4 +1,4 @@
-{ addOpenGLRunpath
+{ addDriverRunpath
 , alsa-lib
 , at-spi2-atk
 , at-spi2-core
@@ -178,7 +178,7 @@ stdenv.mkDerivation {
       # FIXME: Add back NIXOS_OZONE_WL support once upstream fixes the crash on native Wayland (see #318035)
       wrapProgram $executable \
         --prefix XDG_DATA_DIRS    :  "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \
-        --prefix LD_LIBRARY_PATH  :  ${rpath}:$out/opt/bytedance/feishu:${addOpenGLRunpath.driverLink}/share \
+        --prefix LD_LIBRARY_PATH  :  ${rpath}:$out/opt/bytedance/feishu:${addDriverRunpath.driverLink}/share \
         ${lib.optionalString (commandLineArgs!="") "--add-flags ${lib.escapeShellArg commandLineArgs}"}
     done
 
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/flare-signal/Cargo.lock b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/flare-signal/Cargo.lock
index 2c3c6fd52e..4f715a576a 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/flare-signal/Cargo.lock
+++ b/third_party/nixpkgs/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 = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247"
+checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
+
+[[package]]
+name = "arbitrary"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+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"
+version = "3.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b"
+checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18"
 dependencies = [
- "event-listener 2.5.3",
-]
-
-[[package]]
-name = "async-lock"
-version = "3.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b"
-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 = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+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 = "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 = "bumpalo"
-version = "3.15.4"
+name = "built"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa"
+checksum = "236e6289eda5a812bc6b53c3b024039382a2895fbbeef2d748b2931546d392c4"
+
+[[package]]
+name = "bumpalo"
+version = "3.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+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"
@@ -468,18 +520,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
-name = "bytes"
-version = "1.6.0"
+name = "byteorder-lite"
+version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9"
+checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495"
+
+[[package]]
+name = "bytes"
+version = "1.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+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"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3"
+checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1"
 dependencies = [
- "event-listener 4.0.3",
- "pin-project-lite",
-]
-
-[[package]]
-name = "event-listener-strategy"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "332f51cb23d20b0de8458b86580878211da09bcd4503cb579c225b3d124cabb3"
-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 = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
+checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
+
+[[package]]
+name = "libfuzzer-sys"
+version = "0.4.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+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"
@@ -2150,10 +2239,30 @@ dependencies = [
 ]
 
 [[package]]
-name = "memchr"
-version = "2.7.2"
+name = "maybe-rayon"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d"
+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.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+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",
@@ -2259,10 +2374,16 @@ dependencies = [
 ]
 
 [[package]]
-name = "num"
-version = "0.4.1"
+name = "noop_proc_macro"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b05180d69e3da0e530ba2a1dae5110317e49e3b7f3d41be227dc5f92e49ee7af"
+checksum = "0676bb32a98c1a483ce53e500a81ad9c3d5b3f7c920c28c24e9cb0980d0b5bc8"
+
+[[package]]
+name = "num"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+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 = "prost"
-version = "0.12.3"
+name = "profiling"
+version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "146c289cda302b98a28d40c8b3b90498d6e526dd24ac2ecea73e4e491685b94a"
+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.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+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",
 ]
 
@@ -2956,10 +3107,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4339fc7a1021c9c1621d87f5e3505f2805c8c105420ba2f2a4df86814590c142"
 
 [[package]]
-name = "quick-xml"
-version = "0.28.2"
+name = "quick-error"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ce5e73202a820a31f8a0ee32ada5e21029c81fd9e3ebf668a40832e4219d9d1"
+checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3"
+
+[[package]]
+name = "quick-xml"
+version = "0.31.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+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 = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56"
+checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
+
+[[package]]
+name = "rgb"
+version = "0.8.45"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+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 = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+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"
@@ -4339,10 +4576,19 @@ dependencies = [
 ]
 
 [[package]]
-name = "zvariant"
-version = "4.0.2"
+name = "zune-jpeg"
+version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c1b3ca6db667bfada0f1ebfc94b2b1759ba25472ee5373d4551bb892616389a"
+checksum = "16099418600b4d8f028622f73ff6e3deaabdff330fb9a2a131dea781ee8b0768"
+dependencies = [
+ "zune-core",
+]
+
+[[package]]
+name = "zvariant"
+version = "4.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+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/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/flare-signal/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/flare-signal/default.nix
index b22963c476..6614d54ff6 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/flare-signal/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/kaidan/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/kaidan/default.nix
index b710421adb..497f9eef64 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/kaidan/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/kaidan/default.nix
@@ -21,14 +21,14 @@
 
 mkDerivation rec {
   pname = "kaidan";
-  version = "0.9.1";
+  version = "0.9.2";
 
   src = fetchFromGitLab {
     domain = "invent.kde.org";
     owner = "network";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-F5GhN9hAF2e8b0T3peUnLk8CVd+nq4YR8k52x6ZOoLM=";
+    hash = "sha256-2UzXWd/fR5UwGywebYGWhh817x+VC76zmVaVZSBOg7M=";
   };
 
   nativeBuildInputs = [ cmake extra-cmake-modules pkg-config ];
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/mm/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/mm/default.nix
index c5ac50f675..2fa65fddfd 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/mm/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/neosay/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/neosay/default.nix
index b6fbbd6840..b931cdb05a 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/neosay/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/carbons/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/carbons/default.nix
index f702a667ae..d24504f826 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/carbons/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-skypeweb/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-skypeweb/default.nix
index d7c3c6caca..fc877115ad 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/pidgin-skypeweb/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-googlechat/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-googlechat/default.nix
index 217b87c26a..4fb4a1c1c2 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-googlechat/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-mm-sms/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-mm-sms/default.nix
index 4989c36d83..1b84b1a93a 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-mm-sms/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/window-merge/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/window-merge/default.nix
index c5437e965e..bcc09b1f64 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/window-merge/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/session-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/session-desktop/default.nix
index a272967119..11336d70ef 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/session-desktop/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/session-desktop/default.nix
@@ -1,32 +1,32 @@
-{ lib
-, makeDesktopItem
-, copyDesktopItems
-, stdenvNoCC
-, fetchurl
-, appimageTools
-, makeWrapper
+{
+  lib,
+  makeDesktopItem,
+  copyDesktopItems,
+  stdenvNoCC,
+  fetchurl,
+  appimageTools,
+  makeWrapper,
 }:
 
 let
-  version = "1.11.5";
+  version = "1.12.5";
   pname = "session-desktop";
 
   src = fetchurl {
     url = "https://github.com/oxen-io/session-desktop/releases/download/v${version}/session-desktop-linux-x86_64-${version}.AppImage";
-    hash = "sha256-Sma8e3A1tf7JmnlS4mbtlF98Ow5aRPqw+aUoitzCjmk=";
-  };
-  appimage = appimageTools.wrapType2 {
-    inherit version pname src;
-  };
-  appimage-contents = appimageTools.extractType2 {
-    inherit version pname src;
+    hash = "sha256-5lE2jab9AK40j2rKYE8zFJr3a+drwCKnVmIZoihhJv8=";
   };
+  appimage = appimageTools.wrapType2 { inherit version pname src; };
+  appimage-contents = appimageTools.extractType2 { inherit version pname src; };
 in
 stdenvNoCC.mkDerivation {
   inherit version pname;
   src = appimage;
 
-  nativeBuildInputs = [ copyDesktopItems makeWrapper ];
+  nativeBuildInputs = [
+    copyDesktopItems
+    makeWrapper
+  ];
 
   desktopItems = [
     (makeDesktopItem {
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-cli/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-cli/default.nix
index 808fc19418..0706ce6573 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-cli/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-cli/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   pname = "signal-cli";
-  version = "0.13.4";
+  version = "0.13.5";
 
   # Building from source would be preferred, but is much more involved.
   src = fetchurl {
     url = "https://github.com/AsamK/signal-cli/releases/download/v${version}/signal-cli-${version}.tar.gz";
-    hash = "sha256-R+ylymM0k9wvK12qo+S1Ezu2kheH1x4Ll3VFR7HKVXo=";
+    hash = "sha256-MWQz/+eusZpXUlpPemLf8Y2nOsh2lv0+Ilf/w+7na+k=";
   };
 
   buildInputs = lib.optionals stdenv.isLinux [ libmatthew_java dbus dbus_java ];
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix
index c251258772..79c501a2e6 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix
index 26d43cf11d..ebe2cbc9d9 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/silc-client/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/silc-client/default.nix
index 9dd94225ac..7a64e5cc12 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/silc-client/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/silc-client/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
     description = "Secure Internet Live Conferencing server";
     mainProgram = "silc";
     license = lib.licenses.gpl2;
-    maintainers = with lib.maintainers; [viric];
+    maintainers = [ ];
     platforms = with lib.platforms; linux;
   };
 }
diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/slack-term/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/slack-term/default.nix
index b03446d889..a7c302dbd4 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/slack-term/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix
index e27bbcdb1b..3a26639e2e 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/slack/update.sh b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/slack/update.sh
index eacd7b4284..8b66e30002 100755
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/slack/update.sh
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix
index 9a8e547b70..4054219850 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix
index 03465b1314..92daa59ae4 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telepathy/mission-control/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/turses/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/turses/default.nix
index dfcb9facfd..d6d403322c 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/turses/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/utox/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/utox/default.nix
index d809337de0..706904a8dd 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/utox/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/irc/epic5/default.nix b/third_party/nixpkgs/pkgs/applications/networking/irc/epic5/default.nix
index 404eca810e..2331eaa459 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/irc/epic5/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/irc/epic5/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
     homepage = "http://epicsol.org";
     description = "IRC client that offers a great ircII interface";
     license = licenses.bsd3;
-    maintainers = [];
+    maintainers = [ ];
   };
 }
 
diff --git a/third_party/nixpkgs/pkgs/applications/networking/irc/glowing-bear/default.nix b/third_party/nixpkgs/pkgs/applications/networking/irc/glowing-bear/default.nix
index d5c0cad075..c493cae6d4 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/irc/glowing-bear/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/irc/irssi/fish/default.nix b/third_party/nixpkgs/pkgs/applications/networking/irc/irssi/fish/default.nix
index b26b2cb1da..a5ee8b7cef 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/irc/irssi/fish/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/irc/irssi/fish/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     homepage = "https://github.com/falsovsky/FiSH-irssi";
     license = licenses.mit;
-    maintainers = with maintainers; [ viric ];
+    maintainers = [ ];
     platforms = platforms.unix;
   };
 }
diff --git a/third_party/nixpkgs/pkgs/applications/networking/irc/thelounge/default.nix b/third_party/nixpkgs/pkgs/applications/networking/irc/thelounge/default.nix
index 1078f515c6..729afb831d 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/irc/thelounge/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/irc/thelounge/default.nix
@@ -7,7 +7,7 @@
 , fixup-yarn-lock
 , python3
 , npmHooks
-, darwin
+, cctools
 , sqlite
 , srcOnly
 , buildPackages
@@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-MM6SgVT7Pjdu96A4eWRucEzT7uNPxBqUDgHKl8mH2C0=";
   };
 
-  nativeBuildInputs = [ nodejs yarn fixup-yarn-lock python3 npmHooks.npmInstallHook ] ++ lib.optional stdenv.isDarwin darwin.cctools;
+  nativeBuildInputs = [ nodejs yarn fixup-yarn-lock python3 npmHooks.npmInstallHook ] ++ lib.optional stdenv.isDarwin cctools;
   buildInputs = [ sqlite ];
 
   configurePhase = ''
diff --git a/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix b/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix
index 46cb08594e..e51e6f061b 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix-bridge/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/iroh/default.nix b/third_party/nixpkgs/pkgs/applications/networking/iroh/default.nix
index b0eb919cb4..c976b7f826 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/iroh/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/lls/default.nix b/third_party/nixpkgs/pkgs/applications/networking/lls/default.nix
index 3d4d70597e..3662477fde 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/lls/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/lls/default.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-FtRPRR+/R3JTEI90mAEHFyhqloAbNEdR3jkquKa9Ahw=";
   };
 
-  cargoSha256 = "sha256-yjRbg/GzCs5d3zXL22j5U9c4BlOcRHyggHCovj4fMIs=";
+  cargoHash = "sha256-yjRbg/GzCs5d3zXL22j5U9c4BlOcRHyggHCovj4fMIs=";
 
   meta = with lib; {
     description = "Tool to list listening sockets";
diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix
index 3c933eaa4b..6de6838eee 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/notmuch/muchsync.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
index 3bed100179..608e6bf1d7 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
@@ -1,665 +1,665 @@
 {
-  version = "115.10.1";
+  version = "115.13.0";
   sources = [
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/af/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/af/thunderbird-115.13.0.tar.bz2";
       locale = "af";
       arch = "linux-x86_64";
-      sha256 = "9023faca327f2ef67090cd06635030acde12caf4b028f293d06463cc6303f2c7";
+      sha256 = "73600c9de1e75f0a2baf7e13d9ecded491e93f7fb4d5aa63e8e4ec2f5c95ab2d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/ar/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/ar/thunderbird-115.13.0.tar.bz2";
       locale = "ar";
       arch = "linux-x86_64";
-      sha256 = "3d312b1a651a836e725ef79236ff4b0a8e73d7ebe3ee065da7d87ff329ec3596";
+      sha256 = "8eee06c6f5d347d23fa2401862bc733065162415e15a8decba31d7f71afaf8f5";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/ast/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/ast/thunderbird-115.13.0.tar.bz2";
       locale = "ast";
       arch = "linux-x86_64";
-      sha256 = "8d645ce0694a5f9e464243f85e46c96e08c69aec7d4e7ef6b7028f457cf11a8a";
+      sha256 = "6ebcc36fc7306e49513ce6ba9090817acbfcc65eefacac552d4c1fbb3d2ee452";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/be/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/be/thunderbird-115.13.0.tar.bz2";
       locale = "be";
       arch = "linux-x86_64";
-      sha256 = "c5564e5235f990caccae034b77ea835f5b9a3741e2bdcbc5ed750e1b3161af4e";
+      sha256 = "386cd002e1986c4ae5e3d05e3279713994b610453745b25199906427db3874ee";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/bg/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/bg/thunderbird-115.13.0.tar.bz2";
       locale = "bg";
       arch = "linux-x86_64";
-      sha256 = "061d15ae7805143fd74d8b16a2c2fcbfed471297d815692c55415c92ffe8bb41";
+      sha256 = "c909a752e7f09c37ce67cd7995562eaa30cdb5f604bda70a222e376eacdab8b2";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/br/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/br/thunderbird-115.13.0.tar.bz2";
       locale = "br";
       arch = "linux-x86_64";
-      sha256 = "33e802d7485b46bab1626dc1290db69df39c19434af8ad8dbdaecdb05cd5b2c0";
+      sha256 = "511f1af492da3cd5a6aea641a8cc67f5f779196cbd81a940f3b0390dc0c1809f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/ca/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/ca/thunderbird-115.13.0.tar.bz2";
       locale = "ca";
       arch = "linux-x86_64";
-      sha256 = "6bdd0eb8fe98dca531796228ef3fbc51bca6d2a220111272464192ef9744fa78";
+      sha256 = "c7f087af3ed5b3fa60b94cd5380aabf019397479591be08b60d23ca782ac144d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/cak/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/cak/thunderbird-115.13.0.tar.bz2";
       locale = "cak";
       arch = "linux-x86_64";
-      sha256 = "9430aa1c2e5af6e461cfe7947c00421d32e5d91f69215981f470db14355d53c7";
+      sha256 = "fe7c6fe3e99f0d4d8d6e2561e1fb2e5e8ce6def6caa119d4bb73c55605c3222d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/cs/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/cs/thunderbird-115.13.0.tar.bz2";
       locale = "cs";
       arch = "linux-x86_64";
-      sha256 = "f40ccf3947b4f98306697ffb984ac93ea1777019cb778fd1dd97d5f39c8718e8";
+      sha256 = "222a9a0898375e5edfe09ff67a6db89a340eab4c7b195f895dbe891b5157846c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/cy/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/cy/thunderbird-115.13.0.tar.bz2";
       locale = "cy";
       arch = "linux-x86_64";
-      sha256 = "694d0e4a7ca2585afb3c8fa8a41e318c5de7fbcbe91627c3acf692974c75685f";
+      sha256 = "19e3060fb67039a6fd70bbbce712aeab7def908528a3d54cc77387cac8c58d83";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/da/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/da/thunderbird-115.13.0.tar.bz2";
       locale = "da";
       arch = "linux-x86_64";
-      sha256 = "8b8f5c9895b40ee6dc5d2ef0877325ec0af21ab638abb47c5d952334fcde29aa";
+      sha256 = "a2462934c90fb2433692b8ccf342c1669770a20be0c3703ecc54f65e5aaa2487";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/de/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/de/thunderbird-115.13.0.tar.bz2";
       locale = "de";
       arch = "linux-x86_64";
-      sha256 = "f6f498a1e0756248fa06b4b94b52be11026a28cadd1aaab81b49aca3a311f3c1";
+      sha256 = "d45733c83c65abc1a3df8f6fc0cb2880c55405a4b2a798a5062304dc93f4ac43";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/dsb/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/dsb/thunderbird-115.13.0.tar.bz2";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha256 = "2415f1a021c2005c8646bfa8b75df2115fd6d86c5eabf6bbc23aa499d3a1d045";
+      sha256 = "e91883128422d834b7713f1ffc0d8095882e4f4e594940c5adf825f38ca8c1e7";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/el/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/el/thunderbird-115.13.0.tar.bz2";
       locale = "el";
       arch = "linux-x86_64";
-      sha256 = "57b4f990a15d0a2a9361bf9ec241fbe7b1fa33f7d3da871bec68e32d1b89ee3c";
+      sha256 = "f54b76e5ae958ad3eb5bf651f892fbfef460732dee8364df70ed5f8b24a77a5c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/en-CA/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/en-CA/thunderbird-115.13.0.tar.bz2";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha256 = "3ad955c9557f0a692d7ce8b42cd764e3f9cb9dcba2b5bbb396a9debb40b8c1a4";
+      sha256 = "fff09666b871aff621cc513aa8fab7843cb1d019e1914c9b654e8af797edfc04";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/en-GB/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/en-GB/thunderbird-115.13.0.tar.bz2";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha256 = "c52eff0e765472a4e6f9db49210e1aad20fcfa422749d7962c7fbc7d92ef86a9";
+      sha256 = "2762b9c0c2da7b1d35b51231f395b34d6e7ed8a8c34c56a3c36fd1af40152d57";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/en-US/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/en-US/thunderbird-115.13.0.tar.bz2";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha256 = "66afb5c126670e37b7a127d33c8d93da0eabbf360ee2ece42270535069f2186d";
+      sha256 = "b70d487213fca89aaed8c2a1da07e179597cf70c6bc56e5fcc93855afdf66365";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/es-AR/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/es-AR/thunderbird-115.13.0.tar.bz2";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha256 = "ab2ba1379c80e1e52971656dcea195d06c0c19d4ccef107a55e92dc8dfc24d0a";
+      sha256 = "37341713a27b90cd8324585cbe2b4413ed0ce3415366b27f1cbfb97f91595e22";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/es-ES/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/es-ES/thunderbird-115.13.0.tar.bz2";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha256 = "4d55e1ac9aca0f85a890e6a014407eeafcd75710157a6c869d03c5d9bb3f010e";
+      sha256 = "c2412ebe923dfcdc464bd6d7576c0fdfde748d26b5684b75618b21fa3396d69a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/es-MX/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/es-MX/thunderbird-115.13.0.tar.bz2";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha256 = "6ab228494d21fe9846aa9370942ef619422b3a65106ad943e5870322f011d2d8";
+      sha256 = "6a1e03cdf4605b768feb802502dc00b9cf7567804c8c2cc7eebf7855c10e555c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/et/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/et/thunderbird-115.13.0.tar.bz2";
       locale = "et";
       arch = "linux-x86_64";
-      sha256 = "46b9ed9a8a4244b0660b04acc357b27dbd516bef5b0c82001021a46f72087305";
+      sha256 = "e8d92ff29455577680ea1c24f5025387ec502ae5ce65a528c3d526dc2b0e23d5";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/eu/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/eu/thunderbird-115.13.0.tar.bz2";
       locale = "eu";
       arch = "linux-x86_64";
-      sha256 = "322ef300f4a92bc5263e3fc5aef5a6ce5ff13bcda841af06546c2d580e104b89";
+      sha256 = "0added0bc1846f7231a8806bbf5d4478743fb9dab3ba12270a540cb298ce2e12";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/fi/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/fi/thunderbird-115.13.0.tar.bz2";
       locale = "fi";
       arch = "linux-x86_64";
-      sha256 = "f84c400cf83c8676b25669fe9208da4da56e3a88161fea806b39fb61b39ad79d";
+      sha256 = "08ecb359ec9f1bb79271fae375f4094f32232ca17ba516b4dc68d33a49fe26a4";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/fr/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/fr/thunderbird-115.13.0.tar.bz2";
       locale = "fr";
       arch = "linux-x86_64";
-      sha256 = "ed2aeb8f849e433771f79bedc8b05ab83cc7a22a0b7c7b4fc333ded3ec0a18d1";
+      sha256 = "5cbb360a2f824a63a06996d8d7bd11184f04a154acca6d11f9d9ad149add7211";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/fy-NL/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/fy-NL/thunderbird-115.13.0.tar.bz2";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha256 = "99210d27c75e591355fb641664f8e477b412b79ed545b87f9fc10b7ea7956c5c";
+      sha256 = "8c489d2e33c2c0d0d1ecb7c8d8766fce2498ee1256cd37e12f4c975b5533a98d";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/ga-IE/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/ga-IE/thunderbird-115.13.0.tar.bz2";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha256 = "7cb91bef278037efd512f8e5384cb8011ffee3025c0209c9d575d0693523891e";
+      sha256 = "5841ef91f177e47ff8a272e76cb57968863c341531b45a42c14bac80979b3187";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/gd/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/gd/thunderbird-115.13.0.tar.bz2";
       locale = "gd";
       arch = "linux-x86_64";
-      sha256 = "116149801edfb6166d651eed7752cae466a7998700e2d85e0fa0e89dcb8ed12b";
+      sha256 = "a07eacd6df3834980886517a9eb1f5d4a6c05d087bb6aac024456b1867079ab6";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/gl/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/gl/thunderbird-115.13.0.tar.bz2";
       locale = "gl";
       arch = "linux-x86_64";
-      sha256 = "47789526c5de43000f58bcdbb0a88e7fdd67deb5f4fd836236347cf62194b9ea";
+      sha256 = "d5359822c6817dc8937a3d24e3e50efa27d450c1f9d48d5b79c63b7ffce54439";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/he/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/he/thunderbird-115.13.0.tar.bz2";
       locale = "he";
       arch = "linux-x86_64";
-      sha256 = "9f3968f4919398b33bd16c645d86aac5e58d8b713204ea5ac8db06f37f3c8fbe";
+      sha256 = "5320ef08555bf368c4e09a80524429482f2b23fb27b8b2850ef4a1f60eaf34b0";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/hr/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/hr/thunderbird-115.13.0.tar.bz2";
       locale = "hr";
       arch = "linux-x86_64";
-      sha256 = "b5e436bf3c02a0a9085b0a35fac71646dec1f0e83970e7532fcf35dcda8cd1b7";
+      sha256 = "dd6a69a320ed40b662814da28af7165ac499cbcdca1371bba86ef4c84f0d0949";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/hsb/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/hsb/thunderbird-115.13.0.tar.bz2";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha256 = "6e42557492e0db90f0a42c2c239f8bf052b9c4c43a55d615fa1ec4da5a5c678b";
+      sha256 = "fdc547651aa09c3874366180d4e3fcca407fc8efba5745344cfca1f5c4597003";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/hu/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/hu/thunderbird-115.13.0.tar.bz2";
       locale = "hu";
       arch = "linux-x86_64";
-      sha256 = "e11733b4f2fd13071fb0d1e25f3f21c0c022016e634f630a98cd5053d0850889";
+      sha256 = "85b1b6f9b3f52258ddae7fd03dcd12dc87564d5d797cf7dd8c9fa6f1278da233";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/hy-AM/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/hy-AM/thunderbird-115.13.0.tar.bz2";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha256 = "0a13c41658426d99de46f3b7e6a5d2faba81040ac71368d910d1222b9d47b8ff";
+      sha256 = "13c0f0e3b112ac7d4ec0c794458b81057f9965ca718b10bf2b7880be4f4a85fd";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/id/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/id/thunderbird-115.13.0.tar.bz2";
       locale = "id";
       arch = "linux-x86_64";
-      sha256 = "d9194d612852c4e7cf7ee466e95318716c83a2f7badcba280a31eef10d8296d9";
+      sha256 = "700393b3b121a6398e3f809d035e5b90fd8f3879f0a751a4ed362fb973b3ccfd";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/is/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/is/thunderbird-115.13.0.tar.bz2";
       locale = "is";
       arch = "linux-x86_64";
-      sha256 = "143d425cce754af88da296fd1dd3e40b0a2e125f6d45ca066940efdeeaa92d11";
+      sha256 = "8eb368b9ffc00aa06238af03c16c3b183858aff829d5741100e515498bee065a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/it/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/it/thunderbird-115.13.0.tar.bz2";
       locale = "it";
       arch = "linux-x86_64";
-      sha256 = "130e92f13ad92e110378eee9f2caead36a4280d6380d45390ab6e6d4b7e2bf86";
+      sha256 = "c3d8d2136e3a0096c07413c0c591cc60e322ee1b929b5f6cd99708413014913c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/ja/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/ja/thunderbird-115.13.0.tar.bz2";
       locale = "ja";
       arch = "linux-x86_64";
-      sha256 = "9561fc79e72fe60c36313f0e07b14f04cae28a47108832cb3853d5da610c6652";
+      sha256 = "af6109dade0343a3354e5b8c82df8505ecca189bb9eae0037a578db4fcf99f1b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/ka/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/ka/thunderbird-115.13.0.tar.bz2";
       locale = "ka";
       arch = "linux-x86_64";
-      sha256 = "f37f5eb50af136c712726c3ed180e564a243ac9b0d87166ec0acf058f6be7bf7";
+      sha256 = "ad7c22e31b575f28268794b390d75021bcf67cb2a4d7ecbdfc3a5bce8f547160";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/kab/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/kab/thunderbird-115.13.0.tar.bz2";
       locale = "kab";
       arch = "linux-x86_64";
-      sha256 = "2923b3671f38b72890e0d8be963ecccfb682ce0e09ff2286d05fc0d86413da45";
+      sha256 = "0356017444c3a046c85599f7188d012f1a8260a5a76d42e8bddb3e937ff1d0db";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/kk/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/kk/thunderbird-115.13.0.tar.bz2";
       locale = "kk";
       arch = "linux-x86_64";
-      sha256 = "c3414484527fb499b4fa1a19010e97b452d1c6a48d0731ec3f8bb7041bc2d400";
+      sha256 = "d278f53f92f4514b1a1b0cc87a6329e1cfe53d82c815557d2d1038b192fb0a03";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/ko/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/ko/thunderbird-115.13.0.tar.bz2";
       locale = "ko";
       arch = "linux-x86_64";
-      sha256 = "4caf7796c7af7e9421d1f20f8b238abd6ef369131e1beb614fcba6d8e15c397a";
+      sha256 = "0cda6697ab6041f0983447e5594158e185905d34a7b3ec70022f258403dba6d5";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/lt/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/lt/thunderbird-115.13.0.tar.bz2";
       locale = "lt";
       arch = "linux-x86_64";
-      sha256 = "8c9c7de04c3537013e002dd2833ba9bd0a647e4e01f2d94e9eebef88a67dcae6";
+      sha256 = "f783e465629993c2e5d7c5f71fa421b289ca1051ab461ea4e128a9facf370e21";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/lv/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/lv/thunderbird-115.13.0.tar.bz2";
       locale = "lv";
       arch = "linux-x86_64";
-      sha256 = "63fa8509fbb99621226378d79ad75b0cf7f474dd7403bb8963361c81c9d01c61";
+      sha256 = "b64684c99509c9b2751d4afaced2a2f6067251345f672eb84d2337f9082fee67";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/ms/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/ms/thunderbird-115.13.0.tar.bz2";
       locale = "ms";
       arch = "linux-x86_64";
-      sha256 = "9de01e0ede9d4d6196c7b72e08f7abb438681a303b679abbc1f8294448211ab3";
+      sha256 = "a001272f61877db602f26aa80c485f0ad7be82acc26343fbf18a95040aeed429";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/nb-NO/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/nb-NO/thunderbird-115.13.0.tar.bz2";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha256 = "8eb261abc0f68e42bd048315957acc47665b275bce848372e1b0953e2ab99c26";
+      sha256 = "6d9b817608399d59a20d34da172529eacb950e19ddb3cb3966f8acb2704099e1";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/nl/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/nl/thunderbird-115.13.0.tar.bz2";
       locale = "nl";
       arch = "linux-x86_64";
-      sha256 = "c4aae2a0489d919c4665285b402d113a8efec53d15279eff056d9a576888287b";
+      sha256 = "259e8b433b7c757c507f8deb5ae9453f593f353a7544ec6d8e4b798b3c9958e1";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/nn-NO/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/nn-NO/thunderbird-115.13.0.tar.bz2";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha256 = "4495660e73f937a07c2745c6d48fa43a8a159b1d84d8e6859e1a42579f1157e5";
+      sha256 = "0af2bea6b0b4b56dfbbf0b3a4845d5540d17a2998ee000c16a9dee0e63814ee7";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/pa-IN/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/pa-IN/thunderbird-115.13.0.tar.bz2";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha256 = "874ae66c39b199981cc02363bed7a2a74c133a80b591785c8c862e7499b17c89";
+      sha256 = "7a686986ed8d899ffd00dd770c04c16a0ba5ef66e6889dbf34e86d9794d27448";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/pl/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/pl/thunderbird-115.13.0.tar.bz2";
       locale = "pl";
       arch = "linux-x86_64";
-      sha256 = "ae7c458b41e7eecc2581be2801571bac54933372797d291f03acee7311ba784e";
+      sha256 = "d736d10c5c57a2b8b5c7ddd8620eea673e83a4efb66288dcac4f39fb9cafdeef";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/pt-BR/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/pt-BR/thunderbird-115.13.0.tar.bz2";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha256 = "30912ac7a19d1bbdad39e537f78d512951124a44407eddfc4382c1175cae76de";
+      sha256 = "2666dfb8ed5cdcc747d91b5a8f396a268243c9e46aada60b26a62ac1904f11d0";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/pt-PT/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/pt-PT/thunderbird-115.13.0.tar.bz2";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha256 = "2cb2225df1364a1f67911a0cbbe034d62df6fd51b567e5fa8b036273790c3fad";
+      sha256 = "ba1a76293cac33601f8317e538b54c4a05b277f862d3e76e11944a0d51d0b4c2";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/rm/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/rm/thunderbird-115.13.0.tar.bz2";
       locale = "rm";
       arch = "linux-x86_64";
-      sha256 = "09d6d3cdf00a280eb2b1149154150b1ce23e2761d379b1b4eb362422e0ce7584";
+      sha256 = "d55625a4a75b671cc614f04fa55337df80d0949906256c8852274b0c73f9d8c1";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/ro/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/ro/thunderbird-115.13.0.tar.bz2";
       locale = "ro";
       arch = "linux-x86_64";
-      sha256 = "fdffa6a81e15bc84f4cb1d48ebc1109413ec10f40ba7ab4a78e8c980fd447683";
+      sha256 = "ff56d88c4c003bf8e5aa245b65ae17d0d2a3f40ab5cf341fedf7b2bbcfec7088";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/ru/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/ru/thunderbird-115.13.0.tar.bz2";
       locale = "ru";
       arch = "linux-x86_64";
-      sha256 = "0cea8488bf4537d205b3fab1f98239f7cff85fff6c2f7eab247a3191e089c14e";
+      sha256 = "a9eb569ff312c13fc651c44f192c64cd46eb27624f71a4ad9399b0531cdf1a57";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/sk/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/sk/thunderbird-115.13.0.tar.bz2";
       locale = "sk";
       arch = "linux-x86_64";
-      sha256 = "eff9c4d36259590e8397cff0ee8ba407e5f116b541f730e5845a2bce70f7a68b";
+      sha256 = "82bb11f5491a90404d40692218848a36c62ee1f73294f94abaf89102c185dfae";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/sl/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/sl/thunderbird-115.13.0.tar.bz2";
       locale = "sl";
       arch = "linux-x86_64";
-      sha256 = "97db4b1c97a85cc65c16e72e166a1739bbfa20e07be767e5695c10fbdcb86231";
+      sha256 = "b5400b07f12e0712157bbaedafd9f88e7d2326e1407b9a989ae9da8fc245c558";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/sq/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/sq/thunderbird-115.13.0.tar.bz2";
       locale = "sq";
       arch = "linux-x86_64";
-      sha256 = "f6d3b3a90cc9ec5c794b803675c141c9cc6acbdc6d25093369ecd0c937206f85";
+      sha256 = "cff26cd2e27db6c374d1b34da18bd513010bd4572a5abd3179cb6b0bb062a750";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/sr/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/sr/thunderbird-115.13.0.tar.bz2";
       locale = "sr";
       arch = "linux-x86_64";
-      sha256 = "3f6f0f5222f4481406087b11bca95b122705e60d3050040e31f901960d729aaf";
+      sha256 = "bce534608ef8da85ea0083dfc86c40759b4b073c90369f94ed98df3d41c3e1c9";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/sv-SE/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/sv-SE/thunderbird-115.13.0.tar.bz2";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha256 = "a168edd15476aa8150718de09fdb0d94bee32b9f20dc9cfb4ef942684a96e857";
+      sha256 = "3a2e9f610436b140e3a7098ac27516c3ce5fe2dd672e23a85050bbd896bb2738";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/th/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/th/thunderbird-115.13.0.tar.bz2";
       locale = "th";
       arch = "linux-x86_64";
-      sha256 = "65992ba363ce0378a271cc0d073e64176873be8dfd5a4c6f3378b5e819aeed0a";
+      sha256 = "3753527489a666c2e89cc1c4be85d85a52890069700ef9bd809e14a50d253d37";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/tr/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/tr/thunderbird-115.13.0.tar.bz2";
       locale = "tr";
       arch = "linux-x86_64";
-      sha256 = "d1a2c48e4c12977151361ab1264d26b0027fc74a256b7a2ccdd3e38050a14049";
+      sha256 = "90d37e9512c46db20d8ce44863dabb1c72b196fb26e462e310f83bf7472763b1";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/uk/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/uk/thunderbird-115.13.0.tar.bz2";
       locale = "uk";
       arch = "linux-x86_64";
-      sha256 = "ac72a9b613ea56178c2f5a16ec59a5f4d481b85aed1932689ea1cae328d8e81b";
+      sha256 = "07f8d8809d3dc079e9f5d25f0b553b96efa975c69f4b94ddc5772bbb07c6f2a9";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/uz/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/uz/thunderbird-115.13.0.tar.bz2";
       locale = "uz";
       arch = "linux-x86_64";
-      sha256 = "0db8b885543185f06d0f5ae4ee18b95046cf00172774ccbd6c79f825e94a0a67";
+      sha256 = "7d3d207fe4f427b5492771a6db5f6716d0f49ea2452f3521c53d06da15090135";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/vi/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/vi/thunderbird-115.13.0.tar.bz2";
       locale = "vi";
       arch = "linux-x86_64";
-      sha256 = "ce91ae20b5feaa7f0d9a20de5661bfece4b84da32063bcd647309ad0c7a3a342";
+      sha256 = "48de00ce91f678f9e2b2fdddd57b164feee7c06079c10796707cd1be67452cf1";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/zh-CN/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/zh-CN/thunderbird-115.13.0.tar.bz2";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha256 = "ab89a35b926209221fb672bcd9c3a83c636e3c7b95b507926ca6317e5f977b51";
+      sha256 = "686dd1d40c6e5d473b7f768919567d71d7a32bf277aa4f20ee160850d4a19812";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-x86_64/zh-TW/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-x86_64/zh-TW/thunderbird-115.13.0.tar.bz2";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha256 = "407062f4b5de3e40e44888713a39337b6e223487a76fff0bdb7219154700cfdf";
+      sha256 = "3be64c8cb88ab2e93ce85249110e91da26f958f5f667f9b2c3524d9337aa3ae6";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/af/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/af/thunderbird-115.13.0.tar.bz2";
       locale = "af";
       arch = "linux-i686";
-      sha256 = "19b5940f6fba18e0246d1173d2a5fcb8c93d7265ffe8c9028647f9ff0afbc486";
+      sha256 = "fc6f36e813419ef33d9491c0317c8f73a7d08a10d2767446a6e708499d0664db";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/ar/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/ar/thunderbird-115.13.0.tar.bz2";
       locale = "ar";
       arch = "linux-i686";
-      sha256 = "9dc9deb45751da0d2d09d0331eaaa89c318f2457d575a2c03bef207f169e8de7";
+      sha256 = "d7134af862d2f588623a9414d0e09702b04c20577f674ade2c67269db25e7bbf";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/ast/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/ast/thunderbird-115.13.0.tar.bz2";
       locale = "ast";
       arch = "linux-i686";
-      sha256 = "5710e364f670e388d9bf6dbc8b1fb7fcded75806a4be249b7ddacc2c24d6da06";
+      sha256 = "5632d2264f4ad78115c66542bb9a30bd92044e2e480612f0755d1f2bbac1fa39";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/be/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/be/thunderbird-115.13.0.tar.bz2";
       locale = "be";
       arch = "linux-i686";
-      sha256 = "f7e20df373381cc63c4d52c50c4e9305bd9378c2e2f1d21a4d2f0db36d831156";
+      sha256 = "522b1219b3586e028023a0b40b5a0b807fd5bbf26981ae0b28fed41111dfd97f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/bg/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/bg/thunderbird-115.13.0.tar.bz2";
       locale = "bg";
       arch = "linux-i686";
-      sha256 = "8c7332cbbcc3df7be3b6ab2d7e929031c4e349de0aa548b775c6b7af3e63cca3";
+      sha256 = "cee2dbcb5d3e6cff325cc5a9132d574c48cc356a524b619ab0efea481fed87a5";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/br/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/br/thunderbird-115.13.0.tar.bz2";
       locale = "br";
       arch = "linux-i686";
-      sha256 = "4b5621ab96b9a937851698e18347259155803a3cc7d7ac9b7227a3fa203178a7";
+      sha256 = "5583cf26d49f32dfaf5a7000c8c670d3b7fd1e839595960bc73e81e5bed8b2b1";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/ca/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/ca/thunderbird-115.13.0.tar.bz2";
       locale = "ca";
       arch = "linux-i686";
-      sha256 = "965a5374467b248e52f9508154fecf9d6bb9cb58eb3fd6be240d74a7208650fb";
+      sha256 = "7ecbeb64308d4a8962c86a75742dcf86ac4f3a0009fa60071f1ba90e3fd89cc3";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/cak/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/cak/thunderbird-115.13.0.tar.bz2";
       locale = "cak";
       arch = "linux-i686";
-      sha256 = "f17a469e28cfc5aa9b2b795c1d7517e076146f87cf534b9fd4a4ecc905858a4a";
+      sha256 = "4c55e8fa96c9763d1b8e9d8c47b55683827dfceac982514206c422edd34afe37";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/cs/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/cs/thunderbird-115.13.0.tar.bz2";
       locale = "cs";
       arch = "linux-i686";
-      sha256 = "802fa9a0d857a973592ae87a94fc9ba3b18c8fc86a3352d90d152c0a7ece0db5";
+      sha256 = "6f0e483d77b6322fcd50decd868994c9a22e8f7f8ede4a8cc6def64cebf3fd36";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/cy/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/cy/thunderbird-115.13.0.tar.bz2";
       locale = "cy";
       arch = "linux-i686";
-      sha256 = "c9cba2912211963ca4acccb1bbf9c904e9a79f1c3781a69df76c003bbd1f5c1a";
+      sha256 = "0c727b6364d07666417f7ab03dbf9e8e1cc040d855cbe361e1385cb2d4aa4242";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/da/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/da/thunderbird-115.13.0.tar.bz2";
       locale = "da";
       arch = "linux-i686";
-      sha256 = "5c54d287396d2c172f463010bb5be1520a5c7636a6f79435430420943036a364";
+      sha256 = "819b01b0fb03eab22d58de73f464e98133778154e122463d20693b4aa1090ecb";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/de/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/de/thunderbird-115.13.0.tar.bz2";
       locale = "de";
       arch = "linux-i686";
-      sha256 = "c6558305d0207a706fb8f5af595dbfc2515652a732fb7e95646a334335a01a61";
+      sha256 = "84db18d8ebc383fac729a9e5be2554169368aaaac34523450151ec9c4f8015b1";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/dsb/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/dsb/thunderbird-115.13.0.tar.bz2";
       locale = "dsb";
       arch = "linux-i686";
-      sha256 = "9eb4d57f121df4714d91ac0a5075face494fb6efea301625ede1b4420c398ff8";
+      sha256 = "4d23aead7db91ca8f657f6eefc3cb37d08be537586d492122b2583c5e4bac516";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/el/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/el/thunderbird-115.13.0.tar.bz2";
       locale = "el";
       arch = "linux-i686";
-      sha256 = "a96136d8392cdf21af28efe2b512efd45190e97ad420a293cba6d621ca7f2106";
+      sha256 = "44833b968bf29d784163776cc7343d23a9c4a781aa36728dcea9fad23b776aa8";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/en-CA/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/en-CA/thunderbird-115.13.0.tar.bz2";
       locale = "en-CA";
       arch = "linux-i686";
-      sha256 = "30d9f5125940c08c77d2c6f2aa2de794fd9abfbdf88640dd56c0ed4e87f33ead";
+      sha256 = "c29f159ff4a8aa234f8117c936fc1621aac4ad12841ac261a85c7326d9ad8704";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/en-GB/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/en-GB/thunderbird-115.13.0.tar.bz2";
       locale = "en-GB";
       arch = "linux-i686";
-      sha256 = "9e78d591b35f8aad5811a5cdceaf9ab5d394fd3ad1dade692d21a3ccbec4b14e";
+      sha256 = "51a2633ed89f3eb08df77153a1a894983b9609fab6aed998cbad7e78129845aa";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/en-US/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/en-US/thunderbird-115.13.0.tar.bz2";
       locale = "en-US";
       arch = "linux-i686";
-      sha256 = "1f459cd30a477a654f91565963ba6ef077c087a8fea98ac36186c41ed78db627";
+      sha256 = "badce662962c90cc0fe4a0e89c7b69185fcf11ac1fdebcb12078226d06eec7cd";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/es-AR/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/es-AR/thunderbird-115.13.0.tar.bz2";
       locale = "es-AR";
       arch = "linux-i686";
-      sha256 = "17cbdbfc9df3e0f8447f73d8205ff4e126cce613ff596c64dcc99992e6c2bddc";
+      sha256 = "6e26898de69237d3915c7b7b18ee565e1b882a0a62ff89d0c64de74f4cf32b06";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/es-ES/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/es-ES/thunderbird-115.13.0.tar.bz2";
       locale = "es-ES";
       arch = "linux-i686";
-      sha256 = "a5622a156340409aa1ea7af7b0531741e3024a1fdacd9bc5307a17d596dfe720";
+      sha256 = "8de6a6bc3c688375239fd56a72c8f9b5db45dbc01793cdb4e508b89b600957cf";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/es-MX/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/es-MX/thunderbird-115.13.0.tar.bz2";
       locale = "es-MX";
       arch = "linux-i686";
-      sha256 = "cb69980eafc5209b37606cdd2b6657943d2d4f827450fa0f9bbf64ae31bf8a05";
+      sha256 = "d7fa892b266cde71881c6bc1a2926c273ac9990a5f555a1da7ad92e8da7d2079";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/et/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/et/thunderbird-115.13.0.tar.bz2";
       locale = "et";
       arch = "linux-i686";
-      sha256 = "b8ad3424ba8f4aa2affd9cf03133d64e0c68513983f733c4805962ca0535bd40";
+      sha256 = "7e3f6026fd7eb69fcc716b1fd512e43bb24e666fd9792b9c0fcdecc6c2080c64";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/eu/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/eu/thunderbird-115.13.0.tar.bz2";
       locale = "eu";
       arch = "linux-i686";
-      sha256 = "800c8f9ae9486d8109bc0e62636b511662042b6115313e4be5e50cb8851b0d8b";
+      sha256 = "6992361227e6455834651d2d4c322d68b2772e81f5d41495bc891c6968a31fb3";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/fi/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/fi/thunderbird-115.13.0.tar.bz2";
       locale = "fi";
       arch = "linux-i686";
-      sha256 = "b4e47065f2f91cbd84c16f23f25682dd1928ab966c497d0584cc19eaaf5436a0";
+      sha256 = "eb2f64b6079a7fc82ac9cb300a3263682c30f5d5ca88b7e8ffc239b0eeff2e4b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/fr/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/fr/thunderbird-115.13.0.tar.bz2";
       locale = "fr";
       arch = "linux-i686";
-      sha256 = "fd47e4c10a7c1c70c34635a899aa03c139666b3b5c9752dcfd7f5d6aaea750d5";
+      sha256 = "2cd90fda0de39c0c5f880967d5b3c887b82a4b2b2cff68e563cacf918d1067c2";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/fy-NL/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/fy-NL/thunderbird-115.13.0.tar.bz2";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha256 = "1d690a540600918e3bc8ee664b29cb9855b10c961d2d09bf434d3473ceb98933";
+      sha256 = "79e3d745529f8ba10c47bf47c530d251a60fba60ae6434c28b21d6d920715343";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/ga-IE/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/ga-IE/thunderbird-115.13.0.tar.bz2";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha256 = "b62a866a69ef782a51e5a0e3ad314e944a0cb63968454d049c5c2112adaff143";
+      sha256 = "eecef1ff59423519f2dcda87e5bbe2d627324c1e2812d2ee8554fe4624ae5f13";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/gd/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/gd/thunderbird-115.13.0.tar.bz2";
       locale = "gd";
       arch = "linux-i686";
-      sha256 = "35eafe0440625d32249d7cc721f2fde9dc7331f9d4b542682f23f3c3281f584d";
+      sha256 = "98061b5bbba7663a76ba1fd81c45da1b819dc60d7eb328865bb4e6054893e68c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/gl/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/gl/thunderbird-115.13.0.tar.bz2";
       locale = "gl";
       arch = "linux-i686";
-      sha256 = "1a6badeae7defbb158615639fd129a59e0b24db557f5106fe20b85d0b5e0b46e";
+      sha256 = "20b27324d5d1007898432a5149be39e023d0574cd9412e1981644fa437559462";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/he/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/he/thunderbird-115.13.0.tar.bz2";
       locale = "he";
       arch = "linux-i686";
-      sha256 = "12cb6baa362cc0c4147cc75d80bf94d0a5be18dc895aabcc1359df1bd483e096";
+      sha256 = "d0b623cb12b09e8da788a248d9d0c73075a47ab400cd5e9636d63f802d81239f";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/hr/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/hr/thunderbird-115.13.0.tar.bz2";
       locale = "hr";
       arch = "linux-i686";
-      sha256 = "a130fee072cc32f1203da09507e5935aa1669b018a44f7d6ca097119f835e184";
+      sha256 = "a4c6f3c8c4e39677e4fa7a7260bff44764fa66e571919d70349f615429ded199";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/hsb/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/hsb/thunderbird-115.13.0.tar.bz2";
       locale = "hsb";
       arch = "linux-i686";
-      sha256 = "5e564ff266867829b963e058a2cecc5da29258acb1a852329e7d57c746e5ad61";
+      sha256 = "e059202e8add45d767878d96af50d08e540e21af6239e101825153ad3bcde087";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/hu/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/hu/thunderbird-115.13.0.tar.bz2";
       locale = "hu";
       arch = "linux-i686";
-      sha256 = "c050c63e38cdd80d57b1d06abad5f3810454523ce1f9c2bb4c25ed656d1f3102";
+      sha256 = "a02b0c0460e6bdc54f4d9be92e78ff5c6f8730e1f7199f5f0eceefc220d585ab";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/hy-AM/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/hy-AM/thunderbird-115.13.0.tar.bz2";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha256 = "56536454c673a14a5166533f695d31168a6a64d14b69a5a344270b8e1a9b9754";
+      sha256 = "53b02544de8294c1292311510f5e72b0b0c6c0209e3d01d92d603e5e52f988b6";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/id/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/id/thunderbird-115.13.0.tar.bz2";
       locale = "id";
       arch = "linux-i686";
-      sha256 = "f6731b88513533b355b73293fac108f77c2a0a4c47e2e5ac4ab560a91c90cc4c";
+      sha256 = "014a9d5214ccd346df23168d1f523374bc5058d247a3817fa8a3df1af7255230";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/is/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/is/thunderbird-115.13.0.tar.bz2";
       locale = "is";
       arch = "linux-i686";
-      sha256 = "c9ba2344d981c83bf78e38f2d694db8ce34877dbd62cf4fe2657c31e4ddb8420";
+      sha256 = "f81280dd398b1e5f6e003ec040052f739d20e3f5bc6ebf79ba5ddef068ab9cd7";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/it/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/it/thunderbird-115.13.0.tar.bz2";
       locale = "it";
       arch = "linux-i686";
-      sha256 = "c4e4c6956aff5ccc290a3fec4354c7cfff3bc9370917820208e270211730d3a1";
+      sha256 = "54a9b84390fe010708a901aeedd95a1a6b51aeeb44c47760ee68c261898fa52a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/ja/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/ja/thunderbird-115.13.0.tar.bz2";
       locale = "ja";
       arch = "linux-i686";
-      sha256 = "a998c41e9afc12fb0f79146271a88f45153ec640ccd5c62132f2081cf404f355";
+      sha256 = "a3a1e497d31244a7acc5ea99a1cd4129c28fc00d82d750b5ce360165e7c6b915";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/ka/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/ka/thunderbird-115.13.0.tar.bz2";
       locale = "ka";
       arch = "linux-i686";
-      sha256 = "20d8145d782954c0647e416a062dff881370bbed4370d122a74f8d0854cc542f";
+      sha256 = "df4ea755689a82315627d851fa7b59d5cb9730064785099273431e1993ccb529";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/kab/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/kab/thunderbird-115.13.0.tar.bz2";
       locale = "kab";
       arch = "linux-i686";
-      sha256 = "065579cf33edb1ecceb56b5f3fa3a4b1f4f2da93dcf666aef859206fd30f515a";
+      sha256 = "e40f72751b40fe6896ab0cdd78ab540ece04d1650c35d1d9af944f5e9983da69";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/kk/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/kk/thunderbird-115.13.0.tar.bz2";
       locale = "kk";
       arch = "linux-i686";
-      sha256 = "691b931acec550b087ec3950bb74f17b040bc0b8f9f9cf475603906a9fcaf5be";
+      sha256 = "aee0ac4b2bf06468b0fd4d302507693c3e5a76426d4aa2b4deb9081f054156b3";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/ko/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/ko/thunderbird-115.13.0.tar.bz2";
       locale = "ko";
       arch = "linux-i686";
-      sha256 = "c91281e38d08a5c738ae3cf1be458566c998c0d65e588b0a463202a6bd19020b";
+      sha256 = "32cbdac8073fdc47feda1e17754a1966d668d10b881d137d593f10ef61f1c8a8";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/lt/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/lt/thunderbird-115.13.0.tar.bz2";
       locale = "lt";
       arch = "linux-i686";
-      sha256 = "6b9309f8f3c1191addb96770e4569fadb81de8f807790d9d00ad303d0d47a2e9";
+      sha256 = "be4a3241453d43ec04586d27c7a2d09c96ab0558eba5c52a6242b5cc39f7be89";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/lv/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/lv/thunderbird-115.13.0.tar.bz2";
       locale = "lv";
       arch = "linux-i686";
-      sha256 = "d91fef64dde27d7b756327afa8b115e07c58906fc1bccb98ca893755e34a36bd";
+      sha256 = "6b92c31b2e2cbb9f2dcf73d29004233f4a4128dfa315fcc0e642aab59ea65c82";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/ms/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/ms/thunderbird-115.13.0.tar.bz2";
       locale = "ms";
       arch = "linux-i686";
-      sha256 = "9f2b25e37d18a39542d60257813d72a7075dca6dee2fe70e437de430cbeb2ee2";
+      sha256 = "87cc4f4a7cf59361c899990e023a57ffd6cd7f8b575fa4f06b5045d71b7d0ba8";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/nb-NO/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/nb-NO/thunderbird-115.13.0.tar.bz2";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha256 = "44fd3298de7c95033c47831484549fbd8121b463f2e904d51b43c9502e712c09";
+      sha256 = "5a21efede9c8f142e77c37dd569a42467408c9863c03b791b26153c4e09a962a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/nl/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/nl/thunderbird-115.13.0.tar.bz2";
       locale = "nl";
       arch = "linux-i686";
-      sha256 = "067f544982f4174eee55d621a495e9c286f70a70d0ca072668a087e434906a2b";
+      sha256 = "d6158645ee629b89a6d518d1e62f6777f3f453e6546ad177979473f432dfb376";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/nn-NO/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/nn-NO/thunderbird-115.13.0.tar.bz2";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha256 = "a60ca5cce0a272b2213312fc86930134c2d513fb8d7d8eea9c77de68f2fdbf0c";
+      sha256 = "1528148ba47eabfce476ca351ba0c7341a5454d38c798c3b6dfb1c2f02efd3f8";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/pa-IN/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/pa-IN/thunderbird-115.13.0.tar.bz2";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha256 = "d5c43a67d0cb9146ef6d9b076ab04c37c22e26ee24e16867f2af497e752a8aab";
+      sha256 = "8d6c1f3ce92af5e19e24661aa7bbbe815e3c9ac7ff3e9b6db7c2662e8f56f97c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/pl/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/pl/thunderbird-115.13.0.tar.bz2";
       locale = "pl";
       arch = "linux-i686";
-      sha256 = "0c9df1326d8b72f3492f690c34841fa4558452fd2a386b2724e8433470effda7";
+      sha256 = "b26ab380e57e442047092f8f12ce701fc062d3dffb3fb905ffde8ec1c2bd9975";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/pt-BR/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/pt-BR/thunderbird-115.13.0.tar.bz2";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha256 = "69fff4ee82f72116bcfabd82fc44fa9878e2d1b378120ab22958784e257b32d4";
+      sha256 = "23ff7b60b2a754c34bf243851ce7896cba6918126615ebffb030180fc4df754b";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/pt-PT/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/pt-PT/thunderbird-115.13.0.tar.bz2";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha256 = "ce4a6b8a0b81e7a481a08222671daf80c9ee1f0f6a41c1e10e9b060d1b64db23";
+      sha256 = "f6667f60d0a54f4e5c25b7c15d843f7215fb0ff8f65962b9ed219f9fa1cac9c1";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/rm/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/rm/thunderbird-115.13.0.tar.bz2";
       locale = "rm";
       arch = "linux-i686";
-      sha256 = "a45d5e83cbaf53a7c7d87e3c573719b03017f6fddfff7badce77b8a29012c404";
+      sha256 = "c6c6d412f9a01824bedb46094239caec8c8f32b249f5c9bcce455166472e0c8a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/ro/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/ro/thunderbird-115.13.0.tar.bz2";
       locale = "ro";
       arch = "linux-i686";
-      sha256 = "8e59f5a9da26c90e2841931c3a54f0416b425b9d084a97370d3794605fe9f815";
+      sha256 = "d87bb9e6262ca8639db9c72dc512ccd6e2c5c644b2540b76f1d8db2c6cc11681";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/ru/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/ru/thunderbird-115.13.0.tar.bz2";
       locale = "ru";
       arch = "linux-i686";
-      sha256 = "fbdd472bc1d768fb7bc5491772326ffdda0fb48c2754e6dd6352dba20d2d221b";
+      sha256 = "933509f254d0a83807eb8423a812b44fa293a34302179bde31f8e7c63f29f17a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/sk/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/sk/thunderbird-115.13.0.tar.bz2";
       locale = "sk";
       arch = "linux-i686";
-      sha256 = "ffb92d870c91aeb8385d3a5a1aedd86198567861e8a8e9fe249671c42b9f0e8a";
+      sha256 = "7075f022ecbc76d4c00a9816f85f22a08998bd44080b3edf7bb2b15f78a5ca98";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/sl/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/sl/thunderbird-115.13.0.tar.bz2";
       locale = "sl";
       arch = "linux-i686";
-      sha256 = "e291960c5edbaf370afb39593e79e50d896942358fe1b19a0267c5cb68e09bbb";
+      sha256 = "66bd3ea1238198fdf240fa471c846b83ae6ddcb7bb164d3e0bad8480c2b0c9cc";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/sq/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/sq/thunderbird-115.13.0.tar.bz2";
       locale = "sq";
       arch = "linux-i686";
-      sha256 = "613aec7a4f08bf323f75a8517deb27fe4957e7119c45e8c91628dadf51f9ec64";
+      sha256 = "0fa98fbe0ebd473ffb247546fba6e7ebcb994bbd4bbbbffb868c2d27984ed8e2";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/sr/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/sr/thunderbird-115.13.0.tar.bz2";
       locale = "sr";
       arch = "linux-i686";
-      sha256 = "55b488eaf7dcc4fd0e1a8ca4720d82960a5a93a32e729f5b0b3b95e535971776";
+      sha256 = "8388932ebc71148cfd3be78d5fd31754c78c4e249930ec5290876655e115207a";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/sv-SE/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/sv-SE/thunderbird-115.13.0.tar.bz2";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha256 = "e3ace007963edaa894c97701bf80acf2cdbd1609e2d0d23aeee56ec53aa4fc79";
+      sha256 = "793f43ad4062323b408527cbf98988291452fb5007938fc6c75f794a95f6fbbd";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/th/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/th/thunderbird-115.13.0.tar.bz2";
       locale = "th";
       arch = "linux-i686";
-      sha256 = "17a3032090164feaa68196709e19d8a255beed609e3b178ff08009efceb39c2c";
+      sha256 = "ccd43eb6dd39d0be2af3ab4581a1d49563b78aa1389ff227b5b9c7ae83a782b1";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/tr/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/tr/thunderbird-115.13.0.tar.bz2";
       locale = "tr";
       arch = "linux-i686";
-      sha256 = "5eea9db6abfa816f30b0bfb0e6da6a5b9777edaea1fc451cce6ed3a5a44f7df4";
+      sha256 = "61cef2f34fba3606af62ed2cdeff626f73d1bf628af17c9a30b151da4f7357e2";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/uk/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/uk/thunderbird-115.13.0.tar.bz2";
       locale = "uk";
       arch = "linux-i686";
-      sha256 = "300d12c8eb0f735996bcd443adba9252d5ec4267cf9348ecff8f4a9f22ad3afe";
+      sha256 = "51daf721ea9864fb199eab9908792b67031005238067543f4a69ebc5ad4fb10c";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/uz/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/uz/thunderbird-115.13.0.tar.bz2";
       locale = "uz";
       arch = "linux-i686";
-      sha256 = "bc6707522482d5b01e2d908040f878322e79bee9e2121c041b340cf12634058f";
+      sha256 = "83acb46cce8a7e94e16bb0dd323af816284728d507c2787ae3a8e77fd78662d9";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/vi/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/vi/thunderbird-115.13.0.tar.bz2";
       locale = "vi";
       arch = "linux-i686";
-      sha256 = "b4cd7d36debe223a05a1539e33c951564aea27d392cd0d1f081f14b3cade6d7e";
+      sha256 = "2ddc9a1b085f1a936e1ac10fb84440cb6159d77baab95ee7a2073202b3341987";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/zh-CN/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/zh-CN/thunderbird-115.13.0.tar.bz2";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha256 = "956851f3eabd6345ebeb6719dc3e80dd30b66bf42c1078e02996dc5b0ea66e67";
+      sha256 = "6468070bca4ab013646945206c04a03a9b5ac5bac5b07cd48543aa0b7e980353";
     }
-    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.10.1/linux-i686/zh-TW/thunderbird-115.10.1.tar.bz2";
+    { url = "http://archive.mozilla.org/pub/thunderbird/releases/115.13.0/linux-i686/zh-TW/thunderbird-115.13.0.tar.bz2";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha256 = "93561ed61edb07a8a4882e0687db51238d31f7d6c04919b39b3e88156d3be132";
+      sha256 = "27a73e84abdea7e4f9d4fe595129f08dd92dc9fdb4d2a3c275481096be90cb8a";
     }
     ];
 }
diff --git a/third_party/nixpkgs/pkgs/applications/networking/mujmap/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mujmap/default.nix
index 60f49163be..d89c173550 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/mujmap/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/mujmap/default.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-Qb9fEPQrdn+Ek9bdOMfaPIxlGGpQ9RfQZOeeqoOf17E=";
   };
 
-  cargoSha256 = "sha256-nnAYjutjxtEpDNoWTnlESDO4Haz14wZxY4gdyzdLgBU=";
+  cargoHash = "sha256-nnAYjutjxtEpDNoWTnlESDO4Haz14wZxY4gdyzdLgBU=";
 
   buildInputs = [
     notmuch
diff --git a/third_party/nixpkgs/pkgs/applications/networking/mumble/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mumble/default.nix
index e781ec1b13..f33ef641ab 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/mumble/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/mumble/default.nix
@@ -11,7 +11,7 @@
 , jackSupport ? false, libjack2
 , pipewireSupport ? true, pipewire
 , pulseSupport ? true, libpulseaudio
-, speechdSupport ? false, speechd
+, speechdSupport ? false, speechd-minimal
 }:
 
 let
@@ -53,7 +53,7 @@ let
     buildInputs = [ flac libogg libopus libsndfile libvorbis qt5.qtsvg rnnoise speex ]
       ++ lib.optional (!jackSupport) alsa-lib
       ++ lib.optional jackSupport libjack2
-      ++ lib.optional speechdSupport speechd
+      ++ lib.optional speechdSupport speechd-minimal
       ++ lib.optional pulseSupport libpulseaudio
       ++ lib.optional pipewireSupport pipewire;
 
@@ -72,7 +72,7 @@ let
       ++ lib.optional (!pipewireSupport) "-D pipewire=OFF"
       ++ lib.optional jackSupport "-D alsa=OFF -D jackaudio=ON";
 
-    env.NIX_CFLAGS_COMPILE = lib.optionalString speechdSupport "-I${speechd}/include/speech-dispatcher";
+    env.NIX_CFLAGS_COMPILE = lib.optionalString speechdSupport "-I${speechd-minimal}/include/speech-dispatcher";
 
     postFixup = ''
       wrapProgram $out/bin/mumble \
diff --git a/third_party/nixpkgs/pkgs/applications/networking/ncgopher/default.nix b/third_party/nixpkgs/pkgs/applications/networking/ncgopher/default.nix
index 6f7dcc5120..4d2f72c354 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/ncgopher/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/ncgopher/default.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-KrvTwcIeINIBkia6PTnKXp4jFd6GEMBh/xbn0Ot/wmE=";
   };
 
-  cargoSha256 = "sha256-Zft/ip+/uJbUIqCDDEa4hchmZZiYWGdaVnzWC74FgU8=";
+  cargoHash = "sha256-Zft/ip+/uJbUIqCDDEa4hchmZZiYWGdaVnzWC74FgU8=";
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/networking/offrss/default.nix b/third_party/nixpkgs/pkgs/applications/networking/offrss/default.nix
index 8d7889663f..081f7d96c1 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/offrss/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/offrss/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
     homepage = "http://vicerveza.homeunix.net/~viric/cgi-bin/offrss";
     description = "Offline RSS/Atom reader";
     license = licenses.agpl3Plus;
-    maintainers = with maintainers; [ viric ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
     mainProgram = "offrss";
   };
diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/stig/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/stig/default.nix
index b5db5573ab..19e108f45a 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/p2p/stig/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/p2p/vuze/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/vuze/default.nix
index 6dc00cba9e..e246017576 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/p2p/vuze/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/remote/vmware-horizon-client/default.nix b/third_party/nixpkgs/pkgs/applications/networking/remote/vmware-horizon-client/default.nix
index 5f9ef27201..e223dfad5a 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/remote/vmware-horizon-client/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/remote/x2goclient/default.nix b/third_party/nixpkgs/pkgs/applications/networking/remote/x2goclient/default.nix
index 848590d4cb..551f8e57f7 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/remote/x2goclient/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/siproxd/default.nix b/third_party/nixpkgs/pkgs/applications/networking/siproxd/default.nix
index 76ef0338dc..7c6319e450 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/siproxd/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/siproxd/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     homepage = "http://siproxd.sourceforge.net/";
     description = "Masquerading SIP Proxy Server";
     mainProgram = "siproxd";
-    maintainers = with lib.maintainers; [viric];
+    maintainers = [ ];
     platforms = with lib.platforms; linux;
     license = lib.licenses.gpl2Plus;
   };
diff --git a/third_party/nixpkgs/pkgs/applications/networking/sniffers/qtwirediff/default.nix b/third_party/nixpkgs/pkgs/applications/networking/sniffers/qtwirediff/default.nix
index 655626d07e..7cadaee0e2 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/sniffers/qtwirediff/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/station/default.nix b/third_party/nixpkgs/pkgs/applications/networking/station/default.nix
index 7207617a11..c1a4dab8f7 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/station/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/sync/lcsync/default.nix b/third_party/nixpkgs/pkgs/applications/networking/sync/lcsync/default.nix
index 9ba34ab631..a71514516e 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/sync/lcsync/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/sync/lcsync/default.nix
@@ -8,14 +8,14 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "lcsync";
-  version = "0.3.0";
+  version = "0.3.1";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "librecast";
     repo = "lcsync";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-eiYbS/LYnM2ZjDHO9KhBp1rrovbhm+OVVfmLtjxAE+Y=";
+    hash = "sha256-x8KjvUtn00g+zxDfSWZq4WgALDKRgbCF9rtipdOMbpc=";
   };
   buildInputs = [ lcrq librecast libsodium ];
   configureFlags = [ "SETCAP_PROGRAM=true" ];
diff --git a/third_party/nixpkgs/pkgs/applications/networking/sync/rsync/configure.ac-fix-failing-IPv6-check.patch b/third_party/nixpkgs/pkgs/applications/networking/sync/rsync/configure.ac-fix-failing-IPv6-check.patch
new file mode 100644
index 0000000000..3305653d02
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/networking/sync/rsync/configure.ac-fix-failing-IPv6-check.patch
@@ -0,0 +1,12 @@
+diff -rup rsync-3.2.7/configure.sh rsync-3.2.7-fixed/configure.sh
+--- rsync-3.2.7/configure.sh	2022-10-20 17:57:22
++++ rsync-3.2.7-fixed/configure.sh	2024-01-01 19:51:58
+@@ -7706,7 +7706,7 @@ else $as_nop
+ #include <stdlib.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
+-main()
++int main()
+ {
+    if (socket(AF_INET6, SOCK_STREAM, 0) < 0)
+      exit(1);
diff --git a/third_party/nixpkgs/pkgs/applications/networking/sync/rsync/default.nix b/third_party/nixpkgs/pkgs/applications/networking/sync/rsync/default.nix
index 555fb68416..32236f36a9 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/sync/rsync/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/sync/rsync/default.nix
@@ -31,6 +31,11 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook perl ];
 
+  patches = [
+    # https://github.com/WayneD/rsync/pull/558
+    ./configure.ac-fix-failing-IPv6-check.patch
+  ];
+
   buildInputs = [ libiconv zlib popt ]
     ++ lib.optional enableACLs acl
     ++ lib.optional enableZstd zstd
@@ -39,6 +44,10 @@ stdenv.mkDerivation rec {
     ++ lib.optional enableXXHash xxHash;
 
   configureFlags = [
+    (lib.enableFeature enableLZ4 "lz4")
+    (lib.enableFeature enableOpenSSL "openssl")
+    (lib.enableFeature enableXXHash "xxhash")
+    (lib.enableFeature enableZstd "zstd")
     "--with-nobody-group=nogroup"
 
     # disable the included zlib explicitly as it otherwise still compiles and
@@ -47,14 +56,6 @@ stdenv.mkDerivation rec {
   ] ++ lib.optionals (stdenv.hostPlatform.isMusl && stdenv.hostPlatform.isx86_64) [
     # fix `multiversioning needs 'ifunc' which is not supported on this target` error
     "--disable-roll-simd"
-  ] ++ lib.optionals (!enableZstd) [
-    "--disable-zstd"
-  ] ++ lib.optionals (!enableXXHash) [
-    "--disable-xxhash"
-  ] ++ lib.optionals (!enableLZ4) [
-    "--disable-lz4"
-  ] ++ lib.optionals (!enableOpenSSL) [
-    "--disable-openssl"
   ];
 
   enableParallelBuilding = true;
diff --git a/third_party/nixpkgs/pkgs/applications/networking/sync/storj-uplink/default.nix b/third_party/nixpkgs/pkgs/applications/networking/sync/storj-uplink/default.nix
index 6887df12cf..0c172f31d0 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/sync/storj-uplink/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/sync/storj-uplink/default.nix
@@ -5,13 +5,13 @@
 
 buildGoModule rec {
   pname = "storj-uplink";
-  version = "1.108.1";
+  version = "1.108.3";
 
   src = fetchFromGitHub {
     owner = "storj";
     repo = "storj";
     rev = "v${version}";
-    hash = "sha256-4paP42Cu5/j+rYU//YGPTrgkz+RsG6AcJi8si0i6MNw=";
+    hash = "sha256-ZCQRzbu1cNSid/A/NOJm0p/voGP1sXqhxKcSgnu16EI=";
   };
 
   subPackages = [ "cmd/uplink" ];
diff --git a/third_party/nixpkgs/pkgs/applications/networking/trayscale/default.nix b/third_party/nixpkgs/pkgs/applications/networking/trayscale/default.nix
index e6a474abd7..28663a6e68 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/trayscale/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/wg-bond/default.nix b/third_party/nixpkgs/pkgs/applications/networking/wg-bond/default.nix
index 4b4ca8fd6b..88e30976b3 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/wg-bond/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/networking/wg-bond/default.nix
@@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256:04k0maxy39k7qzcsqsv1byddsmjszmnyjffrf22nzbvml83p3l0y";
   };
 
-  cargoSha256 = "1nlzhkhk1y0jhj6n3wn4dm783ldsxn7dk0d2xjx6ylczf9z3gp12";
+  cargoHash = "sha256-Itw3fnKfUW+67KKB2Y7tutGBTm3E8mGNhBL4MOGEn9o=";
 
   nativeBuildInputs = [ makeWrapper ];
   postInstall = ''
diff --git a/third_party/nixpkgs/pkgs/applications/networking/znc/modules.nix b/third_party/nixpkgs/pkgs/applications/networking/znc/modules.nix
index 7478461947..f19573bace 100644
--- a/third_party/nixpkgs/pkgs/applications/networking/znc/modules.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/office/fava/default.nix b/third_party/nixpkgs/pkgs/applications/office/fava/default.nix
deleted file mode 100644
index d00600bbea..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/office/ktimetracker/default.nix b/third_party/nixpkgs/pkgs/applications/office/ktimetracker/default.nix
index 0bca134753..b31eb4588c 100644
--- a/third_party/nixpkgs/pkgs/applications/office/ktimetracker/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/office/libreoffice/default.nix b/third_party/nixpkgs/pkgs/applications/office/libreoffice/default.nix
index 8b063ad6c7..d5d48219be 100644
--- a/third_party/nixpkgs/pkgs/applications/office/libreoffice/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/office/libreoffice/default.nix
@@ -200,9 +200,8 @@ let
       }) // {
         inherit (x) md5name md5;
       }) srcsAttributes.deps;
-  } // optionalAttrs (variant != "collabora") {
-    translations = fetchurl srcsAttributes.translations;
-    help = fetchurl srcsAttributes.help;
+    translations = srcsAttributes.translations { inherit fetchurl fetchgit; };
+    help = srcsAttributes.help { inherit fetchurl fetchgit; };
   };
 
   qtMajor = lib.versions.major qtbase.version;
@@ -235,14 +234,17 @@ in stdenv.mkDerivation (finalAttrs: {
       ln -sfv ${f} $sourceRoot/${tarballPath}/${f.md5name}
       ln -sfv ${f} $sourceRoot/${tarballPath}/${f.name}
     '')}
-  '' + optionalString (variant != "collabora") ''
 
+  '' + (if (variant != "collabora") then ''
     ln -sv ${srcs.help} $sourceRoot/${tarballPath}/${srcs.help.name}
     ln -svf ${srcs.translations} $sourceRoot/${tarballPath}/${srcs.translations.name}
 
     tar -xf ${srcs.help}
     tar -xf ${srcs.translations}
-  '';
+  '' else ''
+    cp -r --no-preserve=mode ${srcs.help}/. $sourceRoot/helpcontent2/
+    cp -r --no-preserve=mode ${srcs.translations}/. $sourceRoot/translations/
+  '');
 
   patches = [
     # Skip some broken tests:
diff --git a/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-collabora/help.nix b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-collabora/help.nix
new file mode 100644
index 0000000000..fc5d4a3fa2
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-collabora/help.nix
@@ -0,0 +1,6 @@
+{ fetchgit, ... }:
+fetchgit {
+  url = "https://gerrit.libreoffice.org/help";
+  rev = "27f62cdb52fe23f6090a3249fcd1433777b2598d";
+  hash = "sha256-lyBuj7FI1jwVLLBkB6JJcmQVtm1FKExYWvRUoGqRbJ0=";
+}
diff --git a/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-collabora/main.nix b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-collabora/main.nix
index 7e4bf5f4fd..ef4d5d77bf 100644
--- a/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-collabora/main.nix
+++ b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-collabora/main.nix
@@ -2,6 +2,6 @@
 fetchgit {
   url = "https://gerrit.libreoffice.org/core";
   rev = "refs/tags/cp-24.04.5-4";
-  hash = "sha256-27uLK1u8XWNigxZUCUu8nNZP3p5eFUsS2gCcfSYJK2k=";
-  fetchSubmodules = true;
+  hash = "sha256-OJ3R8qs8/R8QnXGCRgn/ZJK7Nn8cWwYbZxjEWg0VpBc=";
+  fetchSubmodules = false;
 }
diff --git a/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-collabora/translations.nix b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-collabora/translations.nix
new file mode 100644
index 0000000000..06f5fe5a36
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-collabora/translations.nix
@@ -0,0 +1,6 @@
+{ fetchgit, ... }:
+fetchgit {
+  url = "https://gerrit.libreoffice.org/translations";
+  rev = "5fd34a953e6861cb8e392363c0a3500059ed6b01";
+  hash = "sha256-1j0kTvPbytsCWszXz+xFE+n53zPkR8gNgVaawn+rjfI=";
+}
diff --git a/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/help.nix b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/help.nix
index 164121f061..0f9f549052 100644
--- a/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/help.nix
+++ b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/help.nix
@@ -1,4 +1,5 @@
-{
+{ fetchurl, ... }:
+fetchurl {
   sha256 = "090pi8dnj5izpvng94hgmjid14n7xvy3rlqqvang3pqdn35xnpsl";
   url = "https://download.documentfoundation.org/libreoffice/src/24.2.5/libreoffice-help-24.2.5.2.tar.xz";
 }
diff --git a/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/translations.nix b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/translations.nix
index 82291fab83..b969430601 100644
--- a/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/translations.nix
+++ b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-fresh/translations.nix
@@ -1,4 +1,5 @@
-{
+{ fetchurl, ... }:
+fetchurl {
   sha256 = "0fri41y59zhm8lq0kh6hvf5rpdjdqx0lg1sl40mhh1d6lf1izc1w";
   url = "https://download.documentfoundation.org/libreoffice/src/24.2.5/libreoffice-translations-24.2.5.2.tar.xz";
 }
diff --git a/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-still/help.nix b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-still/help.nix
index f9e71ea799..8bdc4617e1 100644
--- a/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-still/help.nix
+++ b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-still/help.nix
@@ -1,4 +1,5 @@
-{
+{ fetchurl, ... }:
+fetchurl {
   sha256 = "1l543k603mbr3rnwlnv9j52mblmvkgj9y49w4v7w3xm8b15331rs";
   url = "https://download.documentfoundation.org/libreoffice/src/7.6.7/libreoffice-help-7.6.7.2.tar.xz";
 }
diff --git a/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-still/translations.nix b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-still/translations.nix
index 9604ad622e..fffb89108f 100644
--- a/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-still/translations.nix
+++ b/third_party/nixpkgs/pkgs/applications/office/libreoffice/src-still/translations.nix
@@ -1,4 +1,5 @@
-{
+{ fetchurl, ... }:
+fetchurl {
   sha256 = "1bzmpa04bv8afhl3p68dlicamh0zyckmbdgqb3v72fjmx2h8i64a";
   url = "https://download.documentfoundation.org/libreoffice/src/7.6.7/libreoffice-translations-7.6.7.2.tar.xz";
 }
diff --git a/third_party/nixpkgs/pkgs/applications/office/libreoffice/update.sh b/third_party/nixpkgs/pkgs/applications/office/libreoffice/update.sh
index 6f9612dd70..9f7a580ad5 100755
--- a/third_party/nixpkgs/pkgs/applications/office/libreoffice/update.sh
+++ b/third_party/nixpkgs/pkgs/applications/office/libreoffice/update.sh
@@ -47,7 +47,8 @@ case $variant in
     echo \"$full_version\" > version.nix
 
     for t in help translations; do
-        echo "{" > $t.nix
+        echo "{ fetchurl, ... }:" > $t.nix
+        echo "fetchurl {" >> $t.nix
         echo "  sha256 = "\"$(nix-prefetch-url $baseurl/libreoffice-$t-$full_version.tar.xz)'";' >> $t.nix
         echo "  url = "\"$baseurl/libreoffice-$t-$full_version.tar.xz'";' >> $t.nix
         echo "}" >> $t.nix
@@ -56,7 +57,7 @@ case $variant in
     # Out of loop nix-prefetch-url, because there is no $t, and we want the output
     # path as well, to get the download.lst file from there afterwards.
     main_path_hash=($(nix-prefetch-url --print-path $baseurl/libreoffice-$full_version.tar.xz))
-    echo "{ fetchurl, ...}:" > main.nix
+    echo "{ fetchurl, ... }:" > main.nix
     echo "fetchurl {" >> main.nix
     echo "  sha256 = "\"${main_path_hash[0]}'";' >> main.nix
     echo "  url = "\"$baseurl/libreoffice-$full_version.tar.xz'";' >> main.nix
@@ -78,27 +79,41 @@ case $variant in
     ;;
 
 (collabora)
-    full_version=$(git ls-remote --tags --sort -v:refname https://gerrit.libreoffice.org/core | grep -Pom1 'refs/tags/cp-\K\d+\.\d+\.\d+-\d+$')
+    all_tags=$(git ls-remote --tags --sort -v:refname https://gerrit.libreoffice.org/core)
+    rev=$(grep --perl-regexp --only-matching --max-count=1 \
+        '\Krefs/tags/cp-\d+\.\d+\.\d+-\d+$' <<< "$all_tags")
+    full_version=${rev#refs/tags/cp-}
     echoerr full version is $full_version
     echo \"$full_version\" > version.nix
 
-    rev="refs/tags/cp-$full_version"
+    # The full checkout including the submodules is too big for Hydra, so we fetch
+    # submodules separately.
+    declare -A dirnames=([help]=helpcontent2 [translations]=translations)
+    for t in help translations; do
+        sub_rev=$(curl --silent "https://git.libreoffice.org/core/+/$rev/${dirnames[$t]}" |\
+            pup '.gitlink-detail text{}' |\
+            sed -n 's/^Submodule link to \([0-9a-f]\{40\}\) of .*/\1/p')
+        echoerr got rev $sub_rev for $t
+        prefetch_output=$(nix-prefetch-git "https://gerrit.libreoffice.org/$t" --rev "$sub_rev")
+        echo "{ fetchgit, ... }:" > $t.nix
+        echo "fetchgit {" >> $t.nix
+        echo "  url = \"$(jq -r '.url' <<< "$prefetch_output")\";" >> $t.nix
+        echo "  rev = \"$rev\";" >> $t.nix
+        echo "  hash = \"$(jq -r '.hash' <<< "$prefetch_output")\";" >> $t.nix
+        echo "}"
+    done
 
-    prefetch_output=$(nix-prefetch-git https://gerrit.libreoffice.org/core --rev "$rev" --fetch-submodules)
-    fetched_git_path=$(echo "$prefetch_output" | jq -r '.path')
-    hash=$(echo "$prefetch_output" | jq -r '.hash')
-
-    # Generate main.nix
+    local prefetch_output=$(nix-prefetch-git "https://gerrit.libreoffice.org/core" --rev "$rev")
     echo "{ fetchgit, ... }:" > main.nix
     echo "fetchgit {" >> main.nix
-    echo "  url = \"https://gerrit.libreoffice.org/core\";" >> main.nix
+    echo "  url = \"$(jq -r '.url' <<< "$prefetch_output")\";" >> main.nix
     echo "  rev = \"$rev\";" >> main.nix
-    echo "  hash = \"$hash\";" >> main.nix
-    echo "  fetchSubmodules = true;" >> main.nix
+    echo "  hash = \"$(jq -r '.hash' <<< "$prefetch_output")\";" >> main.nix
+    echo "  fetchSubmodules = false;" >> main.nix
     echo "}" >> main.nix
 
     # Environment variable required by ../generate-libreoffice-srcs.py
-    export downloadList="$fetched_git_path/download.lst"
+    export downloadList=$(jq -r '.path' <<< "$prefetch_output")/download.lst
 esac
 
 cd ..
diff --git a/third_party/nixpkgs/pkgs/applications/office/mmex/default.nix b/third_party/nixpkgs/pkgs/applications/office/mmex/default.nix
index c4508df84b..14f3c40981 100644
--- a/third_party/nixpkgs/pkgs/applications/office/mmex/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/office/mmex/default.nix
@@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
     description = "Easy-to-use personal finance software";
     homepage = "https://www.moneymanagerex.org/";
     license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [ viric ];
+    maintainers = [ ];
     platforms = with lib.platforms; unix;
     mainProgram = "mmex";
   };
diff --git a/third_party/nixpkgs/pkgs/applications/office/softmaker/generic.nix b/third_party/nixpkgs/pkgs/applications/office/softmaker/generic.nix
index fed47d637f..0cdbe16e11 100644
--- a/third_party/nixpkgs/pkgs/applications/office/softmaker/generic.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/office/todoman/default.nix b/third_party/nixpkgs/pkgs/applications/office/todoman/default.nix
index 76fb6b906b..eae9e42485 100644
--- a/third_party/nixpkgs/pkgs/applications/office/todoman/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/office/todoman/default.nix
@@ -45,7 +45,7 @@ python3.pkgs.buildPythonApplication rec {
     hypothesis
     pytestCheckHook
     glibcLocales
-    pytest-cov
+    pytest-cov-stub
   ];
 
   LC_ALL = "en_US.UTF-8";
diff --git a/third_party/nixpkgs/pkgs/applications/office/wpsoffice/default.nix b/third_party/nixpkgs/pkgs/applications/office/wpsoffice/default.nix
index e13be24ee5..81d6e299bb 100644
--- a/third_party/nixpkgs/pkgs/applications/office/wpsoffice/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/office/wpsoffice/default.nix
@@ -23,7 +23,7 @@
 , useChineseVersion ? false
 }:
 let
-  pkgVersion = "11.1.0.11720";
+  pkgVersion = "11.1.0.11723";
   url =
     if useChineseVersion then
       "https://wps-linux-personal.wpscdn.cn/wps/download/ep/Linux2019/${lib.last (lib.splitVersion pkgVersion)}/wps-office_${pkgVersion}_amd64.deb"
@@ -31,9 +31,9 @@ let
       "https://wdl1.pcfg.cache.wpscdn.com/wpsdl/wpsoffice/download/linux/${lib.last (lib.splitVersion pkgVersion)}/wps-office_${pkgVersion}.XA_amd64.deb";
   hash =
     if useChineseVersion then
-      "sha256-wf0zgFrhqHXV68Qsa20X8FbMA83XeYr/dSCBg1IjVlg="
+      "sha256-vpXK8YyjqhFdmtajO6ZotYACpe5thMct9hwUT3advUM="
     else
-      "sha256-MvJ5XQx9fmNIFKvzSEbu1BAdxiASJ6HR+qsDFLm53dU=";
+      "sha256-o8njvwE/UsQpPuLyChxGAZ4euvwfuaHxs5pfUvcM7kI=";
   uri = builtins.replaceStrings [ "https://wps-linux-personal.wpscdn.cn" ] [ "" ] url;
   securityKey = "7f8faaaa468174dc1c9cd62e5f218a5b";
 in
diff --git a/third_party/nixpkgs/pkgs/applications/plasma-mobile/plasma-dialer.nix b/third_party/nixpkgs/pkgs/applications/plasma-mobile/plasma-dialer.nix
index 975d4571a1..5fa2638042 100644
--- a/third_party/nixpkgs/pkgs/applications/plasma-mobile/plasma-dialer.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/plasma-mobile/plasma-phonebook.nix b/third_party/nixpkgs/pkgs/applications/plasma-mobile/plasma-phonebook.nix
index 67164f548d..a3d62cc4a7 100644
--- a/third_party/nixpkgs/pkgs/applications/plasma-mobile/plasma-phonebook.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/plasma-mobile/plasma-settings.nix b/third_party/nixpkgs/pkgs/applications/plasma-mobile/plasma-settings.nix
index c30cda1cd8..c0e58b6653 100644
--- a/third_party/nixpkgs/pkgs/applications/plasma-mobile/plasma-settings.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/plasma-mobile/spacebar.nix b/third_party/nixpkgs/pkgs/applications/plasma-mobile/spacebar.nix
index 8dce4192a0..4e38649d47 100644
--- a/third_party/nixpkgs/pkgs/applications/plasma-mobile/spacebar.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/printing/pappl/default.nix b/third_party/nixpkgs/pkgs/applications/printing/pappl/default.nix
index 7c44bebcb0..02c4e74eb8 100644
--- a/third_party/nixpkgs/pkgs/applications/printing/pappl/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/radio/aldo/default.nix b/third_party/nixpkgs/pkgs/applications/radio/aldo/default.nix
index 3488ddecde..03e7757386 100644
--- a/third_party/nixpkgs/pkgs/applications/radio/aldo/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/radio/anytone-emu/default.nix b/third_party/nixpkgs/pkgs/applications/radio/anytone-emu/default.nix
index 337038fd32..8d87096b44 100644
--- a/third_party/nixpkgs/pkgs/applications/radio/anytone-emu/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/radio/dmrconfig/default.nix b/third_party/nixpkgs/pkgs/applications/radio/dmrconfig/default.nix
index 292263c0f2..e235d68d36 100644
--- a/third_party/nixpkgs/pkgs/applications/radio/dmrconfig/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/radio/dsd/default.nix b/third_party/nixpkgs/pkgs/applications/radio/dsd/default.nix
index 620923377a..f23add3215 100644
--- a/third_party/nixpkgs/pkgs/applications/radio/dsd/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/radio/pothos/default.nix b/third_party/nixpkgs/pkgs/applications/radio/pothos/default.nix
index 93613cb5fa..ac28698a46 100644
--- a/third_party/nixpkgs/pkgs/applications/radio/pothos/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/radio/qdmr/default.nix b/third_party/nixpkgs/pkgs/applications/radio/qdmr/default.nix
index 4096b648ec..2ebc0d30ff 100644
--- a/third_party/nixpkgs/pkgs/applications/radio/qdmr/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/radio/qdmr/default.nix
@@ -21,13 +21,13 @@ in
 
 stdenv.mkDerivation rec {
   pname = "qdmr";
-  version = "0.11.3";
+  version = "0.12.0";
 
   src = fetchFromGitHub {
     owner = "hmatuschek";
     repo = "qdmr";
     rev = "v${version}";
-    hash = "sha256-YLGsKGcKIPd0ihd5IzlT71dYkxZfeH7BpnKQMEyY8dI=";
+    hash = "sha256-8NV0+M9eMcvkP3UERDkaimbapTKxB4rYRLbHZjzG4Ws=";
   };
 
   nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/radio/tlf/default.nix b/third_party/nixpkgs/pkgs/applications/radio/tlf/default.nix
index aad6260288..c6d8920f82 100644
--- a/third_party/nixpkgs/pkgs/applications/radio/tlf/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/science/astronomy/celestia/default.nix b/third_party/nixpkgs/pkgs/applications/science/astronomy/celestia/default.nix
index 3347fa5356..2d227389d4 100644
--- a/third_party/nixpkgs/pkgs/applications/science/astronomy/celestia/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/astronomy/celestia/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = with lib; {
-    homepage = "https://celestia.space/";
+    homepage = "https://celestiaproject.space/";
     description = "Real-time 3D simulation of space";
     mainProgram = "celestia";
     changelog = "https://github.com/CelestiaProject/Celestia/releases/tag/${version}";
diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/mrbayes/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/mrbayes/default.nix
index ddc7bff445..88b4027120 100644
--- a/third_party/nixpkgs/pkgs/applications/science/biology/mrbayes/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/science/biology/sratoolkit/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/sratoolkit/default.nix
deleted file mode 100644
index 62c21a23eb..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/science/computer-architecture/timeloop/default.nix b/third_party/nixpkgs/pkgs/applications/science/computer-architecture/timeloop/default.nix
index ec8ec3ed8a..7fc5da8dfa 100644
--- a/third_party/nixpkgs/pkgs/applications/science/computer-architecture/timeloop/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/computer-architecture/timeloop/default.nix
@@ -41,10 +41,6 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  #link-time optimization fails on darwin
-  #see https://github.com/NixOS/nixpkgs/issues/19098
-  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-fno-lto";
-
   postPatch = ''
     # Fix gcc-13 build failure due to missing includes:
     sed -e '1i #include <cstdint>' -i \
diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/caneda/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/caneda/default.nix
index 4a4cf61c7f..7eac675eca 100644
--- a/third_party/nixpkgs/pkgs/applications/science/electronics/caneda/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/electronics/caneda/default.nix
@@ -19,7 +19,7 @@ mkDerivation rec {
     mainProgram = "caneda";
     homepage = "http://caneda.org";
     license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [viric];
+    maintainers = [ ];
     platforms = with lib.platforms; linux;
   };
 }
diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/diylc/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/diylc/default.nix
index ced8c72d21..072faf3a8a 100644
--- a/third_party/nixpkgs/pkgs/applications/science/electronics/diylc/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/science/electronics/dwfv/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/dwfv/default.nix
index 52c4ab1006..950182954a 100644
--- a/third_party/nixpkgs/pkgs/applications/science/electronics/dwfv/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/electronics/dwfv/default.nix
@@ -9,7 +9,7 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-JzOD0QQfDfIkJQATxGpyJBrFg5l6lkkAXY2qv9bir3c=";
   };
 
-  cargoSha256 = "1z51yx3psdxdzmwny0rzlch5hjx2pssll73q79qij2bc7wgyjscy";
+  cargoHash = "sha256-nmnpHz9sCRlxOngcSrW+oktYIKM/A295/a03fUf3ofw=";
 
   meta = with lib; {
     description = "Simple digital waveform viewer with vi-like key bindings";
diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/flopoco/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/flopoco/default.nix
index cf0ebf18ff..e15ef3277a 100644
--- a/third_party/nixpkgs/pkgs/applications/science/electronics/flopoco/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/electronics/flopoco/default.nix
@@ -54,12 +54,12 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     bison
     cmake
+    flex
     installShellFiles
   ];
 
   buildInputs = [
     boost
-    flex
     gmp
     libxml2
     mpfi
diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/versions.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/versions.nix
index b3ddbd5b60..3d66c90903 100644
--- a/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/versions.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/versions.nix
@@ -3,23 +3,23 @@
 {
   "kicad" = {
     kicadVersion = {
-      version =			"8.0.3";
+      version =			"8.0.4";
       src = {
-        rev =			"8ba5ba46af8502ea7a7d2a9754363167c2742399";
-        sha256 =		"0hafvcjjwylgcpgyyasmb2q210k82wvcswvgjvwwh76bwshwcpwa";
+        rev =			"5609722002776982320b6a8fbe6d096bbccf469b";
+        sha256 =		"03971przr1kzmkr302qzx30mmp92mkwg29dwjvzayc522iskxcbx";
       };
     };
     libVersion = {
-      version =			"8.0.3";
+      version =			"8.0.4";
       libSources = {
-        symbols.rev =		"2bc103c46a8daacbba2cded8b9f095b330ba928d";
-        symbols.sha256 =	"1za0spq09bbj7xwfwr1abmwjnqfd3zx0crayaz7915ja0ifi75hd";
-        templates.rev =		"0f57b59d365d1f8b8fdd0745e10beb035e88ba37";
+        symbols.rev =		"967a2828636d21f90ccc28dcfdc0e48508101c9d";
+        symbols.sha256 =	"1s8mkxb3ncb0w8z5q8jzhryb0yri7g51vx29qykqwv4ksra1f07i";
+        templates.rev =		"9c51a73b2e2fc4ea75d8b8be0a78bc9fb1785433";
         templates.sha256 =	"03idwrk3vj9h2az8j8lqpbdbnfxdbkzh4db68kq3644yj3cnlcza";
-        footprints.rev =	"539ffd8c0898ad8c8c51c2ab85ba56bfd77271c7";
-        footprints.sha256 =	"0ik4hjl5m65wnpaymg58zbvsfvchhyq5x3psvj6005mgv2hrican";
-        packages3d.rev =	"3172a1cc0931c1734efad68623374d5277f8ab60";
-        packages3d.sha256 =	"1yjlg7cxwhlzcdbxjqyqamr140sz8gvzi63k2401mhdbh88c9kii";
+        footprints.rev =	"a2aa9b5aea64c0efad9a31bc9ca88d48c0203752";
+        footprints.sha256 =	"1aqdb7mamz8xzz1qrw3qnvnaj97asb8z37w1cjz6y06sjcznlihn";
+        packages3d.rev =	"5430edd57b3a66fe69288aa8fda714f9732a7f52";
+        packages3d.sha256 =	"0vixdcldvnl8lr8bq3rc748q3vhx1lr2a0i071w914xyn983z9vz";
       };
     };
   };
diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/nvc/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/nvc/default.nix
index 6f8fbc6d6d..0cfaa31613 100644
--- a/third_party/nixpkgs/pkgs/applications/science/electronics/nvc/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/electronics/nvc/default.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation rec {
   pname = "nvc";
-  version = "1.13.0";
+  version = "1.13.1";
 
   src = fetchFromGitHub {
     owner = "nickg";
     repo = "nvc";
     rev = "r${version}";
-    hash = "sha256-mM2TkNXZSTr6fo8FxqDYbRlKw4dsADddS+VUEeeH3h8=";
+    hash = "sha256-mi/ruW+KLOeT6QpyRr+ZRtyOAyXsoKiO5WKAuXz5Wc4=";
   };
 
   nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/xoscope/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/xoscope/default.nix
index 0fa0c1bc79..37b9076c01 100644
--- a/third_party/nixpkgs/pkgs/applications/science/electronics/xoscope/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/electronics/xoscope/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     mainProgram = "xoscope";
     homepage = "https://xoscope.sourceforge.net";
     license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [viric];
+    maintainers = [ ];
     platforms = with lib.platforms; linux;
   };
 }
diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/lean4/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/lean4/default.nix
index 2c63edc1e7..81be0baf5c 100644
--- a/third_party/nixpkgs/pkgs/applications/science/logic/lean4/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/science/logic/prover9/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/prover9/default.nix
index 5c476be06e..a82e44c8a5 100644
--- a/third_party/nixpkgs/pkgs/applications/science/logic/prover9/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/science/machine-learning/finalfrontier/default.nix b/third_party/nixpkgs/pkgs/applications/science/machine-learning/finalfrontier/default.nix
index 1a6e9351d3..9dbbe8455d 100644
--- a/third_party/nixpkgs/pkgs/applications/science/machine-learning/finalfrontier/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/machine-learning/finalfrontier/default.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-bnRzXIYairlBjv2JxU16UXYc5BB3VeKZNiJ4+XDzub4=";
   };
 
-  cargoSha256 = "sha256-C/D9EPfifyajrCyXE8w/qRuzWEoyJJIcj4xii94/9l4=";
+  cargoHash = "sha256-C/D9EPfifyajrCyXE8w/qRuzWEoyJJIcj4xii94/9l4=";
 
   nativeBuildInputs = [
     installShellFiles
@@ -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/third_party/nixpkgs/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix b/third_party/nixpkgs/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix
index 0df8a0525b..b6fa984e7d 100644
--- a/third_party/nixpkgs/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/machine-learning/finalfusion-utils/default.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-suzivynlgk4VvDOC2dQR40n5IJHoJ736+ObdrM9dIqE=";
   };
 
-  cargoSha256 = "sha256-HekjmctuzOWs5k/ihhsV8vVkm6906jEnFf3yvhkrA5Y=";
+  cargoHash = "sha256-HekjmctuzOWs5k/ihhsV8vVkm6906jEnFf3yvhkrA5Y=";
 
   nativeBuildInputs = [ installShellFiles ];
 
@@ -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/third_party/nixpkgs/pkgs/applications/science/machine-learning/sc2-headless/default.nix b/third_party/nixpkgs/pkgs/applications/science/machine-learning/sc2-headless/default.nix
index d96d71695e..37128ce67e 100644
--- a/third_party/nixpkgs/pkgs/applications/science/machine-learning/sc2-headless/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/science/math/bcal/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/bcal/default.nix
index 9ba028d1cb..6e87136170 100644
--- a/third_party/nixpkgs/pkgs/applications/science/math/bcal/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/science/math/caffe/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/caffe/default.nix
index 2a84d4b27b..0f36c4783d 100644
--- a/third_party/nixpkgs/pkgs/applications/science/math/caffe/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/science/math/getdp/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/getdp/default.nix
index 8accf9d767..18000c147d 100644
--- a/third_party/nixpkgs/pkgs/applications/science/math/getdp/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/science/math/mathematica/generic.nix b/third_party/nixpkgs/pkgs/applications/science/math/mathematica/generic.nix
index 5a96bf1a26..c1c10f8937 100644
--- a/third_party/nixpkgs/pkgs/applications/science/math/mathematica/generic.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/math/mathematica/generic.nix
@@ -1,4 +1,4 @@
-{ addOpenGLRunpath
+{ addDriverRunpath
 , autoPatchelfHook
 , lib
 , makeWrapper
@@ -57,7 +57,7 @@ let cudaEnv = symlinkJoin {
       ];
       postBuild = ''
         if [ ! -e $out/lib/libcuda.so ]; then
-            ln -s ${addOpenGLRunpath.driverLink}/lib/libcuda.so $out/lib
+            ln -s ${addDriverRunpath.driverLink}/lib/libcuda.so $out/lib
         fi
         ln -s lib $out/lib64
       '';
@@ -69,7 +69,7 @@ in stdenv.mkDerivation {
   nativeBuildInputs = [
     autoPatchelfHook
     makeWrapper
-  ] ++ lib.optional cudaSupport addOpenGLRunpath;
+  ] ++ lib.optional cudaSupport addDriverRunpath;
 
   buildInputs = [
     alsa-lib
@@ -136,8 +136,8 @@ in stdenv.mkDerivation {
     "--set QT_QPA_PLATFORM wayland;xcb"
   ] ++ lib.optionals cudaSupport [
     "--set CUDA_PATH ${cudaEnv}"
-    "--set NVIDIA_DRIVER_LIBRARY_PATH ${addOpenGLRunpath.driverLink}/lib/libnvidia-tls.so"
-    "--set CUDA_LIBRARY_PATH ${addOpenGLRunpath.driverLink}/lib/libcuda.so"
+    "--set NVIDIA_DRIVER_LIBRARY_PATH ${addDriverRunpath.driverLink}/lib/libnvidia-tls.so"
+    "--set CUDA_LIBRARY_PATH ${addDriverRunpath.driverLink}/lib/libcuda.so"
   ];
 
   unpackPhase = ''
diff --git a/third_party/nixpkgs/pkgs/applications/science/math/nota/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/nota/default.nix
index 6b13c8160c..3a98eacd47 100644
--- a/third_party/nixpkgs/pkgs/applications/science/math/nota/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/science/math/yacas/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/yacas/default.nix
index 7fa2fe1a60..ad4e3f37d0 100644
--- a/third_party/nixpkgs/pkgs/applications/science/math/yacas/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/math/yacas/default.nix
@@ -80,7 +80,7 @@ stdenv.mkDerivation rec {
     description = "Easy to use, general purpose Computer Algebra System${lib.optionalString enableGui ", built with GUI."}";
     homepage = "http://www.yacas.org/";
     license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [ viric ];
+    maintainers = [ ];
     platforms = with lib.platforms; linux;
   };
 }
diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/cwltool/default.nix b/third_party/nixpkgs/pkgs/applications/science/misc/cwltool/default.nix
index ab43eac8bf..8da98e131f 100644
--- a/third_party/nixpkgs/pkgs/applications/science/misc/cwltool/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/science/misc/cwltool/default.nix
@@ -24,7 +24,8 @@ python3.pkgs.buildPythonApplication rec {
       --replace '"schema-salad >= 8.4.20230426093816, < 9",' "" \
       --replace "PYTEST_RUNNER + " ""
     substituteInPlace pyproject.toml \
-      --replace "ruamel.yaml>=0.16.0,<0.18" "ruamel.yaml"
+      --replace "ruamel.yaml>=0.16.0,<0.18" "ruamel.yaml" \
+      --replace "mypy==1.10.0" "mypy==1.10.*"
   '';
 
   nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/vite/default.nix b/third_party/nixpkgs/pkgs/applications/science/misc/vite/default.nix
index f1c9329c94..8cf8ceb497 100644
--- a/third_party/nixpkgs/pkgs/applications/science/misc/vite/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/science/programming/groove/default.nix b/third_party/nixpkgs/pkgs/applications/science/programming/groove/default.nix
index fb314cdff3..6350d0bade 100644
--- a/third_party/nixpkgs/pkgs/applications/science/programming/groove/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/science/robotics/mujoco/default.nix b/third_party/nixpkgs/pkgs/applications/science/robotics/mujoco/default.nix
index d4a7a961d3..ba79ddb237 100644
--- a/third_party/nixpkgs/pkgs/applications/science/robotics/mujoco/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/search/doodle/default.nix b/third_party/nixpkgs/pkgs/applications/search/doodle/default.nix
index 928548e7e7..ced330bd64 100644
--- a/third_party/nixpkgs/pkgs/applications/search/doodle/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/search/doodle/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     homepage = "https://grothoff.org/christian/doodle/";
     description = "Tool to quickly index and search documents on a computer";
     license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [ viric ];
+    maintainers = [ ];
     platforms = with lib.platforms; linux;
     mainProgram = "doodle";
   };
diff --git a/third_party/nixpkgs/pkgs/applications/search/recoll/default.nix b/third_party/nixpkgs/pkgs/applications/search/recoll/default.nix
index c3c1b6d85e..5de1166e11 100644
--- a/third_party/nixpkgs/pkgs/applications/search/recoll/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/search/recoll/default.nix
@@ -22,6 +22,8 @@
 , libxslt
 , lyx
 , makeWrapper
+, meson
+, ninja
 , perl
 , perlPackages
 , pkg-config
@@ -66,35 +68,36 @@ let filters = {
       perl = perl.passthru.withPackages (p: [ p.ImageExifTool ]);
     };
     filterPath = lib.makeBinPath (map lib.getBin (builtins.attrValues filters));
+    useInotify = if stdenv.isLinux then "true" else "false";
 in
 
 mkDerivation rec {
   pname = "recoll";
-  version = "1.37.5";
+  version = "1.39.1";
 
   src = fetchurl {
-    url = "https://www.lesbonscomptes.com/${pname}/${pname}-${version}.tar.gz";
-    hash = "sha256-vv2AMt6ufrfxRX2yF28X3E500MYP9hnGfDb3I9RdMVU=";
+    url = "https://www.recoll.org/${pname}-${version}.tar.gz";
+    hash = "sha256-Eeadj/AnuztCb7VIYEy4hKbduH3CzK53tADvI9+PWmQ=";
   };
 
-  configureFlags = [
-    "--enable-recollq"
-    "--disable-webkit"
-    "--without-systemd"
+  mesonFlags = [
+    "-Drecollq=true"
+    "-Dwebkit=false"
+    "-Dsystemd=false"
 
     # this leaks into the final `librecoll-*.so` binary, so we need
     # to be sure it is taken from `pkgs.file` rather than `stdenv`,
     # especially when cross-compiling
-    "--with-file-command=${file}/bin/file"
+    "-Dfile-command=${file}/bin/file"
 
   ] ++ lib.optionals (!withPython) [
-    "--disable-python-module"
-    "--disable-python-chm"
+    "-Dpython-module=false"
+    "-Dpython-chm=false"
   ] ++ lib.optionals (!withGui) [
-    "--disable-qtgui"
-    "--disable-x11mon"
+    "-Dqtgui=false"
+    "-Dx11mon=false"
   ] ++ [
-    (lib.withFeature stdenv.isLinux "inotify")
+    "-Dinotify=${useInotify}"
   ];
 
   env.NIX_CFLAGS_COMPILE = toString [
@@ -111,6 +114,8 @@ mkDerivation rec {
 
   nativeBuildInputs = [
     makeWrapper
+    meson
+    ninja
     pkg-config
     which
   ] ++ lib.optionals withGui [
@@ -174,7 +179,7 @@ mkDerivation rec {
     ln -s ../Applications/recoll.app/Contents/MacOS/recoll $out/bin/recoll
   '';
 
-  enableParallelBuilding = true;
+  enableParallelBuilding = false; # XXX: -j44 tried linking befoire librecoll had been created
 
   meta = with lib; {
     description = "Full-text search tool";
@@ -182,8 +187,8 @@ mkDerivation rec {
       Recoll is an Xapian frontend that can search through files, archive
       members, email attachments.
     '';
-    homepage = "https://www.lesbonscomptes.com/recoll/";
-    changelog = "https://www.lesbonscomptes.com/recoll/pages/release-${versions.majorMinor version}.html";
+    homepage = "https://www.recoll.org";
+    changelog = "https://www.recoll.org/pages/release-history.html";
     license = licenses.gpl2Plus;
     platforms = platforms.unix;
     maintainers = with maintainers; [ jcumming ehmry ];
diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/cool-retro-term/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/cool-retro-term/default.nix
index 6630cbaa12..8a33d22285 100644
--- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/cool-retro-term/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/terminal-emulators/mrxvt/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/mrxvt/default.nix
index b05872b11e..83bac2343b 100644
--- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/mrxvt/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-font-size/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-font-size/default.nix
index ac2a5f09fb..fa356081a8 100644
--- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-font-size/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-perl/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-perl/default.nix
index f30507483f..64a1ed125a 100644
--- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-perl/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-theme-switch/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-theme-switch/default.nix
index c7510568e2..2bfc966933 100644
--- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-theme-switch/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/version-management/commit-formatter/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/commit-formatter/default.nix
index 3a3fc7b281..8ed831d886 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/commit-formatter/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/commit-formatter/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "EYzhb9jJ4MzHxIbaTb1MxeXUgoxTwcnq5JdxAv2uNcA=";
   };
 
-  cargoSha256 = "AeHQCoP1HOftlOt/Yala3AXocMlwwIXIO2i1AsFSvGQ=";
+  cargoHash = "sha256-AeHQCoP1HOftlOt/Yala3AXocMlwwIXIO2i1AsFSvGQ=";
 
   meta = with lib; {
     description = "CLI tool to help you write git commit";
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/datalad/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/datalad/default.nix
index 2b7d9eb032..f9c3ac400d 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/datalad/default.nix
+++ b/third_party/nixpkgs/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 ];
+  postPatch = ''
+    substituteInPlace datalad/distribution/create_sibling.py \
+      --replace-fail "/bin/ls" "${coreutils}/bin/ls"
+  '';
 
-  propagatedBuildInputs = with python3.pkgs; [
-    # core
-    platformdirs
-    chardet
-    iso8601
-    humanize
-    fasteners
-    packaging
-    patool
-    tqdm
-    annexremote
-    looseversion
-    setuptools
-    git-annex
+  nativeBuildInputs = [
+    installShellFiles
+    git
+  ];
 
-    # downloaders-extra
-    # requests-ftp # not in nixpkgs yet
+  build-system = [ python3.pkgs.setuptools ];
 
-    # downloaders
-    boto
-    keyrings-alt
-    keyring
-    msgpack
-    requests
+  dependencies =
+    with python3.pkgs;
+    [
+      # core
+      platformdirs
+      chardet
+      iso8601
+      humanize
+      fasteners
+      packaging
+      patool
+      tqdm
+      annexremote
+      looseversion
+      setuptools
+      git-annex
 
-    # publish
-    python-gitlab
+      # downloaders-extra
+      # requests-ftp # not in nixpkgs yet
 
-    # misc
-    argcomplete
-    pyperclip
-    python-dateutil
+      # downloaders
+      boto3
+      keyrings-alt
+      keyring
+      msgpack
+      requests
 
-    # metadata
-    simplejson
-    whoosh
+      # publish
+      python-gitlab
 
-    # metadata-extra
-    pyyaml
-    mutagen
-    exifread
-    python-xmp-toolkit
-    pillow
-
-    # duecredit
-    duecredit
-
-    # python>=3.8
-    distro
-  ] ++ lib.optionals stdenv.hostPlatform.isWindows [ colorama ]
-    ++ lib.optionals (python3.pythonOlder "3.10") [ importlib-metadata ];
+      # 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/third_party/nixpkgs/pkgs/applications/version-management/fornalder/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/fornalder/default.nix
index 7d012c8360..c7774a60cf 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/fornalder/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/fornalder/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-IPSxVWJs4EhyBdA1NXpD8v3fusewt1ELpn/kbZt7c5Q=";
   };
 
-  cargoSha256 = "sha256-eK+oQbOQj8pKiOTXzIgRjzVB7Js8MMa9V6cF9D98Ftc=";
+  cargoHash = "sha256-eK+oQbOQj8pKiOTXzIgRjzVB7Js8MMa9V6cF9D98Ftc=";
 
   nativeBuildInputs = [ makeWrapper ];
 
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/fossil/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/fossil/default.nix
index 49829a2fd4..b1b828d479 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/fossil/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/fossil/default.nix
@@ -86,7 +86,7 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     homepage = "https://www.fossil-scm.org/";
     license = licenses.bsd2;
-    maintainers = with maintainers; [ maggesi viric ];
+    maintainers = with maintainers; [ maggesi ];
     platforms = platforms.all;
     mainProgram = "fossil";
   };
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-quickfix/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-quickfix/default.nix
index cfed9952f7..9bc7e678d3 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/git-quickfix/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/git-quickfix/default.nix
@@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec {
     libiconv
   ];
 
-  cargoSha256 = "sha256-eTAEf2nRrJ7i2Dw5BBZlLLu8mK2G/wUk40ivtfxk1pI=";
+  cargoHash = "sha256-eTAEf2nRrJ7i2Dw5BBZlLLu8mK2G/wUk40ivtfxk1pI=";
 
   meta = with lib; {
     description = "Quickfix allows you to commit changes in your git repository to a new branch without leaving the current branch";
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-remote-hg/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-remote-hg/default.nix
index 57741a0763..76f40911f0 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/git-remote-hg/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/version-management/git-workspace/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-workspace/default.nix
index fc16e778f2..6106477792 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/git-workspace/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/git-workspace/default.nix
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-9/t2MDZ5bYTuzCYTodeATqk+xqST2aQMr7Z1x5fPIuw=";
   };
 
-  cargoSha256 = "sha256-/drXVkYgdkFqZJsz2fNx3Ms21xYKQmwLXRJEmKSaikQ=";
+  cargoHash = "sha256-/drXVkYgdkFqZJsz2fNx3Ms21xYKQmwLXRJEmKSaikQ=";
 
   nativeBuildInputs = [ pkg-config ];
 
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab-triage/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitlab-triage/default.nix
index 5397688ebf..20335e2003 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab-triage/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/version-management/gittyup/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gittyup/default.nix
index 6fa79e6926..2a7cb13d2a 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/gittyup/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/version-management/gitweb/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitweb/default.nix
index 2c8d7eedc2..f2cb91ac4f 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/gitweb/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/version-management/gut/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gut/default.nix
index a6604e24fb..0192fc3df9 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/gut/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/version-management/josh/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/josh/default.nix
index aed7ab9b52..b074d0b086 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/josh/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/josh/default.nix
@@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "10fspcafqnv6if5c1h8z9pf9140jvvlrch88w62wsg4w2vhaii0v";
   };
 
-  cargoSha256 = "1j0vl3h6f65ldg80bgryh1mz423lcrcdkn8rmajya1850pfxk3w3";
+  cargoHash = "sha256-g4/Z3QUFBeWlqhnZ2VhmdAjya4A+vwXQa7QYZ+CgG8g=";
 
   nativeBuildInputs = [
     pkg-config
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/lab/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/lab/default.nix
index 9155f7398c..f2ca2210f4 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/lab/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/version-management/mercurial/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/mercurial/default.nix
index 5057e72501..f60813a7ee 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/mercurial/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/mercurial/default.nix
@@ -1,8 +1,6 @@
 { lib, stdenv, fetchurl, python3Packages, makeWrapper, gettext, installShellFiles
 , re2Support ? true
-# depends on rust-cpython which won't support python312
-# https://github.com/dgrunwald/rust-cpython/commit/e815555629e557be084813045ca1ddebc2f76ef9
-, rustSupport ? (stdenv.hostPlatform.isLinux && python3Packages.pythonOlder "3.12"), cargo, rustPlatform, rustc
+, rustSupport ? stdenv.hostPlatform.isLinux, cargo, rustPlatform, rustc
 , fullBuild ? false
 , gitSupport ? fullBuild
 , guiSupport ? fullBuild, tk
@@ -19,15 +17,15 @@
 }:
 
 let
-  inherit (python3Packages) docutils python fb-re2 pygit2 pygments;
+  inherit (python3Packages) docutils python fb-re2 pygit2 pygments setuptools;
 
   self = python3Packages.buildPythonApplication rec {
     pname = "mercurial${lib.optionalString fullBuild "-full"}";
-    version = "6.7.4";
+    version = "6.8";
 
     src = fetchurl {
       url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz";
-      hash = "sha256-dHCPhzQFwSJy/sEWxt1Shi6O0RwQARx+V19eqBJj6l4=";
+      hash = "sha256-COTQ5dqK8RMrUea8M1AYCtV63Nk18Je20LwRmiwsChA=";
     };
 
     format = "other";
@@ -37,7 +35,7 @@ let
     cargoDeps = if rustSupport then rustPlatform.fetchCargoTarball {
       inherit src;
       name = "mercurial-${version}";
-      hash = "sha256-FRa7frX2z9jQGFBXS2TpOUANs0+xwegNETUAQIU0S4o=";
+      hash = "sha256-mP82UtASD0Fh8ilDDCB6ubY7/MGPoRP6hg6/xRwzwAw=";
       sourceRoot = "mercurial-${version}/rust";
     } else null;
     cargoRoot = if rustSupport then "rust" else null;
@@ -45,7 +43,7 @@ let
     propagatedBuildInputs = lib.optional re2Support fb-re2
       ++ lib.optional gitSupport pygit2
       ++ lib.optional highlightSupport pygments;
-    nativeBuildInputs = [ makeWrapper gettext installShellFiles python3Packages.setuptools ]
+    nativeBuildInputs = [ makeWrapper gettext installShellFiles setuptools ]
       ++ lib.optionals rustSupport [
            rustPlatform.cargoSetupHook
            cargo
@@ -114,6 +112,9 @@ let
       gnupg
     ];
 
+    # https://bz.mercurial-scm.org/show_bug.cgi?id=6887
+    propagatedBuildInputs = [ setuptools ];
+
     postPatch = ''
       patchShebangs .
 
@@ -127,6 +128,12 @@ let
           --replace '*/hg:' '*/*hg*:' \${/* paths emitted by our wrapped hg look like ..hg-wrapped-wrapped */""}
           --replace '"$PYTHON" "$BINDIR"/hg' '"$BINDIR"/hg' ${/* 'hg' is a wrapper; don't run using python directly */""}
       done
+
+      # https://bz.mercurial-scm.org/show_bug.cgi?id=6887
+      # Adding setuptools to the python path is not enough for the distutils
+      # module to be found, so we patch usage directly:
+      substituteInPlace tests/hghave.py \
+        --replace-fail "distutils" "setuptools._distutils"
     '';
 
     # This runs Mercurial _a lot_ of times.
@@ -156,6 +163,21 @@ let
     # Python 3.10-3.12 deprecation warning: asyncore
     # https://bz.mercurial-scm.org/show_bug.cgi?id=6727
     test-patchbomb-tls.t
+
+    # Python 3.12 _lsprof module change, breaking profile test
+    # https://bz.mercurial-scm.org/show_bug.cgi?id=6846
+    test-profile.t
+
+    # Python 3.12 deprecation warning: multi-threaded fork in worker.py
+    # https://bz.mercurial-scm.org/show_bug.cgi?id=6892
+    test-clone-stream.t
+    test-clonebundles.t
+    test-fix-topology.t
+    test-fix.t
+    test-persistent-nodemap.t
+    test-profile.t
+    test-simple-update.t
+
     EOF
 
     export HGTEST_REAL_HG="${mercurial}/bin/hg"
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/nitpick/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/nitpick/default.nix
index eb6956b1a3..f1f52baf03 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/nitpick/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/nitpick/default.nix
@@ -35,6 +35,6 @@ buildPythonPackage rec {
     '';
     homepage = "http://travisbrown.ca/projects/nitpick/docs/nitpick.html";
     license = with lib.licenses; gpl2;
-    maintainers = [];
+    maintainers = [ ];
   };
 }
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/rapidsvn/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/rapidsvn/default.nix
index 53df3af4a7..8887d5126f 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/rapidsvn/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/rapidsvn/default.nix
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
     description = "Multi-platform GUI front-end for the Subversion revision system";
     homepage = "http://rapidsvn.tigris.org/";
     license = lib.licenses.gpl3Plus;
-    maintainers = [ lib.maintainers.viric ];
+    maintainers = [ ];
     platforms = lib.platforms.unix;
     mainProgram = "rapidsvn";
   };
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/rs-git-fsmonitor/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/rs-git-fsmonitor/default.nix
index 7c4ecaf307..ffde4f16f1 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/rs-git-fsmonitor/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/rs-git-fsmonitor/default.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "021vdk5i7yyrnh4apn0gnsh6ycnx15wm3g2jrfsg7fycnq8167wc";
   };
 
-  cargoSha256 = "0hx5nhxci6p0gjjn1f3vpfykq0f7hdvhlv8898vrv0lh5r9hybsn";
+  cargoHash = "sha256-Vi8PUy6Qgp03SghtCneDxwE8vbt7uGClfOCayDq0pUM=";
 
   nativeBuildInputs = [ makeWrapper ];
 
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/sublime-merge/common.nix b/third_party/nixpkgs/pkgs/applications/version-management/sublime-merge/common.nix
index df5e362282..43a1490763 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/sublime-merge/common.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/sublime-merge/common.nix
@@ -116,7 +116,7 @@ let
 
       # We need to replace the ssh-askpass-sublime executable because the default one
       # will not function properly, in order to work it needs to pass an argv[0] to
-      # the sublime_merge binary, and the built-in version will will try to call the
+      # the sublime_merge binary, and the built-in version will try to call the
       # sublime_merge wrapper script which cannot pass through the original argv[0] to
       # the sublime_merge binary. Thankfully the ssh-askpass-sublime functionality is
       # very simple and can be replaced with a simple wrapper script.
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/ungit/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/ungit/default.nix
index 5d5c833698..98846c445d 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/ungit/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/version-management/vcprompt/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/vcprompt/default.nix
index ff4968d716..d2ef35c9b6 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/vcprompt/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/version-management/verco/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/verco/default.nix
index ca41cdc00b..079b10d2f5 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/verco/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/version-management/verco/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-M3Utrt350I67kqzEH130tgBIiI7rY8ODCSxgMohWWWM=";
   };
 
-  cargoSha256 = "sha256-urnTPlQTmOPq7mHZjsTqxql/FQe7NYHE8sVJJ4fno+U=";
+  cargoHash = "sha256-urnTPlQTmOPq7mHZjsTqxql/FQe7NYHE8sVJJ4fno+U=";
 
   meta = with lib; {
     description = "Simple Git/Mercurial/PlasticSCM tui client based on keyboard shortcuts";
diff --git a/third_party/nixpkgs/pkgs/applications/video/alass/default.nix b/third_party/nixpkgs/pkgs/applications/video/alass/default.nix
index d6b6da1fd6..bbbbe91beb 100644
--- a/third_party/nixpkgs/pkgs/applications/video/alass/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/video/alass/default.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-q1IV9TtmznpR7RO75iN0p16nmTja5ADWqFj58EOPWvU=";
   };
 
-  cargoSha256 = "sha256-6swIoVp1B4CMvaGvq868LTKkzpI6zFKJNgUVqjdyH20=";
+  cargoHash = "sha256-6swIoVp1B4CMvaGvq868LTKkzpI6zFKJNgUVqjdyH20=";
 
   nativeBuildInputs = [ makeWrapper ];
 
diff --git a/third_party/nixpkgs/pkgs/applications/video/anime-downloader/default.nix b/third_party/nixpkgs/pkgs/applications/video/anime-downloader/default.nix
index 99323ef960..bf8fa063bd 100644
--- a/third_party/nixpkgs/pkgs/applications/video/anime-downloader/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/video/catt/default.nix b/third_party/nixpkgs/pkgs/applications/video/catt/default.nix
index 5b22b30e76..d8aa3e44b2 100644
--- a/third_party/nixpkgs/pkgs/applications/video/catt/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/video/ccextractor/default.nix b/third_party/nixpkgs/pkgs/applications/video/ccextractor/default.nix
index 399287c93f..3391210462 100644
--- a/third_party/nixpkgs/pkgs/applications/video/ccextractor/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/video/davinci-resolve/default.nix b/third_party/nixpkgs/pkgs/applications/video/davinci-resolve/default.nix
index be18304386..574de6f427 100644
--- a/third_party/nixpkgs/pkgs/applications/video/davinci-resolve/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/video/davinci-resolve/default.nix
@@ -5,7 +5,7 @@
 , runCommandLocal
 , unzip
 , appimage-run
-, addOpenGLRunpath
+, addDriverRunpath
 , dbus
 , libGLU
 , xorg
@@ -38,7 +38,7 @@ let
 
       nativeBuildInputs = [
         (appimage-run.override { buildFHSEnv = buildFHSEnvChroot; } )
-        addOpenGLRunpath
+        addDriverRunpath
         copyDesktopItems
         unzip
       ];
@@ -150,14 +150,14 @@ let
       postFixup = ''
         for program in $out/bin/*; do
           isELF "$program" || continue
-          addOpenGLRunpath "$program"
+          addDriverRunpath "$program"
         done
 
         for program in $out/libs/*; do
           isELF "$program" || continue
           if [[ "$program" != *"libcudnn_cnn_infer"* ]];then
             echo $program
-            addOpenGLRunpath "$program"
+            addDriverRunpath "$program"
           fi
         done
         ln -s $out/libs/libcrypto.so.1.1 $out/libs/libcrypt.so.1
diff --git a/third_party/nixpkgs/pkgs/applications/video/gnome-mplayer/default.nix b/third_party/nixpkgs/pkgs/applications/video/gnome-mplayer/default.nix
index 436f31ac5a..3d6b281ef0 100644
--- a/third_party/nixpkgs/pkgs/applications/video/gnome-mplayer/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/video/go-chromecast/default.nix b/third_party/nixpkgs/pkgs/applications/video/go-chromecast/default.nix
index 44495386d4..cade6f0c74 100644
--- a/third_party/nixpkgs/pkgs/applications/video/go-chromecast/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/video/kodi/addons/osmc-skin/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/osmc-skin/default.nix
index 2cf5f8784d..7644a71d71 100644
--- a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/osmc-skin/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/video/kodi/addons/pvr-hts/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/pvr-hts/default.nix
index e384345135..50e12c09c1 100644
--- a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/pvr-hts/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/pvr-hts/default.nix
@@ -2,13 +2,13 @@
 buildKodiBinaryAddon rec {
   pname = "pvr-hts";
   namespace = "pvr.hts";
-  version = "21.2.4";
+  version = "21.2.5";
 
   src = fetchFromGitHub {
     owner = "kodi-pvr";
     repo = "pvr.hts";
     rev = "${version}-${rel}";
-    sha256 = "sha256-3q78rJ+LGRD/pqeWfcP2Z469HAu1T0LoidvD6mjNkwg=";
+    sha256 = "sha256-BG5mGD674gvjUSdydu4g3F/4GH53gkJoKMDuvaFNi6k=";
   };
 
   meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/pvr-iptvsimple/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/pvr-iptvsimple/default.nix
index 59f39a06fd..b976c15371 100644
--- a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/pvr-iptvsimple/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/pvr-iptvsimple/default.nix
@@ -6,13 +6,13 @@
 buildKodiBinaryAddon rec {
   pname = "pvr-iptvsimple";
   namespace = "pvr.iptvsimple";
-  version = "21.8.4";
+  version = "21.8.5";
 
   src = fetchFromGitHub {
     owner = "kodi-pvr";
     repo = "pvr.iptvsimple";
     rev = "${version}-${rel}";
-    sha256 = "sha256-uuqk1kJnioCaRWIkC5liPSVRQPpviuaE+wmE4rq6fJw=";
+    sha256 = "sha256-UFEZZr7Z6GqnN8ZSA+JkdsiAlf7p5xPwDOcwLzJc9v8=";
   };
 
   extraBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/pvr-vdr-vnsi/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/pvr-vdr-vnsi/default.nix
index 9fdbee949d..85729e1290 100644
--- a/third_party/nixpkgs/pkgs/applications/video/kodi/addons/pvr-vdr-vnsi/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/video/kodi/addons/pvr-vdr-vnsi/default.nix
@@ -2,13 +2,13 @@
 buildKodiBinaryAddon rec {
   pname = "pvr-vdr-vnsi";
   namespace = "pvr.vdr.vnsi";
-  version = "21.1.1";
+  version = "21.1.2";
 
   src = fetchFromGitHub {
     owner = "kodi-pvr";
     repo = "pvr.vdr.vnsi";
     rev = "${version}-${rel}";
-    sha256 = "sha256-Bd/21y3oAhQMmvrZzrN5Z6jLHySBd2LXNbLt/Me4jSw=";
+    sha256 = "sha256-o7WVO/TvSK6bZEnUeNQhapXOVQbDlpJDObC93/9XpJo=";
   };
 
   extraBuildInputs = [ libGL ];
diff --git a/third_party/nixpkgs/pkgs/applications/video/lightworks/default.nix b/third_party/nixpkgs/pkgs/applications/video/lightworks/default.nix
index ea2f0bde5e..c803e906e2 100644
--- a/third_party/nixpkgs/pkgs/applications/video/lightworks/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/video/minitube/default.nix b/third_party/nixpkgs/pkgs/applications/video/minitube/default.nix
index 1954609245..0f290f0145 100644
--- a/third_party/nixpkgs/pkgs/applications/video/minitube/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/video/mlv-app/default.nix b/third_party/nixpkgs/pkgs/applications/video/mlv-app/default.nix
index 05c6799e42..e3f61cdd82 100644
--- a/third_party/nixpkgs/pkgs/applications/video/mlv-app/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/video/mpv/default.nix b/third_party/nixpkgs/pkgs/applications/video/mpv/default.nix
index 965baf2abb..5b255be9a1 100644
--- a/third_party/nixpkgs/pkgs/applications/video/mpv/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/video/mpv/default.nix
@@ -1,7 +1,7 @@
 {
   lib,
   SDL2,
-  addOpenGLRunpath,
+  addDriverRunpath,
   alsa-lib,
   bash,
   buildPackages,
@@ -203,7 +203,7 @@ stdenv'.mkDerivation (finalAttrs: {
 
   nativeBuildInputs =
     [
-      addOpenGLRunpath
+      addDriverRunpath
       docutils # for rst2man
       meson
       ninja
@@ -329,9 +329,9 @@ stdenv'.mkDerivation (finalAttrs: {
     '';
 
   # Set RUNPATH so that libcuda in /run/opengl-driver(-32)/lib can be found.
-  # See the explanation in addOpenGLRunpath.
+  # See the explanation in addDriverRunpath.
   postFixup = lib.optionalString stdenv.isLinux ''
-    addOpenGLRunpath $out/bin/mpv
+    addDriverRunpath $out/bin/mpv
     patchShebangs --update --host $out/bin/umpv $out/bin/mpv_identify.sh
   '';
 
diff --git a/third_party/nixpkgs/pkgs/applications/video/obs-studio/default.nix b/third_party/nixpkgs/pkgs/applications/video/obs-studio/default.nix
index 7de06b33e4..0adac74846 100644
--- a/third_party/nixpkgs/pkgs/applications/video/obs-studio/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/video/obs-studio/default.nix
@@ -5,7 +5,7 @@
 , nv-codec-headers-12
 , fetchFromGitHub
 , fetchpatch
-, addOpenGLRunpath
+, addDriverRunpath
 , cmake
 , fdk_aac
 , ffmpeg
@@ -88,7 +88,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   nativeBuildInputs = [
-    addOpenGLRunpath
+    addDriverRunpath
     cmake
     pkg-config
     wrapGAppsHook3
@@ -184,8 +184,8 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   postFixup = lib.optionalString stdenv.isLinux ''
-    addOpenGLRunpath $out/lib/lib*.so
-    addOpenGLRunpath $out/lib/obs-plugins/*.so
+    addDriverRunpath $out/lib/lib*.so
+    addDriverRunpath $out/lib/obs-plugins/*.so
 
     # Link libcef again after patchelfing other libs
     ln -s ${libcef}/lib/* $out/lib/obs-plugins/
diff --git a/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix b/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix
index ec19f26e8a..4415cd416e 100644
--- a/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/video/pitivi/default.nix b/third_party/nixpkgs/pkgs/applications/video/pitivi/default.nix
index 85ee9c0e7e..e278d4a158 100644
--- a/third_party/nixpkgs/pkgs/applications/video/pitivi/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/video/plex-media-player/default.nix b/third_party/nixpkgs/pkgs/applications/video/plex-media-player/default.nix
index 6a686d9d2c..fb10bff45e 100644
--- a/third_party/nixpkgs/pkgs/applications/video/plex-media-player/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/video/plex-media-player/default.nix
@@ -7,7 +7,7 @@ let
   # sandboxed builds, we manually download them and save them so these files
   # are fetched ahead-of-time instead of during the CMake build. To update
   # plex-media-player use the update.sh script, so the versions and hashes
-  # for these files are are also updated!
+  # for these files are also updated!
   depSrcs = import ./deps.nix { inherit fetchurl; };
 in mkDerivation rec {
   pname = "plex-media-player";
diff --git a/third_party/nixpkgs/pkgs/applications/video/rtabmap/default.nix b/third_party/nixpkgs/pkgs/applications/video/rtabmap/default.nix
index b2eb371625..6565a40975 100644
--- a/third_party/nixpkgs/pkgs/applications/video/rtabmap/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/video/shaka-packager/default.nix b/third_party/nixpkgs/pkgs/applications/video/shaka-packager/default.nix
index 0bb73ee50e..039648963f 100644
--- a/third_party/nixpkgs/pkgs/applications/video/shaka-packager/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/video/sub-batch/default.nix b/third_party/nixpkgs/pkgs/applications/video/sub-batch/default.nix
index bc0d6bd3a6..713a0ad275 100644
--- a/third_party/nixpkgs/pkgs/applications/video/sub-batch/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/video/sub-batch/default.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-TOcK+l65iKON1kgBE4DYV/BXACnvqPCshavnVdpnGH4=";
   };
 
-  cargoSha256 = "sha256-tOY3aLpU08Tg/IT+usS2DNO0Q1aD0bvURmNJmHcJkgI=";
+  cargoHash = "sha256-tOY3aLpU08Tg/IT+usS2DNO0Q1aD0bvURmNJmHcJkgI=";
 
   nativeBuildInputs = [ makeWrapper ];
 
diff --git a/third_party/nixpkgs/pkgs/applications/video/subtitleedit/default.nix b/third_party/nixpkgs/pkgs/applications/video/subtitleedit/default.nix
index b192edbffa..aa00f5e8dc 100644
--- a/third_party/nixpkgs/pkgs/applications/video/subtitleedit/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/video/timelens/default.nix b/third_party/nixpkgs/pkgs/applications/video/timelens/default.nix
index 2124813f41..7b7b1e0e72 100644
--- a/third_party/nixpkgs/pkgs/applications/video/timelens/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/video/wf-recorder/default.nix b/third_party/nixpkgs/pkgs/applications/video/wf-recorder/default.nix
index f4e2c8ee71..830c09bfa6 100644
--- a/third_party/nixpkgs/pkgs/applications/video/wf-recorder/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/video/xscast/default.nix b/third_party/nixpkgs/pkgs/applications/video/xscast/default.nix
index 4e7252a514..71b22201e9 100644
--- a/third_party/nixpkgs/pkgs/applications/video/xscast/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/virtualization/ddev/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/ddev/default.nix
index 738271bf95..66ed0aa6b2 100644
--- a/third_party/nixpkgs/pkgs/applications/virtualization/ddev/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/virtualization/docker/compose.nix b/third_party/nixpkgs/pkgs/applications/virtualization/docker/compose.nix
index 2b9d6e4945..20c390d58d 100644
--- a/third_party/nixpkgs/pkgs/applications/virtualization/docker/compose.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/virtualization/docker/compose_1.nix b/third_party/nixpkgs/pkgs/applications/virtualization/docker/compose_1.nix
deleted file mode 100644
index ac5d726439..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/virtualization/docker/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/docker/default.nix
index 946544a02a..b77d419e18 100644
--- a/third_party/nixpkgs/pkgs/applications/virtualization/docker/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/virtualization/libnvidia-container/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/libnvidia-container/default.nix
index b462b24711..28ea0a675b 100644
--- a/third_party/nixpkgs/pkgs/applications/virtualization/libnvidia-container/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/virtualization/libnvidia-container/default.nix
@@ -1,6 +1,6 @@
 { stdenv
 , lib
-, addOpenGLRunpath
+, addDriverRunpath
 , fetchFromGitHub
 , pkg-config
 , elfutils
@@ -102,7 +102,7 @@ stdenv.mkDerivation rec {
 
   postInstall =
     let
-      inherit (addOpenGLRunpath) driverLink;
+      inherit (addDriverRunpath) driverLink;
       libraryPath = lib.makeLibraryPath [ "$out" driverLink "${driverLink}-32" ];
     in
     ''
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/podman/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/podman/default.nix
index f42eb36e40..e1540b12b2 100644
--- a/third_party/nixpkgs/pkgs/applications/virtualization/podman/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/virtualization/podman/default.nix
@@ -49,7 +49,7 @@ let
   helpersBin = symlinkJoin {
     name = "podman-helper-binary-wrapper";
 
-    # this only works for some binaries, others may need to be be added to `binPath` or in the modules
+    # this only works for some binaries, others may need to be added to `binPath` or in the modules
     paths = [
       gvproxy
     ] ++ lib.optionals stdenv.isLinux [
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/qboot/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/qboot/default.nix
index f5a1e13410..e0d833d0c2 100644
--- a/third_party/nixpkgs/pkgs/applications/virtualization/qboot/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/virtualization/rust-hypervisor-firmware/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/rust-hypervisor-firmware/default.nix
index 8b408cc96e..193776fa5e 100644
--- a/third_party/nixpkgs/pkgs/applications/virtualization/rust-hypervisor-firmware/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/virtualization/rust-hypervisor-firmware/default.nix
@@ -37,7 +37,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-hKk5pcop8rb5Q+IVchcl+XhMc3DCBBPn5P+AkAb9XxI=";
   };
 
-  cargoSha256 = "sha256-edi6/Md6KebKM3wHArZe1htUCg0/BqMVZKA4xEH25GI=";
+  cargoHash = "sha256-edi6/Md6KebKM3wHArZe1htUCg0/BqMVZKA4xEH25GI=";
 
   # lld: error: unknown argument '-Wl,--undefined=AUDITABLE_VERSION_INFO'
   # https://github.com/cloud-hypervisor/rust-hypervisor-firmware/issues/249
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/rvvm/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/rvvm/default.nix
index ce90b686bc..2d6b7d3da0 100644
--- a/third_party/nixpkgs/pkgs/applications/virtualization/rvvm/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/virtualization/rvvm/default.nix
@@ -38,10 +38,7 @@ stdenv.mkDerivation rec {
 
   makeFlags = [ "PREFIX=$(out)" ]
     ++ lib.optional enableSDL "USE_SDL=2" # Use SDL2 instead of SDL1
-    ++ lib.optional (!enableSDL && !enableX11) "USE_FB=0"
-
-    # work around https://github.com/NixOS/nixpkgs/issues/19098
-    ++ lib.optional (stdenv.cc.isClang && stdenv.isDarwin) "CFLAGS=-fno-lto";
+    ++ lib.optional (!enableSDL && !enableX11) "USE_FB=0";
 
   meta = with lib; {
     homepage = "https://github.com/LekKit/RVVM";
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/stratovirt/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/stratovirt/default.nix
index 7070387fc5..a1f3fb53e0 100644
--- a/third_party/nixpkgs/pkgs/applications/virtualization/stratovirt/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/virtualization/stratovirt/default.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-1Ex6ahKBoVRikSqrgHGYaBFzWkPFDm8bGVyB7KmO8tI=";
   };
 
-  cargoSha256 = "sha256-uuZCbmt3eIlKurwMOV7LezVSjOVG/90OdT2PC8YLi3I=";
+  cargoHash = "sha256-uuZCbmt3eIlKurwMOV7LezVSjOVG/90OdT2PC8YLi3I=";
 
   nativeBuildInputs = [
     pkg-config
diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/x11docker/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/x11docker/default.nix
index 840c9d648b..1e40008869 100644
--- a/third_party/nixpkgs/pkgs/applications/virtualization/x11docker/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/virtualization/youki/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/youki/default.nix
index d63fa87238..506179dbf3 100644
--- a/third_party/nixpkgs/pkgs/applications/virtualization/youki/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/virtualization/youki/default.nix
@@ -44,7 +44,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://containers.github.io/youki/";
     changelog = "https://github.com/containers/youki/releases/tag/v${version}";
     license = licenses.asl20;
-    maintainers = [];
+    maintainers = [ ];
     platforms = platforms.linux;
     mainProgram = "youki";
   };
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/dwl/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/dwl/default.nix
deleted file mode 100644
index 65ea637d6d..0000000000
--- a/third_party/nixpkgs/pkgs/applications/window-managers/dwl/default.nix
+++ /dev/null
@@ -1,98 +0,0 @@
-{ lib
-, stdenv
-, fetchFromGitea
-, installShellFiles
-, libX11
-, libinput
-, libxcb
-, libxkbcommon
-, pixman
-, pkg-config
-, wayland-scanner
-, wayland
-, wayland-protocols
-, wlroots
-, writeText
-, xcbutilwm
-, xwayland
-, enableXWayland ? true
-, conf ? null
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "dwl";
-  version = "0.5";
-
-  src = fetchFromGitea {
-    domain = "codeberg.org";
-    owner = "dwl";
-    repo = "dwl";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-U/vqGE1dJKgEGTfPMw02z5KJbZLWY1vwDJWnJxT8urM=";
-  };
-
-  nativeBuildInputs = [
-    installShellFiles
-    pkg-config
-    wayland-scanner
-  ];
-
-  buildInputs = [
-    libinput
-    libxcb
-    libxkbcommon
-    pixman
-    wayland
-    wayland-protocols
-    wlroots
-  ] ++ lib.optionals enableXWayland [
-    libX11
-    xcbutilwm
-    xwayland
-  ];
-
-  outputs = [ "out" "man" ];
-
-  # Allow users to set an alternative config.def.h
-  postPatch = let
-    configFile = if lib.isDerivation conf || builtins.isPath conf
-                 then conf
-                 else writeText "config.def.h" conf;
-  in lib.optionalString (conf != null) "cp ${configFile} config.def.h";
-
-  makeFlags = [
-    "PKG_CONFIG=${stdenv.cc.targetPrefix}pkg-config"
-    "WAYLAND_SCANNER=wayland-scanner"
-    "PREFIX=$(out)"
-    "MANDIR=$(man)/share/man"
-  ];
-
-  preBuild = ''
-    makeFlagsArray+=(
-      XWAYLAND=${lib.optionalString enableXWayland "-DXWAYLAND"}
-      XLIBS=${lib.optionalString enableXWayland "xcb\\ xcb-icccm"}
-    )
-  '';
-
-  meta = {
-    homepage = "https://github.com/djpohly/dwl/";
-    description = "Dynamic window manager for Wayland";
-    longDescription = ''
-      dwl is a compact, hackable compositor for Wayland based on wlroots. It is
-      intended to fill the same space in the Wayland world that dwm does in X11,
-      primarily in terms of philosophy, and secondarily in terms of
-      functionality. Like dwm, dwl is:
-
-      - Easy to understand, hack on, and extend with patches
-      - One C source file (or a very small number) configurable via config.h
-      - Limited to 2000 SLOC to promote hackability
-      - Tied to as few external dependencies as possible
-    '';
-    changelog = "https://github.com/djpohly/dwl/releases/tag/v${finalAttrs.version}";
-    license = lib.licenses.gpl3Only;
-    maintainers = [ lib.maintainers.AndersonTorres ];
-    inherit (wayland.meta) platforms;
-    mainProgram = "dwl";
-  };
-})
-# TODO: custom patches from upstream website
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/dwm/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/dwm/default.nix
index 10fef61b49..74d5022219 100644
--- a/third_party/nixpkgs/pkgs/applications/window-managers/dwm/default.nix
+++ b/third_party/nixpkgs/pkgs/applications/window-managers/dwm/default.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
       tags.
     '';
     license = licenses.mit;
-    maintainers = with maintainers; [ viric neonfuz ];
+    maintainers = with maintainers; [ neonfuz ];
     platforms = platforms.all;
     mainProgram = "dwm";
   };
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/dwm/dwm-status.nix b/third_party/nixpkgs/pkgs/applications/window-managers/dwm/dwm-status.nix
index 1d5f84abe2..cb303ff268 100644
--- a/third_party/nixpkgs/pkgs/applications/window-managers/dwm/dwm-status.nix
+++ b/third_party/nixpkgs/pkgs/applications/window-managers/dwm/dwm-status.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
   nativeBuildInputs = [ makeWrapper pkg-config ];
   buildInputs = [ dbus gdk-pixbuf libnotify xorg.libX11 ];
 
-  cargoSha256 = "sha256-eRfXUnyzOfVSEiwjLCaNbETUPXVU2Ed2VUNM9FjS5YE=";
+  cargoHash = "sha256-eRfXUnyzOfVSEiwjLCaNbETUPXVU2Ed2VUNM9FjS5YE=";
 
   postInstall = lib.optionalString (bins != [])  ''
     wrapProgram $out/bin/dwm-status --prefix "PATH" : "${lib.makeBinPath bins}"
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/i3/auto-layout.nix b/third_party/nixpkgs/pkgs/applications/window-managers/i3/auto-layout.nix
index bfcb35a870..ef6c27de43 100644
--- a/third_party/nixpkgs/pkgs/applications/window-managers/i3/auto-layout.nix
+++ b/third_party/nixpkgs/pkgs/applications/window-managers/i3/auto-layout.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-gpVYVyh+2y4Tttvw1SuCf7mx/nxR330Ob2R4UmHZSJs=";
   };
 
-  cargoSha256 = "sha256-OxQ7S+Sqc3aRH53Bs53Y+EKOYFgboGOBsQ7KJgICcGo=";
+  cargoHash = "sha256-OxQ7S+Sqc3aRH53Bs53Y+EKOYFgboGOBsQ7KJgICcGo=";
 
   # Currently no tests are implemented, so we avoid building the package twice
   doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/i3/i3-ratiosplit.nix b/third_party/nixpkgs/pkgs/applications/window-managers/i3/i3-ratiosplit.nix
index 0903ceb318..ad585ef088 100644
--- a/third_party/nixpkgs/pkgs/applications/window-managers/i3/i3-ratiosplit.nix
+++ b/third_party/nixpkgs/pkgs/applications/window-managers/i3/i3-ratiosplit.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0yfmr5zk2c2il9d31yjjbr48sqgcq6hp4a99hl5mjm2ajyhy5bz3";
   };
 
-  cargoSha256 = "134sgc9d0j57swknl9sgil6212rws2hhp92s3cg1yzz5ygx21c76";
+  cargoHash = "sha256-5rAg+vPlfx8eG1qkC6HQPIsgDI1PJ2on16dI0BJ7mow=";
 
   # Currently no tests are implemented, so we avoid building the package twice
   doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/i3/kitti3.nix b/third_party/nixpkgs/pkgs/applications/window-managers/i3/kitti3.nix
index 1c43064910..4a88518d50 100644
--- a/third_party/nixpkgs/pkgs/applications/window-managers/i3/kitti3.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/window-managers/i3/layout-manager.nix b/third_party/nixpkgs/pkgs/applications/window-managers/i3/layout-manager.nix
index b2a3adb98f..df5bb41d85 100644
--- a/third_party/nixpkgs/pkgs/applications/window-managers/i3/layout-manager.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/window-managers/i3/wsr.nix b/third_party/nixpkgs/pkgs/applications/window-managers/i3/wsr.nix
index e64194ac38..f282e38b6d 100644
--- a/third_party/nixpkgs/pkgs/applications/window-managers/i3/wsr.nix
+++ b/third_party/nixpkgs/pkgs/applications/window-managers/i3/wsr.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-Mq4TpQDiIYePUS3EwBfOe2+QmvF6+WEDK12WahbuhSU=";
   };
 
-  cargoSha256 = "sha256-hybvzHwHM0rQwgZfQpww/w9wQDW5h9P2KSjpAScVTBo=";
+  cargoHash = "sha256-hybvzHwHM0rQwgZfQpww/w9wQDW5h9P2KSjpAScVTBo=";
 
   nativeBuildInputs = [ python3 ];
   buildInputs = [ libxcb ];
diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/ion-3/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/ion-3/default.nix
index 6fb504144b..8b0d3beb1c 100644
--- a/third_party/nixpkgs/pkgs/applications/window-managers/ion-3/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/window-managers/tabbed/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/tabbed/default.nix
index 4bcc48eb4d..9108eec14c 100644
--- a/third_party/nixpkgs/pkgs/applications/window-managers/tabbed/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/window-managers/vwm/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/vwm/default.nix
index 7cba387369..0560bb214b 100644
--- a/third_party/nixpkgs/pkgs/applications/window-managers/vwm/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/window-managers/yabar/build.nix b/third_party/nixpkgs/pkgs/applications/window-managers/yabar/build.nix
index e68dcdcd0e..edeeaf5fbf 100644
--- a/third_party/nixpkgs/pkgs/applications/window-managers/yabar/build.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/build-support/add-opengl-runpath/default.nix b/third_party/nixpkgs/pkgs/build-support/add-opengl-runpath/default.nix
deleted file mode 100644
index 5cab0937e0..0000000000
--- a/third_party/nixpkgs/pkgs/build-support/add-opengl-runpath/default.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ lib, stdenv }:
-
-stdenv.mkDerivation {
-  name = "add-opengl-runpath";
-
-  driverLink = "/run/opengl-driver" + lib.optionalString stdenv.isi686 "-32";
-
-  buildCommand = ''
-    mkdir -p $out/nix-support
-    substituteAll ${./setup-hook.sh} $out/nix-support/setup-hook
-  '';
-}
diff --git a/third_party/nixpkgs/pkgs/build-support/add-opengl-runpath/setup-hook.sh b/third_party/nixpkgs/pkgs/build-support/add-opengl-runpath/setup-hook.sh
deleted file mode 100644
index e556e7ead2..0000000000
--- a/third_party/nixpkgs/pkgs/build-support/add-opengl-runpath/setup-hook.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-# Set RUNPATH so that driver libraries in /run/opengl-driver(-32)/lib can be found.
-# This is needed to not rely on LD_LIBRARY_PATH which does not work with setuid
-# executables. Fixes https://github.com/NixOS/nixpkgs/issues/22760. It must be run
-# in postFixup because RUNPATH stripping in fixup would undo it. Note that patchelf
-# actually sets RUNPATH not RPATH, which applies only to dependencies of the binary
-# it set on (including for dlopen), so the RUNPATH must indeed be set on these
-# libraries and would not work if set only on executables.
-addOpenGLRunpath() {
-    local forceRpath=
-
-    while [ $# -gt 0 ]; do
-        case "$1" in
-            --) shift; break;;
-            --force-rpath) shift; forceRpath=1;;
-            --*)
-                echo "addOpenGLRunpath: ERROR: Invalid command line" \
-                     "argument: $1" >&2
-                return 1;;
-            *) break;;
-        esac
-    done
-
-    for file in "$@"; do
-        if ! isELF "$file"; then continue; fi
-        local origRpath="$(patchelf --print-rpath "$file")"
-        patchelf --set-rpath "@driverLink@/lib:$origRpath" ${forceRpath:+--force-rpath} "$file"
-    done
-}
-
diff --git a/third_party/nixpkgs/pkgs/build-support/appimage/appimage-exec.sh b/third_party/nixpkgs/pkgs/build-support/appimage/appimage-exec.sh
index b91d13c4a2..975dfb4c3d 100755
--- a/third_party/nixpkgs/pkgs/build-support/appimage/appimage-exec.sh
+++ b/third_party/nixpkgs/pkgs/build-support/appimage/appimage-exec.sh
@@ -10,6 +10,7 @@ apprun_opt=true
 OWD=$(readlink -f .)
 # can be read by appimages: https://docs.appimage.org/packaging-guide/environment-variables.html
 export OWD
+export APPIMAGE
 
 # src : AppImage
 # dest : let's unpack() create the directory
diff --git a/third_party/nixpkgs/pkgs/build-support/bintools-wrapper/default.nix b/third_party/nixpkgs/pkgs/build-support/bintools-wrapper/default.nix
index b7561f1aab..215dd0f39c 100644
--- a/third_party/nixpkgs/pkgs/build-support/bintools-wrapper/default.nix
+++ b/third_party/nixpkgs/pkgs/build-support/bintools-wrapper/default.nix
@@ -60,9 +60,6 @@
       (!(targetPlatform.isAarch && targetPlatform.isStatic))
     ])
   ]) "pie"
-
-# Darwin code signing support utilities
-, postLinkSignHook ? null, signingUtils ? null
 }:
 
 assert propagateDoc -> bintools ? man;
@@ -357,7 +354,7 @@ stdenvNoCC.mkDerivation {
     ##
 
     # TODO(@sternenseemann): make a generic strip wrapper?
-    + optionalString (bintools.isGNU or false) ''
+    + optionalString (bintools.isGNU or false || bintools.isCCTools or false) ''
       wrap ${targetPrefix}strip ${./gnu-binutils-strip-wrapper.sh} \
         "${bintools_bin}/bin/${targetPrefix}strip"
     ''
@@ -396,24 +393,6 @@ stdenvNoCC.mkDerivation {
       ''
     )
 
-    ##
-    ## Code signing on Apple Silicon
-    ##
-    + optionalString (targetPlatform.isDarwin && targetPlatform.isAarch64) ''
-      echo 'source ${postLinkSignHook}' >> $out/nix-support/post-link-hook
-
-      export signingUtils=${signingUtils}
-
-      wrap \
-        ${targetPrefix}install_name_tool \
-        ${./darwin-install_name_tool-wrapper.sh} \
-        "${bintools_bin}/bin/${targetPrefix}install_name_tool"
-
-      wrap \
-        ${targetPrefix}strip ${./darwin-strip-wrapper.sh} \
-        "${bintools_bin}/bin/${targetPrefix}strip"
-    ''
-
     ##
     ## Extra custom steps
     ##
diff --git a/third_party/nixpkgs/pkgs/build-support/bintools-wrapper/ld-wrapper.sh b/third_party/nixpkgs/pkgs/build-support/bintools-wrapper/ld-wrapper.sh
index dcbe8a4c24..3bd9c68f23 100644
--- a/third_party/nixpkgs/pkgs/build-support/bintools-wrapper/ld-wrapper.sh
+++ b/third_party/nixpkgs/pkgs/build-support/bintools-wrapper/ld-wrapper.sh
@@ -257,10 +257,13 @@ PATH="$path_backup"
 # Old bash workaround, see above.
 
 if (( "${NIX_LD_USE_RESPONSE_FILE:-@use_response_file_by_default@}" >= 1 )); then
-    @prog@ @<(printf "%q\n" \
-        ${extraBefore+"${extraBefore[@]}"} \
-        ${params+"${params[@]}"} \
-        ${extraAfter+"${extraAfter[@]}"})
+    responseFile=$(mktemp "${TMPDIR:-/tmp}/ld-params.XXXXXX")
+    trap 'rm -f -- "$responseFile"' EXIT
+    printf "%q\n" \
+       ${extraBefore+"${extraBefore[@]}"} \
+       ${params+"${params[@]}"} \
+       ${extraAfter+"${extraAfter[@]}"} > "$responseFile"
+    @prog@ "@$responseFile"
 else
     @prog@ \
         ${extraBefore+"${extraBefore[@]}"} \
diff --git a/third_party/nixpkgs/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix b/third_party/nixpkgs/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix
index ffd19cfd4a..c00aff0b22 100644
--- a/third_party/nixpkgs/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/build-support/build-fhsenv-chroot/chrootenv/default.nix b/third_party/nixpkgs/pkgs/build-support/build-fhsenv-chroot/chrootenv/default.nix
index 9d405c8a49..856d8e9ccd 100644
--- a/third_party/nixpkgs/pkgs/build-support/build-fhsenv-chroot/chrootenv/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/build-support/dev-shell-tools/default.nix b/third_party/nixpkgs/pkgs/build-support/dev-shell-tools/default.nix
index cd5fa5f593..487be83472 100644
--- a/third_party/nixpkgs/pkgs/build-support/dev-shell-tools/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/build-support/dev-shell-tools/tests/default.nix b/third_party/nixpkgs/pkgs/build-support/dev-shell-tools/tests/default.nix
index bfedc04409..06ef7e393e 100644
--- a/third_party/nixpkgs/pkgs/build-support/dev-shell-tools/tests/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/build-support/docker/default.nix b/third_party/nixpkgs/pkgs/build-support/docker/default.nix
index 3c580fafe9..8e73717280 100644
--- a/third_party/nixpkgs/pkgs/build-support/docker/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/build-support/docker/stream_layered_image.py b/third_party/nixpkgs/pkgs/build-support/docker/stream_layered_image.py
index 98ec2358ce..d3778625cc 100644
--- a/third_party/nixpkgs/pkgs/build-support/docker/stream_layered_image.py
+++ b/third_party/nixpkgs/pkgs/build-support/docker/stream_layered_image.py
@@ -32,7 +32,7 @@ function does all this.
 [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/third_party/nixpkgs/pkgs/build-support/kernel/make-initrd-ng.nix b/third_party/nixpkgs/pkgs/build-support/kernel/make-initrd-ng.nix
index 65e143cb73..c70e9cc6dc 100644
--- a/third_party/nixpkgs/pkgs/build-support/kernel/make-initrd-ng.nix
+++ b/third_party/nixpkgs/pkgs/build-support/kernel/make-initrd-ng.nix
@@ -72,7 +72,7 @@ in
   ${if makeUInitrd then "uInitrdCompression" else null} = uInitrdCompression;
 
   passAsFile = ["contents"];
-  contents = lib.concatMapStringsSep "\n" ({ object, symlink, ... }: "${object}\n${lib.optionalString (symlink != null) symlink}") contents + "\n";
+  contents = builtins.toJSON contents;
 
   nativeBuildInputs = [makeInitrdNGTool libarchive] ++ lib.optional makeUInitrd ubootTools ++ lib.optional strip binutils;
 
diff --git a/third_party/nixpkgs/pkgs/build-support/kernel/make-initrd-ng/Cargo.lock b/third_party/nixpkgs/pkgs/build-support/kernel/make-initrd-ng/Cargo.lock
index 61f71f6427..ce5f5ef009 100644
--- a/third_party/nixpkgs/pkgs/build-support/kernel/make-initrd-ng/Cargo.lock
+++ b/third_party/nixpkgs/pkgs/build-support/kernel/make-initrd-ng/Cargo.lock
@@ -30,10 +30,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683"
 
 [[package]]
-name = "log"
-version = "0.4.20"
+name = "itoa"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
+checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
+
+[[package]]
+name = "log"
+version = "0.4.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
 
 [[package]]
 name = "make-initrd-ng"
@@ -41,6 +47,8 @@ version = "0.1.0"
 dependencies = [
  "eyre",
  "goblin",
+ "serde",
+ "serde_json",
 ]
 
 [[package]]
@@ -57,22 +65,28 @@ checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
 
 [[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",
 ]
 
+[[package]]
+name = "ryu"
+version = "1.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
+
 [[package]]
 name = "scroll"
 version = "0.11.0"
@@ -94,10 +108,41 @@ dependencies = [
 ]
 
 [[package]]
-name = "syn"
-version = "2.0.48"
+name = "serde"
+version = "1.0.203"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.203"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.118"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d947f6b3163d8857ea16c4fa0dd4840d52f3041039a85decd46867eb1abef2e4"
+dependencies = [
+ "itoa",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.68"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/third_party/nixpkgs/pkgs/build-support/kernel/make-initrd-ng/Cargo.toml b/third_party/nixpkgs/pkgs/build-support/kernel/make-initrd-ng/Cargo.toml
index 028833c12b..69081b94d8 100644
--- a/third_party/nixpkgs/pkgs/build-support/kernel/make-initrd-ng/Cargo.toml
+++ b/third_party/nixpkgs/pkgs/build-support/kernel/make-initrd-ng/Cargo.toml
@@ -9,3 +9,5 @@ edition = "2018"
 [dependencies]
 eyre = "0.6.8"
 goblin = "0.5.0"
+serde = { version = "1.0", features = ["derive"] }
+serde_json = "1.0"
diff --git a/third_party/nixpkgs/pkgs/build-support/kernel/make-initrd-ng/src/main.rs b/third_party/nixpkgs/pkgs/build-support/kernel/make-initrd-ng/src/main.rs
index daa688976c..29f10552bd 100644
--- a/third_party/nixpkgs/pkgs/build-support/kernel/make-initrd-ng/src/main.rs
+++ b/third_party/nixpkgs/pkgs/build-support/kernel/make-initrd-ng/src/main.rs
@@ -1,9 +1,8 @@
-use std::collections::{HashSet, VecDeque};
+use std::collections::{BTreeSet, HashSet, VecDeque};
 use std::env;
 use std::ffi::{OsStr, OsString};
 use std::fs;
 use std::hash::Hash;
-use std::io::{BufRead, BufReader};
 use std::iter::FromIterator;
 use std::os::unix;
 use std::path::{Component, Path, PathBuf};
@@ -11,6 +10,44 @@ use std::process::Command;
 
 use eyre::Context;
 use goblin::{elf::Elf, Object};
+use serde::Deserialize;
+
+#[derive(PartialEq, Eq, PartialOrd, Ord, Clone, Copy, Debug, Deserialize, Hash)]
+#[serde(rename_all = "lowercase")]
+enum DLOpenPriority {
+    Required,
+    Recommended,
+    Suggested,
+}
+
+#[derive(PartialEq, Eq, Debug, Deserialize, Clone, Hash)]
+#[serde(rename_all = "camelCase")]
+struct DLOpenConfig {
+    use_priority: DLOpenPriority,
+    features: BTreeSet<String>,
+}
+
+#[derive(Deserialize, Debug)]
+struct DLOpenNote {
+    soname: Vec<String>,
+    feature: Option<String>,
+    // description is in the spec, but we don't need it here.
+    // description: Option<String>,
+    priority: Option<DLOpenPriority>,
+}
+
+#[derive(Deserialize, Debug, PartialEq, Eq, Hash, Clone)]
+struct StoreInput {
+    source: String,
+    target: Option<String>,
+    dlopen: Option<DLOpenConfig>,
+}
+
+#[derive(PartialEq, Eq, Hash, Clone)]
+struct StorePath {
+    path: Box<Path>,
+    dlopen: Option<DLOpenConfig>,
+}
 
 struct NonRepeatingQueue<T> {
     queue: VecDeque<T>,
@@ -42,13 +79,47 @@ impl<T: Clone + Eq + Hash> NonRepeatingQueue<T> {
     }
 }
 
-fn add_dependencies<P: AsRef<Path> + AsRef<OsStr>>(
+fn add_dependencies<P: AsRef<Path> + AsRef<OsStr> + std::fmt::Debug>(
     source: P,
     elf: Elf,
-    queue: &mut NonRepeatingQueue<Box<Path>>,
-) {
+    contents: &[u8],
+    dlopen: &Option<DLOpenConfig>,
+    queue: &mut NonRepeatingQueue<StorePath>,
+) -> eyre::Result<()> {
     if let Some(interp) = elf.interpreter {
-        queue.push_back(Box::from(Path::new(interp)));
+        queue.push_back(StorePath {
+            path: Box::from(Path::new(interp)),
+            dlopen: dlopen.clone(),
+        });
+    }
+
+    let mut dlopen_libraries = vec![];
+    if let Some(dlopen) = dlopen {
+        for n in elf
+            .iter_note_sections(&contents, Some(".note.dlopen"))
+            .into_iter()
+            .flatten()
+        {
+            let note = n.wrap_err_with(|| format!("bad note in {:?}", source))?;
+            // Payload is padded and zero terminated
+            let payload = &note.desc[..note
+                .desc
+                .iter()
+                .position(|x| *x == 0)
+                .unwrap_or(note.desc.len())];
+            let parsed = serde_json::from_slice::<Vec<DLOpenNote>>(payload)?;
+            for mut parsed_note in parsed {
+                if dlopen.use_priority
+                    >= parsed_note.priority.unwrap_or(DLOpenPriority::Recommended)
+                    || parsed_note
+                        .feature
+                        .map(|f| dlopen.features.contains(&f))
+                        .unwrap_or(false)
+                {
+                    dlopen_libraries.append(&mut parsed_note.soname);
+                }
+            }
+        }
     }
 
     let rpaths = if elf.runpaths.len() > 0 {
@@ -65,13 +136,21 @@ fn add_dependencies<P: AsRef<Path> + AsRef<OsStr>>(
         .map(|p| Box::<Path>::from(Path::new(p)))
         .collect::<Vec<_>>();
 
-    for line in elf.libraries {
+    for line in elf
+        .libraries
+        .into_iter()
+        .map(|s| s.to_string())
+        .chain(dlopen_libraries)
+    {
         let mut found = false;
         for path in &rpaths_as_path {
-            let lib = path.join(line);
+            let lib = path.join(&line);
             if lib.exists() {
                 // No need to recurse. The queue will bring it back round.
-                queue.push_back(Box::from(lib.as_path()));
+                queue.push_back(StorePath {
+                    path: Box::from(lib.as_path()),
+                    dlopen: dlopen.clone(),
+                });
                 found = true;
                 break;
             }
@@ -86,6 +165,8 @@ fn add_dependencies<P: AsRef<Path> + AsRef<OsStr>>(
             );
         }
     }
+
+    Ok(())
 }
 
 fn copy_file<
@@ -94,7 +175,8 @@ fn copy_file<
 >(
     source: P,
     target: S,
-    queue: &mut NonRepeatingQueue<Box<Path>>,
+    dlopen: &Option<DLOpenConfig>,
+    queue: &mut NonRepeatingQueue<StorePath>,
 ) -> eyre::Result<()> {
     fs::copy(&source, &target)
         .wrap_err_with(|| format!("failed to copy {:?} to {:?}", source, target))?;
@@ -103,7 +185,7 @@ fn copy_file<
         fs::read(&source).wrap_err_with(|| format!("failed to read from {:?}", source))?;
 
     if let Ok(Object::Elf(e)) = Object::parse(&contents) {
-        add_dependencies(source, e, queue);
+        add_dependencies(source, e, &contents, &dlopen, queue)?;
 
         // Make file writable to strip it
         let mut permissions = fs::metadata(&target)
@@ -132,14 +214,18 @@ fn copy_file<
 
 fn queue_dir<P: AsRef<Path> + std::fmt::Debug>(
     source: P,
-    queue: &mut NonRepeatingQueue<Box<Path>>,
+    dlopen: &Option<DLOpenConfig>,
+    queue: &mut NonRepeatingQueue<StorePath>,
 ) -> eyre::Result<()> {
     for entry in
         fs::read_dir(&source).wrap_err_with(|| format!("failed to read dir {:?}", source))?
     {
         let entry = entry?;
         // No need to recurse. The queue will bring us back round here on its own.
-        queue.push_back(Box::from(entry.path().as_path()));
+        queue.push_back(StorePath {
+            path: Box::from(entry.path().as_path()),
+            dlopen: dlopen.clone(),
+        });
     }
 
     Ok(())
@@ -147,12 +233,12 @@ fn queue_dir<P: AsRef<Path> + std::fmt::Debug>(
 
 fn handle_path(
     root: &Path,
-    p: &Path,
-    queue: &mut NonRepeatingQueue<Box<Path>>,
+    p: StorePath,
+    queue: &mut NonRepeatingQueue<StorePath>,
 ) -> eyre::Result<()> {
     let mut source = PathBuf::new();
     let mut target = Path::new(root).to_path_buf();
-    let mut iter = p.components().peekable();
+    let mut iter = p.path.components().peekable();
     while let Some(comp) = iter.next() {
         match comp {
             Component::Prefix(_) => panic!("This tool is not meant for Windows"),
@@ -176,7 +262,7 @@ fn handle_path(
                     .wrap_err_with(|| format!("failed to get symlink metadata for {:?}", source))?
                     .file_type();
                 if typ.is_file() && !target.exists() {
-                    copy_file(&source, &target, queue)?;
+                    copy_file(&source, &target, &p.dlopen, queue)?;
 
                     if let Some(filename) = source.file_name() {
                         source.set_file_name(OsString::from_iter([
@@ -187,7 +273,10 @@ fn handle_path(
 
                         let wrapped_path = source.as_path();
                         if wrapped_path.exists() {
-                            queue.push_back(Box::from(wrapped_path));
+                            queue.push_back(StorePath {
+                                path: Box::from(wrapped_path),
+                                dlopen: p.dlopen.clone(),
+                            });
                         }
                     }
                 } else if typ.is_symlink() {
@@ -207,7 +296,10 @@ fn handle_path(
                     }
                     let link_target_path = source.as_path();
                     if link_target_path.exists() {
-                        queue.push_back(Box::from(link_target_path));
+                        queue.push_back(StorePath {
+                            path: Box::from(link_target_path),
+                            dlopen: p.dlopen.clone(),
+                        });
                     }
                     break;
                 } else if typ.is_dir() {
@@ -218,7 +310,7 @@ fn handle_path(
 
                     // Only recursively copy if the directory is the target object
                     if iter.peek().is_none() {
-                        queue_dir(&source, queue)
+                        queue_dir(&source, &p.dlopen, queue)
                             .wrap_err_with(|| format!("failed to queue dir {:?}", source))?;
                     }
                 }
@@ -231,26 +323,26 @@ fn handle_path(
 
 fn main() -> eyre::Result<()> {
     let args: Vec<String> = env::args().collect();
-    let input =
-        fs::File::open(&args[1]).wrap_err_with(|| format!("failed to open file {:?}", &args[1]))?;
+    let contents =
+        fs::read(&args[1]).wrap_err_with(|| format!("failed to open file {:?}", &args[1]))?;
+    let input = serde_json::from_slice::<Vec<StoreInput>>(&contents)
+        .wrap_err_with(|| format!("failed to parse JSON in {:?}", &args[1]))?;
     let output = &args[2];
     let out_path = Path::new(output);
 
-    let mut queue = NonRepeatingQueue::<Box<Path>>::new();
+    let mut queue = NonRepeatingQueue::<StorePath>::new();
 
-    let mut lines = BufReader::new(input).lines();
-    while let Some(obj) = lines.next() {
-        // Lines should always come in pairs
-        let obj = obj?;
-        let sym = lines.next().unwrap()?;
-
-        let obj_path = Path::new(&obj);
-        queue.push_back(Box::from(obj_path));
-        if !sym.is_empty() {
-            println!("{} -> {}", &sym, &obj);
+    for sp in input {
+        let obj_path = Path::new(&sp.source);
+        queue.push_back(StorePath {
+            path: Box::from(obj_path),
+            dlopen: sp.dlopen,
+        });
+        if let Some(target) = sp.target {
+            println!("{} -> {}", &target, &sp.source);
             // We don't care about preserving symlink structure here
             // nearly as much as for the actual objects.
-            let link_string = format!("{}/{}", output, sym);
+            let link_string = format!("{}/{}", output, target);
             let link_path = Path::new(&link_string);
             let mut link_parent = link_path.to_path_buf();
             link_parent.pop();
@@ -261,7 +353,7 @@ fn main() -> eyre::Result<()> {
         }
     }
     while let Some(obj) = queue.pop_front() {
-        handle_path(out_path, &*obj, &mut queue)?;
+        handle_path(out_path, obj, &mut queue)?;
     }
 
     Ok(())
diff --git a/third_party/nixpkgs/pkgs/build-support/libredirect/default.nix b/third_party/nixpkgs/pkgs/build-support/libredirect/default.nix
index c4399189b7..9998241673 100644
--- a/third_party/nixpkgs/pkgs/build-support/libredirect/default.nix
+++ b/third_party/nixpkgs/pkgs/build-support/libredirect/default.nix
@@ -1,12 +1,5 @@
-{ lib, stdenv, bintools-unwrapped, llvmPackages, llvmPackages_13, coreutils }:
+{ lib, stdenv, bintools-unwrapped, llvmPackages, coreutils }:
 
-let
-  # aarch64-darwin needs a clang that can build arm64e binaries, so make sure a version of LLVM
-  # is used that can do that, but prefer the stdenv one if it is new enough.
-  llvmPkgs = if (lib.versionAtLeast (lib.getVersion llvmPackages.clang) "13")
-    then llvmPackages
-    else llvmPackages_13;
-  in
 if stdenv.hostPlatform.isStatic
 then throw ''
   libredirect is not available on static builds.
@@ -46,11 +39,11 @@ else stdenv.mkDerivation rec {
     # and the library search directory for libdl.
     # We can't build this on x86_64, because the libSystem we point to doesn't
     # like arm64(e).
-    PATH=${bintools-unwrapped}/bin:${llvmPkgs.clang-unwrapped}/bin:$PATH \
+    PATH=${bintools-unwrapped}/bin:${llvmPackages.clang-unwrapped}/bin:$PATH \
       clang -arch x86_64 -arch arm64 -arch arm64e \
-      -isystem ${llvmPkgs.clang.libc}/include \
-      -isystem ${llvmPkgs.libclang.lib}/lib/clang/*/include \
-      -L${llvmPkgs.clang.libc}/lib \
+      -isystem ${llvmPackages.clang.libc}/include \
+      -isystem ${llvmPackages.libclang.lib}/lib/clang/*/include \
+      -L${llvmPackages.clang.libc}/lib \
       -Wl,-install_name,$libName \
       -Wall -std=c99 -O3 -fPIC libredirect.c \
       -shared -o "$libName"
diff --git a/third_party/nixpkgs/pkgs/build-support/node/build-npm-package/default.nix b/third_party/nixpkgs/pkgs/build-support/node/build-npm-package/default.nix
index 1c7bf63e8c..4bcbf3f14f 100644
--- a/third_party/nixpkgs/pkgs/build-support/node/build-npm-package/default.nix
+++ b/third_party/nixpkgs/pkgs/build-support/node/build-npm-package/default.nix
@@ -3,7 +3,7 @@
 , fetchNpmDeps
 , buildPackages
 , nodejs
-, darwin
+, cctools
 } @ topLevelArgs:
 
 { name ? "${args.pname}-${args.version}"
@@ -76,7 +76,7 @@ stdenv.mkDerivation (args // {
       (if npmInstallHook != null then npmInstallHook else npmHooks.npmInstallHook)
       nodejs.python
     ]
-    ++ lib.optionals stdenv.isDarwin [ darwin.cctools ];
+    ++ lib.optionals stdenv.isDarwin [ cctools ];
   buildInputs = buildInputs ++ [ nodejs ];
 
   strictDeps = true;
diff --git a/third_party/nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix b/third_party/nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
index 36e0408cc1..a1727c91ba 100644
--- a/third_party/nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
+++ b/third_party/nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
@@ -61,7 +61,7 @@
 
 assert cargoVendorDir == null && cargoLock == null
     -> !(args ? cargoSha256 && args.cargoSha256 != null) && !(args ? cargoHash && args.cargoHash != null)
-    -> throw "cargoSha256, cargoHash, cargoVendorDir, or cargoLock must be set";
+    -> throw "cargoHash, cargoVendorDir, or cargoLock must be set";
 
 let
 
@@ -75,7 +75,7 @@ let
     } // lib.optionalAttrs (args ? cargoHash) {
       hash = args.cargoHash;
     } // lib.optionalAttrs (args ? cargoSha256) {
-      sha256 = args.cargoSha256;
+      sha256 = lib.warn "cargoSha256 is deprecated. Please use cargoHash with SRI hash instead" args.cargoSha256;
     } // depsExtraArgs);
 
   target = stdenv.hostPlatform.rust.rustcTargetSpec;
diff --git a/third_party/nixpkgs/pkgs/build-support/rust/build-rust-package/sysroot/default.nix b/third_party/nixpkgs/pkgs/build-support/rust/build-rust-package/sysroot/default.nix
index bb95b7bdc3..240866b56e 100644
--- a/third_party/nixpkgs/pkgs/build-support/rust/build-rust-package/sysroot/default.nix
+++ b/third_party/nixpkgs/pkgs/build-support/rust/build-rust-package/sysroot/default.nix
@@ -14,7 +14,7 @@ in rustPlatform.buildRustPackage {
 
   RUSTC_BOOTSTRAP = 1;
   __internal_dontAddSysroot = true;
-  cargoSha256 = "sha256-zgkwevitxsu1C4OgGTsqNSc0gDxaNXYK1WPbfER48d0=";
+  cargoHash = "sha256-zgkwevitxsu1C4OgGTsqNSc0gDxaNXYK1WPbfER48d0=";
 
   doCheck = false;
 
diff --git a/third_party/nixpkgs/pkgs/build-support/setup-hooks/auto-patchelf.py b/third_party/nixpkgs/pkgs/build-support/setup-hooks/auto-patchelf.py
index 4769179167..a6744b9211 100644
--- a/third_party/nixpkgs/pkgs/build-support/setup-hooks/auto-patchelf.py
+++ b/third_party/nixpkgs/pkgs/build-support/setup-hooks/auto-patchelf.py
@@ -5,16 +5,18 @@ import os
 import pprint
 import subprocess
 import sys
+import json
 from fnmatch import fnmatch
 from collections import defaultdict
 from contextlib import contextmanager
 from dataclasses import dataclass
 from itertools import chain
 from pathlib import Path, PurePath
-from typing import DefaultDict, Iterator, List, Optional, Set, Tuple
+from typing import DefaultDict, Generator, Iterator, Optional
 
 from elftools.common.exceptions import ELFError  # type: ignore
 from elftools.elf.dynamic import DynamicSection  # type: ignore
+from elftools.elf.sections import NoteSection  # type: ignore
 from elftools.elf.elffile import ELFFile  # type: ignore
 from elftools.elf.enums import ENUM_E_TYPE, ENUM_EI_OSABI  # type: ignore
 
@@ -38,7 +40,7 @@ def is_dynamic_executable(elf: ELFFile) -> bool:
     return bool(elf.get_section_by_name(".interp"))
 
 
-def get_dependencies(elf: ELFFile) -> List[str]:
+def get_dependencies(elf: ELFFile) -> list[list[Path]]:
     dependencies = []
     # This convoluted code is here on purpose. For some reason, using
     # elf.get_section_by_name(".dynamic") does not always return an
@@ -46,13 +48,34 @@ def get_dependencies(elf: ELFFile) -> List[str]:
     for section in elf.iter_sections():
         if isinstance(section, DynamicSection):
             for tag in section.iter_tags('DT_NEEDED'):
-                dependencies.append(tag.needed)
+                dependencies.append([Path(tag.needed)])
             break # There is only one dynamic section
 
     return dependencies
 
 
-def get_rpath(elf: ELFFile) -> List[str]:
+def get_dlopen_dependencies(elf: ELFFile) -> list[list[Path]]:
+    """
+    Extracts dependencies from the `.note.dlopen` section.
+    This is a FreeDesktop standard to annotate binaries with libraries that it may `dlopen`.
+    See https://systemd.io/ELF_DLOPEN_METADATA/
+    """
+    dependencies = []
+    for section in elf.iter_sections():
+        if not isinstance(section, NoteSection) or section.name != ".note.dlopen":
+            continue
+        for note in section.iter_notes():
+            if note["n_type"] != 0x407C0C0A or note["n_name"] != "FDO":
+                continue
+            note_desc = note["n_desc"]
+            text = note_desc.decode("utf-8").rstrip("\0")
+            j = json.loads(text)
+            for d in j:
+                dependencies.append([Path(soname) for soname in d["soname"]])
+    return dependencies
+
+
+def get_rpath(elf: ELFFile) -> list[str]:
     # This convoluted code is here on purpose. For some reason, using
     # elf.get_section_by_name(".dynamic") does not always return an
     # instance of DynamicSection, but that is required to call iter_tags
@@ -119,11 +142,11 @@ def glob(path: Path, pattern: str, recursive: bool) -> Iterator[Path]:
         return [path] if path.match(pattern) else []
 
 
-cached_paths: Set[Path] = set()
-soname_cache: DefaultDict[Tuple[str, str], List[Tuple[Path, str]]] = defaultdict(list)
+cached_paths: set[Path] = set()
+soname_cache: DefaultDict[tuple[str, str], list[tuple[Path, str]]] = defaultdict(list)
 
 
-def populate_cache(initial: List[Path], recursive: bool =False) -> None:
+def populate_cache(initial: list[Path], recursive: bool =False) -> None:
     lib_dirs = list(initial)
 
     while lib_dirs:
@@ -174,7 +197,7 @@ class Dependency:
     found: bool = False     # Whether it was found somewhere
 
 
-def auto_patchelf_file(path: Path, runtime_deps: list[Path], append_rpaths: List[Path] = [], extra_args: List[str] = []) -> list[Dependency]:
+def auto_patchelf_file(path: Path, runtime_deps: list[Path], append_rpaths: list[Path] = [], extra_args: list[str] = []) -> list[Dependency]:
     try:
         with open_elf(path) as elf:
 
@@ -204,7 +227,7 @@ def auto_patchelf_file(path: Path, runtime_deps: list[Path], append_rpaths: List
 
             file_is_dynamic_executable = is_dynamic_executable(elf)
 
-            file_dependencies = map(Path, get_dependencies(elf))
+            file_dependencies = get_dependencies(elf) + get_dlopen_dependencies(elf)
 
     except ELFError:
         return []
@@ -223,24 +246,44 @@ def auto_patchelf_file(path: Path, runtime_deps: list[Path], append_rpaths: List
     # failing at the first one, because it's more useful when working
     # on a new package where you don't yet know the dependencies.
     for dep in file_dependencies:
-        if dep.is_absolute() and dep.is_file():
-            # This is an absolute path. If it exists, just use it.
-            # Otherwise, we probably want this to produce an error when
-            # checked (because just updating the rpath won't satisfy
-            # it).
-            continue
-        elif (libc_lib / dep).is_file():
-            # This library exists in libc, and will be correctly
-            # resolved by the linker.
-            continue
+        was_found = False
+        for candidate in dep:
 
-        if found_dependency := find_dependency(dep.name, file_arch, file_osabi):
-            rpath.append(found_dependency)
-            dependencies.append(Dependency(path, dep, True))
-            print(f"    {dep} -> found: {found_dependency}")
-        else:
-            dependencies.append(Dependency(path, dep, False))
-            print(f"    {dep} -> not found!")
+            # This loop determines which candidate for a given
+            # dependency can be found, and how. There may be multiple
+            # candidates for a dep because of '.note.dlopen'
+            # dependencies.
+            #
+            # 1. If a candidate is an absolute path, it is already a
+            #    valid dependency if that path exists, and nothing needs
+            #    to be done. It should be an error if that path does not exist.
+            # 2. If a candidate is found in our library dependencies, that
+            #    dependency should be added to rpath.
+            # 3. If a candidate is found in libc, it will be correctly
+            #    resolved by the dynamic linker automatically.
+            #
+            # These conditions are checked in this order, because #2
+            # and #3 may both be true. In that case, we still want to
+            # add the dependency to rpath, as the original binary
+            # presumably had it and this should be preserved.
+
+            if candidate.is_absolute() and candidate.is_file():
+                was_found = True
+                break
+            elif found_dependency := find_dependency(candidate.name, file_arch, file_osabi):
+                rpath.append(found_dependency)
+                dependencies.append(Dependency(path, candidate, found=True))
+                print(f"    {candidate} -> found: {found_dependency}")
+                was_found = True
+                break
+            elif (libc_lib / candidate).is_file():
+                was_found = True
+                break
+
+        if not was_found:
+            dep_name = dep[0] if len(dep) == 1 else f"any({', '.join(map(str, dep))})"
+            dependencies.append(Dependency(path, dep_name, found=False))
+            print(f"    {dep_name} -> not found!")
 
     rpath.extend(append_rpaths)
 
@@ -257,13 +300,13 @@ def auto_patchelf_file(path: Path, runtime_deps: list[Path], append_rpaths: List
 
 
 def auto_patchelf(
-        paths_to_patch: List[Path],
-        lib_dirs: List[Path],
-        runtime_deps: List[Path],
+        paths_to_patch: list[Path],
+        lib_dirs: list[Path],
+        runtime_deps: list[Path],
         recursive: bool = True,
-        ignore_missing: List[str] = [],
-        append_rpaths: List[Path] = [],
-        extra_args: List[str] = []) -> None:
+        ignore_missing: list[str] = [],
+        append_rpaths: list[Path] = [],
+        extra_args: list[str] = []) -> None:
 
     if not paths_to_patch:
         sys.exit("No paths to patch, stopping.")
diff --git a/third_party/nixpkgs/pkgs/build-support/setup-hooks/separate-debug-info.sh b/third_party/nixpkgs/pkgs/build-support/setup-hooks/separate-debug-info.sh
index 197e8a920b..ebc773a492 100644
--- a/third_party/nixpkgs/pkgs/build-support/setup-hooks/separate-debug-info.sh
+++ b/third_party/nixpkgs/pkgs/build-support/setup-hooks/separate-debug-info.sh
@@ -1,7 +1,7 @@
 export NIX_SET_BUILD_ID=1
 export NIX_LDFLAGS+=" --compress-debug-sections=zlib"
 export NIX_CFLAGS_COMPILE+=" -ggdb -Wa,--compress-debug-sections"
-export NIX_RUSTFLAGS+=" -g"
+export NIX_RUSTFLAGS+=" -g -C strip=none"
 
 fixupOutputHooks+=(_separateDebugInfo)
 
diff --git a/third_party/nixpkgs/pkgs/build-support/setup-hooks/set-source-date-epoch-to-latest.sh b/third_party/nixpkgs/pkgs/build-support/setup-hooks/set-source-date-epoch-to-latest.sh
index ae34ffec48..a9a0dc6890 100644
--- a/third_party/nixpkgs/pkgs/build-support/setup-hooks/set-source-date-epoch-to-latest.sh
+++ b/third_party/nixpkgs/pkgs/build-support/setup-hooks/set-source-date-epoch-to-latest.sh
@@ -1,5 +1,8 @@
 updateSourceDateEpoch() {
     local path="$1"
+    # Avoid passing option-looking directory to find. The example is diffoscope-269:
+    #   https://salsa.debian.org/reproducible-builds/diffoscope/-/issues/378
+    [[ $path == -* ]] && path="./$path"
 
     # Get the last modification time of all regular files, sort them,
     # and get the most recent. Maybe we should use
diff --git a/third_party/nixpkgs/pkgs/build-support/testers/default.nix b/third_party/nixpkgs/pkgs/build-support/testers/default.nix
index 20d2957134..d0d8811500 100644
--- a/third_party/nixpkgs/pkgs/build-support/testers/default.nix
+++ b/third_party/nixpkgs/pkgs/build-support/testers/default.nix
@@ -140,4 +140,6 @@
   hasPkgConfigModules = callPackage ./hasPkgConfigModules/tester.nix { };
 
   testMetaPkgConfig = callPackage ./testMetaPkgConfig/tester.nix { };
+
+  shellcheck = callPackage ./shellcheck/tester.nix { };
 }
diff --git a/third_party/nixpkgs/pkgs/build-support/testers/shellcheck/example.sh b/third_party/nixpkgs/pkgs/build-support/testers/shellcheck/example.sh
new file mode 100644
index 0000000000..7e89bf37d3
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/build-support/testers/shellcheck/example.sh
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+echo $@
diff --git a/third_party/nixpkgs/pkgs/build-support/testers/shellcheck/tester.nix b/third_party/nixpkgs/pkgs/build-support/testers/shellcheck/tester.nix
new file mode 100644
index 0000000000..66f048f230
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/build-support/testers/shellcheck/tester.nix
@@ -0,0 +1,28 @@
+# Dependencies (callPackage)
+{ lib, stdenv, shellcheck }:
+
+# testers.shellcheck function
+# Docs: doc/build-helpers/testers.chapter.md
+# Tests: ./tests.nix
+{ src }:
+let
+  inherit (lib) fileset pathType isPath;
+in
+stdenv.mkDerivation {
+  name = "run-shellcheck";
+  src =
+    if isPath src && pathType src == "regular" # note that for strings this would have been IFD, which we prefer to avoid
+    then fileset.toSource { root = dirOf src; fileset = src; }
+    else src;
+  nativeBuildInputs = [ shellcheck ];
+  doCheck = true;
+  dontConfigure = true;
+  dontBuild = true;
+  checkPhase = ''
+    find . -type f -print0 \
+      | xargs -0 shellcheck
+  '';
+  installPhase = ''
+    touch $out
+  '';
+}
diff --git a/third_party/nixpkgs/pkgs/build-support/testers/shellcheck/tests.nix b/third_party/nixpkgs/pkgs/build-support/testers/shellcheck/tests.nix
new file mode 100644
index 0000000000..855aa14afe
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/build-support/testers/shellcheck/tests.nix
@@ -0,0 +1,38 @@
+# Run:
+#   nix-build -A tests.testers.shellcheck
+
+{ lib, testers, runCommand }:
+let
+  inherit (lib) fileset;
+in
+lib.recurseIntoAttrs {
+
+  example-dir = runCommand "test-testers-shellcheck-example-dir" {
+    failure = testers.testBuildFailure
+      (testers.shellcheck {
+        src = fileset.toSource {
+          root = ./.;
+          fileset = fileset.unions [
+            ./example.sh
+          ];
+        };
+      });
+  } ''
+    log="$failure/testBuildFailure.log"
+    echo "Checking $log"
+    grep SC2068 "$log"
+    touch $out
+  '';
+
+  example-file = runCommand "test-testers-shellcheck-example-file" {
+    failure = testers.testBuildFailure
+      (testers.shellcheck {
+        src = ./example.sh;
+      });
+  } ''
+    log="$failure/testBuildFailure.log"
+    echo "Checking $log"
+    grep SC2068 "$log"
+    touch $out
+  '';
+}
diff --git a/third_party/nixpkgs/pkgs/build-support/testers/test/default.nix b/third_party/nixpkgs/pkgs/build-support/testers/test/default.nix
index 8e8886342f..48855df916 100644
--- a/third_party/nixpkgs/pkgs/build-support/testers/test/default.nix
+++ b/third_party/nixpkgs/pkgs/build-support/testers/test/default.nix
@@ -16,6 +16,8 @@ lib.recurseIntoAttrs {
 
   hasPkgConfigModules = pkgs.callPackage ../hasPkgConfigModules/tests.nix { };
 
+  shellcheck = pkgs.callPackage ../shellcheck/tests.nix { };
+
   runNixOSTest-example = pkgs-with-overlay.testers.runNixOSTest ({ lib, ... }: {
     name = "runNixOSTest-test";
     nodes.machine = { pkgs, ... }: {
diff --git a/third_party/nixpkgs/pkgs/build-support/trivial-builders/default.nix b/third_party/nixpkgs/pkgs/build-support/trivial-builders/default.nix
index 2a887721d8..fc6f07fdd1 100644
--- a/third_party/nixpkgs/pkgs/build-support/trivial-builders/default.nix
+++ b/third_party/nixpkgs/pkgs/build-support/trivial-builders/default.nix
@@ -127,7 +127,13 @@ rec {
 
   # See doc/build-helpers/trivial-build-helpers.chapter.md
   # or https://nixos.org/manual/nixpkgs/unstable/#trivial-builder-text-writing
-  writeText = name: text: writeTextFile { inherit name text; };
+  writeText = name: text:
+    # TODO: To fully deprecate, replace the assertion with `lib.isString` and remove the warning
+    assert lib.assertMsg (lib.strings.isConvertibleWithToString text) ''
+      pkgs.writeText ${lib.strings.escapeNixString name}: The second argument should be a string, but it's a ${builtins.typeOf text} instead.'';
+    lib.warnIf (! lib.isString text) ''
+      pkgs.writeText ${lib.strings.escapeNixString name}: The second argument should be a string, but it's a ${builtins.typeOf text} instead, which is deprecated. Use `toString` to convert the value to a string first.''
+    writeTextFile { inherit name text; };
 
   # See doc/build-helpers/trivial-build-helpers.chapter.md
   # or https://nixos.org/manual/nixpkgs/unstable/#trivial-builder-text-writing
diff --git a/third_party/nixpkgs/pkgs/build-support/trivial-builders/test/concat-test.nix b/third_party/nixpkgs/pkgs/build-support/trivial-builders/test/concat-test.nix
index 7d023503c0..8f7e7a4200 100644
--- a/third_party/nixpkgs/pkgs/build-support/trivial-builders/test/concat-test.nix
+++ b/third_party/nixpkgs/pkgs/build-support/trivial-builders/test/concat-test.nix
@@ -2,7 +2,7 @@
 let
   stri = writeText "pathToTest";
   txt1 = stri "abc";
-  txt2 = stri hello;
+  txt2 = stri (builtins.toString hello);
   res = concatText "textToTest" [ txt1 txt2 ];
 in
 runCommand "test-concatPaths" { } ''
diff --git a/third_party/nixpkgs/pkgs/by-name/_4/_4d-minesweeper/package.nix b/third_party/nixpkgs/pkgs/by-name/_4/_4d-minesweeper/package.nix
index 7372545eb5..857b11229c 100644
--- a/third_party/nixpkgs/pkgs/by-name/_4/_4d-minesweeper/package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/ae/aerc/package.nix b/third_party/nixpkgs/pkgs/by-name/ae/aerc/package.nix
index a36b27afe6..d6697cf155 100644
--- a/third_party/nixpkgs/pkgs/by-name/ae/aerc/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/ae/aerc/package.nix
@@ -12,17 +12,17 @@
 
 buildGoModule rec {
   pname = "aerc";
-  version = "0.18.1";
+  version = "0.18.2";
 
   src = fetchFromSourcehut {
     owner = "~rjarry";
     repo = "aerc";
     rev = version;
-    hash = "sha256-yyVK87EIoW0Chz9xUOtoKHKIQUs2QDKtpsApvDuqSL4=";
+    hash = "sha256-J4W7ynJ5DpE97sILENNt6eya04aiq9DWBhlytsVmZHg=";
   };
 
   proxyVendor = true;
-  vendorHash = "sha256-kOBkwkFv86lbK/J0NGTgZadL26kvqmGLeWVYm+ie1HQ=";
+  vendorHash = "sha256-STQzc25gRozNHKjjYb8J8CL5WMhnx+nTJOGbuFmUYSU=";
 
   nativeBuildInputs = [
     scdoc
@@ -60,18 +60,18 @@ buildGoModule rec {
 
   postFixup = ''
     wrapProgram $out/bin/aerc \
-      --prefix PATH ":" "${lib.makeBinPath [ ncurses ]}"
+      --prefix PATH : ${lib.makeBinPath [ ncurses ]}
     wrapProgram $out/libexec/aerc/filters/html \
-      --prefix PATH ":"  ${lib.makeBinPath [ w3m dante ]}
+      --prefix PATH : ${lib.makeBinPath [ w3m dante ]}
     wrapProgram $out/libexec/aerc/filters/html-unsafe \
-      --prefix PATH ":" ${lib.makeBinPath [ w3m dante ]}
+      --prefix PATH : ${lib.makeBinPath [ w3m dante ]}
     patchShebangs $out/libexec/aerc/filters
   '';
 
   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/third_party/nixpkgs/pkgs/by-name/an/ananicy-cpp/package.nix b/third_party/nixpkgs/pkgs/by-name/an/ananicy-cpp/package.nix
index 1906773921..e34bebff8f 100644
--- a/third_party/nixpkgs/pkgs/by-name/an/ananicy-cpp/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/an/ananicy-cpp/package.nix
@@ -1,27 +1,29 @@
-{ lib
-, clangStdenv
-, fetchFromGitLab
-, fetchpatch
-, cmake
-, pkg-config
-, spdlog
-, nlohmann_json
-, systemd
-, libbpf
-, elfutils
-, bpftools
-, pcre2
-, zlib
+{
+  lib,
+  clangStdenv,
+  fetchFromGitLab,
+  fetchpatch,
+  cmake,
+  pkg-config,
+  spdlog,
+  nlohmann_json,
+  systemd,
+  libbpf,
+  elfutils,
+  bpftools,
+  pcre2,
+  zlib,
+  withBpf ? true,
 }:
 
-clangStdenv.mkDerivation rec {
+clangStdenv.mkDerivation (finalAttrs: {
   pname = "ananicy-cpp";
   version = "1.1.1";
 
   src = fetchFromGitLab {
     owner = "ananicy-cpp";
     repo = "ananicy-cpp";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     fetchSubmodules = true;
     hash = "sha256-oPinSc00+Z6SxjfTh7DttcXSjsLv1X0NI+O37C8M8GY=";
   };
@@ -41,6 +43,7 @@ clangStdenv.mkDerivation rec {
   nativeBuildInputs = [
     cmake
     pkg-config
+  ] ++ lib.optionals withBpf [
     bpftools
   ];
 
@@ -49,23 +52,29 @@ clangStdenv.mkDerivation rec {
     spdlog
     nlohmann_json
     systemd
+    zlib
+  ] ++ lib.optionals withBpf [
     libbpf
     elfutils
-    zlib
   ];
 
   # BPF A call to built-in function '__stack_chk_fail' is not supported.
-  hardeningDisable = [ "stackprotector" "zerocallusedregs" ];
+  hardeningDisable = [
+    "stackprotector"
+    "zerocallusedregs"
+  ];
 
   cmakeFlags = [
-    "-DUSE_EXTERNAL_JSON=ON"
-    "-DUSE_EXTERNAL_SPDLOG=ON"
-    "-DUSE_EXTERNAL_FMTLIB=ON"
-    "-DUSE_BPF_PROC_IMPL=ON"
-    "-DBPF_BUILD_LIBBPF=OFF"
-    "-DENABLE_SYSTEMD=ON"
-    "-DENABLE_REGEX_SUPPORT=ON"
-    "-DVERSION=${version}"
+    (lib.mapAttrsToList lib.cmakeBool {
+      "USE_EXTERNAL_JSON" = true;
+      "USE_EXTERNAL_SPDLOG" = true;
+      "USE_EXTERNAL_FMTLIB" = true;
+      "USE_BPF_PROC_IMPL" = withBpf;
+      "BPF_BUILD_LIBBPF" = false;
+      "ENABLE_SYSTEMD" = true;
+      "ENABLE_REGEX_SUPPORT" = true;
+    })
+    (lib.cmakeFeature "VERSION" finalAttrs.version)
   ];
 
   postInstall = ''
@@ -85,4 +94,4 @@ clangStdenv.mkDerivation rec {
     ];
     mainProgram = "ananicy-cpp";
   };
-}
+})
diff --git a/third_party/nixpkgs/pkgs/by-name/ar/arcan/package.nix b/third_party/nixpkgs/pkgs/by-name/ar/arcan/package.nix
index d3eeec5c58..d472b9f132 100644
--- a/third_party/nixpkgs/pkgs/by-name/ar/arcan/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/ar/arcan/package.nix
@@ -41,6 +41,7 @@
   valgrind,
   wayland,
   wayland-protocols,
+  wayland-scanner,
   xcbutil,
   xcbutilwm,
   xz,
@@ -63,6 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
     cmake
     makeWrapper
     pkg-config
+    wayland-scanner
   ] ++ lib.optionals buildManPages [ ruby ];
 
   buildInputs = [
diff --git a/third_party/nixpkgs/pkgs/by-name/ar/arduino-cli/package.nix b/third_party/nixpkgs/pkgs/by-name/ar/arduino-cli/package.nix
new file mode 100644
index 0000000000..9d887c5f20
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/by-name/ar/arduino-cli/package.nix
@@ -0,0 +1,113 @@
+{
+  lib,
+  stdenv,
+  buildGoModule,
+  fetchFromGitHub,
+  buildFHSEnv,
+  installShellFiles,
+  go-task,
+}:
+
+let
+
+  pkg = buildGoModule rec {
+    pname = "arduino-cli";
+    version = "1.0.3";
+
+    src = fetchFromGitHub {
+      owner = "arduino";
+      repo = pname;
+      rev = "v${version}";
+      hash = "sha256-/2GtWiks/d8sTJ6slX2nQtFpGkqm4PSfgDd0uVG+qN8=";
+    };
+
+    nativeBuildInputs = [ installShellFiles ];
+
+    nativeCheckInputs = [ go-task ];
+
+    subPackages = [ "." ];
+
+    vendorHash = "sha256-OkilZMDTueHfn6T5Af8e+CVersSPDMcAUUB2o1ny6nc=";
+
+    postPatch =
+      let
+        skipTests = [
+          # tries to "go install"
+          "TestDummyMonitor"
+          # try to Get "https://downloads.arduino.cc/libraries/library_index.tar.bz2"
+          "TestDownloadAndChecksums"
+          "TestParseArgs"
+          "TestParseReferenceCores"
+          "TestPlatformSearch"
+          "TestPlatformSearchSorting"
+        ];
+      in
+      ''
+        substituteInPlace Taskfile.yml \
+          --replace-fail "go test" "go test -p $NIX_BUILD_CORES -skip '(${lib.concatStringsSep "|" skipTests})'"
+      '';
+
+    doCheck = stdenv.isLinux;
+
+    checkPhase = ''
+      runHook preCheck
+      task go:test
+      runHook postCheck
+    '';
+
+    ldflags = [
+      "-s"
+      "-w"
+      "-X github.com/arduino/arduino-cli/version.versionString=${version}"
+      "-X github.com/arduino/arduino-cli/version.commit=unknown"
+    ] ++ lib.optionals stdenv.isLinux [ "-extldflags '-static'" ];
+
+    postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+      export HOME="$(mktemp -d)"
+      installShellCompletion --cmd arduino-cli \
+        --bash <($out/bin/arduino-cli completion bash) \
+        --zsh <($out/bin/arduino-cli completion zsh) \
+        --fish <($out/bin/arduino-cli completion fish)
+      unset HOME
+    '';
+
+    meta = with lib; {
+      inherit (src.meta) homepage;
+      description = "Arduino from the command line";
+      mainProgram = "arduino-cli";
+      changelog = "https://github.com/arduino/arduino-cli/releases/tag/${version}";
+      license = [
+        licenses.gpl3Only
+        licenses.asl20
+      ];
+      maintainers = with maintainers; [
+        ryantm
+        sfrijters
+      ];
+    };
+
+  };
+
+in
+if stdenv.isLinux then
+  # buildFHSEnv is needed because the arduino-cli downloads compiler
+  # toolchains from the internet that have their interpreters pointed at
+  # /lib64/ld-linux-x86-64.so.2
+  buildFHSEnv {
+    inherit (pkg) name meta;
+
+    runScript = "${pkg.outPath}/bin/arduino-cli";
+
+    extraInstallCommands =
+      ''
+        mv $out/bin/$name $out/bin/arduino-cli
+      ''
+      + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+        cp -r ${pkg.outPath}/share $out/share
+      '';
+    passthru.pureGoPkg = pkg;
+
+    targetPkgs = pkgs: with pkgs; [ zlib ];
+  }
+else
+  pkg
diff --git a/third_party/nixpkgs/pkgs/by-name/ar/argc/package.nix b/third_party/nixpkgs/pkgs/by-name/ar/argc/package.nix
index 8c286ebff9..4e98fd7900 100644
--- a/third_party/nixpkgs/pkgs/by-name/ar/argc/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/ar/argc/package.nix
@@ -4,6 +4,7 @@
   pkgsCross,
   rustPlatform,
   stdenv,
+  glibcLocales,
   fetchFromGitHub,
   installShellFiles,
 }:
@@ -13,16 +14,16 @@ let
 in
 rustPlatform.buildRustPackage rec {
   pname = "argc";
-  version = "1.14.0";
+  version = "1.19.0";
 
   src = fetchFromGitHub {
     owner = "sigoden";
     repo = "argc";
     rev = "v${version}";
-    hash = "sha256-Li/K5/SLG6JuoRJDz2DQoj1Oi9LQgZWHNvtZ1HVbj88=";
+    hash = "sha256-I5dx0/aHCGmzgAEBL9gZcG7DFWCkSpndGvv2enQIZGU=";
   };
 
-  cargoHash = "sha256-D1T9FWTvwKtAYoqFlR2OmLRLGWhPJ9D8J7lq/QKcBoM=";
+  cargoHash = "sha256-30BY6ceJj0UeZE30O/LovR+YXSd7jIxFo6ojKFuecFM=";
 
   nativeBuildInputs = [ installShellFiles ] ++ lib.optional (!canExecuteHost) buildPackages.argc;
 
@@ -37,6 +38,14 @@ rustPlatform.buildRustPackage rec {
 
   disallowedReferences = lib.optional (!canExecuteHost) buildPackages.argc;
 
+  env =
+    {
+      LANG = "C.UTF-8";
+    }
+    // lib.optionalAttrs (glibcLocales != null) {
+      LOCALE_ARCHIVE = "${glibcLocales}/lib/locale/locale-archive";
+    };
+
   passthru = {
     tests = {
       cross =
diff --git a/third_party/nixpkgs/pkgs/by-name/au/audiness/package.nix b/third_party/nixpkgs/pkgs/by-name/au/audiness/package.nix
index 8ad9d63973..d7cff9d14e 100644
--- a/third_party/nixpkgs/pkgs/by-name/au/audiness/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/au/audiness/package.nix
@@ -30,8 +30,7 @@ python3.pkgs.buildPythonApplication rec {
       pytenable
       typer
       validators
-    ]
-    ++ typer.optional-dependencies.all;
+    ];
 
   pythonImportsCheck = [ "audiness" ];
 
diff --git a/third_party/nixpkgs/pkgs/tools/admin/aws-vault/default.nix b/third_party/nixpkgs/pkgs/by-name/aw/aws-vault/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/admin/aws-vault/default.nix
rename to third_party/nixpkgs/pkgs/by-name/aw/aws-vault/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/ay/ayatana-indicator-datetime/package.nix b/third_party/nixpkgs/pkgs/by-name/ay/ayatana-indicator-datetime/package.nix
index 0f7ce4b43d..d55574c062 100644
--- a/third_party/nixpkgs/pkgs/by-name/ay/ayatana-indicator-datetime/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/ay/ayatana-indicator-datetime/package.nix
@@ -85,6 +85,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeCheckInputs = [
     dbus
+    dbus-test-runner
     (python3.withPackages (ps: with ps; [
       python-dbusmock
     ]))
diff --git a/third_party/nixpkgs/pkgs/by-name/az/azure-cli/extensions-generated.nix b/third_party/nixpkgs/pkgs/by-name/az/azure-cli/extensions-generated.nix
index db3452e1be..9519a5e706 100644
--- a/third_party/nixpkgs/pkgs/by-name/az/azure-cli/extensions-generated.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/ba/balls/lock.json b/third_party/nixpkgs/pkgs/by-name/ba/balls/lock.json
new file mode 100644
index 0000000000..5379ad56d2
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/ba/balls/package.nix b/third_party/nixpkgs/pkgs/by-name/ba/balls/package.nix
new file mode 100644
index 0000000000..04f6d701bb
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/ba/bankstown-lv2/package.nix b/third_party/nixpkgs/pkgs/by-name/ba/bankstown-lv2/package.nix
index 2ee7b4486e..7cbe4708ff 100644
--- a/third_party/nixpkgs/pkgs/by-name/ba/bankstown-lv2/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/ba/bankstown-lv2/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-IThXEY+mvT2MCw0PSWU/182xbUafd6dtm6hNjieLlKg=";
   };
 
-  cargoSha256 = "sha256-yRzM4tcYc6mweTpLnnlCeKgP00L2wRgHamtUzK9Kstc=";
+  cargoHash = "sha256-yRzM4tcYc6mweTpLnnlCeKgP00L2wRgHamtUzK9Kstc=";
 
   installPhase = ''
     export LIBDIR=$out/lib
diff --git a/third_party/nixpkgs/pkgs/by-name/ba/batmon/package.nix b/third_party/nixpkgs/pkgs/by-name/ba/batmon/package.nix
index e41587b1f5..5e5cf3f650 100644
--- a/third_party/nixpkgs/pkgs/by-name/ba/batmon/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/ba/batmon/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-+kjDNQKlaoI5fQ5FqYF6IPCKeE92WKxIhVCKafqfE0o=";
   };
 
-  cargoSha256 = "sha256-DJpWBset6SW7Ahg60+Tu1VpH34LcVOyrEs9suKyTE9g=";
+  cargoHash = "sha256-DJpWBset6SW7Ahg60+Tu1VpH34LcVOyrEs9suKyTE9g=";
 
   meta = with lib; {
     description = "Interactive batteries viewer";
diff --git a/third_party/nixpkgs/pkgs/servers/beanstalkd/default.nix b/third_party/nixpkgs/pkgs/by-name/be/beanstalkd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/beanstalkd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/be/beanstalkd/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/be/bee/package.nix b/third_party/nixpkgs/pkgs/by-name/be/bee/package.nix
index 6e85456b3a..ce4c9b1d02 100644
--- a/third_party/nixpkgs/pkgs/by-name/be/bee/package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/be/beeper-bridge-manager/package.nix b/third_party/nixpkgs/pkgs/by-name/be/beeper-bridge-manager/package.nix
new file mode 100644
index 0000000000..17030eb6cc
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/bi/bitwarden-cli/package.nix b/third_party/nixpkgs/pkgs/by-name/bi/bitwarden-cli/package.nix
index b1879dce47..8338dd2335 100644
--- a/third_party/nixpkgs/pkgs/by-name/bi/bitwarden-cli/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/bi/bitwarden-cli/package.nix
@@ -3,31 +3,31 @@
 , buildNpmPackage
 , nodejs_20
 , fetchFromGitHub
-, python311
-, darwin
+, python3
+, cctools
 , nixosTests
 , xcbuild
 }:
 
 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 [
-    darwin.cctools
+    cctools
     xcbuild.xcrun
   ];
 
diff --git a/third_party/nixpkgs/pkgs/by-name/bl/bluez/package.nix b/third_party/nixpkgs/pkgs/by-name/bl/bluez/package.nix
index 454d677d90..1a459bba18 100644
--- a/third_party/nixpkgs/pkgs/by-name/bl/bluez/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/bl/bluez/package.nix
@@ -5,6 +5,7 @@
 , docutils
 , ell
 , enableExperimental ? false
+, fetchpatch
 , fetchurl
 , glib
 , json_c
@@ -18,17 +19,23 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "bluez";
-  version = "5.75";
+  version = "5.76";
 
   src = fetchurl {
     url = "mirror://kernel/linux/bluetooth/bluez-${finalAttrs.version}.tar.xz";
-    hash = "sha256-mIyzxFUfbjpmdwilePXKn5P8iWUI+Y8IcJvk+KsDPC8=";
+    hash = "sha256-VeLGRZCa2C2DPELOhewgQ04O8AcJQbHqtz+s3SQLvWM=";
   };
 
-  patches =
+  patches = [
+    # hog-lib: Fix passing wrong parameters to bt_uhid_get_report_reply
+    (fetchpatch {
+      url = "https://github.com/bluez/bluez/commit/5ebaeab4164f80539904b9a520d9b7a8307e06e2.patch";
+      hash = "sha256-f1A8DmRPfm+zid4XMj1zsfcLZ0WTEax3YPbydKZF9RE=";
+    })
+  ]
     # Disable one failing test with musl libc, also seen by alpine
     # https://github.com/bluez/bluez/issues/726
-    lib.optional (stdenv.hostPlatform.isMusl && stdenv.hostPlatform.isx86_64)
+    ++ lib.optional (stdenv.hostPlatform.isMusl && stdenv.hostPlatform.isx86_64)
       (fetchurl {
         url = "https://git.alpinelinux.org/aports/plain/main/bluez/disable_aics_unit_testcases.patch?id=8e96f7faf01a45f0ad8449c1cd825db63a8dfd48";
         hash = "sha256-1PJkipqBO3qxxOqRFQKfpWlne1kzTCgtnTFYI1cFQt4=";
diff --git a/third_party/nixpkgs/pkgs/by-name/bo/boilr/package.nix b/third_party/nixpkgs/pkgs/by-name/bo/boilr/package.nix
index 381fcd1617..d7e95b5a8b 100644
--- a/third_party/nixpkgs/pkgs/by-name/bo/boilr/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/bo/boilr/package.nix
@@ -7,14 +7,14 @@
 , xorg
 , perl
 , openssl
-, speechd
+, speechd-minimal
 , libxkbcommon
 , libGL
 , wayland
 }:
 let
   rpathLibs = [
-    speechd
+    speechd-minimal
     openssl
     gtk3
     libxkbcommon
diff --git a/third_party/nixpkgs/pkgs/by-name/bp/bpftop/package.nix b/third_party/nixpkgs/pkgs/by-name/bp/bpftop/package.nix
index d30ceb62d7..4f912c09e6 100644
--- a/third_party/nixpkgs/pkgs/by-name/bp/bpftop/package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/bs/bsc/package.nix b/third_party/nixpkgs/pkgs/by-name/bs/bsc/package.nix
new file mode 100644
index 0000000000..48a1c8f994
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/bs/bsd-finger/package.nix b/third_party/nixpkgs/pkgs/by-name/bs/bsd-finger/package.nix
new file mode 100644
index 0000000000..1e55dc65d9
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/by-name/bs/bsd-finger/package.nix
@@ -0,0 +1,209 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  fetchpatch,
+  # Configurable options
+  buildProduct ? # can be "client" or "daemon"
+    if buildClient != null then
+      lib.warn ''
+        buildClient is deprecated;
+        use buildProduct instead
+      '' (if buildClient then "client" else "daemon")
+    else
+      "client",
+  # Deprecated options
+  # Remove them before next version of either Nixpkgs or bsd-finger itself
+  buildClient ? null,
+}:
+
+assert lib.elem buildProduct [
+  "client"
+  "daemon"
+];
+stdenv.mkDerivation (finalAttrs: {
+  pname = "bsd-finger" + lib.optionalString (buildProduct == "daemon") "d";
+  version = "0.17";
+
+  src = fetchurl {
+    url = "http://ftp.de.debian.org/debian/pool/main/b/bsd-finger/bsd-finger_${finalAttrs.version}.orig.tar.bz2";
+    hash = "sha256-KLNNYF0j6mh9eeD8SMA1q+gPiNnBVH56pGeW0QgcA2M=";
+  };
+
+  patches =
+    let
+      debianRevision = "17";
+      generateUrl =
+        patchName:
+        "https://sources.debian.org/data/main/b/bsd-finger/${finalAttrs.version}-${debianRevision}/debian/patches/${patchName}.patch";
+    in
+    [
+      # Patches original finger sources to make the programs more robust and
+      # compatible
+      (fetchpatch {
+        url = generateUrl "01-legacy";
+        hash = "sha256-84znJLXez4w6WB2nOW+PHK/0srE0iG9nGAjO1/AGczw=";
+      })
+
+      # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=518559
+      #
+      # Doesn't work with a non-iterable nsswitch source
+      #
+      # Currently, "finger tabbott" works by iterating through the list of users
+      # on the system using getpwent and checking if any of them match
+      # "tabbott".
+      #
+      # Some nsswitch backends (including Hesiod and LDAP[1]) do not support
+      # iterating through the complete list of users.  These nsswitch backends
+      # instead only fully support looking up a user's information by username
+      # or uid.
+      #
+      # So, if tabbott is a user whose nsswitch information comes from LDAP,
+      # then "finger tabbott" will incorrectly report "finger: tabbott: no such
+      # user."  "finger -m tabbott" does work correctly, however, because it
+      # looks up the matching username using getpwnam.
+      #
+      # A fix for this is to always look up an argument to finger for a username
+      # match, and having -m only control whether finger searches the entire
+      # user database for real name matches.  Patch attached.
+      #
+      # This patch has the advantageous side effect that if there are some real
+      # name matches and a username match, finger will always display the
+      # username match first (rather than in some random place in the list).
+      #
+      #     -Tim Abbott
+      #
+      # [1] with LDAP, it is typically the case that one can iterate through
+      # only the first 100 results from a query.
+      (fetchpatch {
+        url = generateUrl "02-518559-nsswitch-sources";
+        hash = "sha256-oBXJ/kr/czevWk0TcsutGINNwCoHnEStRT8Jfgp/lbM=";
+      })
+
+      # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=468454
+      # Implement IPv6 capacity for the server Fingerd.
+      (fetchpatch {
+        url = generateUrl "03-468454-fingerd-ipv6";
+        hash = "sha256-a5+qoy2UKa2nCJrwrfJ5VPZoACFXFQ1j/rweoMYW1Z0=";
+      })
+
+      # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=468454
+      # Implement IPv6 capability for the client Finger.
+      (fetchpatch {
+        url = generateUrl "04-468454-finger-ipv6";
+        hash = "sha256-cg93NL02lJm/5Freegb3EbjDAQVkurLEEJifcyQRRfk=";
+      })
+
+      # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=547014
+      # From: "Matthew A. Dunford" <mdunford@lbl.gov>
+      #
+      # finger segfaults when it comes across a netgroup entry in /etc/passwd.
+      # A netgroup entry doesn't include many of the fields in a normal passwd
+      # entry, so pw->pw_gecos is set to NULL, which causes finger to core dump.
+      #
+      # Here is part of a /etc/passwd file with a netgroup entry:
+      #
+      # nobody:x:65534:65534:nobody:/nonexistent:/bin/sh +@operator
+      #
+      # This patch sidesteps what finger considers a malformed passwd entry:
+      (fetchpatch {
+        url = generateUrl "05-547014-netgroup";
+        hash = "sha256-d+ufp7nPZwW+t+EWASzHrXT/O6zSzt6OOV12cKVo3P0=";
+      })
+
+      # Decrease timeout length during connect().
+      # In cases where a name server is answering with A as well as AAAA
+      # records, but the system to be queried has lost a corresponding address,
+      # the TCP handshake timeout will cause a long delay before allowing the
+      # query of the next address family, or the next address in general.
+      #  .
+      # The use of a trivial signal handler for SIGALRM allows the reduction of
+      # this timeout, thus producing better responsiveness for the interactive
+      # user of the Finger service.
+      # Author: Mats Erik Andersson <debian@gisladisker.se>
+      (fetchpatch {
+        url = generateUrl "06-572211-decrease-timeout";
+        hash = "sha256-KtNGU5mmX1nnxQc7XnYoUuVW4We2cF81+x6EQrHF7g0=";
+      })
+
+      # Use cmake as build system
+      (fetchpatch {
+        url = generateUrl "use-cmake-as-buildsystem";
+        hash = "sha256-YOmkF6Oxowy15mCE1pCvHKnLEXglijWFG6eydnZJFhM=";
+      })
+
+      # Debian-specific changes to the cmake build system (that NixOS will also
+      # benefit from)
+      # Adds -D_GNU_SOURCE, which will enable many C extensions that finger
+      # benefits from
+      (fetchpatch {
+        url = generateUrl "use-cmake-as-buildsystem-debian-extras";
+        hash = "sha256-T3DWpyyz15JCiVJ41RrJEhsmicei8G3OaKpxvzOCcBU=";
+      })
+
+      # Fix typo at fingerd man page (Josue Ortega <josue@debian.org>)
+      (fetchpatch {
+        url = generateUrl "fix-fingerd-man-typo";
+        hash = "sha256-f59osGi0a8Tkm2Vxg2+H2brH8WproCDvbPf4jXwi6ag=";
+      })
+    ];
+
+  env.NIX_CFLAGS_COMPILE = "-D_GNU_SOURCE";
+
+  preBuild =
+    let
+      subdir =
+        {
+          "client" = "finger";
+          "daemon" = "fingerd";
+        }
+        .${buildProduct};
+    in
+    ''
+      cd ${subdir}
+    '';
+
+  preInstall =
+    let
+      bindir =
+        {
+          "client" = "bin";
+          "daemon" = "sbin";
+        }
+        .${buildProduct};
+
+      mandir =
+        {
+          "client" = "man1";
+          "daemon" = "man8";
+        }
+        .${buildProduct};
+    in
+    ''
+      mkdir -p $out/${bindir} $out/man/${mandir}
+    '';
+
+  postInstall = lib.optionalString (buildProduct == "daemon") ''
+    pushd $out/sbin
+    ln -s in.fingerd fingerd
+    popd
+  '';
+
+  meta = {
+    description =
+      {
+        "client" = "User information lookup program";
+        "daemon" = "Remote user information server";
+      }
+      .${buildProduct};
+    license = lib.licenses.bsdOriginal;
+    mainProgram =
+      {
+        "client" = "finger";
+        "daemon" = "fingerd";
+      }
+      .${buildProduct};
+    maintainers = with lib.maintainers; [ AndersonTorres ];
+    platforms = lib.platforms.linux;
+  };
+})
diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix b/third_party/nixpkgs/pkgs/by-name/bu/buildkite-agent/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bu/buildkite-agent/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/ruby-modules/bundix/default.nix b/third_party/nixpkgs/pkgs/by-name/bu/bundix/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/ruby-modules/bundix/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bu/bundix/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/compilers/bupc/default.nix b/third_party/nixpkgs/pkgs/by-name/bu/bupc/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/compilers/bupc/default.nix
rename to third_party/nixpkgs/pkgs/by-name/bu/bupc/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/ca/cameractrls/package.nix b/third_party/nixpkgs/pkgs/by-name/ca/cameractrls/package.nix
new file mode 100644
index 0000000000..2b71539715
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/by-name/ca/cameractrls/package.nix
@@ -0,0 +1,133 @@
+{
+  lib,
+  python3Packages,
+  fetchFromGitHub,
+  glibc,
+  SDL2,
+  libjpeg_turbo,
+  alsa-lib,
+  libspnav,
+  desktop-file-utils,
+  gobject-introspection,
+  wrapGAppsHook3,
+  wrapGAppsHook4,
+  cameractrls-gtk3,
+  cameractrls-gtk4,
+  withGtk ? null,
+}:
+
+assert lib.assertOneOf "'withGtk' in cameractrls" withGtk [
+  3
+  4
+  null
+];
+
+let
+  mainExecutable =
+    "cameractrls" + lib.optionalString (withGtk != null) "gtk" + lib.optionalString (withGtk == 4) "4";
+
+  modulePath = "${placeholder "out"}/${python3Packages.python.sitePackages}/CameraCtrls";
+
+  installExecutables = [
+    "cameractrls"
+    "cameractrlsd"
+    "cameraptzgame"
+    "cameraptzmidi"
+    "cameraptzspnav"
+    "cameraview"
+  ] ++ lib.optionals (withGtk != null) [ mainExecutable ];
+in
+python3Packages.buildPythonApplication rec {
+  pname = "cameractrls";
+  version = "0.6.6";
+  pyproject = false;
+
+  src = fetchFromGitHub {
+    owner = "soyersoyer";
+    repo = "cameractrls";
+    rev = "v${version}";
+    hash = "sha256-QjjLd5L+8Slxc3ywurhsWp1pZ2E1Y7NOdnCV2ZYBlqU=";
+  };
+
+  postPatch = ''
+    substituteInPlace cameractrlsd.py \
+      --replace-fail "ctypes.util.find_library('c')" '"${lib.getLib glibc}/lib/libc.so.6"'
+    substituteInPlace cameraptzgame.py cameraview.py \
+      --replace-fail "ctypes.util.find_library('SDL2-2.0')" '"${lib.getLib SDL2}/lib/libSDL2-2.0.so.0"'
+    substituteInPlace cameraview.py \
+      --replace-fail "ctypes.util.find_library('turbojpeg')" '"${lib.getLib libjpeg_turbo}/lib/libturbojpeg.so"'
+    substituteInPlace cameraptzmidi.py \
+      --replace-fail "ctypes.util.find_library('asound')" '"${lib.getLib alsa-lib}/lib/libasound.so"'
+    substituteInPlace cameraptzspnav.py \
+      --replace-fail "ctypes.util.find_library('spnav')" '"${lib.getLib libspnav}/lib/libspnav.so"'
+  '';
+
+  nativeBuildInputs =
+    lib.optionals (withGtk != null) [
+      desktop-file-utils
+      gobject-introspection
+    ]
+    ++ lib.optionals (withGtk == 3) [ wrapGAppsHook3 ]
+    ++ lib.optionals (withGtk == 4) [ wrapGAppsHook4 ];
+
+  # Only used when withGtk != null
+  dependencies = with python3Packages; [ pygobject3 ];
+
+  installPhase =
+    ''
+      runHook preInstall
+
+      mkdir -p $out/bin
+
+      for file in ${lib.concatStringsSep " " installExecutables}; do
+        install -Dm755 $file.py -t ${modulePath}
+        ln -s ${modulePath}/$file.py $out/bin/$file
+      done
+    ''
+    + lib.optionalString (withGtk != null) ''
+      install -Dm644 pkg/hu.irl.cameractrls.svg -t $out/share/icons/hicolor/scalable/apps
+      install -Dm644 pkg/hu.irl.cameractrls.metainfo.xml -t $out/share/metainfo
+      mkdir -p $out/share/applications
+      desktop-file-install \
+        --dir="$out/share/applications" \
+        --set-key=Exec --set-value="${mainExecutable}" \
+        pkg/hu.irl.cameractrls.desktop
+    ''
+    + ''
+      runHook postInstall
+    '';
+
+  dontWrapGApps = true;
+  dontWrapPythonPrograms = true;
+
+  postFixup = lib.optionalString (withGtk != null) ''
+    wrapPythonPrograms
+    patchPythonScript ${modulePath}/${mainExecutable}.py
+    wrapProgram $out/bin/${mainExecutable} ''${makeWrapperArgs[@]} ''${gappsWrapperArgs[@]}
+  '';
+
+  passthru.tests = {
+    # Also build these packages in ofBorg (defined in top-level/all-packages.nix)
+    inherit cameractrls-gtk3 cameractrls-gtk4;
+  };
+
+  meta = {
+    description = "Camera controls for Linux";
+    longDescription = ''
+      It's a standalone Python CLI and GUI (GTK3, GTK4) and
+      camera Viewer (SDL) to set the camera controls in Linux.
+      It can set the V4L2 controls and it is extendable with
+      the non standard controls. Currently it has a Logitech
+      extension (LED mode, LED frequency, BRIO FoV, Relative
+      Pan/Tilt, PTZ presets), Kiyo Pro extension (HDR, HDR
+      mode, FoV, AF mode, Save), Preset extension (Save and
+      restore controls), Control Restore Daemon (to restore
+      presets at device connection).
+    '';
+    homepage = "https://github.com/soyersoyer/cameractrls";
+    license = lib.licenses.gpl3Plus;
+    mainProgram = mainExecutable;
+    maintainers = with lib.maintainers; [ aleksana ];
+    platforms = lib.platforms.linux;
+  };
+}
diff --git a/third_party/nixpkgs/pkgs/by-name/ca/cargo-profiler/package.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-profiler/package.nix
index 595bf6d8d0..63b6aa567d 100644
--- a/third_party/nixpkgs/pkgs/by-name/ca/cargo-profiler/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/ca/cargo-profiler/package.nix
@@ -11,7 +11,7 @@ let
   version = "0.2.0";
   rev = "0a8ab772fd5c0f1579e4847c5d05aa443ffa2bc8";
   sha256 = "sha256-ZRAbvSMrPtgaWy9RwlykQ3iiPxHCMh/tS5p67/4XqqA=";
-  cargoSha256 = "sha256-qt3S6ZcLEP9ZQoP5+kSQdmBlxdMgGUqLszdU7JkFNVI=";
+  cargoHash = "sha256-qt3S6ZcLEP9ZQoP5+kSQdmBlxdMgGUqLszdU7JkFNVI=";
 
   inherit (rustPlatform) buildRustPackage;
 in buildRustPackage rec {
@@ -22,7 +22,7 @@ in buildRustPackage rec {
     repo = pname;
   };
 
-  inherit cargoSha256;
+  inherit cargoHash;
 
   meta = with lib; {
     description = "Cargo subcommand for profiling Rust binaries";
diff --git a/third_party/nixpkgs/pkgs/by-name/ca/cargo-shear/package.nix b/third_party/nixpkgs/pkgs/by-name/ca/cargo-shear/package.nix
index 1258e8dc71..88b8a4b9fc 100644
--- a/third_party/nixpkgs/pkgs/by-name/ca/cargo-shear/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/ca/cargo-shear/package.nix
@@ -6,7 +6,7 @@
   cargo-shear,
 }:
 let
-  version = "1.1.0";
+  version = "1.1.1";
 in
 rustPlatform.buildRustPackage {
   pname = "cargo-shear";
@@ -16,10 +16,10 @@ rustPlatform.buildRustPackage {
     owner = "Boshen";
     repo = "cargo-shear";
     rev = "v${version}";
-    hash = "sha256-D6O8raELxmcv47vaIa7XSmnPNhrsEx8fIpt/n1dp+8Y=";
+    hash = "sha256-4HGI0G3fOzj787fXyUMt4XK4KMtrilOJUw1DqRpUoYY=";
   };
 
-  cargoHash = "sha256-GpEG6yoRTmnjeC74tz6mq6vbG4hnIWbbijIIos7Ng3Y=";
+  cargoHash = "sha256-sQiWd8onSJMo7+ouCPye7IaGzYp0N3rMC4PZv+/DPt4=";
 
   # https://github.com/Boshen/cargo-shear/blob/a0535415a3ea94c86642f39f343f91af5cdc3829/src/lib.rs#L20-L23
   SHEAR_VERSION = version;
diff --git a/third_party/nixpkgs/pkgs/by-name/ca/cartridges/package.nix b/third_party/nixpkgs/pkgs/by-name/ca/cartridges/package.nix
index eeb20dbfda..42575689ea 100644
--- a/third_party/nixpkgs/pkgs/by-name/ca/cartridges/package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/cc/cctools/0001-Fix-build-issues-with-misc-redo_prebinding.c.patch b/third_party/nixpkgs/pkgs/by-name/cc/cctools/0001-Fix-build-issues-with-misc-redo_prebinding.c.patch
new file mode 100644
index 0000000000..5908d030db
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/by-name/cc/cctools/0001-Fix-build-issues-with-misc-redo_prebinding.c.patch
@@ -0,0 +1,53 @@
+From 55b2a5fcc38eb62f53e155bd8c741481690f1c73 Mon Sep 17 00:00:00 2001
+From: Randy Eckenrode <randy@largeandhighquality.com>
+Date: Wed, 10 Apr 2024 19:08:39 -0400
+Subject: [PATCH 1/6] Fix build issues with misc/redo_prebinding.c
+
+- Add missing headers; and
+- Add missing arguments to `writeout`.
+---
+ misc/redo_prebinding.c | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/misc/redo_prebinding.c b/misc/redo_prebinding.c
+index a5a3c81..9d0f4c8 100644
+--- a/misc/redo_prebinding.c
++++ b/misc/redo_prebinding.c
+@@ -83,6 +83,7 @@
+ #include <mach-o/redo_prebinding.h>
+ #endif /* defined(LIBRARY_API) */
+ 
++#import <stdint.h>
+ #import <stdio.h>
+ #import <stdlib.h>
+ #import <string.h>
+@@ -106,7 +107,7 @@
+ #import <stuff/hppa.h>
+ #import <stuff/execute.h>
+ #import <stuff/guess_short_name.h>
+-//#import <stuff/seg_addr_table.h>
++#import <stuff/seg_addr_table.h>
+ #import <stuff/macosx_deployment_target.h>
+ 
+ #include <mach-o/dyld.h>
+@@ -918,7 +919,7 @@ char *envp[])
+                 if(write_to_stdout)
+                     output_file = NULL;
+ 		writeout(archs, narchs, output_file, mode, TRUE, FALSE, FALSE,
+-		         FALSE, NULL);
++		         FALSE, FALSE, NULL);
+ 		if(errors){
+                     if(write_to_stdout == FALSE)
+                         unlink(output_file);
+@@ -928,7 +929,7 @@ char *envp[])
+ 	    else{
+ 		output_file = makestr(input_file, ".redo_prebinding", NULL);
+ 		writeout(archs, narchs, output_file, mode, TRUE, FALSE, FALSE,
+-			 FALSE, NULL);
++			 FALSE, FALSE, NULL);
+ 		if(errors){
+ 		    unlink(output_file);
+ 		    return(2);
+-- 
+2.45.2
+
diff --git a/third_party/nixpkgs/pkgs/by-name/cc/cctools/0002-Rely-on-libcd_is_blob_a_linker_signature.patch b/third_party/nixpkgs/pkgs/by-name/cc/cctools/0002-Rely-on-libcd_is_blob_a_linker_signature.patch
new file mode 100644
index 0000000000..014281039a
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/by-name/cc/cctools/0002-Rely-on-libcd_is_blob_a_linker_signature.patch
@@ -0,0 +1,25 @@
+From 419c469634891d09f6688d56da9e26431018f342 Mon Sep 17 00:00:00 2001
+From: Randy Eckenrode <randy@largeandhighquality.com>
+Date: Wed, 10 Apr 2024 20:36:53 -0400
+Subject: [PATCH 2/6] Rely on libcd_is_blob_a_linker_signature
+
+---
+ libstuff/code_directory.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libstuff/code_directory.c b/libstuff/code_directory.c
+index 7c158fa..3b8eb77 100644
+--- a/libstuff/code_directory.c
++++ b/libstuff/code_directory.c
+@@ -146,7 +146,7 @@ static const char* format_version_xyz(uint32_t version)
+  */
+ int codedir_is_linker_signed(const char* data, uint32_t size)
+ {
+-#if 1
++#if 0
+     // HACK: libcodedirectory.h is in both the macOS SDK in /usr/local/include, and in the tool chain at /usr/include.
+     // but there is no way to control clang's search path to look in the toolchain first.
+     // So, declare newer API locally. Once this new header is in all SDKs we can remove this.
+-- 
+2.45.2
+
diff --git a/third_party/nixpkgs/pkgs/by-name/cc/cctools/0003-Fix-utimensat-compatability-with-the-10.12-SDK.patch b/third_party/nixpkgs/pkgs/by-name/cc/cctools/0003-Fix-utimensat-compatability-with-the-10.12-SDK.patch
new file mode 100644
index 0000000000..4abe9ee863
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/by-name/cc/cctools/0003-Fix-utimensat-compatability-with-the-10.12-SDK.patch
@@ -0,0 +1,50 @@
+From 989ba5e30cefa0dd8990da158661713c4a21c0fe Mon Sep 17 00:00:00 2001
+From: Randy Eckenrode <randy@largeandhighquality.com>
+Date: Thu, 11 Apr 2024 18:05:34 -0400
+Subject: [PATCH 3/6] Fix utimensat compatability with the 10.12 SDK
+
+---
+ include/compat.h    | 3 +++
+ libstuff/writeout.c | 2 +-
+ misc/lipo.c         | 2 +-
+ 3 files changed, 5 insertions(+), 2 deletions(-)
+ create mode 100644 include/compat.h
+
+diff --git a/include/compat.h b/include/compat.h
+new file mode 100644
+index 0000000..8b1b866
+--- /dev/null
++++ b/include/compat.h
+@@ -0,0 +1,3 @@
++#pragma once
++#include <time.h>
++extern int utimensat(int dirfd, const char* pathname, const struct timespec times[_Nullable 2], int flags);
+diff --git a/libstuff/writeout.c b/libstuff/writeout.c
+index f904caa..03fa535 100644
+--- a/libstuff/writeout.c
++++ b/libstuff/writeout.c
+@@ -297,7 +297,7 @@ no_throttle:
+ 	     * have been zeroed out when the library was created. writeout
+ 	     * will not zero out the modification time in the filesystem.
+ 	     */
+-	    if (__builtin_available(macOS 10.12, *)) {
++	    if (__builtin_available(macOS 10.13, *)) {
+ 		struct timespec times[2] = {0};
+ 		memcpy(&times[0], &toc_timespec, sizeof(struct timespec));
+ 		memcpy(&times[1], &toc_timespec, sizeof(struct timespec));
+diff --git a/misc/lipo.c b/misc/lipo.c
+index 04a3eca..887c049 100644
+--- a/misc/lipo.c
++++ b/misc/lipo.c
+@@ -607,7 +607,7 @@ unknown_flag:
+ 		    if(close(fd) == -1)
+ 			system_fatal("can't close output file: %s",output_file);
+ #ifndef __OPENSTEP__
+-		    if (__builtin_available(macOS 10.12, *)) {
++		    if (__builtin_available(macOS 10.13, *)) {
+ 			time_result = utimensat(AT_FDCWD, output_file,
+ 						output_times, 0);
+ 		    }
+-- 
+2.45.2
+
diff --git a/third_party/nixpkgs/pkgs/by-name/cc/cctools/0004-Use-nixpkgs-clang-with-the-assembler-driver.patch b/third_party/nixpkgs/pkgs/by-name/cc/cctools/0004-Use-nixpkgs-clang-with-the-assembler-driver.patch
new file mode 100644
index 0000000000..058cfcdf0c
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/by-name/cc/cctools/0004-Use-nixpkgs-clang-with-the-assembler-driver.patch
@@ -0,0 +1,57 @@
+From 86b5ad551ef0ffc7ca4da24b7619937bec738522 Mon Sep 17 00:00:00 2001
+From: Randy Eckenrode <randy@largeandhighquality.com>
+Date: Mon, 15 Apr 2024 20:47:59 -0400
+Subject: [PATCH 4/6] Use nixpkgs clang with the assembler driver
+
+---
+ as/driver.c | 20 +++-----------------
+ 1 file changed, 3 insertions(+), 17 deletions(-)
+
+diff --git a/as/driver.c b/as/driver.c
+index a0d49ad..c15dcbf 100644
+--- a/as/driver.c
++++ b/as/driver.c
+@@ -36,7 +36,7 @@ char **envp)
+     char *p, c, *arch_name, *as, *as_local;
+     char **new_argv;
+     const char *CLANG = "clang";
+-    char *prefix, buf[MAXPATHLEN], resolved_name[PATH_MAX];
++    char *prefix = "@clang-unwrapped@/bin/";
+     uint32_t bufsize;
+     struct arch_flag arch_flag;
+     const struct arch_flag *arch_flags, *family_arch_flag;
+@@ -50,22 +50,6 @@ char **envp)
+ 	qflag = FALSE;
+ 	Qflag = FALSE;
+ 	some_input_files = FALSE;
+-	/*
+-	 * Construct the prefix to the assembler driver.
+-	 */
+-	bufsize = MAXPATHLEN;
+-	p = buf;
+-	i = _NSGetExecutablePath(p, &bufsize);
+-	if(i == -1){
+-	    p = allocate(bufsize);
+-	    _NSGetExecutablePath(p, &bufsize);
+-	}
+-	prefix = realpath(p, resolved_name);
+-	if(prefix == NULL)
+-	    system_fatal("realpath(3) for %s failed", p);
+-	p = rindex(prefix, '/');
+-	if(p != NULL)
+-	    p[1] = '\0';
+ 	/*
+ 	 * Process the assembler flags exactly like the assembler would (except
+ 	 * let the assembler complain about multiple flags, bad combinations of
+@@ -362,6 +346,8 @@ char **envp)
+ 		exit(1);
+ 	}
+ 
++	prefix = "@gas@/bin/"; /* `libexec` is found relative to the assembler driver’s path. */
++
+ 	/*
+ 	 * If this assembler exist try to run it else print an error message.
+ 	 */
+-- 
+2.45.2
+
diff --git a/third_party/nixpkgs/pkgs/by-name/cc/cctools/0005-Find-ld64-in-the-store.patch b/third_party/nixpkgs/pkgs/by-name/cc/cctools/0005-Find-ld64-in-the-store.patch
new file mode 100644
index 0000000000..8f51b38a9c
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/by-name/cc/cctools/0005-Find-ld64-in-the-store.patch
@@ -0,0 +1,28 @@
+From e62f7d75380540937f24f896c82736a1e653cc75 Mon Sep 17 00:00:00 2001
+From: Randy Eckenrode <randy@largeandhighquality.com>
+Date: Mon, 22 Apr 2024 18:15:53 -0400
+Subject: [PATCH 5/6] Find ld64 in the store
+
+---
+ libstuff/execute.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/libstuff/execute.c b/libstuff/execute.c
+index 8526ab7..abbbf1b 100644
+--- a/libstuff/execute.c
++++ b/libstuff/execute.c
+@@ -149,6 +149,11 @@ char *
+ cmd_with_prefix(
+ char *str)
+ {
++	// Return the path to ld64 in the store.
++	if (strcmp(str, "ld") == 0) {
++	    return "@ld64_path@";
++	}
++
+ 	int i;
+ 	char *p;
+ 	char *prefix, buf[MAXPATHLEN], resolved_name[PATH_MAX];
+-- 
+2.45.2
+
diff --git a/third_party/nixpkgs/pkgs/by-name/cc/cctools/0006-Support-target-prefixes-in-ranlib-detection.patch b/third_party/nixpkgs/pkgs/by-name/cc/cctools/0006-Support-target-prefixes-in-ranlib-detection.patch
new file mode 100644
index 0000000000..1189d20749
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/by-name/cc/cctools/0006-Support-target-prefixes-in-ranlib-detection.patch
@@ -0,0 +1,30 @@
+From e25de788260051892b9e34177ea957cbafe6c415 Mon Sep 17 00:00:00 2001
+From: Randy Eckenrode <randy@largeandhighquality.com>
+Date: Thu, 2 May 2024 07:55:05 -0400
+Subject: [PATCH 6/6] Support target prefixes in ranlib detection
+
+---
+ misc/libtool.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/misc/libtool.c b/misc/libtool.c
+index 289ec4d..8265d53 100644
+--- a/misc/libtool.c
++++ b/misc/libtool.c
+@@ -426,11 +426,11 @@ char **envp)
+ 	    p++;
+ 	else
+ 	    p = argv[0];
+-	if(strncmp(p, "ranlib", sizeof("ranlib") - 1) == 0) {
++	if(strncmp(p, "@targetPrefix@ranlib", sizeof("@targetPrefix@ranlib") - 1) == 0) {
+ 	    cmd_flags.ranlib = TRUE;
+ 	}
+ 	else if (getenv("LIBTOOL_FORCE_RANLIB")) {
+-	    progname = "ranlib";
++	    progname = "@targetPrefix@ranlib";
+ 	    cmd_flags.ranlib = TRUE;
+ 	}
+ 
+-- 
+2.45.2
+
diff --git a/third_party/nixpkgs/pkgs/by-name/cc/cctools/meson.build b/third_party/nixpkgs/pkgs/by-name/cc/cctools/meson.build
new file mode 100644
index 0000000000..c2261d98c9
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/by-name/cc/cctools/meson.build
@@ -0,0 +1,657 @@
+# Build settings based on the upstream Xcode project.
+# See: https://github.com/apple-oss-distributions/cctools/blob/main/cctools.xcodeproj/project.pbxproj
+
+# Project settings
+project(
+    'cctools',
+    'c',
+    version : '@version@',
+    default_options : {
+        'c_args': [
+            '-DCCTB_MACOS=YES',
+            '-DCCTB_PROJECT=cctools',
+            '-DCCTB_PROJVERS=cctools-@version@',
+            '-DCCTB_VERSION=@version@',
+            '-DCURRENT_PROJECT_VERSION="@version@"',
+            '-DCODEDIRECTORY_SUPPORT',
+            '-DLTO_SUPPORT',
+        ],
+    },
+)
+
+fs = import('fs')
+
+# Options
+target_prefix = get_option('target_prefix')
+
+
+# Dependencies
+cc = meson.get_compiler('c')
+
+libcodedirectory = cc.find_library('codedirectory')
+libprunetrie = cc.find_library('prunetrie')
+
+
+# Feature tests
+# Add compatibility header for Darwin SDKs that don’t define `utimensat`.
+utimensat_test = '''
+#include <fcntl.h>
+#include <sys/stat.h>
+int main(int argc, char* argv[]) {
+    utimensat(AT_FDCWD, NULL, NULL, 0);
+    return 0;
+}
+'''
+if host_machine.system() == 'darwin' and not cc.compiles(utimensat_test, name : 'supports utimensat')
+    add_project_arguments('-include', 'compat.h', language : 'c')
+    add_project_link_arguments('-undefined', 'dynamic_lookup', language : 'c')
+endif
+
+
+incdirs = include_directories('include')
+
+# Static libraries
+libstuff = static_library(
+    'stuff',
+    c_args : [
+        '-DCPU_TYPE_RISCV32=24', # Per src/abstraction/MachOFileAbstraction.hpp from ld64
+    ],
+    include_directories : [incdirs, 'include/stuff'],
+    sources : [
+        'libstuff/SymLoc.c',
+        'libstuff/align.c',
+        'libstuff/allocate.c',
+        'libstuff/apple_version.c',
+        'libstuff/arch.c',
+        'libstuff/arch_usage.c',
+        'libstuff/args.c',
+        'libstuff/best_arch.c',
+        'libstuff/breakout.c',
+        'libstuff/bytesex.c',
+        'libstuff/checkout.c',
+        'libstuff/code_directory.c',
+        'libstuff/coff_bytesex.c',
+        'libstuff/crc32.c',
+        'libstuff/depinfo.c',
+        'libstuff/diagnostics.c',
+        'libstuff/dylib_roots.c',
+        'libstuff/dylib_table.c',
+        'libstuff/errors.c',
+        'libstuff/execute.c',
+        'libstuff/fatal_arch.c',
+        'libstuff/fatals.c',
+        'libstuff/get_arch_from_host.c',
+        'libstuff/get_toc_byte_sex.c',
+        'libstuff/guess_short_name.c',
+        'libstuff/hash_string.c',
+        'libstuff/hppa.c',
+        'libstuff/llvm.c',
+        'libstuff/lto.c',
+        'libstuff/macosx_deployment_target.c',
+        'libstuff/ofile.c',
+        'libstuff/ofile_error.c',
+        'libstuff/ofile_get_word.c',
+        'libstuff/print.c',
+        'libstuff/reloc.c',
+        'libstuff/rnd.c',
+        'libstuff/seg_addr_table.c',
+        'libstuff/set_arch_flag_name.c',
+        'libstuff/swap_headers.c',
+        'libstuff/symbol_list.c',
+        'libstuff/unix_standard_mode.c',
+        'libstuff/version_number.c',
+        'libstuff/vm_flush_cache.c',
+        'libstuff/write64.c',
+        'libstuff/writeout.c',
+        'libstuff/xcode.c',
+    ],
+)
+
+libstuff_otool = static_library(
+    'stuff_otool',
+    c_args : [
+        '-DCPU_TYPE_RISCV32=24', # Per src/abstraction/MachOFileAbstraction.hpp from ld64
+    ],
+    include_directories : [incdirs, 'include/stuff', 'otool'],
+    sources : [
+        'libstuff/SymLoc.c',
+        'libstuff/align.c',
+        'libstuff/allocate.c',
+        'libstuff/apple_version.c',
+        'libstuff/arch.c',
+        'libstuff/arch_usage.c',
+        'libstuff/args.c',
+        'libstuff/best_arch.c',
+        'libstuff/breakout.c',
+        'libstuff/bytesex.c',
+        'libstuff/checkout.c',
+        'libstuff/code_directory.c',
+        'libstuff/coff_bytesex.c',
+        'libstuff/crc32.c',
+        'libstuff/depinfo.c',
+        'libstuff/diagnostics.c',
+        'libstuff/dylib_roots.c',
+        'libstuff/dylib_table.c',
+        'libstuff/errors.c',
+        'libstuff/execute.c',
+        'libstuff/fatal_arch.c',
+        'libstuff/fatals.c',
+        'libstuff/get_arch_from_host.c',
+        'libstuff/get_toc_byte_sex.c',
+        'libstuff/guess_short_name.c',
+        'libstuff/hash_string.c',
+        'libstuff/hppa.c',
+        'libstuff/llvm.c',
+        'libstuff/lto.c',
+        'libstuff/macosx_deployment_target.c',
+        'libstuff/ofile.c',
+        'libstuff/ofile_error.c',
+        'libstuff/ofile_get_word.c',
+        'libstuff/print.c',
+        'libstuff/reloc.c',
+        'libstuff/rnd.c',
+        'libstuff/seg_addr_table.c',
+        'libstuff/set_arch_flag_name.c',
+        'libstuff/swap_headers.c',
+        'libstuff/symbol_list.c',
+        'libstuff/unix_standard_mode.c',
+        'libstuff/version_number.c',
+        'libstuff/vm_flush_cache.c',
+        'libstuff/write64.c',
+        'libstuff/writeout.c',
+        'libstuff/xcode.c',
+    ],
+)
+
+
+# Binaries
+ar = executable(
+    f'@target_prefix@ar',
+    include_directories : incdirs,
+    install : true,
+    link_with : [libstuff],
+    sources : [
+        'ar/append.c',
+        'ar/ar.c',
+        'ar/archive.c',
+        'ar/contents.c',
+        'ar/delete.c',
+        'ar/extract.c',
+        'ar/misc.c',
+        'ar/move.c',
+        'ar/print.c',
+        'ar/replace.c',
+    ],
+)
+install_man(
+    'ar/ar.1',
+    'ar/ar.5',
+)
+
+as = executable(
+    f'@target_prefix@gas',
+    include_directories : incdirs,
+    install : true,
+    link_with : [libstuff],
+    sources : ['as/driver.c'],
+)
+
+as_common = files(
+    'as/app.c',
+    'as/as.c',
+    'as/atof-generic.c',
+    'as/atof-ieee.c',
+    'as/dwarf2dbg.c',
+    'as/expr.c',
+    'as/fixes.c',
+    'as/flonum-const.c',
+    'as/flonum-copy.c',
+    'as/flonum-mult.c',
+    'as/frags.c',
+    'as/hash.c',
+    'as/hex-value.c',
+    'as/input-file.c',
+    'as/input-scrub.c',
+    'as/layout.c',
+    'as/messages.c',
+    'as/obstack.c',
+    'as/read.c',
+    'as/sections.c',
+    'as/symbols.c',
+    'as/write_object.c',
+    'as/xmalloc.c',
+)
+
+as_arm = executable(
+    'as-arm',
+    c_args : [
+        '-DARM',
+        '-DNeXT_MOD',
+    ],
+    include_directories : [
+        incdirs,
+        'as',
+        'include/gnu',
+    ],
+    install : true,
+    install_dir : 'libexec/as/arm',
+    link_with : [libstuff],
+    sources : [as_common, 'as/arm.c'],
+)
+
+as_i386 = executable(
+    'as-i386',
+    c_args : [
+        '-DI386',
+        '-Di486',
+        '-Di586',
+        '-Di686',
+        '-DNeXT_MOD',
+    ],
+    include_directories : [
+        incdirs,
+        'as',
+        'include/gnu',
+    ],
+    install : true,
+    install_dir : 'libexec/as/i386',
+    link_with : [libstuff],
+    sources : [as_common, 'as/i386.c'],
+)
+
+as_x86_64 = executable(
+    'as-x86_64',
+    c_args : [
+        '-DI386',
+        '-Di486',
+        '-Di586',
+        '-Di686',
+        '-DARCH64',
+        '-DNeXT_MOD',
+    ],
+    include_directories : [
+        incdirs,
+        'as',
+        'include/gnu'
+    ],
+    install : true,
+    install_dir : 'libexec/as/x86_64',
+    link_with : [libstuff],
+    sources : [as_common, 'as/i386.c'],
+)
+
+# # ld # excluded because ld64 is built separately
+
+bitcode_strip = executable(
+    f'@target_prefix@bitcode_strip',
+    dependencies : [libcodedirectory],
+    include_directories : incdirs,
+    install : true,
+    link_with : [libstuff],
+    sources : ['misc/bitcode_strip.c'],
+)
+install_man('man/bitcode_strip.1')
+
+check_dylib = executable(
+    f'@target_prefix@check_dylib',
+    include_directories : incdirs,
+    install : true,
+    link_with : [libstuff],
+    sources : ['misc/check_dylib.c'],
+)
+install_man('man/check_dylib.1')
+
+checksyms = executable(
+    f'@target_prefix@checksyms',
+    include_directories : incdirs,
+    install : true,
+    link_with : [libstuff],
+    sources : ['misc/checksyms.c'],
+)
+install_man('man/checksyms.1')
+
+cmpdylib = executable(
+    f'@target_prefix@cmpdylib',
+    include_directories : incdirs,
+    install : true,
+    link_with : [libstuff],
+    sources : ['misc/cmpdylib.c'],
+)
+install_man('man/cmpdylib.1')
+
+codesign_allocate = executable(
+    f'@target_prefix@codesign_allocate',
+    dependencies : [libcodedirectory],
+    include_directories : incdirs,
+    install : true,
+    link_with : [libstuff],
+    sources : ['misc/codesign_allocate.c'],
+)
+install_man('man/codesign_allocate.1')
+
+ctf_insert = executable(
+    f'@target_prefix@ctf_insert',
+    dependencies : [libcodedirectory],
+    include_directories : [incdirs, 'include/stuff'],
+    install : true,
+    link_with : [libstuff],
+    sources : ['misc/ctf_insert.c'],
+)
+install_man('man/ctf_insert.1')
+
+depinfo = executable(
+    f'@target_prefix@depinfo',
+    include_directories : incdirs,
+    install : true,
+    link_with : [libstuff],
+    sources : ['misc/depinfo.c'],
+)
+install_man('man/depinfo.1')
+
+diagtest = executable(
+    f'@target_prefix@diagtest',
+    include_directories : incdirs,
+    install : true,
+    link_with : [libstuff],
+    sources : ['misc/diagtest.c'],
+)
+install_man('man/diagtest.1')
+
+gprof = executable(
+    f'@target_prefix@gprof',
+    include_directories : incdirs,
+    install : true,
+    link_with : [libstuff],
+    sources : [
+        'gprof/arcs.c',
+        'gprof/calls.c',
+        'gprof/dfn.c',
+        'gprof/getnfile.c',
+        'gprof/gprof.c',
+        'gprof/hertz.c',
+        'gprof/lookup.c',
+        'gprof/printgprof.c',
+        'gprof/printlist.c',
+        'gprof/scatter.c',
+    ],
+)
+install_man('man/gprof.1')
+
+# Not supported on 64-bit architectures
+# indr = executable(
+#     f'@target_prefix@indr',
+#     include_directories : incdirs,
+#     sources : ['misc/indr.c'],
+# )
+# install_man('man/indr.1')
+
+install_name_tool = executable(
+    f'@target_prefix@install_name_tool',
+    dependencies : [libcodedirectory],
+    include_directories : incdirs,
+    install : true,
+    link_with : [libstuff],
+    sources : ['misc/install_name_tool.c'],
+)
+install_man('man/install_name_tool.1')
+
+libtool = executable(
+    f'@target_prefix@libtool',
+    include_directories : incdirs,
+    install : true,
+    link_with : [libstuff],
+    sources : ['misc/libtool.c'],
+)
+install_man('man/libtool.1')
+
+lipo = executable(
+    f'@target_prefix@lipo',
+    include_directories : incdirs,
+    install : true,
+    link_with : [libstuff],
+    sources : ['misc/lipo.c'],
+)
+install_man('man/lipo.1')
+
+mtoc = executable(
+    f'@target_prefix@mtoc',
+    include_directories : incdirs,
+    install : true,
+    link_with : [libstuff],
+    sources : ['efitools/mtoc.c'],
+)
+install_man('man/mtoc.1')
+
+mtor = executable(
+    f'@target_prefix@mtor',
+    include_directories : incdirs,
+    install : true,
+    link_with : [libstuff],
+    sources : ['efitools/mtor.c'],
+)
+install_man('man/mtor.1')
+
+nm = executable(
+    f'@target_prefix@nm',
+    include_directories : incdirs,
+    install : true,
+    link_with : [libstuff],
+    sources : ['misc/nm.c'],
+)
+install_man('man/nm-classic.1')
+
+nmedit = executable(
+    f'@target_prefix@nmedit',
+    c_args : ['-DNMEDIT'],
+    dependencies : [libcodedirectory],
+    include_directories : incdirs,
+    install : true,
+    link_with : [libstuff],
+    sources : ['misc/strip.c'],
+)
+install_man('man/nmedit.1')
+
+otool = executable(
+    f'@target_prefix@otool',
+    c_args : ['-DEFI_SUPPORT'],
+    include_directories : incdirs,
+    install : true,
+    link_with : [libstuff],
+    sources : [
+        'otool/arm64_disasm.c',
+        'otool/arm_disasm.c',
+        'otool/coff_print.c',
+        'otool/dyld_bind_info.c',
+        'otool/hppa_disasm.c',
+        'otool/i386_disasm.c',
+        'otool/i860_disasm.c',
+        'otool/m68k_disasm.c',
+        'otool/m88k_disasm.c',
+        'otool/main.c',
+        'otool/ofile_print.c',
+        'otool/ppc_disasm.c',
+        'otool/print_bitcode.c',
+        'otool/print_objc.c',
+        'otool/print_objc2_32bit.c',
+        'otool/print_objc2_64bit.c',
+        'otool/print_objc2_util.c',
+        'otool/sparc_disasm.c',
+    ],
+)
+install_man('man/otool-classic.1')
+
+pagestuff = executable(
+    f'@target_prefix@pagestuff',
+    include_directories : incdirs,
+    install : true,
+    link_with : [libstuff],
+    sources : ['misc/pagestuff.c'],
+)
+install_man('man/pagestuff.1')
+
+# ranlib is a symlink to libtool
+install_man(
+    'man/ranlib.1',
+    'man/ranlib.5',
+)
+
+redo_prebinding = executable(
+    f'@target_prefix@redo_prebinding',
+    dependencies : [libcodedirectory],
+    include_directories : incdirs,
+    install : true,
+    link_with : [libstuff],
+    sources : ['misc/redo_prebinding.c'],
+)
+install_man('man/redo_prebinding.1')
+
+seg_addr_table = executable(
+    f'@target_prefix@seg_addr_table',
+    include_directories : incdirs,
+    install : true,
+    link_with : [libstuff],
+    sources : ['misc/seg_addr_table.c'],
+)
+install_man('man/seg_addr_table.1')
+
+seg_hack = executable(
+    f'@target_prefix@seg_hack',
+    dependencies : [libcodedirectory],
+    include_directories : incdirs,
+    install : true,
+    link_with : [libstuff],
+    sources : ['misc/seg_hack.c'],
+)
+
+segedit = executable(
+    f'@target_prefix@segedit',
+    include_directories : incdirs,
+    install : true,
+    link_with : [libstuff],
+    sources : ['misc/segedit.c'],
+)
+install_man('man/segedit.1',)
+
+size = executable(
+    f'@target_prefix@size',
+    include_directories : incdirs,
+    install : true,
+    link_with : [libstuff],
+    sources : ['misc/size.c'],
+)
+install_man('man/size-classic.1')
+
+strings = executable(
+    f'@target_prefix@strings',
+    include_directories : incdirs,
+    install : true,
+    link_with : [libstuff],
+    sources : ['misc/strings.c'],
+)
+install_man('man/strings.1')
+
+strip = executable(
+    f'@target_prefix@strip',
+    c_args : ['-DTRIE_SUPPORT'],
+    dependencies : [libcodedirectory, libprunetrie],
+    include_directories : incdirs,
+    install : true,
+    link_with : [libstuff],
+    sources : ['misc/strip.c'],
+)
+install_man('man/strip.1')
+
+vtool = executable(
+    f'@target_prefix@vtool',
+    dependencies : [libcodedirectory],
+    include_directories : [incdirs, 'include/stuff'],
+    install : true,
+    link_with : [libstuff],
+    sources : ['misc/vtool.c'],
+)
+install_man('man/vtool.1')
+
+
+# Development files
+# Static libraries
+libmacho = static_library(
+    'macho',
+    include_directories : incdirs,
+    sources : [
+        'libmacho/arch.c',
+        'libmacho/get_end.c',
+        'libmacho/getsecbyname.c',
+        'libmacho/getsegbyname.c',
+        'libmacho/hppa_swap.c',
+        'libmacho/i386_swap.c',
+        'libmacho/i860_swap.c',
+        'libmacho/m68k_swap.c',
+        'libmacho/m88k_swap.c',
+        'libmacho/ppc_swap.c',
+        'libmacho/slot_name.c',
+        'libmacho/sparc_swap.c',
+        'libmacho/swap.c',
+    ],
+)
+
+libredo_prebinding = static_library(
+    'redo_prebinding',
+    c_args : ['-DLIBRARY_API'],
+    include_directories : incdirs,
+    sources : ['misc/redo_prebinding.c'],
+)
+install_man('man/redo_prebinding.3')
+
+
+# Development files
+# Based on the contents of the upstream SDK.
+install_headers(
+    'include/mach-o/arch.h',
+    'include/mach-o/fat.h',
+    'include/mach-o/getsect.h',
+    'include/mach-o/ldsyms.h',
+    'include/mach-o/loader.h',
+    'include/mach-o/nlist.h',
+    'include/mach-o/ranlib.h',
+    'include/mach-o/reloc.h',
+    'include/mach-o/stab.h',
+    'include/mach-o/swap.h',
+    subdir : 'mach-o',
+)
+
+# Some of these architectures are irrelevant, but the Libsystem derivation expects their headers to be present.
+# Not every arch has both headers, so tailor the lists for each that does.
+foreach arch : ['arm', 'arm64', 'hppa', 'i860', 'm88k', 'ppc', 'sparc', 'x86_64']
+    install_headers(
+        f'include/mach-o/@arch@/reloc.h',
+        subdir : f'mach-o/@arch@',
+    )
+endforeach
+foreach arch : ['hppa', 'i386', 'i860', 'm68k', 'm88k', 'ppc', 'sparc']
+    install_headers(
+        f'include/mach-o/@arch@/swap.h',
+        subdir : f'mach-o/@arch@',
+    )
+endforeach
+
+install_data(
+    'include/modules/mach-o.modulemap',
+    install_dir : get_option('includedir'),
+    rename : 'mach-o/module.map',
+)
+install_man(
+    'man/Mach-O.5',
+    'man/NSModule.3',
+    'man/NSObjectFileImage.3',
+    'man/NSObjectFileImage_priv.3',
+    'man/arch.3',
+    'man/dyld.3',
+    'man/end.3',
+    'man/get_end.3',
+    'man/getsectbyname.3',
+    'man/getsectbynamefromheader.3',
+    'man/getsectdata.3',
+    'man/getsectdatafromheader.3',
+    'man/getsegbyname.3',
+    'man/stab.5',
+)
diff --git a/third_party/nixpkgs/pkgs/by-name/cc/cctools/meson.options b/third_party/nixpkgs/pkgs/by-name/cc/cctools/meson.options
new file mode 100644
index 0000000000..2417b81f04
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/by-name/cc/cctools/meson.options
@@ -0,0 +1,6 @@
+option(
+    'target_prefix',
+    type : 'string',
+    value : '',
+    description: 'Specifies the prefix to use when building for cross-compilation (e.g., `aarch64-apple-darwin`)'
+)
diff --git a/third_party/nixpkgs/pkgs/by-name/cc/cctools/package.nix b/third_party/nixpkgs/pkgs/by-name/cc/cctools/package.nix
new file mode 100644
index 0000000000..2ab074def6
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/by-name/cc/cctools/package.nix
@@ -0,0 +1,175 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  buildPackages,
+  darwin,
+  ld64,
+  llvm,
+  memstreamHook,
+  meson,
+  ninja,
+  openssl,
+  xar,
+  gitUpdater,
+}:
+
+let
+  # The targetPrefix is prepended to binary names to allow multiple binuntils on the PATH to both be usable.
+  targetPrefix = lib.optionalString (
+    stdenv.targetPlatform != stdenv.hostPlatform
+  ) "${stdenv.targetPlatform.config}-";
+
+  # First version with all the required files
+  xnu = fetchFromGitHub {
+    name = "xnu-src";
+    owner = "apple-oss-distributions";
+    repo = "xnu";
+    rev = "xnu-7195.50.7.100.1";
+    hash = "sha256-uHmAOm6k9ZXWfyqHiDSpm+tZqUbERlr6rXSJ4xNACkM=";
+  };
+in
+stdenv.mkDerivation (finalAttrs: {
+  pname = "${targetPrefix}cctools";
+  version = "1010.6";
+
+  outputs = [
+    "out"
+    "dev"
+    "man"
+    "gas"
+  ];
+
+  src = fetchFromGitHub {
+    owner = "apple-oss-distributions";
+    repo = "cctools";
+    rev = "cctools-${finalAttrs.version}";
+    hash = "sha256-JiKCP6U+xxR4mk4TXWv/mEo9Idg+QQqUYmB/EeRksCE=";
+  };
+
+  xcodeHash = "sha256-5RBbGrz1UKV0wt2Uk7RIHdfgWH8sgw/jy7hfTVrtVuM=";
+
+  postUnpack = ''
+    unpackFile '${xnu}'
+
+    # Verify that the Xcode project has not changed unexpectedly.
+    hashType=$(echo $xcodeHash | cut -d- -f1)
+    expectedHash=$(echo $xcodeHash | cut -d- -f2)
+    hash=$(openssl "$hashType" -binary "$sourceRoot/cctools.xcodeproj/project.pbxproj" | base64)
+
+    if [ "$hash" != "$expectedHash" ]; then
+      echo 'error: hash mismatch in cctools.xcodeproj/project.pbxproj'
+      echo "        specified: $xcodeHash"
+      echo "           got:    $hashType-$hash"
+      echo
+      echo 'Upstream Xcode project has changed. Update `meson.build` with any changes, then update `xcodeHash`.'
+      echo 'Use `nix-hash --flat --sri --type sha256 cctools.xcodeproj/project.pbxproj` to regenerate it.'
+      exit 1
+    fi
+  '';
+
+  patches = [
+    # Fix compile errors in redo_prebinding.c
+    ./0001-Fix-build-issues-with-misc-redo_prebinding.c.patch
+    # Use libcd_is_blob_a_linker_signature as defined in the libcodedirectory.h header
+    ./0002-Rely-on-libcd_is_blob_a_linker_signature.patch
+    # cctools uses availability checks for `utimensat`, but it checks the wrong version.
+    # Also, provide a definition to avoid implicit function definition errors.
+    ./0003-Fix-utimensat-compatability-with-the-10.12-SDK.patch
+    # Use the nixpkgs clang’s path as the prefix.
+    ./0004-Use-nixpkgs-clang-with-the-assembler-driver.patch
+    # Make sure cctools can find ld64 in the store
+    ./0005-Find-ld64-in-the-store.patch
+    # `ranlib` is a symlink to `libtool`. Make sure its detection works when it is used in cross-compilation.
+    ./0006-Support-target-prefixes-in-ranlib-detection.patch
+  ];
+
+  postPatch = ''
+    substitute ${./meson.build} meson.build \
+      --subst-var version
+    cp ${./meson.options} meson.options
+
+    # Make sure as’s clang driver uses clang from nixpkgs and finds the drivers in the store.
+    substituteInPlace as/driver.c \
+      --subst-var-by clang-unwrapped '${lib.getBin buildPackages.clang.cc}' \
+      --subst-var-by gas '${placeholder "gas"}'
+
+    # Need to set the path to make sure cctools can find ld64 in the store.
+    substituteInPlace libstuff/execute.c \
+      --subst-var-by ld64_path '${lib.getBin ld64}/bin/ld'
+
+    # Set the target prefix for `ranlib`
+    substituteInPlace misc/libtool.c \
+      --subst-var-by targetPrefix '${targetPrefix}'
+
+    # The version of this file distributed with cctools defines several CPU types missing from the 10.12 SDK.
+    ln -s machine-cctools.h include/mach/machine.h
+
+    # Use libxar from nixpkgs
+    for cctool_src in misc/nm.c otool/print_bitcode.c; do
+      substituteInPlace $cctool_src \
+        --replace-fail 'makestr(prefix, "../lib/libxar.dylib", NULL)' '"${lib.getLib xar}/lib/libxar.dylib"' \
+        --replace-fail '/usr/lib/libxar.dylib' '${lib.getLib xar}/lib/libxar.dylib'
+    done
+
+    # Use libLTO.dylib from nixpkgs LLVM
+    substituteInPlace libstuff/llvm.c \
+      --replace-fail 'getenv("LIBLTO_PATH")' '"${lib.getLib llvm}/lib/libLTO.dylib"'
+
+    cp ../xnu-src/EXTERNAL_HEADERS/mach-o/fixup-chains.h include/mach-o/fixup-chains.h
+  '';
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    openssl
+  ];
+
+  buildInputs =
+    [
+      ld64
+      llvm
+    ]
+    ++ lib.optionals stdenv.isDarwin [ darwin.objc4 ]
+    ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ memstreamHook ];
+
+  mesonBuildType = "release";
+
+  mesonFlags = [
+    (lib.mesonOption "b_ndebug" "if-release")
+  ] ++ lib.optionals (targetPrefix != "") [ (lib.mesonOption "target_prefix" targetPrefix) ];
+
+  postInstall = ''
+    ln -s ${targetPrefix}libtool "$out/bin/${targetPrefix}ranlib"
+    ln -s nm-classic.1 "''${!outputMan}/share/man/man1/nm.1"
+    ln -s otool-classic.1 "''${!outputMan}/share/man/man1/otool.1"
+    ln -s size-classic.1 "''${!outputMan}/share/man/man1/size.1"
+
+    # Move GNU as to its own output to prevent it from being used accidentally.
+    moveToOutput bin/gas "$gas"
+    moveToOutput libexec "$gas"
+    for arch in arm i386 x86_64; do
+      mv "$gas/libexec/as/$arch/as-$arch" "$gas/libexec/as/$arch/as"
+    done
+  '';
+
+  __structuredAttrs = true;
+
+  passthru = {
+    inherit targetPrefix;
+    updateScript = gitUpdater { rev-prefix = "cctools-"; };
+  };
+
+  meta = {
+    description = "The classic linker for Darwin";
+    homepage = "https://opensource.apple.com/releases/";
+    license = with lib.licenses; [
+      apple-psl20
+      gpl2 # GNU as
+    ];
+    maintainers = with lib.maintainers; [ reckenrode ];
+    platforms = lib.platforms.darwin;
+  };
+})
diff --git a/third_party/nixpkgs/pkgs/by-name/ce/cemu/package.nix b/third_party/nixpkgs/pkgs/by-name/ce/cemu/package.nix
index 259e2fe189..bb92482ff0 100644
--- a/third_party/nixpkgs/pkgs/by-name/ce/cemu/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/ce/cemu/package.nix
@@ -1,7 +1,7 @@
 {
   lib,
   SDL2,
-  addOpenGLRunpath,
+  addDriverRunpath,
   boost,
   cmake,
   cubeb,
@@ -48,13 +48,13 @@ let
   };
 in stdenv.mkDerivation (finalAttrs: {
   pname = "cemu";
-  version = "2.0-88";
+  version = "2.0-91";
 
   src = fetchFromGitHub {
     owner = "cemu-project";
     repo = "Cemu";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-ZXJrxfTgwDmHUk3UqA4H4MSEvNNq9lXHXxf9rgWqkro=";
+    hash = "sha256-4Z2cTunYQ9KEx1VQRiPSqGOLn0eAqcXF+A32KjQDga8=";
   };
 
   patches = [
@@ -66,13 +66,14 @@ in stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [
     SDL2
-    addOpenGLRunpath
+    addDriverRunpath
     wrapGAppsHook3
     cmake
     glslang
     nasm
     ninja
     pkg-config
+    wxGTK32
   ];
 
   buildInputs = [
diff --git a/third_party/nixpkgs/pkgs/by-name/ce/cent/package.nix b/third_party/nixpkgs/pkgs/by-name/ce/cent/package.nix
index 0436166a36..065c666e0a 100644
--- a/third_party/nixpkgs/pkgs/by-name/ce/cent/package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/cj/cjs/package.nix b/third_party/nixpkgs/pkgs/by-name/cj/cjs/package.nix
index bb7ab672db..867b6941d5 100644
--- a/third_party/nixpkgs/pkgs/by-name/cj/cjs/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/cj/cjs/package.nix
@@ -29,6 +29,8 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "dev" ];
 
+  strictDeps = true;
+
   nativeBuildInputs = [
     meson
     ninja
@@ -56,6 +58,10 @@ stdenv.mkDerivation rec {
     "-Dprofiler=disabled"
   ];
 
+  postPatch = ''
+    patchShebangs --build build/choose-tests-locale.sh
+  '';
+
   meta = with lib; {
     homepage = "https://github.com/linuxmint/cjs";
     description = "JavaScript bindings for Cinnamon";
diff --git a/third_party/nixpkgs/pkgs/by-name/cl/cli11/package.nix b/third_party/nixpkgs/pkgs/by-name/cl/cli11/package.nix
index d88470fa4d..0e7146d8d7 100644
--- a/third_party/nixpkgs/pkgs/by-name/cl/cli11/package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/cl/clzip/package.nix b/third_party/nixpkgs/pkgs/by-name/cl/clzip/package.nix
index d2e17c5e14..8220d8b7bf 100644
--- a/third_party/nixpkgs/pkgs/by-name/cl/clzip/package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/cm/cmake/setup-hook.sh b/third_party/nixpkgs/pkgs/by-name/cm/cmake/setup-hook.sh
index b28ed42b68..29b72ddda4 100755
--- a/third_party/nixpkgs/pkgs/by-name/cm/cmake/setup-hook.sh
+++ b/third_party/nixpkgs/pkgs/by-name/cm/cmake/setup-hook.sh
@@ -5,7 +5,7 @@ addCMakeParams() {
 fixCmakeFiles() {
     # Replace occurences of /usr and /opt by /var/empty.
     echo "fixing cmake files..."
-    find "$1" \( -type f -name "*.cmake" -o -name "*.cmake.in" -o -name CMakeLists.txt \) -print |
+    find "$1" -type f \( -name "*.cmake" -o -name "*.cmake.in" -o -name CMakeLists.txt \) -print |
         while read fn; do
             sed -e 's^/usr\([ /]\|$\)^/var/empty\1^g' -e 's^/opt\([ /]\|$\)^/var/empty\1^g' < "$fn" > "$fn.tmp"
             mv "$fn.tmp" "$fn"
diff --git a/third_party/nixpkgs/pkgs/by-name/cm/cmd-polkit/package.nix b/third_party/nixpkgs/pkgs/by-name/cm/cmd-polkit/package.nix
index 0a0c813f91..4ab3eb53d8 100644
--- a/third_party/nixpkgs/pkgs/by-name/cm/cmd-polkit/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/cm/cmd-polkit/package.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://github.com/OmarCastro/cmd-polkit/blob/${finalAttrs.src.rev}/CHANGELOG";
     license = licenses.lgpl21Only;
     maintainers = with maintainers; [ daru-san ];
-    mainProgram = "cmd-polkit";
+    mainProgram = "cmd-polkit-agent";
     platforms = platforms.linux;
   };
 })
diff --git a/third_party/nixpkgs/pkgs/by-name/co/coc-diagnostic/package.nix b/third_party/nixpkgs/pkgs/by-name/co/coc-diagnostic/package.nix
new file mode 100644
index 0000000000..6c67d2cb01
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/co/commitmsgfmt/package.nix b/third_party/nixpkgs/pkgs/by-name/co/commitmsgfmt/package.nix
index 508ce1f983..e653fce267 100644
--- a/third_party/nixpkgs/pkgs/by-name/co/commitmsgfmt/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/co/commitmsgfmt/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
     rev = "v${version}";
     hash = "sha256-HEkPnTO1HeJg8gpHFSUTkEVBPWJ0OdfUhNn9iGfaDD4=";
   };
-  cargoSha256 = "sha256-jTRB9ogFQGVC4C9xpGxsJYV3cnWydAJLMcjhzUPULTE=";
+  cargoHash = "sha256-jTRB9ogFQGVC4C9xpGxsJYV3cnWydAJLMcjhzUPULTE=";
 
   passthru.tests.version = testers.testVersion {
     package = commitmsgfmt;
diff --git a/third_party/nixpkgs/pkgs/tools/system/confd/default.nix b/third_party/nixpkgs/pkgs/by-name/co/confd/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/confd/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/confd/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/coz/default.nix b/third_party/nixpkgs/pkgs/by-name/co/coz/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/analysis/coz/default.nix
rename to third_party/nixpkgs/pkgs/by-name/co/coz/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/cr/crabfit-api/package.nix b/third_party/nixpkgs/pkgs/by-name/cr/crabfit-api/package.nix
index 43fa2947b8..27162f7ee2 100644
--- a/third_party/nixpkgs/pkgs/by-name/cr/crabfit-api/package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/cr/crabfit-frontend/package.nix b/third_party/nixpkgs/pkgs/by-name/cr/crabfit-frontend/package.nix
index 99d7be0fde..920b39a531 100644
--- a/third_party/nixpkgs/pkgs/by-name/cr/crabfit-frontend/package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/cr/create-react-app/package.nix b/third_party/nixpkgs/pkgs/by-name/cr/create-react-app/package.nix
index 7ce48825da..bf7d23c0b2 100644
--- a/third_party/nixpkgs/pkgs/by-name/cr/create-react-app/package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/cu/cups-printers/package.nix b/third_party/nixpkgs/pkgs/by-name/cu/cups-printers/package.nix
index b6e124fef0..7b0cf99298 100644
--- a/third_party/nixpkgs/pkgs/by-name/cu/cups-printers/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/cu/cups-printers/package.nix
@@ -30,8 +30,7 @@ python3.pkgs.buildPythonApplication rec {
       pycups
       typer
       validators
-    ]
-    ++ typer.optional-dependencies.all;
+    ];
 
   # Project has no tests
   doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/by-name/cu/cursewords/package.nix b/third_party/nixpkgs/pkgs/by-name/cu/cursewords/package.nix
index 7a51705c1a..d73705090e 100644
--- a/third_party/nixpkgs/pkgs/by-name/cu/cursewords/package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/de/decker/package.nix b/third_party/nixpkgs/pkgs/by-name/de/decker/package.nix
index c21279ee2f..617642488a 100644
--- a/third_party/nixpkgs/pkgs/by-name/de/decker/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/de/decker/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "decker";
-  version = "1.46";
+  version = "1.47";
 
   src = fetchFromGitHub {
     owner = "JohnEarnest";
     repo = "Decker";
     rev = "v${version}";
-    hash = "sha256-QXW/osCWkAt/qM+JezjluK+fIaSyokVRx7O6Batkauw=";
+    hash = "sha256-r0vBg9/IT9RQBea+XQSc270Q0+D3HzxbzdZV9oIh5vA=";
   };
 
   buildInputs = [
diff --git a/third_party/nixpkgs/pkgs/by-name/de/dep-tree/package.nix b/third_party/nixpkgs/pkgs/by-name/de/dep-tree/package.nix
index 27745d340e..224eddd3d1 100644
--- a/third_party/nixpkgs/pkgs/by-name/de/dep-tree/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/de/dep-tree/package.nix
@@ -32,7 +32,7 @@ let
     };
   };
   pname = "dep-tree";
-  version = "0.20.3";
+  version = "0.23.0";
 in
 buildGoModule {
   inherit pname version;
@@ -41,16 +41,31 @@ buildGoModule {
     owner = "gabotechs";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-w0t6SF0Kqr+XAKPNJpDJGDTm2Tc6J9OzbXtRUNkqp2k=";
+    hash = "sha256-Vd6g9UE3XEFGjCK8tFfOphYcNx+zeBS9rBVz0MDLe1I=";
   };
 
-  vendorHash = "sha256-ZDADo1takCemPGYySLwPAODUF+mEJXsaxZn4WWmaUR8=";
+  vendorHash = "sha256-KoVOjZq+RrJ2gzLnANHPPtbEY1ztC0rIXWD9AXAxqMg=";
 
   preCheck = ''
     substituteInPlace internal/tui/tui_test.go \
       --replace-fail /tmp/dep-tree-tests ${linkFarm "dep-tree_testDeps-farm" testDeps}
   '';
 
+  checkPhase = ''
+    runHook preCheck
+    # We do not set trimpath for tests, in case they reference test assets
+    export GOFLAGS=''${GOFLAGS//-trimpath/}
+
+    # checkFlags is not able to skip tests via pattern.
+    # possibly requires fixing in buildGoModule.
+    # For now, this is the new checkPhase
+    go test ./... -skip='TestRoot.*|TestFilesFromArgs.*'
+    # these tests were not feasibly fixable.
+    # a LARGE portion of the original source would need to be edited via patch for this to work.
+
+    runHook postCheck
+  '';
+
   meta = {
     description = "Tool for visualizing interconnectedness of codebases in multiple languages";
     longDescription = ''
diff --git a/third_party/nixpkgs/pkgs/by-name/di/dim/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/di/dim/Cargo.lock
index adb78aa7a9..d0d35c8ac7 100644
--- a/third_party/nixpkgs/pkgs/by-name/di/dim/Cargo.lock
+++ b/third_party/nixpkgs/pkgs/by-name/di/dim/Cargo.lock
@@ -979,7 +979,7 @@ dependencies = [
  "tracing-appender",
  "tracing-subscriber",
  "url",
- "uuid 1.5.0",
+ "uuid 1.10.0",
  "xmlwriter",
  "xtra",
  "zip",
@@ -1079,7 +1079,7 @@ dependencies = [
  "tracing",
  "tracing-appender",
  "tracing-subscriber",
- "uuid 1.5.0",
+ "uuid 1.10.0",
 ]
 
 [[package]]
@@ -2049,14 +2049,14 @@ dependencies = [
 [[package]]
 name = "nightfall"
 version = "0.3.12-rc4"
-source = "git+https://github.com/Dusk-Labs/nightfall?tag=0.3.12-rc4#147ea96146b4cae6f666741020cef0622a90d46c"
+source = "git+https://github.com/Dusk-Labs/nightfall?rev=878f07edd5d2c71261c5ae02fe3a6db7cda18be7#878f07edd5d2c71261c5ae02fe3a6db7cda18be7"
 dependencies = [
  "async-trait",
  "cfg-if",
  "err-derive",
  "lazy_static",
  "mp4",
- "nix 0.20.0",
+ "nix 0.27.1",
  "ntapi",
  "once_cell",
  "psutil",
@@ -2067,24 +2067,12 @@ dependencies = [
  "tokio",
  "tokio-stream",
  "tracing",
- "uuid 0.8.2",
+ "uuid 1.10.0",
  "winapi",
  "xtra",
  "xtra_proc",
 ]
 
-[[package]]
-name = "nix"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa9b4819da1bc61c0ea48b63b7bc8604064dd43013e7cc325df098d49cd7c18a"
-dependencies = [
- "bitflags 1.3.2",
- "cc",
- "cfg-if",
- "libc",
-]
-
 [[package]]
 name = "nix"
 version = "0.23.2"
@@ -2098,6 +2086,17 @@ dependencies = [
  "memoffset 0.6.5",
 ]
 
+[[package]]
+name = "nix"
+version = "0.27.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053"
+dependencies = [
+ "bitflags 2.4.1",
+ "cfg-if",
+ "libc",
+]
+
 [[package]]
 name = "no-std-compat"
 version = "0.4.1"
@@ -2140,9 +2139,9 @@ dependencies = [
 
 [[package]]
 name = "ntapi"
-version = "0.3.7"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c28774a7fd2fbb4f0babd8237ce554b73af68021b5f695a3cebd6c59bac0980f"
+checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4"
 dependencies = [
  "winapi",
 ]
@@ -3505,7 +3504,7 @@ dependencies = [
  "tower-layer",
  "tower-service",
  "tracing",
- "uuid 1.5.0",
+ "uuid 1.10.0",
 ]
 
 [[package]]
@@ -3747,9 +3746,9 @@ dependencies = [
 
 [[package]]
 name = "uuid"
-version = "1.5.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc"
+checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314"
 dependencies = [
  "getrandom",
 ]
diff --git a/third_party/nixpkgs/pkgs/by-name/di/dim/bump-nightfall.patch b/third_party/nixpkgs/pkgs/by-name/di/dim/bump-nightfall.patch
new file mode 100644
index 0000000000..37979efd5f
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/by-name/di/dim/bump-nightfall.patch
@@ -0,0 +1,48 @@
+diff --git a/dim/Cargo.toml b/dim/Cargo.toml
+index b7c8106493...38518ba29d 100644
+--- a/dim/Cargo.toml
++++ b/dim/Cargo.toml
+@@ -15,7 +15,7 @@
+ fdlimit = "0.2.1"
+ 
+ # git dependencies
+-nightfall = { git = "https://github.com/Dusk-Labs/nightfall", tag = "0.3.12-rc4", default-features = false, features = [
++nightfall = { git = "https://github.com/Dusk-Labs/nightfall", rev = "878f07edd5d2c71261c5ae02fe3a6db7cda18be7", default-features = false, features = [
+     "cuda",
+     "ssa_transmux",
+ ] }
+diff --git a/dim-core/Cargo.toml b/dim-core/Cargo.toml
+index b311b7c7af...ffc5d85dbb 100644
+--- a/dim-core/Cargo.toml
++++ b/dim-core/Cargo.toml
+@@ -11,7 +11,7 @@
+ 
+ [dependencies]
+ # git dependencies
+-nightfall = { git = "https://github.com/Dusk-Labs/nightfall", tag = "0.3.12-rc4", default-features = false, features = [
++nightfall = { git = "https://github.com/Dusk-Labs/nightfall", rev = "878f07edd5d2c71261c5ae02fe3a6db7cda18be7", default-features = false, features = [
+     "cuda",
+     "ssa_transmux",
+ ] }
+@@ -72,7 +72,7 @@
+     "json",
+ ] }
+ url = "2.2.2"
+-uuid = { version = "1.2.2", features = ["v4"] }
++uuid = { version = "1.6.1", features = ["v4"] }
+ xmlwriter = "0.1.0"
+ xtra = { version = "0.5.1", features = ["tokio", "with-tokio-1"] }
+ 
+diff --git a/dim-web/Cargo.toml b/dim-web/Cargo.toml
+index 2da5764d50...4c7574c0b4 100644
+--- a/dim-web/Cargo.toml
++++ b/dim-web/Cargo.toml
+@@ -14,7 +14,7 @@
+ dim-events = { path = "../dim-events" }
+ dim-core = { path = "../dim-core" }
+ 
+-nightfall = { git = "https://github.com/Dusk-Labs/nightfall", tag = "0.3.12-rc4", default-features = false, features = [
++nightfall = { git = "https://github.com/Dusk-Labs/nightfall", rev = "878f07edd5d2c71261c5ae02fe3a6db7cda18be7", default-features = false, features = [
+     "cuda",
+     "ssa_transmux",
+ ] }
diff --git a/third_party/nixpkgs/pkgs/by-name/di/dim/package.nix b/third_party/nixpkgs/pkgs/by-name/di/dim/package.nix
index fba2c5e11f..f7fe86ab9a 100644
--- a/third_party/nixpkgs/pkgs/by-name/di/dim/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/di/dim/package.nix
@@ -6,7 +6,7 @@
   buildNpmPackage,
   darwin,
   makeWrapper,
-  ffmpeg_5,
+  ffmpeg,
   git,
   pkg-config,
   sqlite,
@@ -48,6 +48,10 @@ rustPlatform.buildRustPackage rec {
     # the working dir and PATH instead.
     ./relative-paths.diff
 
+    # Bump the first‐party nightfall dependency to the latest Git
+    # revision for FFmpeg >= 6 support.
+    ./bump-nightfall.patch
+
     # Upstream has some unused imports that prevent things from compiling...
     # Remove for next release.
     (fetchpatch {
@@ -57,6 +61,10 @@ rustPlatform.buildRustPackage rec {
     })
   ];
 
+  postPatch = ''
+    ln -sf ${./Cargo.lock} Cargo.lock
+  '';
+
   postConfigure = ''
     ln -ns $frontend ui/build
   '';
@@ -82,7 +90,7 @@ rustPlatform.buildRustPackage rec {
     lockFile = ./Cargo.lock;
     outputHashes = {
       "mp4-0.8.2" = "sha256-OtVRtOTU/yoxxoRukpUghpfiEgkKoJZNflMQ3L26Cno=";
-      "nightfall-0.3.12-rc4" = "sha256-DtSXdIDg7XBgzEYzHdzjrHdM1ESKTQdgByeerH5TWwU=";
+      "nightfall-0.3.12-rc4" = "sha256-AbSuLe3ySOla3NB+mlfHRHqHuMqQbrThAaUZ747GErE=";
     };
   };
 
@@ -101,7 +109,7 @@ rustPlatform.buildRustPackage rec {
 
   postInstall = ''
     wrapProgram $out/bin/dim \
-      --prefix PATH : ${lib.makeBinPath [ ffmpeg_5 ]}
+      --prefix PATH : ${lib.makeBinPath [ ffmpeg ]}
   '';
 
   meta = {
diff --git a/third_party/nixpkgs/pkgs/tools/misc/direnv/default.nix b/third_party/nixpkgs/pkgs/by-name/di/direnv/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/direnv/default.nix
rename to third_party/nixpkgs/pkgs/by-name/di/direnv/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/X11/dispad/default.nix b/third_party/nixpkgs/pkgs/by-name/di/dispad/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/X11/dispad/default.nix
rename to third_party/nixpkgs/pkgs/by-name/di/dispad/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/do/dooit/package.nix b/third_party/nixpkgs/pkgs/by-name/do/dooit/package.nix
index ea549fff71..b55e7481e5 100644
--- a/third_party/nixpkgs/pkgs/by-name/do/dooit/package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/do/dorion/package.nix b/third_party/nixpkgs/pkgs/by-name/do/dorion/package.nix
index bff13f92f4..1ed9382bef 100644
--- a/third_party/nixpkgs/pkgs/by-name/do/dorion/package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/dr/druid/package.nix b/third_party/nixpkgs/pkgs/by-name/dr/druid/package.nix
new file mode 100644
index 0000000000..3d8c59b3f0
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/by-name/dr/druid/package.nix
@@ -0,0 +1,82 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  extensions ? { },
+  libJars ? [ ],
+  nixosTests,
+  mysqlSupport ? true,
+}:
+let
+  inherit (lib)
+    concatStringsSep
+    licenses
+    maintainers
+    mapAttrsToList
+    optionalString
+    forEach
+    ;
+in
+stdenv.mkDerivation (finalAttrs: {
+  pname = "apache-druid";
+  version = "30.0.0";
+
+  src = fetchurl {
+    url = "mirror://apache/druid/${finalAttrs.version}/apache-druid-${finalAttrs.version}-bin.tar.gz";
+    hash = "sha256-mRYorVkNzM94LP53G78eW20N5UsvMP7Lv4rAysmPwXw=";
+  };
+
+  mysqlConnector = fetchurl {
+    url = "https://repo1.maven.org/maven2/mysql/mysql-connector-java/5.1.48/mysql-connector-java-5.1.48.jar";
+    hash = "sha256-VuJsqqOCH1rkr0T5x09mz4uE6gFRatOAPLsOkEm27Kg=";
+  };
+
+  dontBuild = true;
+
+  loadExtensions = (
+    concatStringsSep "\n" (
+      mapAttrsToList (
+        dir: files:
+        ''
+          if ! test -d $out/extensions/${dir}; then
+               mkdir $out/extensions/${dir};
+           fi
+        ''
+        + concatStringsSep "\n" (
+          forEach files (file: ''
+            if test -d ${file} ; then
+              cp  ${file}/* $out/extensions/${dir}/
+            else
+              cp ${file} $out/extensions/${dir}/
+            fi
+          '')
+        )
+      ) extensions
+    )
+  );
+
+  loadJars = concatStringsSep "\n" (forEach libJars (jar: "cp ${jar} $out/lib/"));
+
+  installPhase = ''
+    runHook preInstall
+    mkdir $out
+    mv * $out
+    ${optionalString mysqlSupport "cp ${finalAttrs.mysqlConnector} $out/extensions/mysql-metadata-storage"}
+    ${finalAttrs.loadExtensions}
+    ${finalAttrs.loadJars}
+    runHook postInstall
+  '';
+
+  passthru = {
+    tests = nixosTests.druid.default.passthru.override { druidPackage = finalAttrs.finalPackage; };
+  };
+
+  meta = {
+    description = "Apache Druid: a high performance real-time analytics database";
+    homepage = "https://github.com/apache/druid";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ vsharathchandra ];
+    mainProgram = "druid";
+  };
+
+})
diff --git a/third_party/nixpkgs/pkgs/by-name/du/dust/package.nix b/third_party/nixpkgs/pkgs/by-name/du/dust/package.nix
index c8414276f3..cf13173519 100644
--- a/third_party/nixpkgs/pkgs/by-name/du/dust/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/du/dust/package.nix
@@ -5,13 +5,13 @@ rustPlatform.buildRustPackage rec {
   # Since then, `dust` has been freed up, allowing this package to take that attribute.
   # However in order for tools like `nix-env` to detect package updates, keep `du-dust` for pname.
   pname = "du-dust";
-  version = "1.1.0";
+  version = "1.1.1";
 
   src = fetchFromGitHub {
     owner = "bootandy";
     repo = "dust";
     rev = "v${version}";
-    hash = "sha256-ERcXVLzgurY6vU+exZ5IcM0rPbWrpghDO1m2XwE5i38=";
+    hash = "sha256-oaDJLDFI193tSzUDqQI/Lvrks0FLYTMLrrwigXwJ+rY=";
     # Remove unicode file names which leads to different checksums on HFS+
     # vs. other filesystems because of unicode normalisation.
     postFetch = ''
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
     '';
   };
 
-  cargoHash = "sha256-ubcfLNiLQ71QcD5YneMD5N1ipsR1GK5GJQ0PrJyv6qI=";
+  cargoHash = "sha256-o9ynFkdx6a8kHS06NQN7BzWrOIxvdVwnUHmxt4cnmQU=";
 
   nativeBuildInputs = [ installShellFiles ];
 
diff --git a/third_party/nixpkgs/pkgs/by-name/dw/dwl/package.nix b/third_party/nixpkgs/pkgs/by-name/dw/dwl/package.nix
new file mode 100644
index 0000000000..152d5000c2
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/by-name/dw/dwl/package.nix
@@ -0,0 +1,132 @@
+{
+  lib,
+  fetchFromGitea,
+  installShellFiles,
+  libX11,
+  libinput,
+  libxcb,
+  libxkbcommon,
+  pixman,
+  pkg-config,
+  stdenv,
+  testers,
+  wayland,
+  wayland-protocols,
+  wayland-scanner,
+  wlroots,
+  writeText,
+  xcbutilwm,
+  xwayland,
+  # Boolean flags
+  enableXWayland ? true,
+  withCustomConfigH ? (configH != null),
+  # Configurable options
+  configH ?
+    if conf != null then
+      lib.warn ''
+        conf parameter is deprecated;
+        use configH instead
+      '' conf
+    else
+      null,
+  # Deprecated options
+  # Remove them before next version of either Nixpkgs or dwl itself
+  conf ? null,
+}:
+
+# If we set withCustomConfigH, let's not forget configH
+assert withCustomConfigH -> (configH != null);
+stdenv.mkDerivation (finalAttrs: {
+  pname = "dwl";
+  version = "0.6";
+
+  src = fetchFromGitea {
+    domain = "codeberg.org";
+    owner = "dwl";
+    repo = "dwl";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-fygUzEi4bgopesvHByfpatkLFYI98qozJOUBNM2t9Mg=";
+  };
+
+  nativeBuildInputs = [
+    installShellFiles
+    pkg-config
+    wayland-scanner
+  ];
+
+  buildInputs =
+    [
+      libinput
+      libxcb
+      libxkbcommon
+      pixman
+      wayland
+      wayland-protocols
+      wlroots
+    ]
+    ++ lib.optionals enableXWayland [
+      libX11
+      xcbutilwm
+      xwayland
+    ];
+
+  outputs = [
+    "out"
+    "man"
+  ];
+
+  postPatch =
+    let
+      configFile =
+        if lib.isDerivation configH || builtins.isPath configH then
+          configH
+        else
+          writeText "config.h" configH;
+    in
+    lib.optionalString withCustomConfigH "cp ${configFile} config.h";
+
+  makeFlags =
+    [
+      "PKG_CONFIG=${stdenv.cc.targetPrefix}pkg-config"
+      "WAYLAND_SCANNER=wayland-scanner"
+      "PREFIX=$(out)"
+      "MANDIR=$(man)/share/man"
+    ]
+    ++ lib.optionals enableXWayland [
+      ''XWAYLAND="-DXWAYLAND"''
+      ''XLIBS="xcb xcb-icccm"''
+    ];
+
+  strictDeps = true;
+
+  # required for whitespaces in makeFlags
+  __structuredAttrs = true;
+
+  passthru = {
+    tests.version = testers.testVersion {
+      package = finalAttrs.finalPackage;
+      # `dwl -v` emits its version string to stderr and returns 1
+      command = "dwl -v 2>&1; return 0";
+    };
+  };
+
+  meta = {
+    homepage = "https://codeberg.org/dwl/dwl";
+    description = "Dynamic window manager for Wayland";
+    longDescription = ''
+      dwl is a compact, hackable compositor for Wayland based on wlroots. It is
+      intended to fill the same space in the Wayland world that dwm does in X11,
+      primarily in terms of philosophy, and secondarily in terms of
+      functionality. Like dwm, dwl is:
+
+      - Easy to understand, hack on, and extend with patches
+      - One C source file (or a very small number) configurable via config.h
+      - Tied to as few external dependencies as possible
+    '';
+    license = lib.licenses.gpl3Only;
+    maintainers = [ lib.maintainers.AndersonTorres ];
+    inherit (wayland.meta) platforms;
+    mainProgram = "dwl";
+  };
+})
+# TODO: custom patches from upstream website
diff --git a/third_party/nixpkgs/pkgs/by-name/dx/dxvk/package.nix b/third_party/nixpkgs/pkgs/by-name/dx/dxvk/package.nix
index 89defd092b..9a82a2a20b 100644
--- a/third_party/nixpkgs/pkgs/by-name/dx/dxvk/package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/dx/dxvk/setup_dxvk.sh b/third_party/nixpkgs/pkgs/by-name/dx/dxvk/setup_dxvk.sh
index 27e5d6aa03..529397ab24 100644
--- a/third_party/nixpkgs/pkgs/by-name/dx/dxvk/setup_dxvk.sh
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/dx/dxvk_2/package.nix b/third_party/nixpkgs/pkgs/by-name/dx/dxvk_2/package.nix
index 56be0cf7cd..d8a00086ab 100644
--- a/third_party/nixpkgs/pkgs/by-name/dx/dxvk_2/package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/ea/ear2ctl/package.nix b/third_party/nixpkgs/pkgs/by-name/ea/ear2ctl/package.nix
index 4d4e038f85..24f7b46496 100644
--- a/third_party/nixpkgs/pkgs/by-name/ea/ear2ctl/package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/ed/ed/package.nix b/third_party/nixpkgs/pkgs/by-name/ed/ed/package.nix
new file mode 100644
index 0000000000..a4fe441ae0
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/by-name/ed/ed/package.nix
@@ -0,0 +1,60 @@
+{
+  lib,
+  fetchurl,
+  lzip,
+  runtimeShellPackage,
+  stdenv,
+  testers,
+}:
+
+# Note: this package is used for bootstrapping fetchurl, and thus cannot use
+# fetchpatch! Any mutable patches (retrieved from GitHub, cgit or any other
+# place) that are needed here should be directly included together as regular
+# files.
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "ed";
+  version = "1.20.2";
+
+  src = fetchurl {
+    url = "mirror://gnu/ed/ed-${finalAttrs.version}.tar.lz";
+    hash = "sha256-Zf7HMY9IwsoX8zSsD0cD3v5iA3uxPMI5IN4He1+iRSM=";
+  };
+
+  nativeBuildInputs = [ lzip ];
+
+  buildInputs = [ runtimeShellPackage ];
+
+  configureFlags = [
+    "CC=${stdenv.cc.targetPrefix}cc"
+  ];
+
+  strictDeps = true;
+
+  doCheck = true;
+
+  passthru = {
+    tests.version = testers.testVersion {
+      package = finalAttrs.finalPackage;
+      command = "ed --version";
+    };
+  };
+
+  meta = {
+    homepage = "https://www.gnu.org/software/ed/";
+    description = "GNU implementation of the standard Unix editor";
+    longDescription = ''
+      GNU ed is a line-oriented text editor. It is used to create, display,
+      modify and otherwise manipulate text files, both interactively and via
+      shell scripts. A restricted version of ed, red, can only edit files in the
+      current directory and cannot execute shell commands. Ed is the 'standard'
+      text editor in the sense that it is the original editor for Unix, and thus
+      widely available. For most purposes, however, it is superseded by
+      full-screen editors such as GNU Emacs or GNU Moe.
+    '';
+    license = lib.licenses.gpl3Plus;
+    mainProgram = "ed";
+    maintainers = with lib.maintainers; [ AndersonTorres ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/third_party/nixpkgs/pkgs/by-name/ed/eduvpn-client/package.nix b/third_party/nixpkgs/pkgs/by-name/ed/eduvpn-client/package.nix
index 3211636b84..d5313bdeff 100644
--- a/third_party/nixpkgs/pkgs/by-name/ed/eduvpn-client/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/ed/eduvpn-client/package.nix
@@ -12,12 +12,12 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "eduvpn-client";
-  version = "4.3.1";
+  version = "4.4.0";
   format = "pyproject";
 
   src = fetchurl {
     url = "https://github.com/eduvpn/python-${pname}/releases/download/${version}/python-${pname}-${version}.tar.xz";
-    hash = "sha256-8k5ZbbN2OvoFFq0nn+fftQfQJbGhb2MEvZNokMXegr0=";
+    hash = "sha256-IHRIjryAIeGcFqz5BMWsE0/gClaSmnwWhjc1f1c69vk=";
   };
 
   nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/by-name/el/elf2nucleus/package.nix b/third_party/nixpkgs/pkgs/by-name/el/elf2nucleus/package.nix
index 08ec2e8f0a..fad1d87199 100644
--- a/third_party/nixpkgs/pkgs/by-name/el/elf2nucleus/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/el/elf2nucleus/package.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-FAIOtGfGow+0DrPPEBEfvaiinNZLQlGWKJ4DkMj63OA=";
   };
 
-  cargoSha256 = "sha256-IeQnI6WTzxSI/VzoHtVukZtB1jX98wzLOT01NMLD5wQ=";
+  cargoHash = "sha256-IeQnI6WTzxSI/VzoHtVukZtB1jX98wzLOT01NMLD5wQ=";
 
   nativeBuildInputs = [ installShellFiles ];
 
diff --git a/third_party/nixpkgs/pkgs/by-name/em/emulationstation/package.nix b/third_party/nixpkgs/pkgs/by-name/em/emulationstation/package.nix
index 62a3537cc5..8be475d885 100644
--- a/third_party/nixpkgs/pkgs/by-name/em/emulationstation/package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/em/emulationstation/sources.nix b/third_party/nixpkgs/pkgs/by-name/em/emulationstation/sources.nix
new file mode 100644
index 0000000000..88273e845f
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/ex/ext4fuse/package.nix b/third_party/nixpkgs/pkgs/by-name/ex/ext4fuse/package.nix
new file mode 100644
index 0000000000..b083ec1c63
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/ez/eza/package.nix b/third_party/nixpkgs/pkgs/by-name/ez/eza/package.nix
index 6f6886fd38..2e04cd6625 100644
--- a/third_party/nixpkgs/pkgs/by-name/ez/eza/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/ez/eza/package.nix
@@ -17,16 +17,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "eza";
-  version = "0.18.22";
+  version = "0.18.23";
 
   src = fetchFromGitHub {
     owner = "eza-community";
     repo = "eza";
     rev = "v${version}";
-    hash = "sha256-AZTfFMovNZao/zYzXkVZFGuxUnWz41PmJhuzcIPmwZc=";
+    hash = "sha256-Zwi6YfYhOLZ+RcIH/u1IeUn4Ty9jOvv9R0RTLO8Yi8Q=";
   };
 
-  cargoHash = "sha256-c35CscrsKrzOpzP00K63VUtNcQOzEvS2412s16O4wHw=";
+  cargoHash = "sha256-6g9EtHJaUAoIyjiklX/FxlGNZMzh6/mN9Yug35svfrE=";
 
   nativeBuildInputs = [ cmake pkg-config installShellFiles pandoc ];
   buildInputs = [ zlib ]
diff --git a/third_party/nixpkgs/pkgs/by-name/fa/fac/package.nix b/third_party/nixpkgs/pkgs/by-name/fa/fac/package.nix
index 93aff4bec6..ad26888ad5 100644
--- a/third_party/nixpkgs/pkgs/by-name/fa/fac/package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/fa/fastcdr/package.nix b/third_party/nixpkgs/pkgs/by-name/fa/fastcdr/package.nix
index 140e67df70..438eac224a 100644
--- a/third_party/nixpkgs/pkgs/by-name/fa/fastcdr/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/fa/fastcdr/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "fastcdr";
-  version = "2.2.2";
+  version = "2.2.3";
 
   src = fetchFromGitHub {
     owner = "eProsima";
     repo = "Fast-CDR";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-gNVHG52KSp6CKGU4RWyFHcI3gAp8kjylS80mCjm/DiY=";
+    hash = "sha256-x+lkbssrNQQXmnlfYM2cGMVQZRiONNeImHj5EPm93ls=";
   };
 
   patches = [
diff --git a/third_party/nixpkgs/pkgs/by-name/fa/fava/package.nix b/third_party/nixpkgs/pkgs/by-name/fa/fava/package.nix
new file mode 100644
index 0000000000..fa17fdda10
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/ff/ffsubsync/package.nix b/third_party/nixpkgs/pkgs/by-name/ff/ffsubsync/package.nix
index 6ecbeb9dd5..10f150a3cc 100644
--- a/third_party/nixpkgs/pkgs/by-name/ff/ffsubsync/package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/fg/fgqcanvas/package.nix b/third_party/nixpkgs/pkgs/by-name/fg/fgqcanvas/package.nix
index f64c4881d8..ec47740232 100644
--- a/third_party/nixpkgs/pkgs/by-name/fg/fgqcanvas/package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/fl/flexget/package.nix b/third_party/nixpkgs/pkgs/by-name/fl/flexget/package.nix
index 26ea275144..661c544776 100644
--- a/third_party/nixpkgs/pkgs/by-name/fl/flexget/package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/system/foreman/Gemfile b/third_party/nixpkgs/pkgs/by-name/fo/foreman/Gemfile
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/foreman/Gemfile
rename to third_party/nixpkgs/pkgs/by-name/fo/foreman/Gemfile
diff --git a/third_party/nixpkgs/pkgs/tools/system/foreman/Gemfile.lock b/third_party/nixpkgs/pkgs/by-name/fo/foreman/Gemfile.lock
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/foreman/Gemfile.lock
rename to third_party/nixpkgs/pkgs/by-name/fo/foreman/Gemfile.lock
diff --git a/third_party/nixpkgs/pkgs/tools/system/foreman/gemset.nix b/third_party/nixpkgs/pkgs/by-name/fo/foreman/gemset.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/foreman/gemset.nix
rename to third_party/nixpkgs/pkgs/by-name/fo/foreman/gemset.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/foreman/default.nix b/third_party/nixpkgs/pkgs/by-name/fo/foreman/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/foreman/default.nix
rename to third_party/nixpkgs/pkgs/by-name/fo/foreman/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/fr/frankenphp/package.nix b/third_party/nixpkgs/pkgs/by-name/fr/frankenphp/package.nix
index da611ee219..e96cbeb8ac 100644
--- a/third_party/nixpkgs/pkgs/by-name/fr/frankenphp/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/fr/frankenphp/package.nix
@@ -6,6 +6,7 @@
 , brotli
 , testers
 , frankenphp
+, cctools
 , darwin
 , libiconv
 , pkg-config
@@ -44,7 +45,7 @@ in buildGoModule rec {
   vendorHash = "sha256-Ir1lwTu3JqIFp9jhJyhTAFm/+XlStkPuCoNAZneeKGc=";
 
   buildInputs = [ phpUnwrapped brotli ] ++ phpUnwrapped.buildInputs;
-  nativeBuildInputs = [ makeBinaryWrapper ] ++ lib.optionals stdenv.isDarwin [ pkg-config darwin.cctools darwin.autoSignDarwinBinariesHook ];
+  nativeBuildInputs = [ makeBinaryWrapper ] ++ lib.optionals stdenv.isDarwin [ pkg-config cctools darwin.autoSignDarwinBinariesHook ];
 
   subPackages = [ "frankenphp" ];
 
diff --git a/third_party/nixpkgs/pkgs/by-name/fr/freecad/package.nix b/third_party/nixpkgs/pkgs/by-name/fr/freecad/package.nix
index b0146582b1..04c40ee03c 100644
--- a/third_party/nixpkgs/pkgs/by-name/fr/freecad/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/fr/freecad/package.nix
@@ -191,7 +191,7 @@ stdenv.mkDerivation (finalAttrs: {
       right at home with FreeCAD.
     '';
     license = lib.licenses.lgpl2Plus;
-    maintainers = with lib.maintainers; [ viric gebner AndersonTorres ];
+    maintainers = with lib.maintainers; [ gebner AndersonTorres ];
     platforms = lib.platforms.linux;
   };
 })
diff --git a/third_party/nixpkgs/pkgs/by-name/fw/fwupd/package.nix b/third_party/nixpkgs/pkgs/by-name/fw/fwupd/package.nix
index b5e985b3d4..0552d7fa16 100644
--- a/third_party/nixpkgs/pkgs/by-name/fw/fwupd/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/fw/fwupd/package.nix
@@ -120,7 +120,7 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "fwupd";
-  version = "1.9.21";
+  version = "1.9.22";
 
   # libfwupd goes to lib
   # daemon, plug-ins and libfwupdplugin go to out
@@ -131,7 +131,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "fwupd";
     repo = "fwupd";
     rev = finalAttrs.version;
-    hash = "sha256-V3v3lTz3KUt/zEv5BuUcN7S2ZXHPbhYN5vsFPNuxbFY=";
+    hash = "sha256-skmfTejj9cPdihwPIbsyoSI8ekVNcUXUNMcpPs9uSNo=";
   };
 
   patches = [
diff --git a/third_party/nixpkgs/pkgs/by-name/fz/fzf/package.nix b/third_party/nixpkgs/pkgs/by-name/fz/fzf/package.nix
index 4508d30e04..2733b9231f 100644
--- a/third_party/nixpkgs/pkgs/by-name/fz/fzf/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/fz/fzf/package.nix
@@ -11,13 +11,13 @@
 
 buildGoModule rec {
   pname = "fzf";
-  version = "0.54.1";
+  version = "0.54.2";
 
   src = fetchFromGitHub {
     owner = "junegunn";
     repo = "fzf";
     rev = "v${version}";
-    hash = "sha256-nE4ibYAOH3fgZbpf/tPocXFH6GfialYk/gvLltO8x/w=";
+    hash = "sha256-9vuz18rosYpkBmJc37CNXEry4OWMSQ03atdCiwY+KYY=";
   };
 
   vendorHash = "sha256-uhjJPB/jfRPAu9g41vWFnSBIN9TIZW3s6BGz0fA2ygE=";
diff --git a/third_party/nixpkgs/pkgs/applications/audio/g4music/default.nix b/third_party/nixpkgs/pkgs/by-name/ga/gapless/package.nix
similarity index 86%
rename from third_party/nixpkgs/pkgs/applications/audio/g4music/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ga/gapless/package.nix
index cbf5aef45c..9852ab96a1 100644
--- a/third_party/nixpkgs/pkgs/applications/audio/g4music/default.nix
+++ b/third_party/nixpkgs/pkgs/by-name/ga/gapless/package.nix
@@ -14,15 +14,15 @@
 , wrapGAppsHook4
 }:
 stdenv.mkDerivation (finalAttrs: {
-  pname = "g4music";
-  version = "3.7.2";
+  pname = "gapless";
+  version = "3.8";
 
   src = fetchFromGitLab {
     domain = "gitlab.gnome.org";
     owner = "neithern";
     repo = "g4music";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-fG8OBAzdCdr3Yo8Vei93HlNa2TIL5gxWG+0jFYjSDZ8=";
+    hash = "sha256-AZoMAbQ3foW2jx+mBam925a8ykMtGvaiVg9N8/Ggny0=";
   };
 
   nativeBuildInputs = [
@@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
     mainProgram = "g4music";
     homepage = "https://gitlab.gnome.org/neithern/g4music";
     license = licenses.gpl3Only;
-    maintainers = with maintainers; [ magnouvean ];
+    maintainers = with maintainers; [ aleksana ];
     platforms = platforms.linux;
   };
 })
diff --git a/third_party/nixpkgs/pkgs/servers/geospatial/geoserver/data-dir.patch b/third_party/nixpkgs/pkgs/by-name/ge/geoserver/data-dir.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/geospatial/geoserver/data-dir.patch
rename to third_party/nixpkgs/pkgs/by-name/ge/geoserver/data-dir.patch
diff --git a/third_party/nixpkgs/pkgs/servers/geospatial/geoserver/extensions.nix b/third_party/nixpkgs/pkgs/by-name/ge/geoserver/extensions.nix
similarity index 53%
rename from third_party/nixpkgs/pkgs/servers/geospatial/geoserver/extensions.nix
rename to third_party/nixpkgs/pkgs/by-name/ge/geoserver/extensions.nix
index 654f84416c..5fbecd9da0 100644
--- a/third_party/nixpkgs/pkgs/servers/geospatial/geoserver/extensions.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/geospatial/geoserver/default.nix b/third_party/nixpkgs/pkgs/by-name/ge/geoserver/package.nix
similarity index 96%
rename from third_party/nixpkgs/pkgs/servers/geospatial/geoserver/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ge/geoserver/package.nix
index dca4c2af1e..e0b1f491aa 100644
--- a/third_party/nixpkgs/pkgs/servers/geospatial/geoserver/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/geospatial/geoserver/update.sh b/third_party/nixpkgs/pkgs/by-name/ge/geoserver/update.sh
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/geospatial/geoserver/update.sh
rename to third_party/nixpkgs/pkgs/by-name/ge/geoserver/update.sh
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gerrit/default.nix b/third_party/nixpkgs/pkgs/by-name/ge/gerrit/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/version-management/gerrit/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ge/gerrit/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/gh/ghciwatch/package.nix b/third_party/nixpkgs/pkgs/by-name/gh/ghciwatch/package.nix
index 55ee9b79ea..b505e405e1 100644
--- a/third_party/nixpkgs/pkgs/by-name/gh/ghciwatch/package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/graphics/gifsicle/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/gifsicle/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/graphics/gifsicle/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/gifsicle/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/text/gist/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/gist/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/gist/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/gist/package.nix
diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-codeowners/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/git-codeowners/package.nix
similarity index 88%
rename from third_party/nixpkgs/pkgs/applications/version-management/git-codeowners/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/git-codeowners/package.nix
index 7ca69ccc3d..7df57966f8 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/git-codeowners/default.nix
+++ b/third_party/nixpkgs/pkgs/by-name/gi/git-codeowners/package.nix
@@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0bzq4ridzb4l1zqrj1r0vlzkjpgfaqwky5jf49cwjhz4ybwrfpkq";
   };
 
-  cargoSha256 = "00wi64v2zn8rp8fjwbdwyvl3pva5sn9xclaawp2m222dqnlszb2d";
+  cargoHash = "sha256-TayvqcVNCFHF5UpR1pPVRe076Pa8LS4duhnZLzYxkQM=";
 
   meta = with lib; {
     homepage = "https://github.com/softprops/git-codeowners";
diff --git a/third_party/nixpkgs/pkgs/by-name/gi/git-igitt/package.nix b/third_party/nixpkgs/pkgs/by-name/gi/git-igitt/package.nix
new file mode 100644
index 0000000000..19183790b8
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/by-name/gi/git-igitt/package.nix
@@ -0,0 +1,46 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  pkg-config,
+  libgit2,
+  oniguruma,
+  zlib,
+}:
+
+let
+  pname = "git-igitt";
+  version = "0.1.18";
+in
+rustPlatform.buildRustPackage {
+  inherit pname version;
+
+  src = fetchFromGitHub {
+    owner = "mlange-42";
+    repo = pname;
+    rev = version;
+    hash = "sha256-JXEWnekL9Mtw0S3rI5aeO1HB9kJ7bRJDJ6EJ4ATlFeQ=";
+  };
+
+  cargoHash = "sha256-5UgcgM/WuyApNFCd8YBodx9crJP3+Bygu9nSBJqPCaQ=";
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [
+    libgit2
+    oniguruma
+    zlib
+  ];
+
+  env = {
+    RUSTONIG_SYSTEM_LIBONIG = true;
+  };
+
+  meta = {
+    description = "Interactive, cross-platform Git terminal application with clear git graphs arranged for your branching model";
+    homepage = "https://github.com/mlange-42/git-igitt";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.pinage404 ];
+    mainProgram = "git-igitt";
+  };
+}
diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/fix-shell-path.patch b/third_party/nixpkgs/pkgs/by-name/gi/gitlab-runner/fix-shell-path.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/fix-shell-path.patch
rename to third_party/nixpkgs/pkgs/by-name/gi/gitlab-runner/fix-shell-path.patch
diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/third_party/nixpkgs/pkgs/by-name/gi/gitlab-runner/package.nix
similarity index 93%
rename from third_party/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
rename to third_party/nixpkgs/pkgs/by-name/gi/gitlab-runner/package.nix
index 683b7f8445..a4806b80c2 100644
--- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
+++ b/third_party/nixpkgs/pkgs/by-name/gi/gitlab-runner/package.nix
@@ -1,7 +1,7 @@
 { lib, buildGoModule, fetchFromGitLab, bash }:
 
 let
-  version = "17.1.0";
+  version = "17.2.0";
 in
 buildGoModule rec {
   inherit version;
@@ -17,13 +17,13 @@ buildGoModule rec {
   # For patchShebangs
   buildInputs = [ bash ];
 
-  vendorHash = "sha256-Rk5/h8wqVwGzovtAjjNkvexG71Dj36mFxU8OsLJzpUo=";
+  vendorHash = "sha256-1MwHss76apA9KoFhEU6lYiUACrPMGYzjhds6nTyNuJI=";
 
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitlab-runner";
     rev = "v${version}";
-    hash = "sha256-mRL62PIAkPK0aLA7uYpGlUvaJfbD354RDOD4P8MLzx8=";
+    hash = "sha256-a2Igy4DS3fYTvPW1vvDrH/DjMQ4lG9cm/P3mFr+y9s4=";
   };
 
   patches = [
diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/remove-bash-test.patch b/third_party/nixpkgs/pkgs/by-name/gi/gitlab-runner/remove-bash-test.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/remove-bash-test.patch
rename to third_party/nixpkgs/pkgs/by-name/gi/gitlab-runner/remove-bash-test.patch
diff --git a/third_party/nixpkgs/pkgs/by-name/gi/gitu/package.nix b/third_party/nixpkgs/pkgs/by-name/gi/gitu/package.nix
index 98935dd0ba..5b8b5b3f15 100644
--- a/third_party/nixpkgs/pkgs/by-name/gi/gitu/package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/gn/gnome-pomodoro/package.nix b/third_party/nixpkgs/pkgs/by-name/gn/gnome-pomodoro/package.nix
index 4261ebaec1..b470feab03 100644
--- a/third_party/nixpkgs/pkgs/by-name/gn/gnome-pomodoro/package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/go/google-chrome/package.nix b/third_party/nixpkgs/pkgs/by-name/go/google-chrome/package.nix
index 806b6cf561..7e3749e5db 100644
--- a/third_party/nixpkgs/pkgs/by-name/go/google-chrome/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/go/google-chrome/package.nix
@@ -24,7 +24,7 @@
 ## Ubuntu
 , liberation_ttf, curl, util-linux, xdg-utils, wget
 ## Arch Linux.
-, flac, harfbuzz, icu, libpng, libopus, snappy, speechd
+, flac, harfbuzz, icu, libpng, libopus, snappy, speechd-minimal
 ## Gentoo
 , bzip2, libcap
 
@@ -38,7 +38,7 @@
 , libvaSupport ? true, libva
 
 # For Vulkan support (--enable-features=Vulkan)
-, addOpenGLRunpath
+, addDriverRunpath
 }:
 
 let
@@ -54,7 +54,7 @@ let
     systemd
     libexif pciutils
     liberation_ttf curl util-linux wget
-    flac harfbuzz icu libpng opusWithCustomModes snappy speechd
+    flac harfbuzz icu libpng opusWithCustomModes snappy speechd-minimal
     bzip2 libcap at-spi2-atk at-spi2-core
     libkrb5 libdrm libglvnd mesa coreutils
     libxkbcommon pipewire wayland
@@ -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 ];
@@ -129,7 +129,7 @@ in stdenv.mkDerivation (finalAttrs: {
       --prefix LD_LIBRARY_PATH : "$rpath" \
       --prefix PATH            : "$binpath" \
       --suffix PATH            : "${lib.makeBinPath [ xdg-utils ]}" \
-      --prefix XDG_DATA_DIRS   : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:${addOpenGLRunpath.driverLink}/share" \
+      --prefix XDG_DATA_DIRS   : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:${addDriverRunpath.driverLink}/share" \
       --set CHROME_WRAPPER  "google-chrome-$dist" \
       --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \
       --add-flags ${lib.escapeShellArg commandLineArgs}
@@ -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/third_party/nixpkgs/pkgs/development/tools/language-servers/gopls/default.nix b/third_party/nixpkgs/pkgs/by-name/go/gopls/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/language-servers/gopls/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/gopls/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/system/goreman/default.nix b/third_party/nixpkgs/pkgs/by-name/go/goreman/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/system/goreman/default.nix
rename to third_party/nixpkgs/pkgs/by-name/go/goreman/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/go/gotenberg/package.nix b/third_party/nixpkgs/pkgs/by-name/go/gotenberg/package.nix
index 889d2109d4..40cb1e185b 100644
--- a/third_party/nixpkgs/pkgs/by-name/go/gotenberg/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/go/gotenberg/package.nix
@@ -22,16 +22,16 @@ let
 in
 buildGoModule rec {
   pname = "gotenberg";
-  version = "8.8.0";
+  version = "8.8.1";
 
   src = fetchFromGitHub {
     owner = "gotenberg";
     repo = "gotenberg";
     rev = "refs/tags/v${version}";
-    hash = "sha256-OHvtdUFZYm+I8DN8lAdlNAIRLWNRC/GbVEueRfyrwDA=";
+    hash = "sha256-vXrSPu/iY6JsOvPKDRdg6TnUjNV7X5GEb5l9bk4lSpY=";
   };
 
-  vendorHash = "sha256-w9Q3hK8d5NwDYp8kydrWrlBlOmMyDqDixdv3z79yhK8=";
+  vendorHash = "sha256-Hxava/dRQ2TFWrg7fIvRkp3NW61QWmWNEQiBP71wlR8=";
 
   postPatch = ''
     find ./pkg -name '*_test.go' -exec sed -i -e 's#/tests#${src}#g' {} \;
diff --git a/third_party/nixpkgs/pkgs/by-name/gp/gpustat/package.nix b/third_party/nixpkgs/pkgs/by-name/gp/gpustat/package.nix
index d98ff336ed..428c2c583a 100644
--- a/third_party/nixpkgs/pkgs/by-name/gp/gpustat/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/gp/gpustat/package.nix
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-M9P/qfw/tp9ogkNOE3b2fD2rGFnii1/VwmqJHqXb7Mg=";
   };
 
-  cargoSha256 = "sha256-po/pEMZEtySZnz7l2FI7Wqbmp2CiWBijchKGkqlIMPU=";
+  cargoHash = "sha256-po/pEMZEtySZnz7l2FI7Wqbmp2CiWBijchKGkqlIMPU=";
 
   nativeBuildInputs = [
     cmake
diff --git a/third_party/nixpkgs/pkgs/by-name/ha/hare/cross-compilation-tests.nix b/third_party/nixpkgs/pkgs/by-name/ha/hare/cross-compilation-tests.nix
index 26611fea9d..c5797a9a15 100644
--- a/third_party/nixpkgs/pkgs/by-name/ha/hare/cross-compilation-tests.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/ha/hare/package.nix b/third_party/nixpkgs/pkgs/by-name/ha/hare/package.nix
index 6090106f7b..c809d73c38 100644
--- a/third_party/nixpkgs/pkgs/by-name/ha/hare/package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/hclfmt/default.nix b/third_party/nixpkgs/pkgs/by-name/hc/hclfmt/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/hclfmt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/hc/hclfmt/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/hi/hidviz/package.nix b/third_party/nixpkgs/pkgs/by-name/hi/hidviz/package.nix
index 52e1b8a586..6e92eed1c6 100644
--- a/third_party/nixpkgs/pkgs/by-name/hi/hidviz/package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/hi/himalaya/package.nix b/third_party/nixpkgs/pkgs/by-name/hi/himalaya/package.nix
index 607bb775f8..5907916306 100644
--- a/third_party/nixpkgs/pkgs/by-name/hi/himalaya/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/hi/himalaya/package.nix
@@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-NrWBg0sjaz/uLsNs8/T4MkUgHOUvAWRix1O5usKsw6o=";
   };
 
-  cargoSha256 = "YS8IamapvmdrOPptQh2Ef9Yold0IK1XIeGs0kDIQ5b8=";
+  cargoHash = "sha256-YS8IamapvmdrOPptQh2Ef9Yold0IK1XIeGs0kDIQ5b8=";
 
   NIX_LDFLAGS = lib.optionals stdenv.isDarwin [
     "-F${darwin.apple_sdk.frameworks.AppKit}/Library/Frameworks"
diff --git a/third_party/nixpkgs/pkgs/by-name/ht/httm/package.nix b/third_party/nixpkgs/pkgs/by-name/ht/httm/package.nix
index d008e766fe..d8c023c533 100644
--- a/third_party/nixpkgs/pkgs/by-name/ht/httm/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/ht/httm/package.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "httm";
-  version = "0.40.1";
+  version = "0.40.4";
 
   src = fetchFromGitHub {
     owner = "kimono-koans";
     repo = pname;
     rev = version;
-    hash = "sha256-iJs151HdwcSNlgbbSX/CKBOeGvfEJes8Q8nm/HDfssg=";
+    hash = "sha256-dWL27Fe8bU8/ikNSh0T3/67XBvFkxd71uvArbJRbqKA=";
   };
 
-  cargoHash = "sha256-n/UKM+/rXuf4vbc+1TGUTZzmRyYjLNMttmYnUs7HZPw=";
+  cargoHash = "sha256-BAOFPsHjd5EaWhtzzUxzKvsBtO/kOB5mUo3nUlf7mlY=";
 
   nativeBuildInputs = [ installShellFiles ];
 
diff --git a/third_party/nixpkgs/pkgs/by-name/ht/http-server/package.nix b/third_party/nixpkgs/pkgs/by-name/ht/http-server/package.nix
index 19e937f242..7c66a03e27 100644
--- a/third_party/nixpkgs/pkgs/by-name/ht/http-server/package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/hy/hyprlock/package.nix b/third_party/nixpkgs/pkgs/by-name/hy/hyprlock/package.nix
index 36df8a7cea..ac691786cd 100644
--- a/third_party/nixpkgs/pkgs/by-name/hy/hyprlock/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/hy/hyprlock/package.nix
@@ -11,6 +11,7 @@
   pam,
   wayland,
   wayland-protocols,
+  wayland-scanner,
   cairo,
   file,
   libjpeg,
@@ -37,6 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     cmake
     pkg-config
+    wayland-scanner
   ];
 
   buildInputs = [
diff --git a/third_party/nixpkgs/pkgs/by-name/ia/ia-writer-quattro/package.nix b/third_party/nixpkgs/pkgs/by-name/ia/ia-writer-quattro/package.nix
index 2f103f7cdb..2a3cdd5fec 100644
--- a/third_party/nixpkgs/pkgs/by-name/ia/ia-writer-quattro/package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/ig/igir/package.nix b/third_party/nixpkgs/pkgs/by-name/ig/igir/package.nix
index 9e301ddb25..fdce5e94c6 100644
--- a/third_party/nixpkgs/pkgs/by-name/ig/igir/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/ig/igir/package.nix
@@ -39,7 +39,7 @@ buildNpmPackage rec {
     mainProgram = "igir";
     homepage = "https://igir.io";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ TheBrainScrambler ];
+    maintainers = with maintainers; [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/third_party/nixpkgs/pkgs/by-name/im/imhex/package.nix b/third_party/nixpkgs/pkgs/by-name/im/imhex/package.nix
index da3a2b4e20..a1b55f1689 100644
--- a/third_party/nixpkgs/pkgs/by-name/im/imhex/package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/ip/ipam/package.nix b/third_party/nixpkgs/pkgs/by-name/ip/ipam/package.nix
index 3f5aa2ea78..3a5b7b8492 100644
--- a/third_party/nixpkgs/pkgs/by-name/ip/ipam/package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/ir/iredis/package.nix b/third_party/nixpkgs/pkgs/by-name/ir/iredis/package.nix
index b0c37d1183..8a5956e52a 100644
--- a/third_party/nixpkgs/pkgs/by-name/ir/iredis/package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/is/iscc/package.nix b/third_party/nixpkgs/pkgs/by-name/is/iscc/package.nix
index 1034842822..e822811388 100644
--- a/third_party/nixpkgs/pkgs/by-name/is/iscc/package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/is/isisdl/package.nix b/third_party/nixpkgs/pkgs/by-name/is/isisdl/package.nix
new file mode 100644
index 0000000000..fc5286e99c
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/by-name/is/isisdl/package.nix
@@ -0,0 +1,58 @@
+{
+  lib,
+  fetchPypi,
+  python3Packages,
+  util-linux,
+}:
+python3Packages.buildPythonApplication rec {
+  pname = "isisdl";
+  version = "1.3.20";
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-s0vGCJVSa6hf6/sIhzmaxpziP4izoRwcZfxvm//5inY=";
+  };
+
+  pyproject = true;
+
+  build-system = with python3Packages; [ setuptools ];
+
+  dependencies = with python3Packages; [
+    cryptography
+    requests
+    pyyaml
+    packaging
+    colorama
+    pyinotify
+    distro
+    psutil
+  ];
+
+  pythonRelaxDeps = [
+    "cryptography"
+    "requests"
+    "packaging"
+    "distro"
+    "psutil"
+  ];
+
+  buildInputs = [
+    util-linux # for runtime dependency `lsblk`
+  ];
+
+  # disable tests since they require valid login credentials
+  doCheck = false;
+
+  meta = {
+    homepage = "https://github.com/Emily3403/isisdl";
+    description = "Downloader for ISIS of TU-Berlin";
+    longDescription = ''
+      A downloading utility for ISIS of TU-Berlin.
+      Download all your files and videos from ISIS.
+    '';
+    license = lib.licenses.gpl3;
+    maintainers = with lib.maintainers; [ bchmnn ];
+    mainProgram = "isisdl";
+    platforms = lib.platforms.linux;
+  };
+}
diff --git a/third_party/nixpkgs/pkgs/by-name/ja/jan/package.nix b/third_party/nixpkgs/pkgs/by-name/ja/jan/package.nix
index 982f6fc915..d423d8e8b5 100644
--- a/third_party/nixpkgs/pkgs/by-name/ja/jan/package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/ja/jansson/package.nix b/third_party/nixpkgs/pkgs/by-name/ja/jansson/package.nix
new file mode 100644
index 0000000000..bb0035b976
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/by-name/ja/jansson/package.nix
@@ -0,0 +1,52 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  nix-update-script,
+  testers,
+  validatePkgConfig,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "jansson";
+  version = "2.14";
+
+  outputs = [
+    "dev"
+    "out"
+  ];
+
+  src = fetchFromGitHub {
+    owner = "akheron";
+    repo = "jansson";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-FQgy2+g3AyRVJeniqPQj0KNeHgPdza2pmEIXqSyYry4=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    validatePkgConfig
+  ];
+
+  cmakeFlags = [
+    # networkmanager relies on libjansson.so:
+    #   https://github.com/NixOS/nixpkgs/pull/176302#issuecomment-1150239453
+    "-DJANSSON_BUILD_SHARED_LIBS=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}"
+  ];
+
+  passthru = {
+    tests.pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; };
+    updateScript = nix-update-script { };
+  };
+
+  meta = {
+    description = "C library for encoding, decoding and manipulating JSON data";
+    homepage = "https://github.com/akheron/jansson";
+    changelog = "https://github.com/akheron/jansson/raw/${finalAttrs.src.rev}/CHANGES";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ getchoo ];
+    platforms = lib.platforms.all;
+    pkgConfigModules = [ "jansson" ];
+  };
+})
diff --git a/third_party/nixpkgs/pkgs/by-name/ka/kanidm/package.nix b/third_party/nixpkgs/pkgs/by-name/ka/kanidm/package.nix
index de9694227f..855bd8a125 100644
--- a/third_party/nixpkgs/pkgs/by-name/ka/kanidm/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/ka/kanidm/package.nix
@@ -71,6 +71,9 @@ rustPlatform.buildRustPackage rec {
     cp -r server/web_ui/pkg $out/ui
   '';
 
+  # Otherwise build breaks on some unused code
+  env.RUSTFLAGS = "-A dead_code";
+
   # Not sure what pathological case it hits when compiling tests with LTO,
   # but disabling it takes the total `cargo check` time from 40 minutes to
   # around 5 on a 16-core machine.
diff --git a/third_party/nixpkgs/pkgs/tools/security/keycard-cli/default.nix b/third_party/nixpkgs/pkgs/by-name/ke/keycard-cli/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/keycard-cli/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ke/keycard-cli/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/ko/koboldcpp/package.nix b/third_party/nixpkgs/pkgs/by-name/ko/koboldcpp/package.nix
index 8f23b6167e..aecb24f217 100644
--- a/third_party/nixpkgs/pkgs/by-name/ko/koboldcpp/package.nix
+++ b/third_party/nixpkgs/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 =
@@ -53,13 +53,13 @@ let
 in
 effectiveStdenv.mkDerivation (finalAttrs: {
   pname = "koboldcpp";
-  version = "1.70.1";
+  version = "1.71.1";
 
   src = fetchFromGitHub {
     owner = "LostRuins";
     repo = "koboldcpp";
     rev = "refs/tags/v${finalAttrs.version}";
-    sha256 = "sha256-wtSkmjx5mzESMvIflqH+QEavH5oeBgKBz8/JjU+CASo=";
+    hash = "sha256-69iqpXzG9NXrqv08lJ36hlHWXwXUJs6yqcaGr32cHPw=";
   };
 
   enableParallelBuilding = true;
@@ -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/third_party/nixpkgs/pkgs/by-name/kr/krr/package.nix b/third_party/nixpkgs/pkgs/by-name/kr/krr/package.nix
index f919f8c0d2..eb76c1fe4a 100644
--- a/third_party/nixpkgs/pkgs/by-name/kr/krr/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/kr/krr/package.nix
@@ -40,7 +40,7 @@ python3.pkgs.buildPythonPackage rec {
     pydantic_1
     slack-sdk
     typer
-  ] ++ typer.optional-dependencies.all;
+  ];
 
   nativeCheckInputs = with python3.pkgs; [
     pytestCheckHook
diff --git a/third_party/nixpkgs/pkgs/by-name/kt/ktls-utils/package.nix b/third_party/nixpkgs/pkgs/by-name/kt/ktls-utils/package.nix
index d25c72f360..cee0ba119b 100644
--- a/third_party/nixpkgs/pkgs/by-name/kt/ktls-utils/package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-doctor/default.nix b/third_party/nixpkgs/pkgs/by-name/ku/kubectl-doctor/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-doctor/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ku/kubectl-doctor/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/ky/kyverno-chainsaw/package.nix b/third_party/nixpkgs/pkgs/by-name/ky/kyverno-chainsaw/package.nix
index fe83e66e7d..f7035840d8 100644
--- a/third_party/nixpkgs/pkgs/by-name/ky/kyverno-chainsaw/package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/la/lan-mouse/package.nix b/third_party/nixpkgs/pkgs/by-name/la/lan-mouse/package.nix
index 8e4218dc3f..dff74b1b79 100644
--- a/third_party/nixpkgs/pkgs/by-name/la/lan-mouse/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/la/lan-mouse/package.nix
@@ -14,13 +14,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "lan-mouse";
-  version = "0.8.0";
+  version = "0.9.1";
 
   src = fetchFromGitHub {
     owner = "feschber";
     repo = "lan-mouse";
     rev = "v${version}";
-    hash = "sha256-s80oaUDuFnbCluImLLliv1b1RDpIKrBWdX4hHy3xUIU=";
+    hash = "sha256-BadpYZnZJcifhe916/X+OGvTQ4FQeTLnoy0gP/i5cLA=";
   };
 
   nativeBuildInputs = [
@@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec {
   ]
   ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.CoreGraphics;
 
-  cargoHash = "sha256-rmiirWNS5Eldq0NyOyYielTPDdKbhtRqRS7RnGZ7H3g=";
+  cargoHash = "sha256-pDdpmZPaClU8KjFHO7v3FDQp9D83GQN+SnFg53q2fjs=";
 
   meta = {
     description = "Software KVM switch for sharing a mouse and keyboard with multiple hosts through the network";
diff --git a/third_party/nixpkgs/pkgs/by-name/ld/ld64/0004-Use-std-atomics-and-std-mutex.patch b/third_party/nixpkgs/pkgs/by-name/ld/ld64/0004-Use-std-atomics-and-std-mutex.patch
new file mode 100644
index 0000000000..8c414fcb51
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/by-name/ld/ld64/0004-Use-std-atomics-and-std-mutex.patch
@@ -0,0 +1,181 @@
+From 5e92d65ef2b5cc07dc25b5b1bf645b314599f5d1 Mon Sep 17 00:00:00 2001
+From: Randy Eckenrode <randy@largeandhighquality.com>
+Date: Sat, 6 Apr 2024 20:29:25 -0400
+Subject: [PATCH 4/8] Use std::atomics and std::mutex
+
+---
+ src/ld/InputFiles.cpp | 13 ++++++-------
+ src/ld/InputFiles.h   |  9 +++++----
+ src/ld/OutputFile.cpp | 13 ++++++-------
+ src/ld/ld.cpp         | 11 +++++------
+ 4 files changed, 22 insertions(+), 24 deletions(-)
+
+diff --git a/src/ld/InputFiles.cpp b/src/ld/InputFiles.cpp
+index ec53a60..427ab09 100644
+--- a/src/ld/InputFiles.cpp
++++ b/src/ld/InputFiles.cpp
+@@ -42,7 +42,6 @@
+ #include <mach-o/dyld.h>
+ #include <mach-o/fat.h>
+ #include <sys/sysctl.h>
+-#include <libkern/OSAtomic.h>
+ #if HAVE_LIBDISPATCH
+ #include <dispatch/dispatch.h>
+ #endif
+@@ -387,16 +386,16 @@ ld::File* InputFiles::makeFile(const Options::FileInfo& info, bool indirectDylib
+ 
+ 	ld::relocatable::File* objResult = mach_o::relocatable::parse(p, len, info.path, info.modTime, info.ordinal, objOpts);
+ 	if ( objResult != NULL ) {
+-		OSAtomicAdd64(len, &_totalObjectSize);
+-		OSAtomicIncrement32(&_totalObjectLoaded);
++		_totalObjectSize += len;
++		++_totalObjectLoaded;
+ 		return objResult;
+ 	}
+ 
+ 	// see if it is an llvm object file
+ 	objResult = lto::parse(p, len, info.path, info.modTime, info.ordinal, _options.architecture(), _options.subArchitecture(), _options.logAllFiles(), _options.verboseOptimizationHints());
+ 	if ( objResult != NULL ) {
+-		OSAtomicAdd64(len, &_totalObjectSize);
+-		OSAtomicIncrement32(&_totalObjectLoaded);
++		_totalObjectSize += len;
++		++_totalObjectLoaded;
+ 		return objResult;
+ 	}
+ 
+@@ -444,8 +443,8 @@ ld::File* InputFiles::makeFile(const Options::FileInfo& info, bool indirectDylib
+ 	ld::archive::File* archiveResult = ::archive::parse(p, len, info.path, info.modTime, info.ordinal, archOpts);
+ 	if ( archiveResult != NULL ) {
+ 	
+-		OSAtomicAdd64(len, &_totalArchiveSize);
+-		OSAtomicIncrement32(&_totalArchivesLoaded);
++		_totalArchiveSize += len;
++		++_totalArchivesLoaded;
+ 		return archiveResult;
+ 	}
+ 	
+diff --git a/src/ld/InputFiles.h b/src/ld/InputFiles.h
+index c18ccf8..ffff26b 100644
+--- a/src/ld/InputFiles.h
++++ b/src/ld/InputFiles.h
+@@ -46,6 +46,7 @@
+ #include <pthread.h>
+ #endif
+ 
++#include <atomic>
+ #include <vector>
+ 
+ #include "Options.h"
+@@ -78,10 +79,10 @@ public:
+ 	size_t						count() const { return _inputFiles.size(); }
+ 
+ 	// for -print_statistics
+-	volatile int64_t			_totalObjectSize;
+-	volatile int64_t			_totalArchiveSize;
+-	volatile int32_t			_totalObjectLoaded;
+-	volatile int32_t			_totalArchivesLoaded;
++	std::atomic<int64_t>			_totalObjectSize;
++	std::atomic<int64_t>			_totalArchiveSize;
++	std::atomic<int32_t>			_totalObjectLoaded;
++	std::atomic<int32_t>			_totalArchivesLoaded;
+ 	         int32_t			_totalDylibsLoaded;
+ 	
+ 	
+diff --git a/src/ld/OutputFile.cpp b/src/ld/OutputFile.cpp
+index e2c0397..15912a2 100644
+--- a/src/ld/OutputFile.cpp
++++ b/src/ld/OutputFile.cpp
+@@ -43,11 +43,10 @@
+ #include <mach-o/dyld.h>
+ #include <mach-o/fat.h>
+ #include <dispatch/dispatch.h>
+-#include <os/lock_private.h>
+ extern "C" {
+     #include <corecrypto/ccsha2.h>
+ }
+-#include <string>
++#include <mutex>
+ #include <string>
+ #include <list>
+ #include <algorithm>
+@@ -1362,7 +1361,7 @@ void OutputFile::rangeCheckRISCVBranch20(int64_t displacement, ld::Internal& sta
+ 
+ 
+ #if SUPPORT_ARCH_arm64e
+-static os_lock_unfair_s  sAuthenticatedFixupDataLock = OS_LOCK_UNFAIR_INIT; // to serialize building of _authenticatedFixupData
++static std::mutex sAuthenticatedFixupDataLock; // to serialize building of _authenticatedFixupData
+ #endif
+ 
+ void OutputFile::applyFixUps(ld::Internal& state, uint64_t mhAddress, const ld::Atom* atom, uint8_t* buffer)
+@@ -1737,11 +1736,11 @@ void OutputFile::applyFixUps(ld::Internal& state, uint64_t mhAddress, const ld::
+ 					}
+ 					else {
+ 						auto fixupOffset = (uintptr_t)(fixUpLocation - mhAddress);
+-						os_lock_lock(&sAuthenticatedFixupDataLock);
++						sAuthenticatedFixupDataLock.lock();
+ 							assert(_authenticatedFixupData.find(fixupOffset) == _authenticatedFixupData.end());
+ 							auto authneticatedData = std::make_pair(authData, accumulator);
+ 							_authenticatedFixupData[fixupOffset] = authneticatedData;
+-						os_lock_unlock(&sAuthenticatedFixupDataLock);
++						sAuthenticatedFixupDataLock.unlock();
+ 						// Zero out this entry which we will expect later.
+ 						set64LE(fixUpLocation, 0);
+ 					}
+@@ -1768,11 +1767,11 @@ void OutputFile::applyFixUps(ld::Internal& state, uint64_t mhAddress, const ld::
+ 					}
+ 					else {
+ 						auto fixupOffset = (uintptr_t)(fixUpLocation - mhAddress);
+-						os_lock_lock(&sAuthenticatedFixupDataLock);
++						sAuthenticatedFixupDataLock.lock();
+ 							assert(_authenticatedFixupData.find(fixupOffset) == _authenticatedFixupData.end());
+ 							auto authneticatedData = std::make_pair(authData, accumulator);
+ 							_authenticatedFixupData[fixupOffset] = authneticatedData;
+-						os_lock_unlock(&sAuthenticatedFixupDataLock);
++						sAuthenticatedFixupDataLock.unlock();
+ 						// Zero out this entry which we will expect later.
+ 						set64LE(fixUpLocation, 0);
+ 					}
+diff --git a/src/ld/ld.cpp b/src/ld/ld.cpp
+index b7590a3..f1bf9df 100644
+--- a/src/ld/ld.cpp
++++ b/src/ld/ld.cpp
+@@ -47,9 +47,8 @@ extern "C" double log2 ( double );
+ #include <mach-o/dyld.h>
+ #include <dlfcn.h>
+ #include <AvailabilityMacros.h>
+-#include <os/lock_private.h>
+ 
+-#include <string>
++#include <mutex>
+ #include <map>
+ #include <set>
+ #include <string>
+@@ -1603,8 +1602,8 @@ int main(int argc, const char* argv[])
+ 								statistics.vmEnd.faults-statistics.vmStart.faults);
+ 			fprintf(stderr, "memory active: %lu, wired: %lu\n", statistics.vmEnd.active_count * vm_page_size, statistics.vmEnd.wire_count * vm_page_size);
+ 			char temp[40];
+-			fprintf(stderr, "processed %3u object files,  totaling %15s bytes\n", inputFiles._totalObjectLoaded, commatize(inputFiles._totalObjectSize, temp));
+-			fprintf(stderr, "processed %3u archive files, totaling %15s bytes\n", inputFiles._totalArchivesLoaded, commatize(inputFiles._totalArchiveSize, temp));
++			fprintf(stderr, "processed %3u object files,  totaling %15s bytes\n", inputFiles._totalObjectLoaded.load(), commatize(inputFiles._totalObjectSize.load(), temp));
++			fprintf(stderr, "processed %3u archive files, totaling %15s bytes\n", inputFiles._totalArchivesLoaded.load(), commatize(inputFiles._totalArchiveSize.load(), temp));
+ 			fprintf(stderr, "processed %3u dylib files\n", inputFiles._totalDylibsLoaded);
+ 			fprintf(stderr, "wrote output file            totaling %15s bytes\n", commatize(out.fileSize(), temp));
+ 		}
+@@ -1634,12 +1633,12 @@ int main(int argc, const char* argv[])
+ #ifndef NDEBUG
+ 
+ //  now that the linker is multi-threaded, only allow one assert() to be processed 
+-static os_lock_unfair_s  sAssertLock = OS_LOCK_UNFAIR_INIT;
++static std::mutex sAssertLock;
+ 
+ // implement assert() function to print out a backtrace before aborting
+ void __assert_rtn(const char* func, const char* file, int line, const char* failedexpr)
+ {
+-	os_lock_lock(&sAssertLock);
++    sAssertLock.lock();
+ 
+     Snapshot *snapshot = Snapshot::globalSnapshot;
+     
+-- 
+2.45.1
+
diff --git a/third_party/nixpkgs/pkgs/by-name/ld/ld64/0005-Support-LTO-in-nixpkgs.patch b/third_party/nixpkgs/pkgs/by-name/ld/ld64/0005-Support-LTO-in-nixpkgs.patch
new file mode 100644
index 0000000000..fec7e31b5c
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/by-name/ld/ld64/0005-Support-LTO-in-nixpkgs.patch
@@ -0,0 +1,48 @@
+From faa5ab7c6e8d9a6c6157a2b681edad592ce78555 Mon Sep 17 00:00:00 2001
+From: Randy Eckenrode <randy@largeandhighquality.com>
+Date: Sun, 7 Apr 2024 15:33:36 -0400
+Subject: [PATCH 5/8] Support LTO in nixpkgs
+
+---
+ src/ld/InputFiles.cpp       | 11 ++---------
+ src/ld/parsers/lto_file.cpp |  2 +-
+ 2 files changed, 3 insertions(+), 10 deletions(-)
+
+diff --git a/src/ld/InputFiles.cpp b/src/ld/InputFiles.cpp
+index 427ab09..b8a9870 100644
+--- a/src/ld/InputFiles.cpp
++++ b/src/ld/InputFiles.cpp
+@@ -464,15 +464,8 @@ ld::File* InputFiles::makeFile(const Options::FileInfo& info, bool indirectDylib
+ 			if ( _options.overridePathlibLTO() != NULL ) {
+ 				libLTO = _options.overridePathlibLTO();
+ 			}
+-			else if ( _NSGetExecutablePath(ldPath, &bufSize) != -1 ) {
+-				if ( realpath(ldPath, tmpPath) != NULL ) {
+-					char* lastSlash = strrchr(tmpPath, '/');
+-					if ( lastSlash != NULL )
+-						strcpy(lastSlash, "/../lib/libLTO.dylib");
+-					libLTO = tmpPath;
+-					if ( realpath(tmpPath, libLTOPath) != NULL ) 
+-						libLTO = libLTOPath;
+-				}
++			else {
++				libLTO = "@libllvm@/lib/libLTO.dylib";
+ 			}
+ 			throwf("could not process llvm bitcode object file, because %s could not be loaded", libLTO);
+ 		}
+diff --git a/src/ld/parsers/lto_file.cpp b/src/ld/parsers/lto_file.cpp
+index 5318212..e18e974 100644
+--- a/src/ld/parsers/lto_file.cpp
++++ b/src/ld/parsers/lto_file.cpp
+@@ -1807,7 +1807,7 @@ bool optimize(  const std::vector<const ld::Atom*>&	allAtoms,
+ 
+ }; // namespace lto
+ 
+-static const char *sLTODylib = "@rpath/libLTO.dylib";
++static const char *sLTODylib = "@libllvm@/lib/libLTO.dylib";
+ static std::atomic<bool> sLTOIsLoaded(false);
+ 
+ static void *getHandle() {
+-- 
+2.45.1
+
diff --git a/third_party/nixpkgs/pkgs/by-name/ld/ld64/0006-Add-libcd_is_blob_a_linker_signature-implementation.patch b/third_party/nixpkgs/pkgs/by-name/ld/ld64/0006-Add-libcd_is_blob_a_linker_signature-implementation.patch
new file mode 100644
index 0000000000..e5485ab4ca
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/by-name/ld/ld64/0006-Add-libcd_is_blob_a_linker_signature-implementation.patch
@@ -0,0 +1,113 @@
+From add8bae5577ebe1c98cf7a711f87a3578a51d313 Mon Sep 17 00:00:00 2001
+From: Randy Eckenrode <randy@largeandhighquality.com>
+Date: Mon, 8 Apr 2024 22:42:40 -0400
+Subject: [PATCH 6/8] Add libcd_is_blob_a_linker_signature implementation
+
+---
+ compat/libcodedirectory.c | 74 +++++++++++++++++++++++++++++++++++++++
+ src/ld/libcodedirectory.h |  8 +++++
+ 2 files changed, 82 insertions(+)
+ create mode 100644 compat/libcodedirectory.c
+
+diff --git a/compat/libcodedirectory.c b/compat/libcodedirectory.c
+new file mode 100644
+index 0000000..e584dfc
+--- /dev/null
++++ b/compat/libcodedirectory.c
+@@ -0,0 +1,74 @@
++// SPDX-License-Identifier: APSL-2.0
++// libcd_is_blob_a_linker_signature implementation written by Randy Eckenrode © 2024
++
++#include <libcodedirectory.h>
++
++#include <stdbool.h>
++
++// References:
++// - https://forums.developer.apple.com/forums/thread/702351
++// - https://redmaple.tech/blogs/macho-files/#codedirectory-blob
++
++static inline uint32_t read32be(const uint8_t* data)
++{
++    return (data[0] << 24) + (data[1] << 16) + (data[2] << 8) + data[3];
++}
++
++static inline bool is_embedded_signature(uint32_t magic) {
++    switch (magic) {
++    case CSMAGIC_EMBEDDED_SIGNATURE:
++    case CSMAGIC_EMBEDDED_SIGNATURE_OLD:
++        return true;
++    default:
++        return false;
++    }
++}
++
++static inline const uint8_t* find_code_directory(const uint8_t* data, size_t size) {
++    const uint8_t* index_ptr = data + offsetof(CS_SuperBlob, index);
++    
++    // There also needs to be space for the actual blobs, but there must be at least enough space
++    // for the blob indexes. If there’s not, then something’s wrong, and the blob is invalid.
++    uint32_t count = read32be(data + offsetof(CS_SuperBlob, count));
++    if (count > ((data + size) - index_ptr) / sizeof(CS_BlobIndex)) {
++        return NULL;
++    }
++
++    for (uint32_t n = 0; n < count; ++n) {
++        const uint8_t* current_index_ptr = index_ptr + n * sizeof(CS_BlobIndex);
++        uint32_t type = read32be(current_index_ptr + offsetof(CS_BlobIndex, type));
++        if (type == CSSLOT_CODEDIRECTORY) {
++            uint32_t offset = read32be(current_index_ptr + offsetof(CS_BlobIndex, offset));
++            if (offset > size - sizeof(CS_CodeDirectory)) {
++                return NULL;
++            } else {
++                return data + offset;
++            }
++        }
++    }
++    return NULL;
++}
++
++enum libcd_signature_query_ret
++libcd_is_blob_a_linker_signature(const uint8_t* data, size_t size, int* linker_signed)
++{
++    if (size < sizeof(CS_SuperBlob) + sizeof(CS_BlobIndex) + sizeof(CS_CodeDirectory)) {
++        return LIBCD_SIGNATURE_QUERY_INVALID_ARGUMENT;
++    }
++
++    if (!is_embedded_signature(read32be(data + offsetof(CS_SuperBlob, magic)))) {
++        return LIBCD_SIGNATURE_QUERY_NOT_A_SIGNATURE;
++    }
++
++    const uint8_t* cd = find_code_directory(data, size);
++    if (!cd) {
++        return LIBCD_SIGNATURE_QUERY_INVALID_ARGUMENT;
++    }
++
++    uint32_t flags = read32be(cd + offsetof(CS_CodeDirectory, flags));
++    if ((flags & CS_LINKER_SIGNED) == CS_LINKER_SIGNED) {
++        *linker_signed = 1;
++    }
++
++    return LIBCD_SIGNATURE_QUERY_SUCCESS;
++}
+diff --git a/src/ld/libcodedirectory.h b/src/ld/libcodedirectory.h
+index 0e989a9..7532648 100644
+--- a/src/ld/libcodedirectory.h
++++ b/src/ld/libcodedirectory.h
+@@ -116,6 +116,14 @@ enum libcd_set_linkage_ret {
+ 
+ enum libcd_set_linkage_ret libcd_set_linkage(libcd *s, int linkage_hash_type, uint8_t *linkage_hash);
+ 
++enum libcd_signature_query_ret {
++    LIBCD_SIGNATURE_QUERY_SUCCESS,
++    LIBCD_SIGNATURE_QUERY_INVALID_ARGUMENT,
++    LIBCD_SIGNATURE_QUERY_NOT_A_SIGNATURE,
++};
++
++enum libcd_signature_query_ret libcd_is_blob_a_linker_signature(const uint8_t* data, size_t size, int* linker_signed);
++
+ __END_DECLS
+ 
+ #endif // H_LIBCODEDIRECTORY
+-- 
+2.45.1
+
diff --git a/third_party/nixpkgs/pkgs/by-name/ld/ld64/0007-Add-OpenSSL-based-CoreCrypto-digest-functions.patch b/third_party/nixpkgs/pkgs/by-name/ld/ld64/0007-Add-OpenSSL-based-CoreCrypto-digest-functions.patch
new file mode 100644
index 0000000000..1687963433
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/by-name/ld/ld64/0007-Add-OpenSSL-based-CoreCrypto-digest-functions.patch
@@ -0,0 +1,311 @@
+From 36767c7345161baf0ab125f95c8557f8e24f25db Mon Sep 17 00:00:00 2001
+From: Randy Eckenrode <randy@largeandhighquality.com>
+Date: Tue, 9 Apr 2024 19:28:17 -0400
+Subject: [PATCH 7/8] Add OpenSSL-based CoreCrypto digest functions
+
+---
+ compat/CommonCrypto/CommonDigest.h    |  6 +++
+ compat/CommonCrypto/CommonDigestSPI.c | 21 +++++++++++
+ compat/CommonCrypto/CommonDigestSPI.h | 14 +++++++
+ compat/corecrypto/api_defines.h       | 10 +++++
+ compat/corecrypto/ccdigest.c          | 53 +++++++++++++++++++++++++++
+ compat/corecrypto/ccdigest.h          | 27 ++++++++++++++
+ compat/corecrypto/ccdigest_private.h  | 19 ++++++++++
+ compat/corecrypto/ccsha1.c            | 22 +++++++++++
+ compat/corecrypto/ccsha1.h            |  9 +++++
+ compat/corecrypto/ccsha2.c            | 22 +++++++++++
+ compat/corecrypto/ccsha2.h            |  9 +++++
+ 11 files changed, 212 insertions(+)
+ create mode 100644 compat/CommonCrypto/CommonDigest.h
+ create mode 100644 compat/CommonCrypto/CommonDigestSPI.c
+ create mode 100644 compat/CommonCrypto/CommonDigestSPI.h
+ create mode 100644 compat/corecrypto/api_defines.h
+ create mode 100644 compat/corecrypto/ccdigest.c
+ create mode 100644 compat/corecrypto/ccdigest.h
+ create mode 100644 compat/corecrypto/ccdigest_private.h
+ create mode 100644 compat/corecrypto/ccsha1.c
+ create mode 100644 compat/corecrypto/ccsha1.h
+ create mode 100644 compat/corecrypto/ccsha2.c
+ create mode 100644 compat/corecrypto/ccsha2.h
+
+diff --git a/compat/CommonCrypto/CommonDigest.h b/compat/CommonCrypto/CommonDigest.h
+new file mode 100644
+index 0000000..a60eba7
+--- /dev/null
++++ b/compat/CommonCrypto/CommonDigest.h
+@@ -0,0 +1,6 @@
++// SPDX-License-Identifier: APSL-2.0
++// CoreCrypto compatibility shims written by Randy Eckenrode © 2024
++
++#pragma once
++
++#define CCSHA256_OUTPUT_SIZE 32
+diff --git a/compat/CommonCrypto/CommonDigestSPI.c b/compat/CommonCrypto/CommonDigestSPI.c
+new file mode 100644
+index 0000000..41269fc
+--- /dev/null
++++ b/compat/CommonCrypto/CommonDigestSPI.c
+@@ -0,0 +1,21 @@
++// SPDX-License-Identifier: APSL-2.0
++// CoreCrypto compatibility shims written by Randy Eckenrode © 2024
++
++#include "CommonDigestSPI.h"
++
++#include <stdlib.h>
++#include <string.h>
++
++#include <corecrypto/ccsha2.h>
++
++void CCDigest(int type, const uint8_t* bytes, size_t count, uint8_t* digest) {
++    if (type != kCCDigestSHA256) {
++        abort();
++    }
++    const struct ccdigest_info* di = ccsha256_di();
++
++    ccdigest_di_decl(_di, ctx);
++    ccdigest_init(di, ctx);
++    ccdigest_update(di, ctx, count, bytes);
++    ccdigest_final(di, ctx, digest);
++}
+diff --git a/compat/CommonCrypto/CommonDigestSPI.h b/compat/CommonCrypto/CommonDigestSPI.h
+new file mode 100644
+index 0000000..172742a
+--- /dev/null
++++ b/compat/CommonCrypto/CommonDigestSPI.h
+@@ -0,0 +1,14 @@
++// SPDX-License-Identifier: APSL-2.0
++// CoreCrypto compatibility shims written by Randy Eckenrode © 2024
++
++#pragma once
++
++#include <stdint.h>
++
++#include <corecrypto/ccdigest.h>
++#include <cs_blobs.h>
++
++
++#define kCCDigestSHA256 10
++
++EXTERN_C void CCDigest(int type, const uint8_t* bytes, size_t count, uint8_t* digest);
+diff --git a/compat/corecrypto/api_defines.h b/compat/corecrypto/api_defines.h
+new file mode 100644
+index 0000000..13d1e7a
+--- /dev/null
++++ b/compat/corecrypto/api_defines.h
+@@ -0,0 +1,10 @@
++// SPDX-License-Identifier: APSL-2.0
++// CoreCrypto compatibility shims written by Randy Eckenrode © 2024
++
++#pragma once
++
++#ifdef __cplusplus
++#define EXTERN_C extern "C"
++#else
++#define EXTERN_C
++#endif
+diff --git a/compat/corecrypto/ccdigest.c b/compat/corecrypto/ccdigest.c
+new file mode 100644
+index 0000000..e29dcb8
+--- /dev/null
++++ b/compat/corecrypto/ccdigest.c
+@@ -0,0 +1,53 @@
++// SPDX-License-Identifier: APSL-2.0
++// CoreCrypto compatibility shims written by Randy Eckenrode © 2024
++
++#include "ccdigest.h"
++#include "ccdigest_private.h"
++
++#include <stdlib.h>
++
++#include <openssl/err.h>
++
++
++struct ccdigest_context* _ccdigest_context_new(void)
++{
++    struct ccdigest_context* ctx = malloc(sizeof(struct ccdigest_context));
++    ctx->context = EVP_MD_CTX_new();
++    return ctx;
++}
++
++struct ccdigest_info* _ccdigest_newprovider(const char* name)
++{
++    struct ccdigest_info* di = malloc(sizeof(struct ccdigest_info));
++    di->provider = EVP_MD_fetch(NULL, name, NULL);
++    return di;
++}
++
++void ccdigest_init(const struct ccdigest_info* di, struct ccdigest_context* ctx)
++{
++    if (!EVP_DigestInit_ex2(ctx->context, di->provider, NULL)) {
++        ERR_print_errors_fp(stderr);
++        abort();
++    }
++}
++
++void ccdigest_update(
++    const struct ccdigest_info* _di,
++    struct ccdigest_context* ctx,
++    size_t count,
++    const void* bytes
++)
++{
++    if (!EVP_DigestUpdate(ctx->context, bytes, count)) {
++        ERR_print_errors_fp(stderr);
++        abort();
++    }
++}
++
++void ccdigest_final(const struct ccdigest_info* _di, struct ccdigest_context* ctx, uint8_t* digest)
++{
++    if (!EVP_DigestFinal_ex(ctx->context, digest, NULL)) {
++        ERR_print_errors_fp(stderr);
++        abort();
++    }
++}
+diff --git a/compat/corecrypto/ccdigest.h b/compat/corecrypto/ccdigest.h
+new file mode 100644
+index 0000000..9af2394
+--- /dev/null
++++ b/compat/corecrypto/ccdigest.h
+@@ -0,0 +1,27 @@
++// SPDX-License-Identifier: APSL-2.0
++// CoreCrypto compatibility shims written by Randy Eckenrode © 2024
++
++#pragma once
++
++#include <stddef.h>
++#include <stdint.h>
++
++#include "api_defines.h"
++
++
++struct ccdigest_info;
++struct ccdigest_context;
++
++EXTERN_C struct ccdigest_context* _ccdigest_context_new(void);
++
++#define ccdigest_di_decl(_di, ctxvar) \
++    struct ccdigest_context* (ctxvar) = _ccdigest_context_new()
++
++EXTERN_C void ccdigest_init(const struct ccdigest_info* di, struct ccdigest_context* ctx);
++EXTERN_C void ccdigest_update(
++    const struct ccdigest_info* _di,
++    struct ccdigest_context* ctx,
++    size_t count,
++    const void* bytes
++);
++EXTERN_C void ccdigest_final(const struct ccdigest_info* _di, struct ccdigest_context* ctx, uint8_t* digest);
+diff --git a/compat/corecrypto/ccdigest_private.h b/compat/corecrypto/ccdigest_private.h
+new file mode 100644
+index 0000000..0ea9759
+--- /dev/null
++++ b/compat/corecrypto/ccdigest_private.h
+@@ -0,0 +1,19 @@
++// SPDX-License-Identifier: APSL-2.0
++// CoreCrypto compatibility shims written by Randy Eckenrode © 2024
++
++#pragma once
++
++#include "api_defines.h"
++
++#include <openssl/evp.h>
++
++
++struct ccdigest_info {
++    EVP_MD* provider;
++};
++
++struct ccdigest_context {
++    EVP_MD_CTX* context;
++};
++
++EXTERN_C struct ccdigest_info* _ccdigest_newprovider(const char* name);
+diff --git a/compat/corecrypto/ccsha1.c b/compat/corecrypto/ccsha1.c
+new file mode 100644
+index 0000000..e02b2b6
+--- /dev/null
++++ b/compat/corecrypto/ccsha1.c
+@@ -0,0 +1,22 @@
++// SPDX-License-Identifier: APSL-2.0
++// CoreCrypto compatibility shims written by Randy Eckenrode © 2024
++
++#include "ccsha1.h"
++
++#include <assert.h>
++
++#include <cs_blobs.h>
++
++#include "ccdigest_private.h"
++
++
++static struct ccdigest_info* di = NULL;
++
++const struct ccdigest_info* ccsha1_di(void)
++{
++    if (!di) {
++        di = _ccdigest_newprovider("SHA-1");
++        assert(EVP_MD_get_size(di->provider) == CS_SHA1_LEN);
++    }
++    return di;
++}
+diff --git a/compat/corecrypto/ccsha1.h b/compat/corecrypto/ccsha1.h
+new file mode 100644
+index 0000000..8e3f85f
+--- /dev/null
++++ b/compat/corecrypto/ccsha1.h
+@@ -0,0 +1,9 @@
++// SPDX-License-Identifier: APSL-2.0
++// CoreCrypto compatibility shims written by Randy Eckenrode © 2024
++
++#pragma once
++
++#include <corecrypto/ccdigest.h>
++
++
++EXTERN_C const struct ccdigest_info* ccsha1_di(void);
+diff --git a/compat/corecrypto/ccsha2.c b/compat/corecrypto/ccsha2.c
+new file mode 100644
+index 0000000..6504503
+--- /dev/null
++++ b/compat/corecrypto/ccsha2.c
+@@ -0,0 +1,22 @@
++// SPDX-License-Identifier: APSL-2.0
++// CoreCrypto compatibility shims written by Randy Eckenrode © 2024
++
++#include "ccsha2.h"
++
++#include <assert.h>
++
++#include <cs_blobs.h>
++
++#include "ccdigest_private.h"
++
++
++static struct ccdigest_info* di = NULL;
++
++const struct ccdigest_info* ccsha256_di(void)
++{
++    if (!di) {
++        di = _ccdigest_newprovider("SHA-256");
++        assert(EVP_MD_get_size(di->provider) == CS_SHA256_LEN);
++    }
++    return di;
++}
+diff --git a/compat/corecrypto/ccsha2.h b/compat/corecrypto/ccsha2.h
+new file mode 100644
+index 0000000..9f30e03
+--- /dev/null
++++ b/compat/corecrypto/ccsha2.h
+@@ -0,0 +1,9 @@
++// SPDX-License-Identifier: APSL-2.0
++// CoreCrypto compatibility shims written by Randy Eckenrode © 2024
++
++#pragma once
++
++#include <corecrypto/ccdigest.h>
++
++
++EXTERN_C const struct ccdigest_info* ccsha256_di(void);
+-- 
+2.45.1
+
diff --git a/third_party/nixpkgs/pkgs/by-name/ld/ld64/0008-Disable-searching-in-standard-library-locations.patch b/third_party/nixpkgs/pkgs/by-name/ld/ld64/0008-Disable-searching-in-standard-library-locations.patch
new file mode 100644
index 0000000000..ddda588c6a
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/by-name/ld/ld64/0008-Disable-searching-in-standard-library-locations.patch
@@ -0,0 +1,25 @@
+From 3e80d438e2a3ec50d666f2b6e32007c275d4a08a Mon Sep 17 00:00:00 2001
+From: Randy Eckenrode <randy@largeandhighquality.com>
+Date: Thu, 11 Apr 2024 23:13:29 -0400
+Subject: [PATCH 8/8] Disable searching in standard library locations
+
+---
+ src/ld/Options.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/ld/Options.cpp b/src/ld/Options.cpp
+index 67a9f53..611b583 100644
+--- a/src/ld/Options.cpp
++++ b/src/ld/Options.cpp
+@@ -4320,7 +4320,7 @@ bool Options::shouldUseBuildVersion(ld::Platform plat, uint32_t minOSvers) const
+ 
+ void Options::buildSearchPaths(int argc, const char* argv[])
+ {
+-	bool addStandardLibraryDirectories = true;
++	bool addStandardLibraryDirectories = false;
+ 	ld::Platform platform = ld::Platform::unknown;
+ 	std::vector<const char*> libraryPaths;
+ 	std::vector<const char*> frameworkPaths;
+-- 
+2.45.1
+
diff --git a/third_party/nixpkgs/pkgs/by-name/ld/ld64/gen_compile_stubs.py b/third_party/nixpkgs/pkgs/by-name/ld/ld64/gen_compile_stubs.py
new file mode 100644
index 0000000000..30fe30789a
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/by-name/ld/ld64/gen_compile_stubs.py
@@ -0,0 +1,8 @@
+#!/usr/bin/env python
+import sys
+from pathlib import Path
+
+byteseq = (str(int(x)) for x in Path(sys.argv[1]).read_bytes())
+
+print("#pragma once")
+print(f"static const char compile_stubs[] = {{ {', '.join(byteseq)} }};")
diff --git a/third_party/nixpkgs/pkgs/by-name/ld/ld64/meson.build b/third_party/nixpkgs/pkgs/by-name/ld/ld64/meson.build
new file mode 100644
index 0000000000..0de64797c4
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/by-name/ld/ld64/meson.build
@@ -0,0 +1,249 @@
+# Build settings based on the upstream Xcode project.
+# See: https://github.com/apple-oss-distributions/ld64/blob/main/ld64.xcodeproj/project.pbxproj
+
+# Project settings
+project(
+    'ld64',
+    'c', 'cpp',
+    version : '@version@',
+    default_options : {'cpp_std': 'c++20'},
+)
+
+fs = import('fs')
+
+# Options
+target_prefix = get_option('target_prefix')
+
+
+# Dependencies
+cc = meson.get_compiler('c')
+cxx = meson.get_compiler('cpp')
+python = find_program('python3')
+
+libtapi = cxx.find_library('tapi')
+openssl = dependency('openssl', version : '>=3.0')
+xar = cc.find_library('xar')
+
+
+# Feature tests
+
+# macOS 10.12 does not support `DISPATCH_APPLY_AUTO`. Fortunately, `DISPATCH_APPLY_CURRENT_ROOT_QUEUE` has the
+# same value and was repurposed in subsequent releases as `DISPATCH_APPLY_AUTO`.
+dispatch_apply_auto_test = '''
+#include <dispatch/dispatch.h>
+int main(int argc, char* argv[]) {
+    dispatch_queue_t queue = DISPATCH_APPLY_AUTO;
+    return 0;
+}
+'''
+if not cc.compiles(
+    dispatch_apply_auto_test,
+    args : '-Wno-unused-command-line-argument',
+    name : 'supports DISPATCH_APPLY_AUTO',
+)
+    add_project_arguments(
+        '-include', 'dispatch/private.h',
+        '-DDISPATCH_APPLY_AUTO=DISPATCH_APPLY_CURRENT_ROOT_QUEUE',
+        '-DPRIVATE', # The required API is private on the 10.12 SDK.
+        language: ['c', 'cpp'],
+    )
+endif
+
+# The return type of `dispatch_get_global_queue` was changed in 10.14.
+# Use the older type if the SDK does not support it.
+dispatch_queue_global_test = '''
+#include <dispatch/dispatch.h>
+int main(int argc, char* argv[]) {
+    dispatch_queue_global_t queue = dispatch_get_global_queue(QOS_CLASS_USER_INITIATED, 0);
+    return 0;
+}
+'''
+if not cc.compiles(
+    dispatch_queue_global_test,
+    args : '-Wno-unused-command-line-argument',
+    name : 'supports dispatch_queue_global_t',
+)
+    add_project_arguments('-Ddispatch_queue_global_t=dispatch_queue_t', language : ['c', 'cpp'])
+endif
+
+
+# Generated files
+
+compile_stubs_h = custom_target(
+    'compile_stubs.h',
+    capture : true,
+    command : [python, '@INPUT0@', '@INPUT1@'],
+    input : ['gen_compile_stubs.py', 'compile_stubs'],
+    output : ['compile_stubs.h'],
+)
+
+configure_h = custom_target(
+    'configure_h',
+    command : ['bash', '@INPUT@'],
+    env : {
+        'DERIVED_FILE_DIR' : meson.current_build_dir(),
+        'RC_ProjectSourceVersion': '@version@'
+    },
+    input : ['src/create_configure'],
+    output : ['configure.h'],
+)
+
+incdirs = include_directories(
+    'compat',
+    'include',
+    'src/abstraction',
+    'src/ld',
+    'src/ld/code-sign-blobs',
+    'src/ld/parsers',
+    'src/ld/passes',
+    'src/mach_o',
+)
+
+# Dynamic libraries
+libcodedirectory = library(
+    'codedirectory',
+    dependencies : [openssl],
+    include_directories : incdirs,
+    install : true,
+    sources : [
+        'compat/corecrypto/ccdigest.c',
+        'compat/corecrypto/ccsha1.c',
+        'compat/corecrypto/ccsha2.c',
+        'compat/libcodedirectory.c',
+        'src/ld/libcodedirectory.c'
+    ],
+    soversion : 1,
+)
+install_headers(
+    'src/ld/cs_blobs.h',
+    'src/ld/libcodedirectory.h',
+)
+
+
+# Static libraries
+libprunetrie = static_library(
+    'prunetrie',
+    include_directories : incdirs,
+    install : true,
+    override_options : {'b_lto': false},
+    sources : [
+        'src/mach_o/Error.cpp',
+        'src/mach_o/ExportsTrie.cpp',
+        'src/other/PruneTrie.cpp',
+    ],
+)
+install_headers(
+    'src/other/prune_trie.h',
+    subdir : 'mach-o',
+)
+
+
+# Binaries
+ld64 = executable(
+    f'@target_prefix@ld',
+    dependencies : [libtapi, openssl, xar],
+    include_directories : incdirs,
+    install : true,
+    # These linker flags mirror those used in a release build of the Xcode project.
+    # See: https://github.com/apple-oss-distributions/ld64/blob/47f477cb721755419018f7530038b272e9d0cdea/ld64.xcodeproj/project.pbxproj#L1292-L1299.
+    link_args : [
+        '-Wl,-exported_symbol,__mh_execute_header',
+        '-Wl,-stack_size,0x02000000',
+        '-Wl,-client_name,ld',
+    ],
+    link_with : [libcodedirectory],
+    sources : [
+        compile_stubs_h,
+        configure_h,
+        'compat/CommonCrypto/CommonDigestSPI.c',
+        'compat/corecrypto/ccdigest.c',
+        'compat/corecrypto/ccsha1.c',
+        'compat/corecrypto/ccsha2.c',
+        'src/ld/FatFile.cpp',
+        'src/ld/InputFiles.cpp',
+        'src/ld/Mangling.cpp',
+        'src/ld/Options.cpp',
+        'src/ld/OutputFile.cpp',
+        'src/ld/PlatformSupport.cpp',
+        'src/ld/Resolver.cpp',
+        'src/ld/ResponseFiles.cpp',
+        'src/ld/Snapshot.cpp',
+        'src/ld/SymbolTable.cpp',
+        'src/ld/code-sign-blobs/blob.cpp',
+        'src/ld/code-sign-blobs/blob.h',
+        'src/ld/debugline.c',
+        'src/ld/ld.cpp',
+        'src/ld/parsers/archive_file.cpp',
+        'src/ld/parsers/generic_dylib_file.cpp',
+        'src/ld/parsers/lto_file.cpp',
+        'src/ld/parsers/macho_dylib_file.cpp',
+        'src/ld/parsers/macho_relocatable_file.cpp',
+        'src/ld/parsers/opaque_section_file.cpp',
+        'src/ld/parsers/textstub_dylib_file.cpp',
+        'src/ld/passes/bitcode_bundle.cpp',
+        'src/ld/passes/branch_island.cpp',
+        'src/ld/passes/branch_shim.cpp',
+        'src/ld/passes/code_dedup.cpp',
+        'src/ld/passes/compact_unwind.cpp',
+        'src/ld/passes/dtrace_dof.cpp',
+        'src/ld/passes/dylibs.cpp',
+        'src/ld/passes/got.cpp',
+        'src/ld/passes/huge.cpp',
+        'src/ld/passes/inits.cpp',
+        'src/ld/passes/objc.cpp',
+        'src/ld/passes/objc_constants.cpp',
+        'src/ld/passes/objc_stubs.cpp',
+        'src/ld/passes/order.cpp',
+        'src/ld/passes/stubs/stubs.cpp',
+        'src/ld/passes/thread_starts.cpp',
+        'src/ld/passes/tlvp.cpp',
+        'src/mach_o/Error.cpp',
+        'src/mach_o/ExportsTrie.cpp',
+    ],
+)
+install_man('doc/man/man1/ld-classic.1')
+
+# Extra tools
+unwinddump = executable(
+    f'@target_prefix@unwinddump',
+    include_directories : incdirs,
+    install : true,
+    sources : [
+        configure_h,
+        'src/other/UnwindDump.cpp',
+    ],
+)
+install_man('doc/man/man1/unwinddump.1')
+
+machocheck = executable(
+    f'@target_prefix@machocheck',
+    include_directories : incdirs,
+    install : true,
+    sources : [
+        configure_h,
+        'src/other/machochecker.cpp',
+    ],
+)
+
+objectdump = executable(
+    f'@target_prefix@ObjectDump',
+    include_directories : incdirs,
+    install : true,
+    sources : [
+        configure_h,
+        'src/ld/PlatformSupport.cpp',
+        'src/ld/debugline.c',
+        'src/ld/parsers/macho_relocatable_file.cpp',
+        'src/other/ObjectDump.cpp',
+    ],
+)
+
+objcimageinfo = executable(
+    f'@target_prefix@objcimageinfo',
+    include_directories : incdirs,
+    install : true,
+    sources : [
+        configure_h,
+        'src/other/objcimageinfo.cpp',
+    ],
+)
diff --git a/third_party/nixpkgs/pkgs/by-name/ld/ld64/meson.options b/third_party/nixpkgs/pkgs/by-name/ld/ld64/meson.options
new file mode 100644
index 0000000000..2417b81f04
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/by-name/ld/ld64/meson.options
@@ -0,0 +1,6 @@
+option(
+    'target_prefix',
+    type : 'string',
+    value : '',
+    description: 'Specifies the prefix to use when building for cross-compilation (e.g., `aarch64-apple-darwin`)'
+)
diff --git a/third_party/nixpkgs/pkgs/by-name/ld/ld64/package.nix b/third_party/nixpkgs/pkgs/by-name/ld/ld64/package.nix
new file mode 100644
index 0000000000..2b00fdfb62
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/by-name/ld/ld64/package.nix
@@ -0,0 +1,204 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  fetchurl,
+  darwin,
+  libtapi,
+  libunwind,
+  llvm,
+  meson,
+  ninja,
+  openssl,
+  pkg-config,
+  python3,
+  swiftPackages,
+  xar,
+  gitUpdater,
+}:
+
+let
+  # The targetPrefix is prepended to binary names to allow multiple binutils on the PATH to be usable.
+  targetPrefix = lib.optionalString (
+    stdenv.targetPlatform != stdenv.hostPlatform
+  ) "${stdenv.targetPlatform.config}-";
+
+  # ld64 needs CrashReporterClient.h, which is hard to find, but WebKit2 has it.
+  # Fetch it directly because the Darwin stdenv bootstrap can’t depend on fetchgit.
+  crashreporter_h = fetchurl {
+    url = "https://raw.githubusercontent.com/apple-oss-distributions/WebKit2/WebKit2-7605.1.33.0.2/Platform/spi/Cocoa/CrashReporterClientSPI.h";
+    hash = "sha256-0ybVcwHuGEdThv0PPjYQc3SW0YVOyrM3/L9zG/l1Vtk=";
+  };
+
+  # First version with all the required definitions. This is used in preference to darwin.xnu to make it easier
+  # to support Linux and because the version of darwin.xnu available on x86_64-darwin in the 10.12 SDK is too old.
+  xnu = fetchFromGitHub {
+    name = "xnu-src";
+    owner = "apple-oss-distributions";
+    repo = "xnu";
+    rev = "xnu-6153.11.26";
+    hash = "sha256-dcnGcp7bIjQxeAn5pXt+mHSYEXb2Ad9Smhd/WUG4kb4=";
+  };
+
+  # Avoid pulling in all of Swift just to build libdispatch
+  libdispatch = swiftPackages.Dispatch.override { useSwift = false; };
+in
+stdenv.mkDerivation (finalAttrs: {
+  pname = "ld64";
+  version = "951.9";
+
+  outputs = [
+    "out"
+    "dev"
+    "lib"
+  ];
+
+  src = fetchFromGitHub {
+    owner = "apple-oss-distributions";
+    repo = "ld64";
+    rev = "ld64-${finalAttrs.version}";
+    hash = "sha256-hLkfqgBwVPlO4gfriYOawTO5E1zSD63ZcNetm1E5I70";
+  };
+
+  xcodeHash = "sha256-+j7Ed/6aD46SJnr3DWPfWuYWylb2FNJRPmWsUVxZJHM=";
+
+  postUnpack = ''
+    unpackFile '${xnu}'
+
+    # Verify that the Xcode project has not changed unexpectedly.
+    hashType=$(echo $xcodeHash | cut -d- -f1)
+    expectedHash=$(echo $xcodeHash | cut -d- -f2)
+    hash=$(openssl "$hashType" -binary "$sourceRoot/ld64.xcodeproj/project.pbxproj" | base64)
+
+    if [ "$hash" != "$expectedHash" ]; then
+      echo 'error: hash mismatch in ld64.xcodeproj/project.pbxproj'
+      echo "        specified: $xcodeHash"
+      echo "           got:    $hashType-$hash"
+      echo
+      echo 'Upstream Xcode project has changed. Update `meson.build` with any changes, then update `xcodeHash`.'
+      echo 'Use `nix-hash --flat --sri --type sha256 ld64.xcodeproj/project.pbxproj` to regenerate it.'
+      exit 1
+    fi
+  '';
+
+  patches = [
+    # Use std::atomic for atomics. Replaces private APIs (`os/lock_private.h`) with standard APIs.
+    ./0004-Use-std-atomics-and-std-mutex.patch
+    # ld64 assumes the default libLTO.dylib can be found relative to its bindir, which is
+    # not the case in nixpkgs. Override it to default to `stdenv.cc`’s libLTO.dylib.
+    ./0005-Support-LTO-in-nixpkgs.patch
+    # Add implementation of missing function required for code directory support.
+    ./0006-Add-libcd_is_blob_a_linker_signature-implementation.patch
+    # Add OpenSSL implementation of CoreCrypto digest functions. Avoids use of private and non-free APIs.
+    ./0007-Add-OpenSSL-based-CoreCrypto-digest-functions.patch
+    # ld64 will search `/usr/lib`, `/Library/Frameworks`, etc by default. Disable that.
+    ./0008-Disable-searching-in-standard-library-locations.patch
+  ];
+
+  postPatch = ''
+    substitute ${./meson.build} meson.build \
+      --subst-var version
+    cp ${./meson.options} meson.options
+
+    # Copy headers for certain private APIs
+    mkdir -p include
+    substitute ${crashreporter_h} include/CrashReporterClient.h \
+      --replace-fail 'USE(APPLE_INTERNAL_SDK)' '0'
+
+    # Copy from the source so the headers can be used on Linux and x86_64-darwin
+    mkdir -p include/System
+    for dir in arm i386 machine; do
+      cp -r ../xnu-src/osfmk/$dir include/System/$dir
+    done
+    mkdir -p include/sys
+    cp ../xnu-src/bsd/sys/commpage.h include/sys
+
+    # Match the version format used by upstream.
+    sed -i src/ld/Options.cpp \
+      -e '1iconst char ld_classicVersionString[] = "@(#)PROGRAM:ld PROJECT:ld64-${finalAttrs.version}\\n";'
+
+    # Instead of messing around with trying to extract and run the script from the Xcode project,
+    # just use our own Python script to generate `compile_stubs.h`
+    cp ${./gen_compile_stubs.py} gen_compile_stubs.py
+
+    # Enable LTO support using LLVM’s libLTO.dylib by default.
+    substituteInPlace src/ld/InputFiles.cpp \
+      --subst-var-by libllvm '${lib.getLib llvm}'
+    substituteInPlace src/ld/parsers/lto_file.cpp \
+      --subst-var-by libllvm '${lib.getLib llvm}'
+
+    # Use portable includes
+    substituteInPlace src/ld/code-sign-blobs/endian.h \
+      --replace-fail '#include <machine/endian.h>' '#include <sys/types.h>'
+  '';
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    openssl
+    pkg-config
+    python3
+  ];
+
+  buildInputs = [
+    libtapi
+    llvm
+    libunwind
+    openssl
+    xar
+  ] ++ lib.optionals stdenv.isDarwin [ darwin.dyld ] ++ lib.optionals stdenv.isLinux [ libdispatch ];
+
+  # Note for overrides: ld64 cannot be built as a debug build because of UB in its iteration implementations,
+  # which trigger libc++ debug assertions due to trying to take the address of the first element of an emtpy vector.
+  mesonBuildType = "release";
+
+  mesonFlags = [
+    (lib.mesonOption "b_ndebug" "if-release")
+    (lib.mesonOption "default_library" (if stdenv.hostPlatform.isStatic then "static" else "shared"))
+  ] ++ lib.optionals (targetPrefix != "") [ (lib.mesonOption "target_prefix" targetPrefix) ];
+
+  doInstallCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
+
+  # ld64 has a test suite, but many of the tests fail (even with ld from Xcode). Instead
+  # of running the test suite, rebuild ld64 using itself to link itself as a check.
+  # LTO is enabled only to confirm that it is set up and working properly in nixpkgs.
+  installCheckPhase = ''
+    runHook preInstallCheck
+
+    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${
+      lib.optionalString (targetPrefix != "") " -Dtarget_prefix=${targetPrefix}"
+    }
+
+    cd build-install-check
+    ninja ${targetPrefix}ld "-j$NIX_BUILD_CORES"
+
+    # Confirm that ld found the LTO library and reports it.
+    ./${targetPrefix}ld -v 2>&1 | grep -q 'LTO support'
+
+    runHook postInstallCheck
+  '';
+
+  postInstall = ''
+    ln -s ld-classic.1 "$out/share/man/man1/ld.1"
+    ln -s ld.1 "$out/share/man/man1/ld64.1"
+    moveToOutput lib/libprunetrie.a "$dev"
+  '';
+
+  __structuredAttrs = true;
+
+  passthru.updateScript = gitUpdater { rev-prefix = "ld64-"; };
+
+  meta = {
+    description = "The classic linker for Darwin";
+    homepage = "https://opensource.apple.com/releases/";
+    license = lib.licenses.apple-psl20;
+    mainProgram = "ld";
+    maintainers = with lib.maintainers; [ reckenrode ];
+    platforms = lib.platforms.darwin; # Porting to other platforms is incomplete. Support only Darwin for now.
+  };
+})
diff --git a/third_party/nixpkgs/pkgs/by-name/le/lexical/package.nix b/third_party/nixpkgs/pkgs/by-name/le/lexical/package.nix
index d836b471cc..18a73f2825 100644
--- a/third_party/nixpkgs/pkgs/by-name/le/lexical/package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/li/libcamera/package.nix b/third_party/nixpkgs/pkgs/by-name/li/libcamera/package.nix
index c6f470c789..32eb20ce16 100644
--- a/third_party/nixpkgs/pkgs/by-name/li/libcamera/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/li/libcamera/package.nix
@@ -68,6 +68,9 @@ stdenv.mkDerivation rec {
     # hotplugging
     systemd
 
+    # pycamera
+    python3Packages.pybind11
+
     # yamlparser
     libyaml
 
@@ -81,7 +84,6 @@ stdenv.mkDerivation rec {
     pkg-config
     python3
     python3Packages.jinja2
-    python3Packages.pybind11
     python3Packages.pyyaml
     python3Packages.ply
     python3Packages.sphinx
diff --git a/third_party/nixpkgs/pkgs/by-name/li/libedit/package.nix b/third_party/nixpkgs/pkgs/by-name/li/libedit/package.nix
index f723ac9656..0b4490a466 100644
--- a/third_party/nixpkgs/pkgs/by-name/li/libedit/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/li/libedit/package.nix
@@ -6,11 +6,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libedit";
-  version = "20230828-3.1";
+  version = "20240517-3.1";
 
   src = fetchurl {
     url = "https://thrysoee.dk/editline/libedit-${finalAttrs.version}.tar.gz";
-    hash = "sha256-TugYK25WkpDn0fRPD3jayHFrNfZWt2Uo9pnGnJiBTa0=";
+    hash = "sha256-OkiQl7tBFUlfO9ha54KFK3CXxVbZUACI10tvo429Ev8=";
   };
 
   outputs = [ "out" "dev" "man" ];
diff --git a/third_party/nixpkgs/pkgs/by-name/li/libeduvpn-common/package.nix b/third_party/nixpkgs/pkgs/by-name/li/libeduvpn-common/package.nix
index bc011a3410..b6c2120cd9 100644
--- a/third_party/nixpkgs/pkgs/by-name/li/libeduvpn-common/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/li/libeduvpn-common/package.nix
@@ -5,11 +5,11 @@
 
 buildGoModule rec {
   pname = "libeduvpn-common";
-  version = "2.0.2";
+  version = "2.1.0";
 
   src = fetchurl {
     url = "https://github.com/eduvpn/eduvpn-common/releases/download/${version}/eduvpn-common-${version}.tar.xz";
-    hash = "sha256-cD2WqxKCQkDL4lNbFKcbKygvmmd5FT8mZe5DDw+kizg=";
+    hash = "sha256-OgcinEeKMDtZj3Tw+7cMsF385ZZTBR/J5dqIihDTlj8=";
   };
 
   vendorHash = null;
diff --git a/third_party/nixpkgs/pkgs/by-name/li/libertine-g/package.nix b/third_party/nixpkgs/pkgs/by-name/li/libertine-g/package.nix
index 6265f3e7df..2f472e345c 100644
--- a/third_party/nixpkgs/pkgs/by-name/li/libertine-g/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/li/libertine-g/package.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
   meta = {
     description = "Graphite versions of Linux Libertine and Linux Biolinum font families for LibreOffice and OpenOffice.org";
     homepage = "https://numbertext.org/linux/";
-    maintainers = [];
+    maintainers = [ ];
     license = lib.licenses.ofl;
   };
 }
diff --git a/third_party/nixpkgs/pkgs/by-name/li/libetonyek/package.nix b/third_party/nixpkgs/pkgs/by-name/li/libetonyek/package.nix
index 8ff8349b9d..393f542a9e 100644
--- a/third_party/nixpkgs/pkgs/by-name/li/libetonyek/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/li/libetonyek/package.nix
@@ -12,6 +12,7 @@
 , librevenge
 , libxml2
 , mdds
+, zlib
 }:
 
 stdenv.mkDerivation rec {
@@ -39,6 +40,7 @@ stdenv.mkDerivation rec {
     librevenge
     libxml2
     mdds
+    zlib
   ];
 
   configureFlags = ["--with-mdds=2.1"];
diff --git a/third_party/nixpkgs/pkgs/by-name/li/libgnome-keyring/package.nix b/third_party/nixpkgs/pkgs/by-name/li/libgnome-keyring/package.nix
index bc4a26a007..4f30ebdae6 100644
--- a/third_party/nixpkgs/pkgs/by-name/li/libgnome-keyring/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/li/libgnome-keyring/package.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
     license = with lib.licenses; [ gpl2Plus lgpl2Plus ];
     pkgConfigModules = [ "gnome-keyring-1" ];
     platforms = lib.platforms.unix;
-    maintainers = [];
+    maintainers = [ ];
 
     longDescription = ''
       gnome-keyring is a program that keeps password and other secrets for
diff --git a/third_party/nixpkgs/pkgs/by-name/li/liborcus/package.nix b/third_party/nixpkgs/pkgs/by-name/li/liborcus/package.nix
index daac73da70..14f2023fc1 100644
--- a/third_party/nixpkgs/pkgs/by-name/li/liborcus/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/li/liborcus/package.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
     homepage = "https://gitlab.com/orcus/orcus";
     changelog = "https://gitlab.com/orcus/orcus/-/blob/${src.rev}/CHANGELOG";
     license = licenses.mpl20;
-    maintainers = [];
+    maintainers = [ ];
     platforms = platforms.all;
   };
 }
diff --git a/third_party/nixpkgs/pkgs/by-name/li/libtapi/0001-Check-for-no_exported_symbols-linker-support.patch b/third_party/nixpkgs/pkgs/by-name/li/libtapi/0001-Check-for-no_exported_symbols-linker-support.patch
new file mode 100644
index 0000000000..1a1c77e6ce
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/by-name/li/libtapi/0001-Check-for-no_exported_symbols-linker-support.patch
@@ -0,0 +1,37 @@
+From e954aacbc075355419f5fc99db61f68aca1fcfe4 Mon Sep 17 00:00:00 2001
+From: Randy Eckenrode <randy@largeandhighquality.com>
+Date: Fri, 5 Apr 2024 14:16:40 -0400
+Subject: [PATCH 1/3] Check for -no_exported_symbols linker support
+
+---
+ CMakeLists.txt | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/tapi/CMakeLists.txt b/tapi/CMakeLists.txt
+index 62affdf..82426de 100644
+--- a/tapi/CMakeLists.txt
++++ b/tapi/CMakeLists.txt
+@@ -73,6 +73,9 @@ llvm_check_linker_flag(CXX "-Wl,-no_inits" LINKER_SUPPORTS_NO_INITS)
+ llvm_check_linker_flag(CXX "-Wl,-iosmac_version_min,13.0" LINKER_SUPPORTS_IOSMAC)
+ # MARZIPAN RENAME
+ 
++# Older versions of ld64 (e.g., in the Darwin bootstrap) do not support this flag.
++llvm_check_linker_flag(CXX "-Wl,-no_exported_symbols" LINKER_SUPPORTS_NO_EXPORTED_SYMBOLS)
++
+ # Check if i386 is supported.
+ SET(CMAKE_OLD_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS})
+ SET(CMAKE_OLD_LINKER_FLAGS ${CMAKE_EXE_LINKER_FLAGS})
+@@ -160,7 +163,9 @@ endmacro(add_tapi_library)
+ macro(add_tapi_executable name)
+   add_llvm_executable(${name} ${ARGN})
+   set_target_properties(${name} PROPERTIES FOLDER "Tapi executables")
+-  target_link_options(${name} PRIVATE "-Wl,-no_exported_symbols")
++  if(LINKER_SUPPORTS_NO_EXPORTED_SYMBOLS)
++    target_link_options(${name} PRIVATE "-Wl,-no_exported_symbols")
++  endif()
+ endmacro(add_tapi_executable)
+ 
+ function(tapi_clang_tablegen)
+-- 
+2.42.0
+
diff --git a/third_party/nixpkgs/pkgs/by-name/li/libtapi/0002-Pass-fileType-to-writeToStream.patch b/third_party/nixpkgs/pkgs/by-name/li/libtapi/0002-Pass-fileType-to-writeToStream.patch
new file mode 100644
index 0000000000..ffcedb0c6f
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/by-name/li/libtapi/0002-Pass-fileType-to-writeToStream.patch
@@ -0,0 +1,25 @@
+From 77ca537cfc61765f2109c626757f2da8de602ce0 Mon Sep 17 00:00:00 2001
+From: Randy Eckenrode <randy@largeandhighquality.com>
+Date: Fri, 5 Apr 2024 23:20:32 -0400
+Subject: [PATCH 2/3] Pass fileType to writeToStream
+
+---
+ lib/Core/JSONReaderWriter.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tapi/lib/Core/JSONReaderWriter.cpp b/tapi/lib/Core/JSONReaderWriter.cpp
+index c040670..c1be85f 100644
+--- a/tapi/lib/Core/JSONReaderWriter.cpp
++++ b/tapi/lib/Core/JSONReaderWriter.cpp
+@@ -57,7 +57,7 @@ Error JSONWriter::writeFile(raw_ostream &os, const InterfaceFile *file,
+   if (file == nullptr)
+     return errorCodeToError(std::make_error_code(std::errc::invalid_argument));
+ 
+-  return TextAPIWriter::writeToStream(os, *file, /*Compact=*/false);
++  return TextAPIWriter::writeToStream(os, *file, fileType, /*Compact=*/false);
+ }
+ 
+ TAPI_NAMESPACE_INTERNAL_END
+-- 
+2.42.0
+
diff --git a/third_party/nixpkgs/pkgs/by-name/li/libtapi/0003-Match-designator-order-with-declaration-order.patch b/third_party/nixpkgs/pkgs/by-name/li/libtapi/0003-Match-designator-order-with-declaration-order.patch
new file mode 100644
index 0000000000..2883af0a52
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/by-name/li/libtapi/0003-Match-designator-order-with-declaration-order.patch
@@ -0,0 +1,28 @@
+From b69038edb2e0ace9128407ab3ee7bc1001ffd751 Mon Sep 17 00:00:00 2001
+From: Randy Eckenrode <randy@largeandhighquality.com>
+Date: Sun, 7 Apr 2024 19:23:24 -0400
+Subject: [PATCH 3/3] Match designator order with declaration order
+
+---
+ lib/Core/Demangler.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/tapi/lib/Core/Demangler.cpp b/tapi/lib/Core/Demangler.cpp
+index d85899a..f5c485a 100644
+--- a/tapi/lib/Core/Demangler.cpp
++++ b/tapi/lib/Core/Demangler.cpp
+@@ -30,9 +30,10 @@ bool Demangler::isItaniumEncoding(StringRef mangledName) {
+   return mangledName.startswith("_Z") || mangledName.startswith("___Z");
+ }
+ 
++
+ DemangledName Demangler::demangle(StringRef mangledName) {
+   DemangledName result{
+-      .str = mangledName.str(), .isSwift = false, .isItanium = false};
++      .str = mangledName.str(), .isItanium = false, .isSwift = false};
+   char *demangled = nullptr;
+ 
+   if (isItaniumEncoding(mangledName)) {
+-- 
+2.42.0
+
diff --git a/third_party/nixpkgs/pkgs/by-name/li/libtapi/package.nix b/third_party/nixpkgs/pkgs/by-name/li/libtapi/package.nix
new file mode 100644
index 0000000000..b11de1756c
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/by-name/li/libtapi/package.nix
@@ -0,0 +1,184 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  fetchpatch,
+  cmake,
+  ninja,
+  python3,
+  zlib,
+}:
+
+let
+  # libtapi is only supported building against Apple’s LLVM fork pinned to a specific revision.
+  # It can’t be built against upstream LLVM because it uses APIs that are specific to Apple’s fork.
+  # See: https://github.com/apple-oss-distributions/tapi/blob/main/Readme.md
+
+  # Apple’s LLVM fork uses its own versioning scheme.
+  # See: https://en.wikipedia.org/wiki/Xcode#Toolchain_versions
+  # Note: Can’t use a sparse checkout because the Darwin stdenv bootstrap can’t depend on fetchgit.
+  appleLlvm = {
+    version = "15.0.0"; # As reported by upstream’s `tapi --version`.
+    rev = "2b5ff47e44b059c03de5779479d01a133ab4d581"; # Per the TAPI repo.
+    hash = "sha256-X37zBbpSEWmqtdTXsd1t++gp+0ggA8YtB73fGKNaiR0=";
+  };
+in
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libtapi";
+  version = "1500.0.12.3";
+
+  outputs = [
+    "out"
+    "bin"
+    "dev"
+  ];
+
+  srcs = [
+    (fetchFromGitHub {
+      name = "tapi-src";
+      owner = "apple-oss-distributions";
+      repo = "tapi";
+      rev = "tapi-${finalAttrs.version}";
+      hash = "sha256-YeaA2OeSY1fXYJHPJJ0TrVC1brspSvutBtPMPGX6Y1o=";
+    })
+    # libtapi can’t avoid pulling the whole repo even though it needs only a couple of folders because
+    # `fetchgit` can’t be used in the Darwin bootstrap.
+    (fetchFromGitHub {
+      name = "apple-llvm-src";
+      owner = "apple";
+      repo = "llvm-project";
+      inherit (appleLlvm) rev hash;
+    })
+  ];
+
+  patches = [
+    # Older versions of ld64 may not support `-no_exported_symbols`, so use it only
+    # when the linker supports it.
+    # Note: This can be dropped once the bootstrap tools are updated after the ld64 update.
+    ./0001-Check-for-no_exported_symbols-linker-support.patch
+    # The recommended upstream revision of Apple’s LLVM fork needs this patch, or
+    # `tapi stubify` will crash when generating stubs.
+    (fetchpatch {
+      url = "https://github.com/apple/llvm-project/commit/455bf3d1ccd6a52df5e38103532c1b8f49924edc.patch";
+      hash = "sha256-ujZcfdAls20JPIvjvO2Xv8st8cNTY/XTEQusICKBKSA";
+    })
+    # Updates `JSONReaderWriter` to work with the API change in the above patch.
+    ./0002-Pass-fileType-to-writeToStream.patch
+    # Fix build on Linux. GCC is more picky than clang about the field order.
+    ./0003-Match-designator-order-with-declaration-order.patch
+  ];
+
+  postPatch =
+    ''
+      # Enable building on non-Darwin platforms
+      substituteInPlace tapi/CMakeLists.txt \
+        --replace-fail 'message(FATAL_ERROR "Unsupported configuration.")' ""
+
+      # Remove the client limitation on linking to libtapi.dylib.
+      substituteInPlace tapi/tools/libtapi/CMakeLists.txt \
+        --replace-fail '-allowable_client ld' ""
+      # Replace hard-coded installation paths with standard ones.
+      declare -A installdirs=(
+        [bin]=BINDIR
+        [include]=INCLUDEDIR
+        [lib]=LIBDIR
+        [local/bin]=BINDIR
+        [local/share/man]=MANDIR
+        [share/man]=MANDIR
+      )
+      for dir in "''${!installdirs[@]}"; do
+        cmakevar=CMAKE_INSTALL_''${installdirs[$dir]}
+        for cmakelist in $(grep -rl "DESTINATION $dir" tapi); do
+          substituteInPlace "$cmakelist" \
+            --replace-fail "DESTINATION $dir" "DESTINATION \''${$cmakevar}"
+        done
+      done
+      # Doesn’t seem to exist publically.
+      substituteInPlace tapi/test/CMakeLists.txt \
+        --replace-fail tapi-configs ""
+    ''
+    + lib.optionalString stdenv.isLinux ''
+      # Remove Darwin-specific versioning flags.
+      substituteInPlace tapi/tools/libtapi/CMakeLists.txt \
+          --replace-fail '-current_version ''${DYLIB_VERSION} -compatibility_version 1' ""
+    '';
+
+  preUnpack = ''
+    mkdir source
+  '';
+
+  sourceRoot = "source";
+
+  postUnpack = ''
+    chmod -R u+w apple-llvm-src tapi-src
+    mv apple-llvm-src/{clang,cmake,llvm,utils} source
+    mv tapi-src source/tapi
+  '';
+
+  strictDeps = true;
+
+  buildInputs = [ zlib ]; # Upstream links against zlib in their distribution.
+
+  nativeBuildInputs = [
+    cmake
+    ninja
+    python3
+  ];
+
+  cmakeDir = "../llvm";
+
+  cmakeFlags = [
+    (lib.cmakeFeature "LLVM_ENABLE_PROJECTS" "clang;tapi")
+    (lib.cmakeFeature "LLVM_EXTERNAL_PROJECTS" "tapi")
+    (lib.cmakeBool "TAPI_INCLUDE_DOCS" true)
+    # Matches the version string format reported by upstream `tapi`.
+    (lib.cmakeFeature "TAPI_REPOSITORY_STRING" "tapi-${finalAttrs.version}")
+    (lib.cmakeFeature "TAPI_FULL_VERSION" appleLlvm.version)
+    # Match the versioning used by Apple’s LLVM fork (primarily used for .so versioning).
+    (lib.cmakeFeature "LLVM_VERSION_MAJOR" (lib.versions.major appleLlvm.version))
+    (lib.cmakeFeature "LLVM_VERSION_MINOR" (lib.versions.minor appleLlvm.version))
+    (lib.cmakeFeature "LLVM_VERSION_PATCH" (lib.versions.patch appleLlvm.version))
+    (lib.cmakeFeature "LLVM_VERSION_SUFFIX" "")
+    # Upstream `tapi` does not link against ncurses. Disable it explicitly to make sure
+    # it is not detected incorrectly from the bootstrap tools tarball.
+    (lib.cmakeBool "LLVM_ENABLE_TERMINFO" false)
+    # Disabling the benchmarks avoids a failure during the configure phase because
+    # the sparse checkout does not include the benchmarks.
+    (lib.cmakeBool "LLVM_INCLUDE_BENCHMARKS" false)
+    # tapi’s tests expect to target macOS 13.0 and build both x86_64 and universal
+    # binaries regardless of the host platform.
+    (lib.cmakeBool "LLVM_INCLUDE_TESTS" false)
+    (lib.cmakeBool "TAPI_INCLUDE_TESTS" false)
+  ];
+
+  ninjaFlags = [
+    "libtapi"
+    "tapi-sdkdb"
+    "tapi"
+  ];
+
+  installTargets = [
+    "install-libtapi"
+    "install-tapi-docs"
+    "install-tapi-headers"
+    "install-tapi-sdkdb"
+    "install-tapi"
+  ];
+
+  postInstall = ''
+    # The man page is installed for these, but they’re not included in the source release.
+    rm $bin/share/man/man1/tapi-analyze.1 $bin/share/man/man1/tapi-api-verify.1
+  '';
+
+  meta = {
+    description = "Replaces the Mach-O Dynamic Library Stub files in Apple's SDKs to reduce the size";
+    homepage = "https://github.com/apple-oss-distributions/tapi/";
+    license = lib.licenses.ncsa;
+    mainProgram = "tapi";
+    maintainers = with lib.maintainers; [
+      matthewbauer
+      reckenrode
+    ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/third_party/nixpkgs/pkgs/by-name/li/libui-ng/package.nix b/third_party/nixpkgs/pkgs/by-name/li/libui-ng/package.nix
index 8799750b94..b5b0812d01 100644
--- a/third_party/nixpkgs/pkgs/by-name/li/libui-ng/package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/li/live-server/package.nix b/third_party/nixpkgs/pkgs/by-name/li/live-server/package.nix
new file mode 100644
index 0000000000..b7c1152d6a
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/by-name/li/live-server/package.nix
@@ -0,0 +1,45 @@
+{
+  lib,
+  stdenv,
+  rustPlatform,
+  fetchFromGitHub,
+  darwin,
+  openssl,
+  pkg-config,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "live-server";
+  version = "0.7.0";
+
+  src = fetchFromGitHub {
+    owner = "lomirus";
+    repo = "live-server";
+    rev = "v${version}";
+    hash = "sha256-BSAsD9nRlHaTDbBpLBxN9OOQ9SekRwQeYUWV1CZO4oY=";
+  };
+
+  cargoHash = "sha256-RwueYpa/CMriSOWwGZhkps6jHmqOdRuz+ECRq/ThPs0=";
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs =
+    [ openssl ]
+    ++ lib.optionals stdenv.isDarwin (
+      with darwin.apple_sdk.frameworks;
+      [
+        CoreServices
+        SystemConfiguration
+      ]
+    );
+
+  meta = with lib; {
+    description = "Local network server with live reload feature for static pages";
+    downloadPage = "https://github.com/lomirus/live-server/releases";
+    homepage = "https://github.com/lomirus/live-server";
+    license = licenses.mit;
+    mainProgram = "live-server";
+    maintainers = [ maintainers.philiptaron ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/third_party/nixpkgs/pkgs/by-name/li/live555/package.nix b/third_party/nixpkgs/pkgs/by-name/li/live555/package.nix
index 232780a524..8e9574376b 100644
--- a/third_party/nixpkgs/pkgs/by-name/li/live555/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/li/live555/package.nix
@@ -1,6 +1,6 @@
 {
   lib,
-  darwin,
+  cctools,
   fetchpatch,
   fetchurl,
   openssl,
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   nativeBuildInputs = lib.optionals stdenv.isDarwin [
-    darwin.cctools
+    cctools
   ];
 
   buildInputs = [
diff --git a/third_party/nixpkgs/pkgs/by-name/ll/llama-cpp/package.nix b/third_party/nixpkgs/pkgs/by-name/ll/llama-cpp/package.nix
index 210df98acc..69ee327cae 100644
--- a/third_party/nixpkgs/pkgs/by-name/ll/llama-cpp/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/ll/llama-cpp/package.nix
@@ -23,6 +23,7 @@
 , metalSupport ? stdenv.isDarwin && stdenv.isAarch64 && !openclSupport
 , vulkanSupport ? false
 , rpcSupport ? false
+, shaderc
 , vulkan-headers
 , vulkan-loader
 , ninja
@@ -61,6 +62,7 @@ let
   ];
 
   vulkanBuildInputs = [
+    shaderc
     vulkan-headers
     vulkan-loader
   ];
diff --git a/third_party/nixpkgs/pkgs/by-name/ll/lldap-cli/package.nix b/third_party/nixpkgs/pkgs/by-name/ll/lldap-cli/package.nix
new file mode 100644
index 0000000000..6bec2c2426
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/lo/logiops/package.nix b/third_party/nixpkgs/pkgs/by-name/lo/logiops/package.nix
index f342da1161..283f09eae4 100644
--- a/third_party/nixpkgs/pkgs/by-name/lo/logiops/package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/lo/logiops_0_2_3/package.nix b/third_party/nixpkgs/pkgs/by-name/lo/logiops_0_2_3/package.nix
index b04e8d682e..c62e3bf9e3 100644
--- a/third_party/nixpkgs/pkgs/by-name/lo/logiops_0_2_3/package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/lo/logseq/package.nix b/third_party/nixpkgs/pkgs/by-name/lo/logseq/package.nix
index 793e305ac3..124c2d0117 100644
--- a/third_party/nixpkgs/pkgs/by-name/lo/logseq/package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/lp/lprint/package.nix b/third_party/nixpkgs/pkgs/by-name/lp/lprint/package.nix
index e45c8a0e30..eb7353142c 100644
--- a/third_party/nixpkgs/pkgs/by-name/lp/lprint/package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/ma/maa-assistant-arknights/pin.json b/third_party/nixpkgs/pkgs/by-name/ma/maa-assistant-arknights/pin.json
index 9074e2b5f7..69b02afd13 100644
--- a/third_party/nixpkgs/pkgs/by-name/ma/maa-assistant-arknights/pin.json
+++ b/third_party/nixpkgs/pkgs/by-name/ma/maa-assistant-arknights/pin.json
@@ -1,10 +1,10 @@
 {
   "stable": {
-    "version": "5.4.1",
-    "hash": "sha256-okVDQyVN+5z7udwSsVVyvg1oTJslpJl2o1qm3HGRqnE="
+    "version": "5.5.0",
+    "hash": "sha256-co/B22kF0D9LBb569zzaCi7aew3pFDz/W5UV8KxoA4g="
   },
   "beta": {
-    "version": "5.5.0-beta.1",
-    "hash": "sha256-q+Iz/yQn71PSm/kW81PMM/2lykZAUgN/DLR9r29ETmI="
+    "version": "5.5.0",
+    "hash": "sha256-co/B22kF0D9LBb569zzaCi7aew3pFDz/W5UV8KxoA4g="
   }
 }
diff --git a/third_party/nixpkgs/pkgs/by-name/ma/mackup/package.nix b/third_party/nixpkgs/pkgs/by-name/ma/mackup/package.nix
index 1e75c0cefc..56b90a35fd 100644
--- a/third_party/nixpkgs/pkgs/by-name/ma/mackup/package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/ma/marwaita-red/package.nix b/third_party/nixpkgs/pkgs/by-name/ma/marwaita-red/package.nix
index 55d7cb136d..bb647ae197 100644
--- a/third_party/nixpkgs/pkgs/by-name/ma/marwaita-red/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/ma/marwaita-red/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   pname = "marwaita-red";
-  version = "20.2-unstable-2024-07-01";
+  version = "20.3.1";
 
   src = fetchFromGitHub {
     owner = "darkomarko42";
     repo = pname;
-    rev = "79c65e37774395f7fa51ed1416874aa78f768d54";
-    hash = "sha256-GmVen97oJel4KVm+IwV8GTemIyHnQ4XjvGclUjdGDvw=";
+    rev = version;
+    hash = "sha256-cMZDd/WQFrfr6Zrq1/1It26OmML3cf7+ZU/I8IMjuX4=";
   };
 
   buildInputs = [
diff --git a/third_party/nixpkgs/pkgs/by-name/ma/maturin/package.nix b/third_party/nixpkgs/pkgs/by-name/ma/maturin/package.nix
index 64f5639dc8..0a1087421c 100644
--- a/third_party/nixpkgs/pkgs/by-name/ma/maturin/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/ma/maturin/package.nix
@@ -13,16 +13,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "maturin";
-  version = "1.6.0";
+  version = "1.7.0";
 
   src = fetchFromGitHub {
     owner = "PyO3";
     repo = "maturin";
     rev = "v${version}";
-    hash = "sha256-cKX5fDPQElNLAur2PF6J5050QnMNrazMTCVtGmjwmxQ=";
+    hash = "sha256-SjINeNtCbyMp3U+Op7ey+8lV7FYxLVpmO5g1a01ouBs=";
   };
 
-  cargoHash = "sha256-EuMPcJAGz564cC9UWrlihBxRUJCtqw4jvP/SQgx2L/0=";
+  cargoHash = "sha256-xJafCgpCeihyORj3gIVUus74vu9h3N1xuyKvkxSqYK4=";
 
   buildInputs = lib.optionals stdenv.isDarwin [
     darwin.apple_sdk.frameworks.Security
diff --git a/third_party/nixpkgs/pkgs/by-name/ma/maven/package.nix b/third_party/nixpkgs/pkgs/by-name/ma/maven/package.nix
index 19844103ed..aa6ba47901 100644
--- a/third_party/nixpkgs/pkgs/by-name/ma/maven/package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/md/md-tui/package.nix b/third_party/nixpkgs/pkgs/by-name/md/md-tui/package.nix
index 6530ed3f4b..0149042406 100644
--- a/third_party/nixpkgs/pkgs/by-name/md/md-tui/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/md/md-tui/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "md-tui";
-  version = "0.8.1";
+  version = "0.8.3";
 
   src = fetchFromGitHub {
     owner = "henriklovhaug";
     repo = "md-tui";
     rev = "refs/tags/v${version}";
-    hash = "sha256-AwJvB1xLsJCr+r0RJi8jH50QlPq7mbUibvmvYZJi9XE=";
+    hash = "sha256-21h1r6rhjFTOhebMS9PO3/OLKKEeFPVpWThFdgxKhh4=";
   };
 
-  cargoHash = "sha256-QapogSDuAiQWbCFFwPiaSpvLHn0oRLwBEBuB44MN/t0=";
+  cargoHash = "sha256-wONvublKzJnVVUjf1z9V4RwSkHg+HSoTGYvnMdslAYg=";
 
   nativeBuildInputs = [ pkg-config ];
 
diff --git a/third_party/nixpkgs/pkgs/by-name/md/mdbook-alerts/package.nix b/third_party/nixpkgs/pkgs/by-name/md/mdbook-alerts/package.nix
index 1dbca74813..d80fce2cc6 100644
--- a/third_party/nixpkgs/pkgs/by-name/md/mdbook-alerts/package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/md/mdbook-yml-header/package.nix b/third_party/nixpkgs/pkgs/by-name/md/mdbook-yml-header/package.nix
new file mode 100644
index 0000000000..58d09cbf29
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/by-name/md/mdbook-yml-header/package.nix
@@ -0,0 +1,28 @@
+{
+  lib,
+  rustPlatform,
+  fetchCrate,
+}:
+
+let
+  pname = "mdbook-yml-header";
+  version = "0.1.4";
+in
+rustPlatform.buildRustPackage {
+  inherit pname version;
+
+  src = fetchCrate {
+    inherit pname version;
+    hash = "sha256-qRAqZUKOiXTh4cJjczBQ9zAL6voaDvko7elfE6eB2jA=";
+  };
+
+  cargoHash = "sha256-cn+R36koBSEp+wKtCQJK/L+mxeb8sHkZu8kWYRigIvw=";
+
+  meta = {
+    description = "MdBook preprocessor for removing yml header within --- (front-matter)";
+    homepage = "https://github.com/dvogt23/mdbook-yml-header";
+    license = lib.licenses.mpl20;
+    mainProgram = "mdbook-yml-header";
+    maintainers = [ lib.maintainers.pinage404 ];
+  };
+}
diff --git a/third_party/nixpkgs/pkgs/by-name/me/melonDS/package.nix b/third_party/nixpkgs/pkgs/by-name/me/melonDS/package.nix
index 6547644479..29ccfb2835 100644
--- a/third_party/nixpkgs/pkgs/by-name/me/melonDS/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/me/melonDS/package.nix
@@ -21,7 +21,8 @@ let
     qtbase
     qtmultimedia
     qtwayland
-    wrapQtAppsHook;
+    wrapQtAppsHook
+    ;
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "melonDS";
@@ -40,38 +41,45 @@ stdenv.mkDerivation (finalAttrs: {
     wrapQtAppsHook
   ];
 
-  buildInputs = [
-    SDL2
-    extra-cmake-modules
-    libarchive
-    libslirp
-    libGL
-    qtbase
-    qtmultimedia
-    zstd
-  ] ++ lib.optionals stdenv.isLinux [
-    wayland
-    qtwayland
-  ];
+  buildInputs =
+    [
+      SDL2
+      extra-cmake-modules
+      libarchive
+      libslirp
+      libGL
+      qtbase
+      qtmultimedia
+      zstd
+    ]
+    ++ lib.optionals stdenv.isLinux [
+      wayland
+      qtwayland
+    ];
 
-  cmakeFlags = [
-    (lib.cmakeBool "USE_QT6" true)
-  ];
+  cmakeFlags = [ (lib.cmakeBool "USE_QT6" true) ];
 
   strictDeps = true;
 
-  qtWrapperArgs = lib.optionals stdenv.isLinux [
-    "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libpcap ]}"
-  ] ++ lib.optionals stdenv.isDarwin [
-    "--prefix DYLD_LIBRARY_PATH : ${lib.makeLibraryPath [ libpcap ]}"
-  ];
+  qtWrapperArgs =
+    lib.optionals stdenv.isLinux [
+      "--prefix LD_LIBRARY_PATH : ${
+        lib.makeLibraryPath [
+          libpcap
+          wayland
+        ]
+      }"
+    ]
+    ++ lib.optionals stdenv.isDarwin [
+      "--prefix DYLD_LIBRARY_PATH : ${lib.makeLibraryPath [ libpcap ]}"
+    ];
 
   installPhase = lib.optionalString stdenv.isDarwin ''
     runHook preInstall
     mkdir -p $out/Applications
     cp -r melonDS.app $out/Applications/
     runHook postInstall
- '';
+  '';
 
   passthru = {
     updateScript = unstableGitUpdater { };
diff --git a/third_party/nixpkgs/pkgs/by-name/me/meson/005-boost-Do-not-add-system-paths-on-nix.patch b/third_party/nixpkgs/pkgs/by-name/me/meson/005-boost-Do-not-add-system-paths-on-nix.patch
index 0a2eda9de9..bfc55b3c0f 100644
--- a/third_party/nixpkgs/pkgs/by-name/me/meson/005-boost-Do-not-add-system-paths-on-nix.patch
+++ b/third_party/nixpkgs/pkgs/by-name/me/meson/005-boost-Do-not-add-system-paths-on-nix.patch
@@ -1,13 +1,18 @@
-diff -Naur meson-0.60.2-old/mesonbuild/dependencies/boost.py meson-0.60.2-new/mesonbuild/dependencies/boost.py
---- meson-0.60.2-old/mesonbuild/dependencies/boost.py	2021-11-02 16:58:07.000000000 -0300
-+++ meson-0.60.2-new/mesonbuild/dependencies/boost.py	2021-12-12 19:21:27.895705897 -0300
-@@ -682,16 +682,7 @@
+diff --git a/mesonbuild/dependencies/boost.py b/mesonbuild/dependencies/boost.py
+index 11cf0beca..80f950866 100644
+--- a/mesonbuild/dependencies/boost.py
++++ b/mesonbuild/dependencies/boost.py
+@@ -687,20 +687,7 @@ class BoostDependency(SystemDependency):
          else:
-             tmp = []  # type: T.List[Path]
+             tmp: T.List[Path] = []
  
 -            # Add some default system paths
+-            if m.is_darwin():
+-                tmp.extend([
+-                    Path('/opt/homebrew/'),        # for Apple Silicon MacOS
+-                    Path('/usr/local/opt/boost'),  # for Intel Silicon MacOS
+-                ])
 -            tmp += [Path('/opt/local')]
--            tmp += [Path('/usr/local/opt/boost')]
 -            tmp += [Path('/usr/local')]
 -            tmp += [Path('/usr')]
 -
diff --git a/third_party/nixpkgs/pkgs/by-name/me/meson/007-Allow-building-via-ninja-12.patch b/third_party/nixpkgs/pkgs/by-name/me/meson/007-Allow-building-via-ninja-12.patch
deleted file mode 100644
index 009d826aab..0000000000
--- a/third_party/nixpkgs/pkgs/by-name/me/meson/007-Allow-building-via-ninja-12.patch
+++ /dev/null
@@ -1,190 +0,0 @@
-From 8e46d3e37f81bf13f3f62a14fb603feb2e37229d Mon Sep 17 00:00:00 2001
-From: John Titor <50095635+JohnRTitor@users.noreply.github.com>
-Date: Fri, 10 May 2024 23:25:58 +0530
-Subject: [PATCH] Fix builds with Ninja 12 and remove a 5 year old workaround.
-
-Co-authored-by: Jussi Pakkanen <jpakkane@gmail.com>
-Co-authored-by: Masum Reza <masumrezarock100@gmail.com>
----
- run_project_tests.py           |  3 +--
- run_tests.py                   | 35 ++++++++++------------------------
- unittests/baseplatformtests.py | 34 +++++++++++++++++++++++++++------
- 3 files changed, 39 insertions(+), 33 deletions(-)
-
-diff --git a/run_project_tests.py b/run_project_tests.py
-index a14741364..222e12f74 100755
---- a/run_project_tests.py
-+++ b/run_project_tests.py
-@@ -45,7 +45,7 @@ from mesonbuild.coredata import backendlist, version as meson_version
- from mesonbuild.modules.python import PythonExternalProgram
- from run_tests import (
-     get_fake_options, run_configure, get_meson_script, get_backend_commands,
--    get_backend_args_for_dir, Backend, ensure_backend_detects_changes,
-+    get_backend_args_for_dir, Backend,
-     guess_backend, handle_meson_skip_test,
- )
- 
-@@ -720,7 +720,6 @@ def _run_test(test: TestDef,
- 
-     # Touch the meson.build file to force a regenerate
-     def force_regenerate() -> None:
--        ensure_backend_detects_changes(backend)
-         os.utime(str(test.path / 'meson.build'))
- 
-     # just test building
-diff --git a/run_tests.py b/run_tests.py
-index 207653219..0c51f3d69 100755
---- a/run_tests.py
-+++ b/run_tests.py
-@@ -39,29 +39,27 @@ from mesonbuild.mesonlib import OptionKey, setup_vsenv
- if T.TYPE_CHECKING:
-     from mesonbuild.coredata import SharedCMDOptions
- 
--NINJA_1_9_OR_NEWER = False
-+NINJA_1_12_OR_NEWER = False
- NINJA_CMD = None
- # If we're on CI, detecting ninja for every subprocess unit test that we run is slow
- # Optimize this by respecting $NINJA and skipping detection, then exporting it on
- # first run.
- try:
--    NINJA_1_9_OR_NEWER = bool(int(os.environ['NINJA_1_9_OR_NEWER']))
-+    NINJA_1_12_OR_NEWER = bool(int(os.environ['NINJA_1_12_OR_NEWER']))
-     NINJA_CMD = [os.environ['NINJA']]
- except (KeyError, ValueError):
--    # Look for 1.9 to see if https://github.com/ninja-build/ninja/issues/1219
--    # is fixed
--    NINJA_CMD = detect_ninja('1.9')
-+    # Look for 1.12, which removes -w dupbuild=err
-+    NINJA_CMD = detect_ninja('1.12')
-     if NINJA_CMD is not None:
--        NINJA_1_9_OR_NEWER = True
-+        NINJA_1_12_OR_NEWER = True
-     else:
--        mlog.warning('Found ninja <1.9, tests will run slower', once=True)
-         NINJA_CMD = detect_ninja()
- 
- if NINJA_CMD is not None:
--    os.environ['NINJA_1_9_OR_NEWER'] = str(int(NINJA_1_9_OR_NEWER))
-+    os.environ['NINJA_1_12_OR_NEWER'] = str(int(NINJA_1_12_OR_NEWER))
-     os.environ['NINJA'] = NINJA_CMD[0]
- else:
--    raise RuntimeError('Could not find Ninja v1.7 or newer')
-+    raise RuntimeError('Could not find Ninja.')
- 
- # Emulate running meson with -X utf8 by making sure all open() calls have a
- # sane encoding. This should be a python default, but PEP 540 considered it not
-@@ -271,7 +269,9 @@ def get_backend_commands(backend: Backend, debug: bool = False) -> \
-         test_cmd = cmd + ['-target', 'RUN_TESTS']
-     elif backend is Backend.ninja:
-         global NINJA_CMD
--        cmd = NINJA_CMD + ['-w', 'dupbuild=err', '-d', 'explain']
-+        cmd = NINJA_CMD + ['-d', 'explain']
-+        if not NINJA_1_12_OR_NEWER:
-+            cmd += ['-w', 'dupbuild=err']
-         if debug:
-             cmd += ['-v']
-         clean_cmd = cmd + ['clean']
-@@ -282,21 +282,6 @@ def get_backend_commands(backend: Backend, debug: bool = False) -> \
-         raise AssertionError(f'Unknown backend: {backend!r}')
-     return cmd, clean_cmd, test_cmd, install_cmd, uninstall_cmd
- 
--def ensure_backend_detects_changes(backend: Backend) -> None:
--    global NINJA_1_9_OR_NEWER
--    if backend is not Backend.ninja:
--        return
--    need_workaround = False
--    # We're using ninja >= 1.9 which has QuLogic's patch for sub-1s resolution
--    # timestamps
--    if not NINJA_1_9_OR_NEWER:
--        mlog.warning('Don\'t have ninja >= 1.9, enabling timestamp resolution workaround', once=True)
--        need_workaround = True
--    # Increase the difference between build.ninja's timestamp and the timestamp
--    # of whatever you changed: https://github.com/ninja-build/ninja/issues/371
--    if need_workaround:
--        time.sleep(1)
--
- def run_mtest_inprocess(commandlist: T.List[str]) -> T.Tuple[int, str, str]:
-     out = StringIO()
-     with mock.patch.object(sys, 'stdout', out), mock.patch.object(sys, 'stderr', out):
-diff --git a/unittests/baseplatformtests.py b/unittests/baseplatformtests.py
-index 6125ed933..226b2e11e 100644
---- a/unittests/baseplatformtests.py
-+++ b/unittests/baseplatformtests.py
-@@ -1,6 +1,8 @@
- # SPDX-License-Identifier: Apache-2.0
- # Copyright 2016-2021 The Meson development team
-+# Copyright © 2024 Intel Corporation
- 
-+from __future__ import annotations
- from pathlib import PurePath
- from unittest import mock, TestCase, SkipTest
- import json
-@@ -9,6 +11,7 @@ import os
- import re
- import subprocess
- import sys
-+import shutil
- import tempfile
- import typing as T
- 
-@@ -28,7 +31,7 @@ import mesonbuild.modules.pkgconfig
- 
- 
- from run_tests import (
--    Backend, ensure_backend_detects_changes, get_backend_commands,
-+    Backend, get_backend_commands,
-     get_builddir_target_args, get_meson_script, run_configure_inprocess,
-     run_mtest_inprocess, handle_meson_skip_test,
- )
-@@ -286,11 +289,11 @@ class BasePlatformTests(TestCase):
-         '''
-         return self.build(target=target, override_envvars=override_envvars)
- 
--    def setconf(self, arg, will_build=True):
--        if not isinstance(arg, list):
-+    def setconf(self, arg: T.Sequence[str], will_build: bool = True) -> None:
-+        if isinstance(arg, str):
-             arg = [arg]
--        if will_build:
--            ensure_backend_detects_changes(self.backend)
-+        else:
-+            arg = list(arg)
-         self._run(self.mconf_command + arg + [self.builddir])
- 
-     def getconf(self, optname: str):
-@@ -304,7 +307,6 @@ class BasePlatformTests(TestCase):
-         windows_proof_rmtree(self.builddir)
- 
-     def utime(self, f):
--        ensure_backend_detects_changes(self.backend)
-         os.utime(f)
- 
-     def get_compdb(self):
-@@ -492,3 +494,23 @@ class BasePlatformTests(TestCase):
- 
-     def assertLength(self, val, length):
-         assert len(val) == length, f'{val} is not length {length}'
-+
-+    def copy_srcdir(self, srcdir: str) -> str:
-+        """Copies a source tree and returns that copy.
-+
-+        ensures that the copied tree is deleted after running.
-+
-+        :param srcdir: The locaiton of the source tree to copy
-+        :return: The location of the copy
-+        """
-+        dest = tempfile.mkdtemp()
-+        self.addCleanup(windows_proof_rmtree, dest)
-+
-+        # shutil.copytree expects the destinatin directory to not exist, Once
-+        # python 3.8 is required the `dirs_exist_ok` parameter negates the need
-+        # for this
-+        dest = os.path.join(dest, 'subdir')
-+
-+        shutil.copytree(srcdir, dest)
-+
-+        return dest
-\ No newline at end of file
--- 
-2.44.0
-
diff --git a/third_party/nixpkgs/pkgs/by-name/me/meson/package.nix b/third_party/nixpkgs/pkgs/by-name/me/meson/package.nix
index 22bbc1c2fb..f05796e20d 100644
--- a/third_party/nixpkgs/pkgs/by-name/me/meson/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/me/meson/package.nix
@@ -13,6 +13,7 @@
 , python3
 , substituteAll
 , zlib
+, fetchpatch
 }:
 
 let
@@ -20,13 +21,13 @@ let
 in
 python3.pkgs.buildPythonApplication rec {
   pname = "meson";
-  version = "1.4.0";
+  version = "1.4.1";
 
   src = fetchFromGitHub {
     owner = "mesonbuild";
     repo = "meson";
     rev = "refs/tags/${version}";
-    hash = "sha256-hRTmKO2E6SIdvAhO7OJtV8dcsGm39c51H+2ZGEkdcFY=";
+    hash = "sha256-RBE4AUF5fymUA87JEDWtpUFXmVPFzdhZgDI7/kscTx4=";
   };
 
   patches = [
@@ -71,13 +72,15 @@ python3.pkgs.buildPythonApplication rec {
     # This edge case is explicitly part of meson but is wrong for nix
     ./007-freebsd-pkgconfig-path.patch
 
-    # Fix cross-compilation of proc-macro (and mesa)
-    # https://github.com/mesonbuild/meson/issues/12973
-    ./0001-Revert-rust-recursively-pull-proc-macro-dependencies.patch
-
-    # Fix compilation of Meson using Ninja 1.12
-    # FIXME: remove in the next point release
-    ./007-Allow-building-via-ninja-12.patch
+    # Find boost via pkg-config
+    # https://github.com/NixOS/nixpkgs/issues/86131
+    # Already merged upstream PR: https://github.com/mesonbuild/meson/pull/13272
+    # FIXME: Will be in meson 1.5.0
+    (fetchpatch {
+      name = "find-boost-pkg-config.patch";
+      url = "https://github.com/mesonbuild/meson/commit/c21b886ba8a60cce7fa56e4be40bd7547129fb00.patch";
+      hash = "sha256-uSilNuSx9yd1cxs0XVLcLw4MOXEd2uIe2g+wk+SBqeU=";
+    })
   ];
 
   buildInputs = lib.optionals (python3.pythonOlder "3.9") [
@@ -175,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/third_party/nixpkgs/pkgs/by-name/me/meson/setup-hook.sh b/third_party/nixpkgs/pkgs/by-name/me/meson/setup-hook.sh
index 3f3c7ac59f..8266645452 100644
--- a/third_party/nixpkgs/pkgs/by-name/me/meson/setup-hook.sh
+++ b/third_party/nixpkgs/pkgs/by-name/me/meson/setup-hook.sh
@@ -25,10 +25,7 @@ mesonConfigurePhase() {
         "--buildtype=${mesonBuildType:-plain}"
     )
 
-    flagsArray+=(
-        $mesonFlags
-        "${mesonFlagsArray[@]}"
-    )
+    _accumFlagsArray mesonFlags mesonFlagsArray
 
     echoCmd 'mesonConfigurePhase flags' "${flagsArray[@]}"
 
diff --git a/third_party/nixpkgs/pkgs/by-name/mi/mihomo/package.nix b/third_party/nixpkgs/pkgs/by-name/mi/mihomo/package.nix
index 50529dec4b..dc7c362bc5 100644
--- a/third_party/nixpkgs/pkgs/by-name/mi/mihomo/package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/mi/miracle-wm/package.nix b/third_party/nixpkgs/pkgs/by-name/mi/miracle-wm/package.nix
new file mode 100644
index 0000000000..e29deb34f9
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/mi/misconfig-mapper/package.nix b/third_party/nixpkgs/pkgs/by-name/mi/misconfig-mapper/package.nix
index cc39fdf446..6d5a487e77 100644
--- a/third_party/nixpkgs/pkgs/by-name/mi/misconfig-mapper/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/mi/misconfig-mapper/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "misconfig-mapper";
-  version = "1.7.0";
+  version = "1.8.0";
 
   src = fetchFromGitHub {
     owner = "intigriti";
     repo = "misconfig-mapper";
     rev = "refs/tags/v${version}";
-    hash = "sha256-QxZDxEt0IHuJh0BBGHFRofXm1nY+Owkyc3GDhDpQSAU=";
+    hash = "sha256-rHEtjbvb907G8RJWLnvrw2xscdWPHQOYSBgYk4yk6ng=";
   };
 
   vendorHash = "sha256-rpDzsUGtYIIUKf8P8Qkd16fuMbwKhKQMATYPVeNhstk=";
diff --git a/third_party/nixpkgs/pkgs/by-name/mo/modrinth-app/package.nix b/third_party/nixpkgs/pkgs/by-name/mo/modrinth-app/package.nix
index 23fd1adf19..12e13017ad 100644
--- a/third_party/nixpkgs/pkgs/by-name/mo/modrinth-app/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/mo/modrinth-app/package.nix
@@ -4,7 +4,7 @@
   symlinkJoin,
   modrinth-app-unwrapped,
   wrapGAppsHook3,
-  addOpenGLRunpath,
+  addDriverRunpath,
   flite,
   glib,
   glib-networking,
@@ -38,7 +38,7 @@ symlinkJoin rec {
   ];
 
   runtimeDependencies = lib.optionalString stdenv.isLinux (lib.makeLibraryPath [
-    addOpenGLRunpath.driverLink
+    addDriverRunpath.driverLink
     flite # narrator support
 
     udev # oshi
diff --git a/third_party/nixpkgs/pkgs/by-name/mo/mommy/package.nix b/third_party/nixpkgs/pkgs/by-name/mo/mommy/package.nix
index c83c91e20e..b36b4cd59a 100644
--- a/third_party/nixpkgs/pkgs/by-name/mo/mommy/package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/mo/mos/package.nix b/third_party/nixpkgs/pkgs/by-name/mo/mos/package.nix
index 8cbca9f534..a006558480 100644
--- a/third_party/nixpkgs/pkgs/by-name/mo/mos/package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/mo/mouse_m908/package.nix b/third_party/nixpkgs/pkgs/by-name/mo/mouse_m908/package.nix
index e41e9de62c..905b8fb1ef 100644
--- a/third_party/nixpkgs/pkgs/by-name/mo/mouse_m908/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/mo/mouse_m908/package.nix
@@ -4,14 +4,12 @@
 , installShellFiles
 , fetchFromGitHub
 , pkg-config
-}: stdenv.mkDerivation (finalAttrs: {
-  name = "mouse_m908";
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "mouse_m908";
   version = "3.4";
 
-  nativeBuildInputs = [ pkg-config installShellFiles ];
-
-  buildInputs = [ libusb1.dev ];
-
   src = fetchFromGitHub {
     owner = "dokutan";
     repo = "mouse_m908";
@@ -19,6 +17,10 @@
     sha256 = "sha256-sCAvjNpJYkp4G0KkDJtHOBR1vc80DZJtWR2W9gakkzQ=";
   };
 
+  nativeBuildInputs = [ pkg-config installShellFiles ];
+
+  buildInputs = [ libusb1 ];
+
   # Uses proper nix directories rather than the ones specified in the makefile
   installPhase = ''
     runHook preInstall
@@ -28,11 +30,11 @@
       $out/share/doc/mouse_m908 \
       $out/lib/udev/rules.d
 
-    cp mouse_m908 $out/bin/mouse_m908 && \
-    cp mouse_m908.rules $out/lib/udev/rules.d && \
-    cp examples/* $out/share/doc/mouse_m908 && \
-    cp README.md $out/share/doc/mouse_m908 && \
-    cp keymap.md $out/share/doc/mouse_m908 && \
+    cp mouse_m908 $out/bin/mouse_m908
+    cp mouse_m908.rules $out/lib/udev/rules.d
+    cp examples/* $out/share/doc/mouse_m908
+    cp README.md $out/share/doc/mouse_m908
+    cp keymap.md $out/share/doc/mouse_m908
     installManPage mouse_m908.1
 
     runHook postInstall
diff --git a/third_party/nixpkgs/pkgs/by-name/my/mysql84/package.nix b/third_party/nixpkgs/pkgs/by-name/my/mysql84/package.nix
index 3ad72c86d2..18dd8fcb09 100644
--- a/third_party/nixpkgs/pkgs/by-name/my/mysql84/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/my/mysql84/package.nix
@@ -1,6 +1,6 @@
 { lib, stdenv, fetchurl, bison, cmake, pkg-config
 , icu, libedit, libevent, lz4, ncurses, openssl, protobuf_21, re2, readline, zlib, zstd, libfido2
-, darwin, numactl, libtirpc, rpcsvc-proto, curl
+, cctools, darwin, numactl, libtirpc, rpcsvc-proto, curl
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
   ] ++ lib.optionals stdenv.isLinux [
     numactl libtirpc
   ] ++ lib.optionals stdenv.isDarwin [
-    darwin.cctools darwin.apple_sdk.frameworks.CoreServices darwin.developer_cmds darwin.DarwinTools
+    cctools darwin.apple_sdk.frameworks.CoreServices darwin.developer_cmds darwin.DarwinTools
   ];
 
   outputs = [ "out" "static" ];
diff --git a/third_party/nixpkgs/pkgs/by-name/na/nanoboyadvance/package.nix b/third_party/nixpkgs/pkgs/by-name/na/nanoboyadvance/package.nix
index b973959bc8..48b7430774 100644
--- a/third_party/nixpkgs/pkgs/by-name/na/nanoboyadvance/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/na/nanoboyadvance/package.nix
@@ -53,6 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.cmakeBool "USE_SYSTEM_FMT" true)
     (lib.cmakeBool "USE_SYSTEM_TOML11" true)
     (lib.cmakeBool "USE_SYSTEM_UNARR" true)
+    (lib.cmakeBool "PORTABLE_MODE" false)
   ];
 
   meta = {
diff --git a/third_party/nixpkgs/pkgs/tools/nix/nar-serve/default.nix b/third_party/nixpkgs/pkgs/by-name/na/nar-serve/package.nix
similarity index 75%
rename from third_party/nixpkgs/pkgs/tools/nix/nar-serve/default.nix
rename to third_party/nixpkgs/pkgs/by-name/na/nar-serve/package.nix
index 98e480d4fd..5f1f55198f 100644
--- a/third_party/nixpkgs/pkgs/tools/nix/nar-serve/default.nix
+++ b/third_party/nixpkgs/pkgs/by-name/na/nar-serve/package.nix
@@ -4,16 +4,16 @@
 }:
 buildGoModule rec {
   pname = "nar-serve";
-  version = "0.6.1";
+  version = "0.7.0";
 
   src = fetchFromGitHub {
     owner = "numtide";
     repo = "nar-serve";
     rev = "v${version}";
-    hash = "sha256-cSOYHYJJEGzFtkD4mjTmYBiM9CaWKt64xgV/JeNHpfM=";
+    hash = "sha256-8QuMS00EutmqzAIPxyJEPxM8EHiWlSKs6E2Htoh3Kes=";
   };
 
-  vendorHash = "sha256-RpjLs4+9abbbysYAlPDUXBLe1cz4Lp+QmR1yv+LpYwQ=";
+  vendorHash = "sha256-td9NYHGYJYPlIj2tnf5I/GnJQOOgODc6TakHFwxyvLQ=";
 
   doCheck = false;
 
diff --git a/third_party/nixpkgs/pkgs/by-name/nb/nbmerge/package.nix b/third_party/nixpkgs/pkgs/by-name/nb/nbmerge/package.nix
index b6dc642c96..3cd2efb857 100644
--- a/third_party/nixpkgs/pkgs/by-name/nb/nbmerge/package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/nc/ncbi-vdb/package.nix b/third_party/nixpkgs/pkgs/by-name/nc/ncbi-vdb/package.nix
new file mode 100644
index 0000000000..64e981610c
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/nc/ncdc/package.nix b/third_party/nixpkgs/pkgs/by-name/nc/ncdc/package.nix
index 0a6be6f40a..912bd60b3b 100644
--- a/third_party/nixpkgs/pkgs/by-name/nc/ncdc/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/nc/ncdc/package.nix
@@ -14,11 +14,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ncdc";
-  version = "1.24";
+  version = "1.24.1";
 
   src = fetchurl {
     url = "https://dev.yorhel.nl/download/ncdc-${finalAttrs.version}.tar.gz";
-    hash = "sha256-IzUQ1TVfxy/a01eOvIqzXR2pWyHSd0mQ86E1a3ES2h4=";
+    hash = "sha256-Koq5rX1D8Bj8c7qLq9aJ36RKuozsU7iOR3AYXLl3ePc=";
   };
 
   nativeBuildInputs = [ perl pkg-config ];
diff --git a/third_party/nixpkgs/pkgs/by-name/ne/nerdfetch/package.nix b/third_party/nixpkgs/pkgs/by-name/ne/nerdfetch/package.nix
index 35f74f1b52..447e46586e 100644
--- a/third_party/nixpkgs/pkgs/by-name/ne/nerdfetch/package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/ne/netbird-dashboard/package.nix b/third_party/nixpkgs/pkgs/by-name/ne/netbird-dashboard/package.nix
index dcacab7f55..f8a6ecb829 100644
--- a/third_party/nixpkgs/pkgs/by-name/ne/netbird-dashboard/package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/ne/neverest/package.nix b/third_party/nixpkgs/pkgs/by-name/ne/neverest/package.nix
index 04e68b5284..ec095dab02 100644
--- a/third_party/nixpkgs/pkgs/by-name/ne/neverest/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/ne/neverest/package.nix
@@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-3PSJyhxrOCiuHUeVHO77+NecnI5fN5EZfPhYizuYvtE=";
   };
 
-  cargoSha256 = "i5or8oBtjGqOfTfwB7dYXn/OPgr5WEWNEvC0WdCCG+c=";
+  cargoHash = "sha256-i5or8oBtjGqOfTfwB7dYXn/OPgr5WEWNEvC0WdCCG+c=";
 
   nativeBuildInputs = [ pkg-config ]
     ++ lib.optional (installManPages || installShellCompletions) installShellFiles;
diff --git a/third_party/nixpkgs/pkgs/by-name/ne/nextpnr/package.nix b/third_party/nixpkgs/pkgs/by-name/ne/nextpnr/package.nix
index 49c86cfc2a..9b00d388b5 100644
--- a/third_party/nixpkgs/pkgs/by-name/ne/nextpnr/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/ne/nextpnr/package.nix
@@ -40,10 +40,10 @@ stdenv.mkDerivation rec {
   sourceRoot = main_src.name;
 
   nativeBuildInputs
-     = [ cmake ]
+     = [ cmake python3 ]
     ++ (lib.optional enableGui wrapQtAppsHook);
   buildInputs
-     = [ boostPython python3 eigen python3Packages.apycula ]
+     = [ boostPython eigen python3Packages.apycula ]
     ++ (lib.optional enableGui qtbase)
     ++ (lib.optional stdenv.cc.isClang llvmPackages.openmp);
 
diff --git a/third_party/nixpkgs/pkgs/by-name/ne/nezha-agent/package.nix b/third_party/nixpkgs/pkgs/by-name/ne/nezha-agent/package.nix
index 090a5ee28d..629b906d82 100644
--- a/third_party/nixpkgs/pkgs/by-name/ne/nezha-agent/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/ne/nezha-agent/package.nix
@@ -7,16 +7,16 @@
 }:
 buildGoModule rec {
   pname = "nezha-agent";
-  version = "0.18.0";
+  version = "0.18.5";
 
   src = fetchFromGitHub {
     owner = "nezhahq";
     repo = "agent";
     rev = "refs/tags/v${version}";
-    hash = "sha256-Y7wuZmFc1ztofbfjmoAKZv9U05RbINYTyoNDHXKORYY=";
+    hash = "sha256-LmWfs3aL+1lsX4ix2FjDP5g+A0wgcfziXdw5SaKlAdk=";
   };
 
-  vendorHash = "sha256-M928t59dP5xqMZ+EzyFrzW0fYWuebk1V7UajI7g4VKg=";
+  vendorHash = "sha256-frPAhiexFSt+KobMbf32h8xv7HMcPl5koEgSs8Nz3cs=";
 
   ldflags = [
     "-s"
diff --git a/third_party/nixpkgs/pkgs/by-name/nf/nf-test/package.nix b/third_party/nixpkgs/pkgs/by-name/nf/nf-test/package.nix
index 44a6c5d8f4..b11fe8ee74 100644
--- a/third_party/nixpkgs/pkgs/by-name/nf/nf-test/package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/nh/nhentai/package.nix b/third_party/nixpkgs/pkgs/by-name/nh/nhentai/package.nix
index e21c98bf58..f6afd8d608 100644
--- a/third_party/nixpkgs/pkgs/by-name/nh/nhentai/package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/ni/nix-required-mounts/package.nix b/third_party/nixpkgs/pkgs/by-name/ni/nix-required-mounts/package.nix
index 197e0812a8..2da30a8688 100644
--- a/third_party/nixpkgs/pkgs/by-name/ni/nix-required-mounts/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/ni/nix-required-mounts/package.nix
@@ -1,5 +1,5 @@
 {
-  addOpenGLRunpath,
+  addDriverRunpath,
   allowedPatternsPath ? callPackage ./closure.nix { inherit allowedPatterns; },
   allowedPatterns ? rec {
     # This config is just an example.
@@ -12,7 +12,7 @@
     ];
     # It exposes these paths in the sandbox:
     nvidia-gpu.paths = [
-      addOpenGLRunpath.driverLink
+      addDriverRunpath.driverLink
       "/dev/dri"
       "/dev/nvidia*"
     ];
diff --git a/third_party/nixpkgs/pkgs/tools/nix/nix-store-gcs-proxy/default.nix b/third_party/nixpkgs/pkgs/by-name/ni/nix-store-gcs-proxy/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/nix/nix-store-gcs-proxy/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ni/nix-store-gcs-proxy/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/nix/nixpkgs-fmt/default.nix b/third_party/nixpkgs/pkgs/by-name/ni/nixpkgs-fmt/package.nix
similarity index 88%
rename from third_party/nixpkgs/pkgs/tools/nix/nixpkgs-fmt/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ni/nixpkgs-fmt/package.nix
index b7f73c7eb7..cbb2ae1d90 100644
--- a/third_party/nixpkgs/pkgs/tools/nix/nixpkgs-fmt/default.nix
+++ b/third_party/nixpkgs/pkgs/by-name/ni/nixpkgs-fmt/package.nix
@@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-6Ut4/ix915EoaPCewoG3KhKBA+OaggpDqnx2nvKxEpQ=";
   };
 
-  cargoSha256 = "sha256-yIwCBm46sgrpTt45uCyyS7M6V0ReGUXVu7tyrjdNqeQ=";
+  cargoHash = "sha256-yIwCBm46sgrpTt45uCyyS7M6V0ReGUXVu7tyrjdNqeQ=";
 
   meta = with lib; {
     description = "Nix code formatter for nixpkgs";
diff --git a/third_party/nixpkgs/pkgs/by-name/no/nomnatong/package.nix b/third_party/nixpkgs/pkgs/by-name/no/nomnatong/package.nix
index 5f2b3f69b7..f0107ff16b 100644
--- a/third_party/nixpkgs/pkgs/by-name/no/nomnatong/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/no/nomnatong/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "nomnatong";
-  version = "5.10";
+  version = "5.11";
 
   src = fetchFromGitHub {
     owner = "nomfoundation";
     repo = "font";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-e7LT6lwm4jbqL+mtvfZsCC7F6KOVYD/lAGRPAgyyMxc=";
+    hash = "sha256-LaMggMZIehQynA6tokOte28bbV3H0kagJRsbE8ZczsM=";
   };
 
   nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/by-name/no/novelwriter/package.nix b/third_party/nixpkgs/pkgs/by-name/no/novelwriter/package.nix
index 7f578f54a4..101783ee60 100644
--- a/third_party/nixpkgs/pkgs/by-name/no/novelwriter/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/no/novelwriter/package.nix
@@ -7,7 +7,7 @@
   nix-update-script,
 }:
 let
-  version = "2.4.4";
+  version = "2.5.1";
 in
 python3.pkgs.buildPythonApplication {
   pname = "novelwriter";
@@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication {
     owner = "vkbo";
     repo = "novelWriter";
     rev = "v${version}";
-    hash = "sha256-vYvrSRQTp/8jcCQIL6HgxdSJwogiPJKfVO+9hhK6emc=";
+    hash = "sha256-DgeDAPE5IkZtzi+Xq2BpGfpgTRonzNjaa1NTcwnqdNo=";
   };
 
   nativeBuildInputs = [ qt5.wrapQtAppsHook ];
diff --git a/third_party/nixpkgs/pkgs/by-name/nr/nrr/package.nix b/third_party/nixpkgs/pkgs/by-name/nr/nrr/package.nix
index 5585d08132..e92704479a 100644
--- a/third_party/nixpkgs/pkgs/by-name/nr/nrr/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/nr/nrr/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "nrr";
-  version = "0.9.3";
+  version = "0.9.4";
 
   src = fetchFromGitHub {
     owner = "ryanccn";
     repo = "nrr";
     rev = "v${version}";
-    hash = "sha256-P1LJFVe2MUkvKFP4XJvuFup9JKPv9Y2uWfoi8/N7JUo=";
+    hash = "sha256-X1zgQvgjWbTQAOHAZ+G2u0yO+qeiU0hamTLM39VOK20=";
   };
 
-  cargoHash = "sha256-owj5rzqtlbMMc84u5so0QbEzd2vnWk3KyM/A9ChxoVw=";
+  cargoHash = "sha256-NpvYN68l5wibrFxST35sWDBbUG1mauNszA8NYIWGGa0=";
 
   buildInputs = lib.optionals stdenv.isDarwin [
     darwin.apple_sdk.frameworks.CoreFoundation
diff --git a/third_party/nixpkgs/pkgs/by-name/nw/nwg-panel/package.nix b/third_party/nixpkgs/pkgs/by-name/nw/nwg-panel/package.nix
index 7e40dcd458..f3df17baea 100644
--- a/third_party/nixpkgs/pkgs/by-name/nw/nwg-panel/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/nw/nwg-panel/package.nix
@@ -16,13 +16,13 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "nwg-panel";
-  version = "0.9.34";
+  version = "0.9.36";
 
   src = fetchFromGitHub {
     owner = "nwg-piotr";
     repo = "nwg-panel";
     rev = "refs/tags/v${version}";
-    hash = "sha256-Mn3HXm6hPKxvf98do177dCN+RJgRc02AQ1ILjkZwBVc=";
+    hash = "sha256-MDQht1qqz7dm3Q6INpJEDZqAwvAa7uUp7mCDW/to3+E=";
   };
 
   # No tests
diff --git a/third_party/nixpkgs/pkgs/by-name/nw/nwjs-ffmpeg-prebuilt/package.nix b/third_party/nixpkgs/pkgs/by-name/nw/nwjs-ffmpeg-prebuilt/package.nix
new file mode 100644
index 0000000000..50b629492f
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/by-name/nw/nwjs-ffmpeg-prebuilt/package.nix
@@ -0,0 +1,54 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  unzip,
+}:
+
+let
+  bits = if stdenv.is64bit then "x64" else "ia32";
+  version = "0.89.0";
+in
+stdenv.mkDerivation {
+  pname = "nwjs-ffmpeg-prebuilt";
+  inherit version;
+
+  src =
+    let
+      hashes = {
+        "x64" = "sha256-uaCGZsPQrA1dl90IqRg7TgWMJyQAGBBF/qNBTShVHcY=";
+        "ia32" = "sha256-uaCGZsPQrA1dl90IqRg7TgWMJyQAGBBF/qNBTShVHcY=";
+      };
+    in
+    fetchurl {
+      url = "https://github.com/nwjs-ffmpeg-prebuilt/nwjs-ffmpeg-prebuilt/releases/download/${version}/${version}-linux-${bits}.zip";
+      hash = hashes.${bits};
+    };
+  sourceRoot = ".";
+
+  nativeBuildInputs = [ unzip ];
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/lib
+    cp -R libffmpeg.so $out/lib/
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "An app runtime based on Chromium and node.js";
+    homepage = "https://nwjs.io/";
+    platforms = [
+      "i686-linux"
+      "x86_64-linux"
+    ];
+    sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
+    maintainers = with lib.maintainers; [
+      ilya-epifanov
+      mikaelfangel
+    ];
+    license = lib.licenses.gpl2Plus;
+  };
+}
diff --git a/third_party/nixpkgs/pkgs/by-name/ob/obj-magic/package.nix b/third_party/nixpkgs/pkgs/by-name/ob/obj-magic/package.nix
new file mode 100644
index 0000000000..4f120323d0
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/of/offat/package.nix b/third_party/nixpkgs/pkgs/by-name/of/offat/package.nix
index 80e092eab8..07bdc8589a 100644
--- a/third_party/nixpkgs/pkgs/by-name/of/offat/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/of/offat/package.nix
@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "offat";
-  version = "0.18.0";
+  version = "0.19.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "OWASP";
     repo = "OFFAT";
     rev = "refs/tags/v${version}";
-    hash = "sha256-AROfhVVV9MN+yRGWrzC2y9lfErT4C3Mg8qPz8lSODFM=";
+    hash = "sha256-USSvUtY5THzsWlJtVYxrCquRJWfAoD7b7NHP7pB27sg=";
   };
 
   sourceRoot = "${src.name}/src";
diff --git a/third_party/nixpkgs/pkgs/by-name/oh/oh-my-fish/package.nix b/third_party/nixpkgs/pkgs/by-name/oh/oh-my-fish/package.nix
index 60448748c3..d18465609d 100644
--- a/third_party/nixpkgs/pkgs/by-name/oh/oh-my-fish/package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/ol/ollama/package.nix b/third_party/nixpkgs/pkgs/by-name/ol/ollama/package.nix
index 122d8fe23e..4406d8985f 100644
--- a/third_party/nixpkgs/pkgs/by-name/ol/ollama/package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/op/opencomposite/package.nix b/third_party/nixpkgs/pkgs/by-name/op/opencomposite/package.nix
index cc9929d392..db42ea0f9f 100644
--- a/third_party/nixpkgs/pkgs/by-name/op/opencomposite/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/op/opencomposite/package.nix
@@ -1,37 +1,35 @@
-{ lib
-, stdenv
-, fetchFromGitLab
-
-, cmake
-
-, glm
-, libGL
-, openxr-loader
-, python3
-, vulkan-headers
-, vulkan-loader
-, xorg
-
-, unstableGitUpdater
+{
+  cmake,
+  fetchFromGitLab,
+  glm,
+  jsoncpp,
+  lib,
+  libGL,
+  openxr-loader,
+  python3,
+  stdenv,
+  unstableGitUpdater,
+  vulkan-headers,
+  vulkan-loader,
+  xorg,
 }:
 
 stdenv.mkDerivation {
   pname = "opencomposite";
-  version = "0-unstable-2024-06-12";
+  version = "0-unstable-2024-07-23";
 
   src = fetchFromGitLab {
     owner = "znixian";
     repo = "OpenOVR";
-    rev = "de1658db7e2535fd36c2e37fa8dd3d756280c86f";
-    hash = "sha256-xyEiuEy3nt2AbF149Pjz5wi/rkTup2SgByR4DrNOJX0=";
+    rev = "632e5cc50b913e93194ca2970e6f13021182579f";
+    hash = "sha256-KQmNyGRlbUrntTPNn5rzTyyR+Bvh3EfSqBgyNGGDo04=";
   };
 
-  nativeBuildInputs = [
-    cmake
-  ];
+  nativeBuildInputs = [ cmake ];
 
   buildInputs = [
     glm
+    jsoncpp
     libGL
     openxr-loader
     python3
@@ -41,19 +39,11 @@ stdenv.mkDerivation {
   ];
 
   cmakeFlags = [
+    (lib.cmakeFeature "CMAKE_CXX_FLAGS" "-Wno-error=format-security")
     (lib.cmakeBool "USE_SYSTEM_OPENXR" true)
     (lib.cmakeBool "USE_SYSTEM_GLM" true)
   ];
 
-  # NOTE: `cmakeFlags` will get later tokenized by bash and there is no way
-  # of inserting a flag value with a space in it (inserting `"` or `'` won't help).
-  # https://discourse.nixos.org/t/cmakeflags-and-spaces-in-option-values/20170/2
-  preConfigure = ''
-    cmakeFlagsArray+=(
-      "-DCMAKE_CXX_FLAGS=-DGLM_ENABLE_EXPERIMENTAL -Wno-error=format-security"
-    )
-  '';
-
   installPhase = ''
     runHook preInstall
     mkdir -p $out/lib/opencomposite
@@ -66,10 +56,10 @@ stdenv.mkDerivation {
     branch = "openxr";
   };
 
-  meta = with lib; {
+  meta = {
     description = "Reimplementation of OpenVR, translating calls to OpenXR";
     homepage = "https://gitlab.com/znixian/OpenOVR";
-    license = with licenses; [ gpl3Only ];
-    maintainers = with maintainers; [ Scrumplex ];
+    license = with lib.licenses; [ gpl3Only ];
+    maintainers = with lib.maintainers; [ Scrumplex ];
   };
 }
diff --git a/third_party/nixpkgs/pkgs/by-name/op/openh264/package.nix b/third_party/nixpkgs/pkgs/by-name/op/openh264/package.nix
index c8eed276e1..ebd93572e2 100644
--- a/third_party/nixpkgs/pkgs/by-name/op/openh264/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/op/openh264/package.nix
@@ -43,6 +43,9 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://github.com/cisco/openh264/releases/tag/${finalAttrs.src.rev}";
     license = with lib.licenses; [ bsd2 ];
     maintainers = with lib.maintainers; [ AndersonTorres ];
-    platforms = lib.platforms.unix ++ lib.platforms.windows;
+    # See meson.build
+    platforms = lib.platforms.windows ++ lib.intersectLists
+      (lib.platforms.x86 ++ lib.platforms.arm ++ lib.platforms.aarch64 ++ lib.platforms.loongarch64)
+      (lib.platforms.linux ++ lib.platforms.darwin);
   };
 })
diff --git a/third_party/nixpkgs/pkgs/by-name/op/openpam/package.nix b/third_party/nixpkgs/pkgs/by-name/op/openpam/package.nix
new file mode 100644
index 0000000000..f0e823780a
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/by-name/op/openpam/package.nix
@@ -0,0 +1,31 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  autoreconfHook,
+  pkg-config,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "openpam";
+  version = "20230627";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/openpam/openpam/Ximenia/openpam-${finalAttrs.version}.tar.gz";
+    hash = "sha256-DZrI9bVaYkH1Bz8T7/HpVGFCLEWsGjBEXX4QaOkdtP0=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ autoreconfHook pkg-config ];
+
+  __structuredAttrs = true;
+
+  meta = with lib; {
+    homepage = "https://www.openpam.org";
+    description = "Open source PAM library that focuses on simplicity, correctness, and cleanliness";
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ matthewbauer ];
+    license = licenses.bsd3;
+  };
+})
diff --git a/third_party/nixpkgs/pkgs/by-name/op/openscad-unstable/package.nix b/third_party/nixpkgs/pkgs/by-name/op/openscad-unstable/package.nix
index 09514490eb..b0881fe10e 100644
--- a/third_party/nixpkgs/pkgs/by-name/op/openscad-unstable/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/op/openscad-unstable/package.nix
@@ -41,15 +41,16 @@ let
   # get cccl from source to avoid license issues
   nvidia-cccl = clangStdenv.mkDerivation {
     pname = "nvidia-cccl";
-    # note that v2.2.0 has some cmake issues
-    version = "2.2.0-unstable-2024-01-26";
+    # note, after v2.2.0, manifold dependency fails with some swap() ambiguities
+    version = "2.2.0";
     src = fetchFromGitHub {
       owner = "NVIDIA";
       repo = "cccl";
       fetchSubmodules = true;
-      rev = "0c9d03276206a5f59368e908e3d643610f9fddcd";
-      hash = "sha256-f11CNfa8jF9VbzvOoX1vT8zGIJL9cZ/VBpiklUn0YdU=";
+      rev = "v2.2.0";
+      hash = "sha256-azHDAuK0rAHrH+XkN3gHDrbwZOclP3zbEMe8VRpMjDQ=";
     };
+    patches = [ ./thrust-cmake.patch ];
     nativeBuildInputs = [ cmake pkg-config ];
     buildInputs = [ tbb_2021_11 ];
     cmakeFlags = [
@@ -81,12 +82,12 @@ in
 # clang consume much less RAM than GCC
 clangStdenv.mkDerivation rec {
   pname = "openscad-unstable";
-  version = "2024-03-10";
+  version = "2024-07-24";
   src = fetchFromGitHub {
     owner = "openscad";
     repo = "openscad";
-    rev = "db167b1df31fbd8a2101cf3a13dac148b0c2165d";
-    hash = "sha256-i2ZGYsNfMLDi3wRd/lohs9BuO2KuQ/7kJIXGtV65OQU=";
+    rev = "48f4430b12c29a95ab89ffdd8307205d7189421c";
+    hash = "sha256-A75JHmWVNlgURb5one5JFkztCrVff2RbyaDaObUp4ZY=";
     fetchSubmodules = true;
   };
   patches = [ ./test.diff ];
diff --git a/third_party/nixpkgs/pkgs/by-name/op/openscad-unstable/thrust-cmake.patch b/third_party/nixpkgs/pkgs/by-name/op/openscad-unstable/thrust-cmake.patch
new file mode 100644
index 0000000000..56422f0992
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/by-name/op/openscad-unstable/thrust-cmake.patch
@@ -0,0 +1,13 @@
+diff --git a/thrust/thrust/cmake/thrust-header-search.cmake.in b/thrust/thrust/cmake/thrust-header-search.cmake.in
+index 8529d89fe..94879ee01 100644
+--- a/thrust/thrust/cmake/thrust-header-search.cmake.in
++++ b/thrust/thrust/cmake/thrust-header-search.cmake.in
+@@ -7,7 +7,6 @@ set(from_install_prefix "@from_install_prefix@")
+ find_path(_THRUST_VERSION_INCLUDE_DIR thrust/version.h
+   NO_CMAKE_FIND_ROOT_PATH # Don't allow CMake to re-root the search
+   NO_DEFAULT_PATH # Only search explicit paths below:
+-  PATHS
+-    "${CMAKE_CURRENT_LIST_DIR}/${from_install_prefix}/@CMAKE_INSTALL_INCLUDEDIR@"
++  PATHS "@CMAKE_INSTALL_INCLUDEDIR@"
+ )
+ set_property(CACHE _THRUST_VERSION_INCLUDE_DIR PROPERTY TYPE INTERNAL)
diff --git a/third_party/nixpkgs/pkgs/by-name/op/opentelemetry-cpp/package.nix b/third_party/nixpkgs/pkgs/by-name/op/opentelemetry-cpp/package.nix
index 5efc256b54..97a7af508f 100644
--- a/third_party/nixpkgs/pkgs/by-name/op/opentelemetry-cpp/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/op/opentelemetry-cpp/package.nix
@@ -21,13 +21,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "opentelemetry-cpp";
-  version = "1.16.0";
+  version = "1.16.1";
 
   src = fetchFromGitHub {
     owner = "open-telemetry";
     repo = "opentelemetry-cpp";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-rMqNz8F/ahgDtQiLsswckd2jQPR9FTeSZKRFz2jWVoo=";
+    hash = "sha256-31zwIZ4oehhfn+oCyg8VQTurPOmdgp72plH1Pf/9UKQ=";
   };
 
   patches = [
diff --git a/third_party/nixpkgs/pkgs/by-name/op/openvas-scanner/package.nix b/third_party/nixpkgs/pkgs/by-name/op/openvas-scanner/package.nix
index d3b352eec8..a554b6403d 100644
--- a/third_party/nixpkgs/pkgs/by-name/op/openvas-scanner/package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/or/orca/package.nix b/third_party/nixpkgs/pkgs/by-name/or/orca/package.nix
index 464e2c1ff7..3670d6b520 100644
--- a/third_party/nixpkgs/pkgs/by-name/or/orca/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/or/orca/package.nix
@@ -20,7 +20,7 @@
 , lsof
 , coreutils
 , gsettings-desktop-schemas
-, speechd
+, speechd-minimal
 , brltty
 , liblouis
 , gst_all_1
@@ -65,7 +65,7 @@ python3.pkgs.buildPythonApplication rec {
     brltty
     liblouis
     psutil
-    speechd
+    speechd-minimal
     gst-python
     setproctitle
   ];
diff --git a/third_party/nixpkgs/pkgs/tools/misc/ovh-ttyrec/default.nix b/third_party/nixpkgs/pkgs/by-name/ov/ovh-ttyrec/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/ovh-ttyrec/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ov/ovh-ttyrec/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/packer/default.nix b/third_party/nixpkgs/pkgs/by-name/pa/packer/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/packer/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pa/packer/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/pa/pahole/package.nix b/third_party/nixpkgs/pkgs/by-name/pa/pahole/package.nix
index 275044ee40..14a31958c0 100644
--- a/third_party/nixpkgs/pkgs/by-name/pa/pahole/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/pa/pahole/package.nix
@@ -9,14 +9,15 @@
 , argp-standalone
 , musl-obstack
 , nixosTests
+, fetchpatch
 }:
 
 stdenv.mkDerivation rec {
   pname = "pahole";
-  version = "1.26";
+  version = "1.27";
   src = fetchzip {
     url = "https://git.kernel.org/pub/scm/devel/pahole/pahole.git/snapshot/pahole-${version}.tar.gz";
-    hash = "sha256-Lf9Z4vHRFplMrUf4VhJ7EDPn+S4RaS1Emm0wyEcG2HU=";
+    hash = "sha256-BwA17lc2yegmOzLfoIu8OmG/PVdc+4sOGzB8Jc4ZjGM=";
   };
 
   nativeBuildInputs = [ cmake pkg-config ];
@@ -26,7 +27,16 @@ stdenv.mkDerivation rec {
     musl-obstack
   ];
 
-  patches = [ ./threading-reproducibility.patch ];
+  patches = [
+    # https://github.com/acmel/dwarves/pull/51 / https://lkml.kernel.org/r/20240626032253.3406460-1-asmadeus@codewreck.org
+    ./threading-reproducibility.patch
+    # https://github.com/acmel/dwarves/issues/53
+    (fetchpatch {
+      name = "fix-clang-btf-generation-bug.patch";
+      url = "https://github.com/acmel/dwarves/commit/6a2b27c0f512619b0e7a769a18a0fb05bb3789a5.patch";
+      hash = "sha256-Le1BAew/a/QKkYNLgSQxEvZ9mEEglUw8URwz1kiheeE=";
+    })
+  ];
 
   # Put libraries in "lib" subdirectory, not top level of $out
   cmakeFlags = [ "-D__LIB=lib" "-DLIBBPF_EMBEDDED=OFF" ];
diff --git a/third_party/nixpkgs/pkgs/by-name/pa/pahole/threading-reproducibility.patch b/third_party/nixpkgs/pkgs/by-name/pa/pahole/threading-reproducibility.patch
index 15893ce2d0..3c76d9c852 100644
--- a/third_party/nixpkgs/pkgs/by-name/pa/pahole/threading-reproducibility.patch
+++ b/third_party/nixpkgs/pkgs/by-name/pa/pahole/threading-reproducibility.patch
@@ -1,18 +1,15 @@
 diff --git a/pahole.c b/pahole.c
-index 6fc4ed6..a4e306f 100644
+index 954498d2ad4f..2b010658330c 100644
 --- a/pahole.c
 +++ b/pahole.c
-@@ -1687,8 +1687,11 @@ static error_t pahole__options_parser(int key, char *arg,
- 		  class_name = arg;			break;
- 	case 'j':
- #if _ELFUTILS_PREREQ(0, 178)
--		  conf_load.nr_jobs = arg ? atoi(arg) :
--					    sysconf(_SC_NPROCESSORS_ONLN) * 1.1;
-+		  // Force single thread if reproducibility is desirable.
-+		  if (!getenv("SOURCE_DATE_EPOCH")) {
-+			  conf_load.nr_jobs = arg ? atoi(arg) :
-+						    sysconf(_SC_NPROCESSORS_ONLN) * 1.1;
-+		  }
- #else
- 		  fputs("pahole: Multithreading requires elfutils >= 0.178. Continuing with a single thread...\n", stderr);
- #endif
+@@ -3705,6 +3705,10 @@ int main(int argc, char *argv[])
+ 		goto out;
+ 	}
+ 
++	/* This being set means whoever called us tries to do a reproducible build */
++	if (getenv("SOURCE_DATE_EPOCH"))
++		conf_load.reproducible_build = true;
++
+ 	if (languages.str && parse_languages())
+ 		return rc;
+ 
diff --git a/third_party/nixpkgs/pkgs/by-name/pa/parallel-disk-usage/package.nix b/third_party/nixpkgs/pkgs/by-name/pa/parallel-disk-usage/package.nix
index f3aa96cbed..03396d94b1 100644
--- a/third_party/nixpkgs/pkgs/by-name/pa/parallel-disk-usage/package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/pa/paratest/package.nix b/third_party/nixpkgs/pkgs/by-name/pa/paratest/package.nix
index b51dac8f23..855db7c079 100644
--- a/third_party/nixpkgs/pkgs/by-name/pa/paratest/package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/pd/pdf2odt/package.nix b/third_party/nixpkgs/pkgs/by-name/pd/pdf2odt/package.nix
index eb748da084..809af89193 100644
--- a/third_party/nixpkgs/pkgs/by-name/pd/pdf2odt/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/pd/pdf2odt/package.nix
@@ -49,6 +49,10 @@ resholve.mkDerivation rec {
       imagemagick
       zip
     ];
+    execer = [
+      # zip can exec; confirmed 2 invocations in pdf2odt don't
+      "cannot:${zip}/bin/zip"
+    ];
   };
 
   meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/by-name/pe/pegtl/package.nix b/third_party/nixpkgs/pkgs/by-name/pe/pegtl/package.nix
index d7a57caa58..5e1704cdeb 100644
--- a/third_party/nixpkgs/pkgs/by-name/pe/pegtl/package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/pe/pest/package.nix b/third_party/nixpkgs/pkgs/by-name/pe/pest/package.nix
index 6157da0d8a..7431914a48 100644
--- a/third_party/nixpkgs/pkgs/by-name/pe/pest/package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/pe/petsc/package.nix b/third_party/nixpkgs/pkgs/by-name/pe/petsc/package.nix
index 421ed4d5b8..a9cc4ace97 100644
--- a/third_party/nixpkgs/pkgs/by-name/pe/petsc/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/pe/petsc/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchzip,
-  darwin,
+  cctools,
   gfortran,
   python3,
   blas,
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
 
   prePatch = lib.optionalString stdenv.isDarwin ''
     substituteInPlace config/install.py \
-      --replace /usr/bin/install_name_tool ${darwin.cctools}/bin/install_name_tool
+      --replace /usr/bin/install_name_tool ${cctools}/bin/install_name_tool
   '';
 
   # Both OpenMPI and MPICH get confused by the sandbox environment and spew errors like this (both to stdout and stderr):
diff --git a/third_party/nixpkgs/pkgs/by-name/pg/pgcopydb/package.nix b/third_party/nixpkgs/pkgs/by-name/pg/pgcopydb/package.nix
index cc415c4d8a..0df2ab9c04 100644
--- a/third_party/nixpkgs/pkgs/by-name/pg/pgcopydb/package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/pi/picom/package.nix b/third_party/nixpkgs/pkgs/by-name/pi/picom/package.nix
index 676ac95fb5..8074e38cf5 100644
--- a/third_party/nixpkgs/pkgs/by-name/pi/picom/package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/pigeon/default.nix b/third_party/nixpkgs/pkgs/by-name/pi/pigeon/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/pigeon/default.nix
rename to third_party/nixpkgs/pkgs/by-name/pi/pigeon/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/pi/pixi/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/pi/pixi/Cargo.lock
index 50e299718e..caf8c8ea08 100644
--- a/third_party/nixpkgs/pkgs/by-name/pi/pixi/Cargo.lock
+++ b/third_party/nixpkgs/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",
@@ -821,10 +844,20 @@ dependencies = [
 ]
 
 [[package]]
-name = "clap_derive"
-version = "4.5.4"
+name = "clap_complete_nushell"
+version = "4.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64"
+checksum = "1accf1b463dee0d3ab2be72591dccdab8bef314958340447c882c4c72acfe2a3"
+dependencies = [
+ "clap",
+ "clap_complete",
+]
+
+[[package]]
+name = "clap_derive"
+version = "4.5.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+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",
@@ -1360,12 +1428,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"
 
 [[package]]
-name = "file_url"
-version = "0.1.2"
+name = "fd-lock"
+version = "4.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1042c5fdc9f2cf548a139ccd0985fa2460d796f99b08574f72f1f53d179e6591"
+checksum = "7e5768da2206272c81ef0b5e951a41862938a6070da63bcea197899942d3b947"
 dependencies = [
- "itertools 0.12.1",
+ "cfg-if",
+ "rustix 0.38.34",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "file_url"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d0d1df57145d7cda57c95c44a2d64c24f579e2d50b8f4f7a779287293ad3adc0"
+dependencies = [
+ "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"
@@ -2415,26 +2523,76 @@ version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 
+[[package]]
+name = "lexical-core"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2cde5de06e8d4c2faabc400238f9ae1c74d5412d03a7bd067645ccbc47070e46"
+dependencies = [
+ "lexical-parse-float",
+ "lexical-parse-integer",
+ "lexical-util",
+ "lexical-write-float",
+ "lexical-write-integer",
+]
+
+[[package]]
+name = "lexical-parse-float"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "683b3a5ebd0130b8fb52ba0bdc718cc56815b6a097e28ae5a6997d0ad17dc05f"
+dependencies = [
+ "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 = "libgit2-sys"
-version = "0.16.2+1.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ee4126d8b4ee5c9d9ea891dd875cfdc1e9d0950437179104b183d7d8a74d24e8"
-dependencies = [
- "cc",
- "libc",
- "libssh2-sys",
- "libz-sys",
- "openssl-sys",
- "pkg-config",
-]
-
 [[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,17 +6171,84 @@ dependencies = [
  "uv-extract",
  "uv-fs",
  "uv-git",
- "uv-interpreter",
  "uv-normalize",
+ "uv-toolchain",
  "uv-types",
  "uv-warnings",
  "walkdir",
 ]
 
 [[package]]
-name = "uv-interpreter"
+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",
+]
+
+[[package]]
+name = "uv-resolver"
+version = "0.0.1"
+source = "git+https://github.com/astral-sh/uv?tag=0.2.18#13b0beb56fdc607c1f38d820dbf8c95c8fd0ce84"
+dependencies = [
+ "anyhow",
+ "cache-key",
+ "chrono",
+ "dashmap 5.5.3",
+ "derivative",
+ "distribution-filename",
+ "distribution-types",
+ "either",
+ "futures",
+ "indexmap 2.2.6",
+ "install-wheel-rs",
+ "itertools 0.13.0",
+ "once-map",
+ "owo-colors",
+ "path-slash",
+ "pep440_rs",
+ "pep508_rs",
+ "petgraph",
+ "platform-tags",
+ "pubgrub",
+ "pypi-types",
+ "requirements-txt",
+ "rkyv",
+ "rustc-hash 2.0.0",
+ "same-file",
+ "serde",
+ "textwrap",
+ "thiserror",
+ "tokio",
+ "tokio-stream",
+ "toml_edit 0.22.13",
+ "tracing",
+ "url",
+ "uv-client",
+ "uv-configuration",
+ "uv-distribution",
+ "uv-git",
+ "uv-normalize",
+ "uv-toolchain",
+ "uv-types",
+ "uv-warnings",
+]
+
+[[package]]
+name = "uv-state"
+version = "0.0.1"
+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",
@@ -6012,6 +6269,7 @@ dependencies = [
  "same-file",
  "serde",
  "serde_json",
+ "target-lexicon",
  "tempfile",
  "thiserror",
  "tokio-util",
@@ -6028,77 +6286,10 @@ dependencies = [
  "winapi",
 ]
 
-[[package]]
-name = "uv-normalize"
-version = "0.0.1"
-source = "git+https://github.com/astral-sh/uv?rev=65b17f6e81125064ea04c5cfef685516ab660cf5#65b17f6e81125064ea04c5cfef685516ab660cf5"
-dependencies = [
- "rkyv",
- "serde",
-]
-
-[[package]]
-name = "uv-resolver"
-version = "0.0.1"
-source = "git+https://github.com/astral-sh/uv?rev=65b17f6e81125064ea04c5cfef685516ab660cf5#65b17f6e81125064ea04c5cfef685516ab660cf5"
-dependencies = [
- "anstream",
- "anyhow",
- "cache-key",
- "chrono",
- "dashmap",
- "derivative",
- "distribution-filename",
- "distribution-types",
- "either",
- "futures",
- "indexmap 2.2.6",
- "install-wheel-rs",
- "itertools 0.13.0",
- "once-map",
- "once_cell",
- "owo-colors",
- "pep440_rs",
- "pep508_rs",
- "petgraph",
- "platform-tags",
- "pubgrub",
- "pypi-types",
- "requirements-txt",
- "rkyv",
- "rustc-hash",
- "serde",
- "textwrap",
- "thiserror",
- "tokio",
- "tokio-stream",
- "tracing",
- "url",
- "uv-cache",
- "uv-client",
- "uv-configuration",
- "uv-distribution",
- "uv-git",
- "uv-interpreter",
- "uv-normalize",
- "uv-types",
- "uv-warnings",
-]
-
-[[package]]
-name = "uv-state"
-version = "0.0.1"
-source = "git+https://github.com/astral-sh/uv?rev=65b17f6e81125064ea04c5cfef685516ab660cf5#65b17f6e81125064ea04c5cfef685516ab660cf5"
-dependencies = [
- "directories",
- "fs-err",
- "tempfile",
-]
-
 [[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/third_party/nixpkgs/pkgs/by-name/pi/pixi/package.nix b/third_party/nixpkgs/pkgs/by-name/pi/pixi/package.nix
index 19206ad014..e6b4c55783 100644
--- a/third_party/nixpkgs/pkgs/by-name/pi/pixi/package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/pi/pizauth/package.nix b/third_party/nixpkgs/pkgs/by-name/pi/pizauth/package.nix
index 17c201663c..811b74b972 100644
--- a/third_party/nixpkgs/pkgs/by-name/pi/pizauth/package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/pl/plasma-panel-colorizer/package.nix b/third_party/nixpkgs/pkgs/by-name/pl/plasma-panel-colorizer/package.nix
new file mode 100644
index 0000000000..2ee82abcf4
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/pl/plasma-plugin-blurredwallpaper/package.nix b/third_party/nixpkgs/pkgs/by-name/pl/plasma-plugin-blurredwallpaper/package.nix
new file mode 100644
index 0000000000..b6fc12d648
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/by-name/pl/plasma-plugin-blurredwallpaper/package.nix
@@ -0,0 +1,39 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+  nix-update-script,
+}:
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "plasma-plugin-blurredwallpaper";
+  version = "3.1.0";
+
+  src = fetchFromGitHub {
+    owner = "bouteillerAlan";
+    repo = "blurredwallpaper";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-+MjnVsGHqitQytxiAH39Kx9SXuTEFfIC14Ayzu4yE4I=";
+  };
+
+  installPhase = ''
+    runHook preInstall
+    install -d $out/share/plasma/wallpapers/a2n.blur{,.plasma5}
+    cp -r a2n.blur{,.plasma5} $out/share/plasma/wallpapers/
+    runHook postInstall
+  '';
+
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
+  meta = {
+    description = "Plasma 6 wallpaper plugin to blur the wallpaper of active window";
+    homepage = "https://github.com/bouteillerAlan/blurredwallpaper";
+    license = lib.licenses.gpl3;
+    maintainers = with lib.maintainers; [
+      dr460nf1r3
+      johnrtitor
+    ];
+    platforms = lib.platforms.linux;
+  };
+})
diff --git a/third_party/nixpkgs/pkgs/by-name/pl/plasmusic-toolbar/package.nix b/third_party/nixpkgs/pkgs/by-name/pl/plasmusic-toolbar/package.nix
index cc0d7f0a32..1d32f0e5fe 100644
--- a/third_party/nixpkgs/pkgs/by-name/pl/plasmusic-toolbar/package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/po/polkit_gnome/package.nix b/third_party/nixpkgs/pkgs/by-name/po/polkit_gnome/package.nix
index fd35df9f9e..68779415b0 100644
--- a/third_party/nixpkgs/pkgs/by-name/po/polkit_gnome/package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/pr/pretix/package.nix b/third_party/nixpkgs/pkgs/by-name/pr/pretix/package.nix
index 1a87317686..c561e9c61c 100644
--- a/third_party/nixpkgs/pkgs/by-name/pr/pretix/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/pr/pretix/package.nix
@@ -93,6 +93,7 @@ python.pkgs.buildPythonApplication rec {
       --replace-fail vat_moss_forked==2020.3.20.0.11.0 vat-moss \
       --replace-fail "bleach==5.0.*" bleach \
       --replace-fail "djangorestframework==3.15.*" djangorestframework \
+      --replace-fail "django-compressor==4.5" django-compressor \
       --replace-fail "dnspython==2.6.*" dnspython \
       --replace-fail "importlib_metadata==7.*" importlib_metadata \
       --replace-fail "markdown==3.6" markdown \
diff --git a/third_party/nixpkgs/pkgs/by-name/pr/prettier-d-slim/package.nix b/third_party/nixpkgs/pkgs/by-name/pr/prettier-d-slim/package.nix
index 3b92503d74..1f3938968f 100644
--- a/third_party/nixpkgs/pkgs/by-name/pr/prettier-d-slim/package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/pr/prismlauncher/package.nix b/third_party/nixpkgs/pkgs/by-name/pr/prismlauncher/package.nix
index c6ff689438..27b66966d4 100644
--- a/third_party/nixpkgs/pkgs/by-name/pr/prismlauncher/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/pr/prismlauncher/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   symlinkJoin,
   prismlauncher-unwrapped,
-  addOpenGLRunpath,
+  addDriverRunpath,
   flite,
   gamemode,
   glfw,
@@ -132,7 +132,7 @@ symlinkJoin {
     in
     [ "--prefix PRISMLAUNCHER_JAVA_PATHS : ${lib.makeSearchPath "bin/java" jdks}" ]
     ++ lib.optionals stdenv.isLinux [
-      "--set LD_LIBRARY_PATH ${addOpenGLRunpath.driverLink}/lib:${lib.makeLibraryPath runtimeLibs}"
+      "--set LD_LIBRARY_PATH ${addDriverRunpath.driverLink}/lib:${lib.makeLibraryPath runtimeLibs}"
       "--prefix PATH : ${lib.makeBinPath runtimePrograms}"
     ];
 
diff --git a/third_party/nixpkgs/pkgs/by-name/pr/protoc-gen-elixir/package.nix b/third_party/nixpkgs/pkgs/by-name/pr/protoc-gen-elixir/package.nix
new file mode 100644
index 0000000000..8e38f33176
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/pr/protoc-gen-js/package.nix b/third_party/nixpkgs/pkgs/by-name/pr/protoc-gen-js/package.nix
index 08fb3345fe..78d03e9b2b 100644
--- a/third_party/nixpkgs/pkgs/by-name/pr/protoc-gen-js/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/pr/protoc-gen-js/package.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildBazelPackage, bazel_6, fetchFromGitHub, darwin }:
+{ stdenv, lib, buildBazelPackage, bazel_6, fetchFromGitHub, cctools }:
 
 buildBazelPackage rec {
   pname = "protoc-gen-js";
@@ -17,7 +17,7 @@ buildBazelPackage rec {
   removeRulesCC = false;
   removeLocalConfigCC = false;
 
-  LIBTOOL = lib.optionalString stdenv.isDarwin "${darwin.cctools}/bin/libtool";
+  LIBTOOL = lib.optionalString stdenv.isDarwin "${cctools}/bin/libtool";
 
   fetchAttrs.sha256 = "sha256-WOBlZ0XNrl5UxIaSDxZeOfzS2a8ZkrKdTLKHBDC9UNQ=";
 
diff --git a/third_party/nixpkgs/pkgs/by-name/pr/proton-ge-bin/package.nix b/third_party/nixpkgs/pkgs/by-name/pr/proton-ge-bin/package.nix
index d5a19506a4..1d31e09525 100644
--- a/third_party/nixpkgs/pkgs/by-name/pr/proton-ge-bin/package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/pr/proton-pass/package.nix b/third_party/nixpkgs/pkgs/by-name/pr/proton-pass/package.nix
index 9e2b4d5f49..58d2633559 100644
--- a/third_party/nixpkgs/pkgs/by-name/pr/proton-pass/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/pr/proton-pass/package.nix
@@ -8,11 +8,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "proton-pass";
-  version = "1.20.1";
+  version = "1.20.2";
 
   src = fetchurl {
     url = "https://proton.me/download/PassDesktop/linux/x64/ProtonPass_${finalAttrs.version}.deb";
-    hash = "sha256-G14/gVevvccV8ILPr701IP8krR2/mOnRn0icCP1Hi4s=";
+    hash = "sha256-4QSBKVnEH7yDXwqY+29/a+yWv89i/TVCYO26V95KA4s=";
   };
 
   dontConfigure = true;
diff --git a/third_party/nixpkgs/pkgs/by-name/pu/pupdate/package.nix b/third_party/nixpkgs/pkgs/by-name/pu/pupdate/package.nix
index 4b86f845b0..ae2ed54131 100644
--- a/third_party/nixpkgs/pkgs/by-name/pu/pupdate/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/pu/pupdate/package.nix
@@ -11,13 +11,13 @@
 
 buildDotnetModule rec {
   pname = "pupdate";
-  version = "3.10.3";
+  version = "3.11.0";
 
   src = fetchFromGitHub {
     owner = "mattpannella";
     repo = "${pname}";
     rev = "${version}";
-    hash = "sha256-xaoOfylDf8KBGjS5RxPH156PRfEBFk+sRZ4QTCMSQbY=";
+    hash = "sha256-SqEmpmjI0m6bJT43TLEmEciNEqR/ggQZqFLCm7oFSnY=";
   };
 
   buildInputs = [
diff --git a/third_party/nixpkgs/pkgs/by-name/qu/quickjs-ng/package.nix b/third_party/nixpkgs/pkgs/by-name/qu/quickjs-ng/package.nix
index 887c482e6c..35a71244ca 100644
--- a/third_party/nixpkgs/pkgs/by-name/qu/quickjs-ng/package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/qu/quill-log/package.nix b/third_party/nixpkgs/pkgs/by-name/qu/quill-log/package.nix
new file mode 100644
index 0000000000..e34be8be3e
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/ra/radicle-httpd/package.nix b/third_party/nixpkgs/pkgs/by-name/ra/radicle-httpd/package.nix
index 6f2333e3d7..dc06524034 100644
--- a/third_party/nixpkgs/pkgs/by-name/ra/radicle-httpd/package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/ra/rav1e/package.nix b/third_party/nixpkgs/pkgs/by-name/ra/rav1e/package.nix
index 2a0ad2ab37..50cf9bef9e 100644
--- a/third_party/nixpkgs/pkgs/by-name/ra/rav1e/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/ra/rav1e/package.nix
@@ -46,6 +46,8 @@ rustPlatform.buildRustPackage rec {
   # and linking it with cctools ld64.
   postPatch = lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) ''
     substituteInPlace build.rs --replace-fail '.arg("-x")' '.arg("-S")'
+    # Thin LTO doesn’t appear to work with Rust 1.79. rav1e fail to build when building fern.
+    substituteInPlace Cargo.toml --replace-fail 'lto = "thin"' 'lto = "fat"'
   '';
 
   checkType = "debug";
diff --git a/third_party/nixpkgs/pkgs/by-name/re/regols/package.nix b/third_party/nixpkgs/pkgs/by-name/re/regols/package.nix
index ca04a777f4..af8f81ff77 100644
--- a/third_party/nixpkgs/pkgs/by-name/re/regols/package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/remind/default.nix b/third_party/nixpkgs/pkgs/by-name/re/remind/package.nix
similarity index 51%
rename from third_party/nixpkgs/pkgs/tools/misc/remind/default.nix
rename to third_party/nixpkgs/pkgs/by-name/re/remind/package.nix
index 51448931dc..34fed0a25a 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/remind/default.nix
+++ b/third_party/nixpkgs/pkgs/by-name/re/remind/package.nix
@@ -1,38 +1,44 @@
-{ lib
-, stdenv
-, fetchurl
-, tk
-, tcllib
-, tcl
-, tkremind ? true
+{
+  lib,
+  stdenv,
+  fetchurl,
+  tk,
+  tcllib,
+  tcl,
+  tkremind ? null,
+  withGui ?
+    if tkremind != null then
+      lib.warn "tkremind is deprecated and should be removed; use withGui instead." tkremind
+    else
+      true,
 }:
 
 tcl.mkTclDerivation rec {
   pname = "remind";
-  version = "05.00.01";
+  version = "05.00.02";
 
   src = fetchurl {
     url = "https://dianne.skoll.ca/projects/remind/download/remind-${version}.tar.gz";
-    hash = "sha256-tj36/lLn67/hkNMrRVGXRLqQ9Sx6oDKZHeajiSYn97c=";
+    hash = "sha256-XxVjAV3TGDPI8XaFXXSminsMffq8m8ljw68YMIC2lYg=";
   };
 
-  propagatedBuildInputs = lib.optionals tkremind [ tcllib tk ];
+  propagatedBuildInputs = lib.optionals withGui [
+    tcllib
+    tk
+  ];
 
-  postPatch = lib.optionalString tkremind ''
+  postPatch = lib.optionalString withGui ''
     # NOTA BENE: The path to rem2pdf is replaced in tkremind for future use
     # as rem2pdf is currently not build since it requires the JSON::MaybeXS,
     # Pango and Cairo Perl modules.
     substituteInPlace scripts/tkremind \
-      --replace-fail "exec wish" "exec ${lib.getBin tk}/bin/wish" \
-      --replace-fail 'set Remind "remind"' "set Remind \"$out/bin/remind\"" \
-      --replace-fail 'set Rem2PS "rem2ps"' "set Rem2PS \"$out/bin/rem2ps\"" \
-      --replace-fail 'set Rem2PDF "rem2pdf"' "set Rem2PDF \"$out/bin/rem2pdf\""
+      --replace-fail "exec wish" "exec ${lib.getExe' tk "wish"}" \
+      --replace-fail 'set Remind "remind"' 'set Remind "$out/bin/remind"' \
+      --replace-fail 'set Rem2PS "rem2ps"' 'set Rem2PS "$out/bin/rem2ps"' \
+      --replace-fail 'set Rem2PDF "rem2pdf"' 'set Rem2PDF "$out/bin/rem2pdf"'
   '';
 
   env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin (toString [
-    # Disable clang link time optimization until the following issue is resolved:
-    # https://github.com/NixOS/nixpkgs/issues/19098
-    "-fno-lto"
     # On Darwin setenv and unsetenv are defined in stdlib.h from libSystem
     "-DHAVE_SETENV"
     "-DHAVE_UNSETENV"
@@ -42,7 +48,10 @@ tcl.mkTclDerivation rec {
     homepage = "https://dianne.skoll.ca/projects/remind/";
     description = "Sophisticated calendar and alarm program for the console";
     license = licenses.gpl2Only;
-    maintainers = with maintainers; [ raskin kovirobi ];
+    maintainers = with maintainers; [
+      raskin
+      kovirobi
+    ];
     mainProgram = "remind";
     platforms = platforms.unix;
   };
diff --git a/third_party/nixpkgs/pkgs/by-name/re/replxx/package.nix b/third_party/nixpkgs/pkgs/by-name/re/replxx/package.nix
index de6c2c9313..705b12deda 100644
--- a/third_party/nixpkgs/pkgs/by-name/re/replxx/package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/re/revolver/no-external-call.patch b/third_party/nixpkgs/pkgs/by-name/re/revolver/no-external-call.patch
new file mode 100644
index 0000000000..9142edd79b
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/re/revolver/package.nix b/third_party/nixpkgs/pkgs/by-name/re/revolver/package.nix
new file mode 100644
index 0000000000..37eac352fd
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/ri/ricochet-refresh/package.nix b/third_party/nixpkgs/pkgs/by-name/ri/ricochet-refresh/package.nix
index e0e55bb8c5..8bbc781bb4 100644
--- a/third_party/nixpkgs/pkgs/by-name/ri/ricochet-refresh/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/ri/ricochet-refresh/package.nix
@@ -37,6 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [
     pkg-config
+    protobuf
     cmake
     qt5.wrapQtAppsHook
   ];
diff --git a/third_party/nixpkgs/pkgs/by-name/ri/ride/package.nix b/third_party/nixpkgs/pkgs/by-name/ri/ride/package.nix
index 25d18248d5..0cce004171 100644
--- a/third_party/nixpkgs/pkgs/by-name/ri/ride/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/ri/ride/package.nix
@@ -12,7 +12,7 @@
   copyDesktopItems,
   makeDesktopItem,
   electron,
-  darwin,
+  cctools,
 }:
 
 let
@@ -92,7 +92,7 @@ buildNpmPackage rec {
       makeWrapper
     ]
     ++ lib.optionals (!stdenv.isDarwin) [ copyDesktopItems ]
-    ++ lib.optionals stdenv.isDarwin [ darwin.cctools ];
+    ++ lib.optionals stdenv.isDarwin [ cctools ];
 
   env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
 
diff --git a/third_party/nixpkgs/pkgs/by-name/ri/river/build.zig.zon.nix b/third_party/nixpkgs/pkgs/by-name/ri/river/build.zig.zon.nix
index 8f51e12020..aff981a246 100644
--- a/third_party/nixpkgs/pkgs/by-name/ri/river/build.zig.zon.nix
+++ b/third_party/nixpkgs/pkgs/by-name/ri/river/build.zig.zon.nix
@@ -3,6 +3,13 @@
 { linkFarm, fetchzip }:
 
 linkFarm "zig-packages" [
+  {
+    name = "12204d789e17c158971f69c7b900e8d8f288e7b9e42b2242f3adfbca57e8266d848f";
+    path = fetchzip {
+      url = "https://codeberg.org/ifreund/zig-wlroots/archive/v0.18.0.tar.gz";
+      hash = "sha256-KDOroHrrye4vlYKyAk8/6CF0+6nzJ/bbETZQhSbrSSk=";
+    };
+  }
   {
     name = "1220687c8c47a48ba285d26a05600f8700d37fc637e223ced3aa8324f3650bf52242";
     path = fetchzip {
@@ -17,13 +24,6 @@ linkFarm "zig-packages" [
       hash = "sha256-zcfZEMnipWDPuptl9UN0PoaJDjy2EHc7Wwi4GQq3hkY=";
     };
   }
-  {
-    name = "1220bb5e5c802c517425bc1d8d8d43d7b7fe5eb81ce4c46b15ce829d67ddadc55418";
-    path = fetchzip {
-      url = "https://codeberg.org/ifreund/zig-wlroots/archive/v0.17.2.tar.gz";
-      hash = "sha256-vS/tv7PAUR+BYgEGJHHGNKDxqgSCBsVFV+w9oeV5sJU=";
-    };
-  }
   {
     name = "1220c90b2228d65fd8427a837d31b0add83e9fade1dcfa539bb56fd06f1f8461605f";
     path = fetchzip {
diff --git a/third_party/nixpkgs/pkgs/by-name/ri/river/package.nix b/third_party/nixpkgs/pkgs/by-name/ri/river/package.nix
index 59abccc41e..2291defb0c 100644
--- a/third_party/nixpkgs/pkgs/by-name/ri/river/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/ri/river/package.nix
@@ -13,7 +13,7 @@
 , udev
 , wayland
 , wayland-protocols
-, wlroots_0_17
+, wlroots_0_18
 , xwayland
 , zig_0_13
 , withManpages ? true
@@ -22,7 +22,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "river";
-  version = "0.3.4";
+  version = "0.3.5";
 
   outputs = [ "out" ] ++ lib.optionals withManpages [ "man" ];
 
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
     repo = "river";
     rev = "refs/tags/v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-a8Xz9VZtwmyynYHL0vNDoWqZmvdRoBmNh2jcaIO72bE=";
+    hash = "sha256-NUKjQOT6UgNYCebeHMxOhX08r3493IOL3qHZivEcbAg=";
   };
 
   deps = callPackage ./build.zig.zon.nix { };
@@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
     pixman
     udev
     wayland-protocols
-    wlroots_0_17
+    wlroots_0_18
   ] ++ lib.optional xwaylandSupport libX11;
 
   dontConfigure = true;
diff --git a/third_party/nixpkgs/pkgs/by-name/rm/rmpc/Cargo.lock.patch b/third_party/nixpkgs/pkgs/by-name/rm/rmpc/Cargo.lock.patch
new file mode 100644
index 0000000000..404baea3e1
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/by-name/rm/rmpc/Cargo.lock.patch
@@ -0,0 +1,28 @@
+diff --git a/Cargo.lock b/Cargo.lock
+index e4e2d1a..72839b4 100644
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -198,9 +198,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "bitstream-io"
+-version = "2.5.0"
++version = "2.3.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "3dcde5f311c85b8ca30c2e4198d4326bc342c76541590106f5fa4a50946ea499"
++checksum = "7c12d1856e42f0d817a835fe55853957c85c8c8a470114029143d3f12671446e"
+ 
+ [[package]]
+ name = "built"
+@@ -1376,9 +1376,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "ravif"
+-version = "0.11.8"
++version = "0.11.5"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "c6ba61c28ba24c0cf8406e025cb29a742637e3f70776e61c27a8a8b72a042d12"
++checksum = "bc13288f5ab39e6d7c9d501759712e6969fcc9734220846fc9ed26cae2cc4234"
+ dependencies = [
+  "avif-serialize",
+  "imgref",
diff --git a/third_party/nixpkgs/pkgs/by-name/rm/rmpc/package.nix b/third_party/nixpkgs/pkgs/by-name/rm/rmpc/package.nix
new file mode 100644
index 0000000000..4ac072cb81
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/by-name/rm/rmpc/package.nix
@@ -0,0 +1,57 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  fetchpatch,
+  pkg-config,
+  cmake,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "rmpc";
+  version = "0.2.1";
+
+  src = fetchFromGitHub {
+    owner = "mierak";
+    repo = "rmpc";
+    rev = "v${version}";
+    hash = "sha256-g+yzW0DfaBhJKTikYZ8eqe4pX8nJvbpJ1xaZ3W/O/bo=";
+  };
+
+  cargoHash = "sha256-wFrHgB4wYGeXvfdGf4SJAAL8fE6dAKDLL51Ohmn+1HQ=";
+
+  cargoPatches = [
+    # Patch Cargo.lock to make rmpc compile with older versions of rustc
+    # Remove when Rust 1.79.0 is in master
+    ./Cargo.lock.patch
+  ];
+
+  patches = [
+    # Fix release mode tests compilation issues
+    # Remove when next rmpc version comes out
+    (fetchpatch {
+      url = "https://github.com/mierak/rmpc/commit/f12be6f606f5319523f41576e7c463b6008b9069.patch";
+      hash = "sha256-4L/MrdC/ydTqnkt3qd5H8hLZimiqct6sOkEq8rJN0F4=";
+    })
+  ];
+
+  nativeBuildInputs = [
+    pkg-config
+    cmake
+  ];
+
+  meta = {
+    changelog = "https://github.com/mierak/rmpc/releases/tag/${src.rev}";
+    description = "TUI music player client for MPD with album art support via kitty image protocol";
+    homepage = "https://mierak.github.io/rmpc/";
+    license = lib.licenses.bsd3;
+    longDescription = ''
+      Rusty Music Player Client is a beautiful, modern and configurable terminal-based Music Player
+      Daemon client. It was inspired by ncmpcpp and aims to provide an alternative with support for
+      album art through kitty image protocol without any ugly hacks. It also features ranger/lf
+      inspired browsing of songs and other goodies.
+    '';
+    maintainers = with lib.maintainers; [ donovanglover ];
+    mainProgram = "rmpc";
+  };
+}
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/rnote/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/rn/rnote/Cargo.lock
similarity index 79%
rename from third_party/nixpkgs/pkgs/applications/graphics/rnote/Cargo.lock
rename to third_party/nixpkgs/pkgs/by-name/rn/rnote/Cargo.lock
index 0cbd1de820..b38a33f7f1 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/rnote/Cargo.lock
+++ b/third_party/nixpkgs/pkgs/by-name/rn/rnote/Cargo.lock
@@ -2,15 +2,6 @@
 # It is not intended for manual editing.
 version = 3
 
-[[package]]
-name = "addr2line"
-version = "0.21.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
-dependencies = [
- "gimli",
-]
-
 [[package]]
 name = "adler"
 version = "1.0.2"
@@ -39,10 +30,16 @@ dependencies = [
 ]
 
 [[package]]
-name = "allocator-api2"
-version = "0.2.16"
+name = "aligned-vec"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5"
+checksum = "4aa90d7ce82d4be67b64039a3d588d38dbcc6736577de4a847025ce5b0c468d1"
+
+[[package]]
+name = "allocator-api2"
+version = "0.2.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f"
 
 [[package]]
 name = "alsa"
@@ -51,7 +48,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "37fe60779335388a88c01ac6c3be40304d1e349de3ada3b15f7808bb90fa9dce"
 dependencies = [
  "alsa-sys",
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "libc",
 ]
 
@@ -82,47 +79,48 @@ dependencies = [
 
 [[package]]
 name = "anstream"
-version = "0.6.13"
+version = "0.6.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb"
+checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526"
 dependencies = [
  "anstyle",
  "anstyle-parse",
  "anstyle-query",
  "anstyle-wincon",
  "colorchoice",
+ "is_terminal_polyfill",
  "utf8parse",
 ]
 
 [[package]]
 name = "anstyle"
-version = "1.0.6"
+version = "1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc"
+checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
 
 [[package]]
 name = "anstyle-parse"
-version = "0.2.3"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c"
+checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb"
 dependencies = [
  "utf8parse",
 ]
 
 [[package]]
 name = "anstyle-query"
-version = "1.0.2"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648"
+checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a"
 dependencies = [
  "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "anstyle-wincon"
-version = "3.0.2"
+version = "3.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7"
+checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8"
 dependencies = [
  "anstyle",
  "windows-sys 0.52.0",
@@ -130,9 +128,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.81"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0952808a6c2afd1aa8947271f3a60f1a6763c7b912d210184c5149b5cf147247"
+checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
 
 [[package]]
 name = "approx"
@@ -144,23 +142,27 @@ dependencies = [
 ]
 
 [[package]]
-name = "aquamarine"
-version = "0.1.12"
+name = "arbitrary"
+version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a941c39708478e8eea39243b5983f1c42d2717b3620ee91f4a52115fd02ac43f"
+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 = [
- "itertools 0.9.0",
- "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "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"
@@ -173,24 +175,22 @@ dependencies = [
 
 [[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.3.0",
- "event-listener-strategy 0.5.1",
+ "event-listener-strategy",
  "futures-core",
  "pin-project-lite",
 ]
 
 [[package]]
 name = "async-executor"
-version = "1.9.1"
+version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10b3e585719c2358d2660232671ca8ca4ddb4be4ce8a1842d6c2dc8685303316"
+checksum = "d7ebdfa2ebdab6b1760375fa7d6f382b9f486eac35fc994625a00e89280bdbb7"
 dependencies = [
- "async-lock 3.3.0",
  "async-task",
  "concurrent-queue",
  "fastrand",
@@ -200,22 +200,22 @@ dependencies = [
 
 [[package]]
 name = "async-fs"
-version = "2.1.1"
+version = "2.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc19683171f287921f2405677dd2ed2549c3b3bda697a563ebc3a121ace2aba1"
+checksum = "ebcd09b382f40fcd159c2d695175b2ae620ffa5f3bd6f664131efff4e8b9e04a"
 dependencies = [
- "async-lock 3.3.0",
+ "async-lock",
  "blocking",
  "futures-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",
@@ -230,21 +230,12 @@ dependencies = [
 
 [[package]]
 name = "async-lock"
-version = "2.8.0"
+version = "3.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b"
+checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18"
 dependencies = [
- "event-listener 2.5.3",
-]
-
-[[package]]
-name = "async-lock"
-version = "3.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b"
-dependencies = [
- "event-listener 4.0.3",
- "event-listener-strategy 0.4.0",
+ "event-listener",
+ "event-listener-strategy",
  "pin-project-lite",
 ]
 
@@ -261,18 +252,18 @@ dependencies = [
 
 [[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.3.0",
+ "event-listener",
  "futures-lite",
  "rustix",
  "tracing",
@@ -281,12 +272,12 @@ dependencies = [
 
 [[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",
@@ -294,14 +285,14 @@ 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 = "atomic-waker"
@@ -322,148 +313,38 @@ dependencies = [
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
-name = "autocxx"
-version = "0.26.0"
+name = "av1-grain"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ba64dd33efd8f09724143d45ab91b48aebcee52f4fb11add3464c998fab47dc"
+checksum = "6678909d8c5d46a42abcf571271e15fdbc0a225e3646cf23762cd415046c78bf"
 dependencies = [
- "aquamarine",
- "autocxx-macro",
- "cxx",
- "moveit",
-]
-
-[[package]]
-name = "autocxx-bindgen"
-version = "0.65.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c9fb7b8dd83a582e12157367773d8d1195f2dea54d4250aaf3426abae3237aa"
-dependencies = [
- "bitflags 1.3.2",
- "cexpr",
- "clang-sys",
- "itertools 0.10.5",
- "lazy_static",
- "lazycell",
+ "anyhow",
+ "arrayvec",
  "log",
- "peeking_take_while",
- "prettyplease",
- "proc-macro2",
- "quote",
- "regex",
- "rustc-hash",
- "shlex",
- "syn 2.0.58",
- "which",
+ "nom",
+ "num-rational",
+ "v_frame",
 ]
 
 [[package]]
-name = "autocxx-build"
-version = "0.26.0"
+name = "avif-serialize"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "955e602d2d68b79ca5d674984259234fad2c8d869ad99011699e0a3cd76f38cd"
+checksum = "876c75a42f6364451a033496a14c44bffe41f5f4a8236f697391f11024e596d2"
 dependencies = [
- "autocxx-engine",
- "env_logger",
- "indexmap 1.9.3",
- "syn 2.0.58",
-]
-
-[[package]]
-name = "autocxx-engine"
-version = "0.26.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5918896fc1d44a647345fd5e8c74208424e394a76bdd2942398f4aff81ec7ab1"
-dependencies = [
- "aquamarine",
- "autocxx-bindgen",
- "autocxx-parser",
- "cc",
- "cxx-gen",
- "indexmap 1.9.3",
- "indoc",
- "itertools 0.10.5",
- "log",
- "miette",
- "once_cell",
- "prettyplease",
- "proc-macro2",
- "quote",
- "regex",
- "rustversion",
- "serde_json",
- "strum_macros",
- "syn 2.0.58",
- "tempfile",
- "thiserror",
- "version_check",
-]
-
-[[package]]
-name = "autocxx-macro"
-version = "0.26.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e594e68d030b6eb1ce7e2b40958f4f4ae7150c588c76d76b9f8178d41c47d80"
-dependencies = [
- "autocxx-parser",
- "proc-macro-error",
- "proc-macro2",
- "quote",
- "syn 2.0.58",
-]
-
-[[package]]
-name = "autocxx-parser"
-version = "0.26.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ef00b2fc378804c31c4fbd693a7fea93f8a90467dce331dae1e4ce41e542953"
-dependencies = [
- "indexmap 1.9.3",
- "itertools 0.10.5",
- "log",
- "once_cell",
- "proc-macro2",
- "quote",
- "serde",
- "serde_json",
- "syn 2.0.58",
- "thiserror",
-]
-
-[[package]]
-name = "backtrace"
-version = "0.3.71"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d"
-dependencies = [
- "addr2line",
- "cc",
- "cfg-if",
- "libc",
- "miniz_oxide",
- "object",
- "rustc-demangle",
-]
-
-[[package]]
-name = "backtrace-ext"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "537beee3be4a18fb023b570f80e3ae28003db9167a751266b259926e25539d50"
-dependencies = [
- "backtrace",
+ "arrayvec",
 ]
 
 [[package]]
 name = "base64"
-version = "0.22.0"
+version = "0.22.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9475866fec1451be56a3c2400fd081ff546538961565ccb5b7142cbd22bc7a51"
+checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
 
 [[package]]
 name = "bindgen"
@@ -471,7 +352,7 @@ version = "0.69.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "cexpr",
  "clang-sys",
  "itertools 0.12.1",
@@ -480,9 +361,9 @@ dependencies = [
  "proc-macro2",
  "quote",
  "regex",
- "rustc-hash",
+ "rustc-hash 1.1.0",
  "shlex",
- "syn 2.0.58",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -499,9 +380,18 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
+version = "2.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "bitstream-io"
 version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "3dcde5f311c85b8ca30c2e4198d4326bc342c76541590106f5fa4a50946ea499"
 
 [[package]]
 name = "block"
@@ -511,31 +401,40 @@ checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"
 
 [[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 = "bumpalo"
-version = "3.15.4"
+name = "built"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ff69b9dd49fd426c69a0db9fc04dd934cdb6645ff000864d98f7e2af8830eaa"
+checksum = "236e6289eda5a812bc6b53c3b024039382a2895fbbeef2d748b2931546d392c4"
+
+[[package]]
+name = "bumpalo"
+version = "3.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
+
+[[package]]
+name = "by_address"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "64fa3c856b712db6612c019f14756e64e4bcea13337a6b33b696333a9eaa2d06"
 
 [[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"
@@ -544,18 +443,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
-name = "bytes"
-version = "1.6.0"
+name = "byteorder-lite"
+version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9"
+checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495"
+
+[[package]]
+name = "bytes"
+version = "1.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+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",
@@ -581,9 +486,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
 
 [[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",
@@ -606,9 +511,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",
@@ -622,23 +527,23 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[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",
  "wasm-bindgen",
- "windows-targets 0.52.4",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
 name = "clang-sys"
-version = "1.7.0"
+version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67523a3b4be3ce1989d607a828d036249522dd9c1c8de7f4dd2dae43a37369d1"
+checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4"
 dependencies = [
  "glob",
  "libc",
@@ -647,9 +552,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.4"
+version = "4.5.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0"
+checksum = "35723e6a11662c2afb578bcf0b88bf6ea8e21282a953428f240574fcc3a2b5b3"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -657,9 +562,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.2"
+version = "4.5.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4"
+checksum = "49eb96cbfa7cfa35017b7cd548c75b14c3118c98b423041d70562665e07fb0fa"
 dependencies = [
  "anstream",
  "anstyle",
@@ -669,40 +574,21 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.5.4"
+version = "4.5.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64"
+checksum = "5d029b67f89d30bbb547c89fd5161293c0aec155fc691d7924b64550662db93e"
 dependencies = [
- "heck 0.5.0",
+ "heck",
  "proc-macro2",
  "quote",
- "syn 2.0.58",
+ "syn 2.0.72",
 ]
 
 [[package]]
 name = "clap_lex"
-version = "0.7.0"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce"
-
-[[package]]
-name = "cmake"
-version = "0.1.50"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130"
-dependencies = [
- "cc",
-]
-
-[[package]]
-name = "codespan-reporting"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e"
-dependencies = [
- "termcolor",
- "unicode-width",
-]
+checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97"
 
 [[package]]
 name = "color_quant"
@@ -712,15 +598,15 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
 
 [[package]]
 name = "colorchoice"
-version = "1.0.0"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
+checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0"
 
 [[package]]
 name = "combine"
-version = "4.6.6"
+version = "4.6.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4"
+checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd"
 dependencies = [
  "bytes",
  "memchr",
@@ -728,9 +614,9 @@ dependencies = [
 
 [[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",
 ]
@@ -799,18 +685,18 @@ 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",
 ]
 
 [[package]]
 name = "crossbeam-channel"
-version = "0.5.12"
+version = "0.5.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95"
+checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2"
 dependencies = [
  "crossbeam-utils",
 ]
@@ -836,9 +722,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"
@@ -866,48 +752,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331"
 dependencies = [
  "quote",
- "syn 2.0.58",
-]
-
-[[package]]
-name = "cxx"
-version = "1.0.120"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff4dc7287237dd438b926a81a1a5605dad33d286870e5eee2db17bf2bcd9e92a"
-dependencies = [
- "cc",
- "cxxbridge-flags",
- "cxxbridge-macro",
- "link-cplusplus",
-]
-
-[[package]]
-name = "cxx-gen"
-version = "0.7.120"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf9e305d914e15a8eefd7972a3b658d876d91a22681d555219feda30a9f5ea2b"
-dependencies = [
- "codespan-reporting",
- "proc-macro2",
- "quote",
- "syn 2.0.58",
-]
-
-[[package]]
-name = "cxxbridge-flags"
-version = "1.0.120"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "701a1ac7a697e249cdd8dc026d7a7dafbfd0dbcd8bd24ec55889f2bc13dd6287"
-
-[[package]]
-name = "cxxbridge-macro"
-version = "1.0.120"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b404f596046b0bb2d903a9c786b875a126261b52b7c3a64bbb66382c41c771df"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.58",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -1000,13 +845,13 @@ dependencies = [
 
 [[package]]
 name = "derive_more"
-version = "0.99.17"
+version = "0.99.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321"
+checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -1024,9 +869,9 @@ dependencies = [
 
 [[package]]
 name = "downcast-rs"
-version = "1.2.0"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650"
+checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2"
 
 [[package]]
 name = "dtoa"
@@ -1036,9 +881,9 @@ checksum = "dcbb2bf8e87535c23f7a8a321e364ce21462d0ff10cb6407820e8e96dfff6653"
 
 [[package]]
 name = "dtoa-short"
-version = "0.3.4"
+version = "0.3.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbaceec3c6e4211c79e7b1800fb9680527106beb2f9c51904a3210c03a448c74"
+checksum = "cd1511a7b6a56299bd043a9c167a6d2bfb37bf84a6dfceaba651168adfb43c87"
 dependencies = [
  "dtoa",
 ]
@@ -1055,9 +900,9 @@ dependencies = [
 
 [[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 = "encode_unicode"
@@ -1067,26 +912,13 @@ checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
 
 [[package]]
 name = "encoding_rs"
-version = "0.8.33"
+version = "0.8.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1"
+checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59"
 dependencies = [
  "cfg-if",
 ]
 
-[[package]]
-name = "env_logger"
-version = "0.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7"
-dependencies = [
- "atty",
- "humantime",
- "log",
- "regex",
- "termcolor",
-]
-
 [[package]]
 name = "equivalent"
 version = "1.0.1"
@@ -1095,9 +927,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
 [[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",
@@ -1105,35 +937,18 @@ dependencies = [
 
 [[package]]
 name = "euclid"
-version = "0.22.9"
+version = "0.22.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87f253bc5c813ca05792837a0ff4b3a580336b224512d48f7eda1d7dd9210787"
+checksum = "e0f0eb73b934648cd7a4a61f1b15391cd95dab0b4da6e2e66c2a072c144b4a20"
 dependencies = [
  "num-traits",
 ]
 
 [[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.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d9944b8ca13534cdfb2800775f8dd4902ff3fc75a50101466decadfdf322a24"
+checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba"
 dependencies = [
  "concurrent-queue",
  "parking",
@@ -1142,21 +957,11 @@ dependencies = [
 
 [[package]]
 name = "event-listener-strategy"
-version = "0.4.0"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3"
+checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1"
 dependencies = [
- "event-listener 4.0.3",
- "pin-project-lite",
-]
-
-[[package]]
-name = "event-listener-strategy"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "332f51cb23d20b0de8458b86580878211da09bcd4503cb579c225b3d124cabb3"
-dependencies = [
- "event-listener 5.3.0",
+ "event-listener",
  "pin-project-lite",
 ]
 
@@ -1190,9 +995,9 @@ checksum = "dd2e7510819d6fbf51a5545c8f922716ecfb14df168a3242f7d33e0239efe6a1"
 
 [[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"
@@ -1230,15 +1035,15 @@ checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd"
 dependencies = [
  "cfg-if",
  "libc",
- "redox_syscall",
+ "redox_syscall 0.4.1",
  "windows-sys 0.52.0",
 ]
 
 [[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",
@@ -1280,14 +1085,14 @@ version = "0.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a595cb550439a117696039dfc69830492058211b771a2a165379f2a1a53d84d"
 dependencies = [
- "roxmltree",
+ "roxmltree 0.19.0",
 ]
 
 [[package]]
 name = "fontdb"
-version = "0.16.2"
+version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0299020c3ef3f60f526a4f64ab4a3d4ce116b1acbf24cdd22da0068e5d81dc3"
+checksum = "e32eac81c1135c1df01d4e6d4233c47ba11f6a6d07f33e0bba09d18797077770"
 dependencies = [
  "fontconfig-parser",
  "log",
@@ -1400,7 +1205,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.58",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -1444,9 +1249,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",
@@ -1456,9 +1261,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",
@@ -1469,9 +1274,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",
@@ -1484,9 +1289,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",
@@ -1539,9 +1344,9 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.2.13"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a06fddc2749e0528d2813f95e050e87e52c8cbbae56223b9babf73b3e53b0cc6"
+checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
 dependencies = [
  "cfg-if",
  "libc",
@@ -1578,17 +1383,11 @@ dependencies = [
  "weezl",
 ]
 
-[[package]]
-name = "gimli"
-version = "0.28.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
-
 [[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",
@@ -1604,9 +1403,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",
@@ -1617,11 +1416,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",
@@ -1648,22 +1447,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",
  "proc-macro2",
  "quote",
- "syn 2.0.58",
+ "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",
@@ -1677,9 +1476,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",
@@ -1688,9 +1487,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",
@@ -1699,9 +1498,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",
@@ -1711,9 +1510,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",
@@ -1726,9 +1525,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",
@@ -1742,9 +1541,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",
@@ -1763,23 +1562,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",
- "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",
@@ -1796,9 +1593,9 @@ dependencies = [
 
 [[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",
@@ -1815,15 +1612,9 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.12.3"
+version = "0.14.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
-
-[[package]]
-name = "hashbrown"
-version = "0.14.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
+checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
 dependencies = [
  "ahash",
  "allocator-api2",
@@ -1839,12 +1630,6 @@ dependencies = [
  "stable_deref_trait",
 ]
 
-[[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"
@@ -1867,19 +1652,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
 
 [[package]]
-name = "home"
-version = "0.5.9"
+name = "hermit-abi"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5"
-dependencies = [
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "humantime"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
+checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc"
 
 [[package]]
 name = "iana-time-zone"
@@ -1950,6 +1726,39 @@ 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 = "imagesize"
 version = "0.12.0"
@@ -1957,15 +1766,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "029d73f573d8e8d63e6d5020011d3255b28c3ba85d6cf870a07184ed23de9284"
 
 [[package]]
-name = "indexmap"
-version = "1.9.3"
+name = "imgref"
+version = "1.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
-dependencies = [
- "autocfg",
- "hashbrown 0.12.3",
- "serde",
-]
+checksum = "44feda355f4159a7c757171a77de25daf6411e217b4cabd03bd6650690468126"
 
 [[package]]
 name = "indexmap"
@@ -1974,7 +1778,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
 dependencies = [
  "equivalent",
- "hashbrown 0.14.3",
+ "hashbrown",
 ]
 
 [[package]]
@@ -1990,23 +1794,11 @@ dependencies = [
  "unicode-width",
 ]
 
-[[package]]
-name = "indoc"
-version = "1.0.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa799dd5ed20a7e349f3b4639aa80d74549c81716d9ec4f994c9b5815598306"
-
 [[package]]
 name = "ink-stroke-modeler-rs"
 version = "0.1.0"
-source = "git+https://github.com/flxzt/ink-stroke-modeler-rs?rev=b67f11b2c174a9ae4a54c22313cf8c218ff0946a#b67f11b2c174a9ae4a54c22313cf8c218ff0946a"
+source = "git+https://github.com/flxzt/ink-stroke-modeler-rs?rev=84d311e9b0d034dcd955a1f353d37f54b2bda70f#84d311e9b0d034dcd955a1f353d37f54b2bda70f"
 dependencies = [
- "autocxx",
- "autocxx-build",
- "cmake",
- "cxx",
- "miette",
- "path-slash",
  "thiserror",
 ]
 
@@ -2032,13 +1824,24 @@ 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 = "interpolate_name"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.72",
+]
+
 [[package]]
 name = "is-docker"
 version = "0.2.0"
@@ -2048,17 +1851,6 @@ dependencies = [
  "once_cell",
 ]
 
-[[package]]
-name = "is-terminal"
-version = "0.4.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b"
-dependencies = [
- "hermit-abi 0.3.9",
- "libc",
- "windows-sys 0.52.0",
-]
-
 [[package]]
 name = "is-wsl"
 version = "0.4.0"
@@ -2070,28 +1862,10 @@ dependencies = [
 ]
 
 [[package]]
-name = "is_ci"
-version = "1.2.0"
+name = "is_terminal_polyfill"
+version = "1.70.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7655c9839580ee829dfacba1d1278c2b7883e50a277ff7541299489d6bdfdc45"
-
-[[package]]
-name = "itertools"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b"
-dependencies = [
- "either",
-]
-
-[[package]]
-name = "itertools"
-version = "0.10.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
-dependencies = [
- "either",
-]
+checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
 
 [[package]]
 name = "itertools"
@@ -2111,6 +1885,15 @@ dependencies = [
  "either",
 ]
 
+[[package]]
+name = "itertools"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
+dependencies = [
+ "either",
+]
+
 [[package]]
 name = "itoa"
 version = "1.0.11"
@@ -2141,9 +1924,9 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"
 
 [[package]]
 name = "jobserver"
-version = "0.1.28"
+version = "0.1.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6"
+checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0"
 dependencies = [
  "libc",
 ]
@@ -2214,9 +1997,9 @@ checksum = "d4345964bb142484797b161f473a503a434de77149dd8c7427788c6e13379388"
 
 [[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"
@@ -2264,18 +2047,29 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.153"
+version = "0.2.155"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
+checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
+
+[[package]]
+name = "libfuzzer-sys"
+version = "0.4.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a96cfd5557eb82f2b83fed4955246c988d331975a002961b07c81584d107e7f7"
+dependencies = [
+ "arbitrary",
+ "cc",
+ "once_cell",
+]
 
 [[package]]
 name = "libloading"
-version = "0.8.3"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19"
+checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4"
 dependencies = [
  "cfg-if",
- "windows-targets 0.52.4",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -2286,9 +2080,9 @@ checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058"
 
 [[package]]
 name = "librsvg"
-version = "2.58.0"
+version = "2.58.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de005d9589235493d0e2b62d055c0d8e368db4fb33e746dafc9400fb67b9c817"
+checksum = "1a0e5200e66bdf58bf95bdbdda1e7e81b73abaa7351a39f26031e8c047735892"
 dependencies = [
  "cairo-rs",
  "cast",
@@ -2298,13 +2092,13 @@ dependencies = [
  "float-cmp",
  "gio",
  "glib",
- "image",
+ "image 0.24.9",
  "itertools 0.12.1",
  "language-tags",
  "libc",
  "locale_config",
  "markup5ever",
- "nalgebra",
+ "nalgebra 0.32.6",
  "num-traits",
  "pango",
  "pangocairo",
@@ -2320,20 +2114,11 @@ dependencies = [
  "xml5ever",
 ]
 
-[[package]]
-name = "link-cplusplus"
-version = "1.0.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d240c6f7e1ba3a28b0249f774e6a9dd0175054b52dfbb61b16eb8505c3785c9"
-dependencies = [
- "cc",
-]
-
 [[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"
@@ -2350,9 +2135,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",
@@ -2360,9 +2145,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 = "mac"
@@ -2428,10 +2222,19 @@ dependencies = [
 ]
 
 [[package]]
-name = "memchr"
-version = "2.7.2"
+name = "maybe-rayon"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d"
+checksum = "8ea1f30cedd69f0a2954655f7188c6a834246d2bcf1e315e2ac40c4b24dc9519"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "memchr"
+version = "2.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
 
 [[package]]
 name = "memmap2"
@@ -2451,38 +2254,6 @@ dependencies = [
  "autocfg",
 ]
 
-[[package]]
-name = "miette"
-version = "5.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59bb584eaeeab6bd0226ccf3509a69d7936d148cf3d036ad350abe35e8c6856e"
-dependencies = [
- "backtrace",
- "backtrace-ext",
- "is-terminal",
- "miette-derive",
- "once_cell",
- "owo-colors",
- "supports-color",
- "supports-hyperlinks",
- "supports-unicode",
- "terminal_size",
- "textwrap",
- "thiserror",
- "unicode-width",
-]
-
-[[package]]
-name = "miette-derive"
-version = "5.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49e7bc1560b95a3c4a25d03de42fe76ca718ab92d1a22a55b9b4cf67b3ae635c"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.58",
-]
-
 [[package]]
 name = "minimal-lexical"
 version = "0.2.1"
@@ -2491,9 +2262,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",
@@ -2512,19 +2283,26 @@ dependencies = [
 ]
 
 [[package]]
-name = "moveit"
-version = "0.6.0"
+name = "nalgebra"
+version = "0.32.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87d7335204cb6ef7bd647fa6db0be3e4d7aa25b5823a7aa030027ddf512cefba"
+checksum = "7b5c17de023a86f59ed79891b2e5d5a94c705dbe904a5b5c9c952ea6221b03e4"
 dependencies = [
- "cxx",
+ "approx",
+ "matrixmultiply",
+ "nalgebra-macros",
+ "num-complex",
+ "num-rational",
+ "num-traits",
+ "simba 0.8.1",
+ "typenum",
 ]
 
 [[package]]
 name = "nalgebra"
-version = "0.32.5"
+version = "0.33.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ea4908d4f23254adda3daa60ffef0f1ac7b8c3e9a864cf3cc154b251908a2ef"
+checksum = "3c4b5f057b303842cf3262c27e465f4c303572e7f6b0648f60e16248ac3397f4"
 dependencies = [
  "approx",
  "matrixmultiply",
@@ -2533,19 +2311,19 @@ dependencies = [
  "num-rational",
  "num-traits",
  "serde",
- "simba",
+ "simba 0.9.0",
  "typenum",
 ]
 
 [[package]]
 name = "nalgebra-macros"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91761aed67d03ad966ef783ae962ef9bbaca728d2dd7ceb7939ec110fffad998"
+checksum = "254a5372af8fc138e36684761d3c0cdb758a4410e938babcff1c860ce14ddbfc"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -2554,7 +2332,7 @@ version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2076a31b7010b17a38c01907c45b945e8f11495ee4dd588309718901b1f7a5b7"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "jni-sys",
  "log",
  "ndk-sys",
@@ -2593,13 +2371,19 @@ 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 = "notify"
 version = "6.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "crossbeam-channel",
  "filetime",
  "fsevent-sys",
@@ -2637,10 +2421,20 @@ dependencies = [
 ]
 
 [[package]]
-name = "num-complex"
-version = "0.4.5"
+name = "num-bigint"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23c6602fda94a57c990fe0df199a035d83576b496aa29f4e634a8ac6004e68a6"
+checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9"
+dependencies = [
+ "num-integer",
+ "num-traits",
+]
+
+[[package]]
+name = "num-complex"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495"
 dependencies = [
  "num-traits",
  "serde",
@@ -2654,7 +2448,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.58",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -2668,20 +2462,20 @@ 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",
 ]
 
 [[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",
  "libm",
@@ -2715,7 +2509,7 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.58",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -2759,15 +2553,6 @@ dependencies = [
  "objc",
 ]
 
-[[package]]
-name = "object"
-version = "0.32.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
-dependencies = [
- "memchr",
-]
-
 [[package]]
 name = "oboe"
 version = "0.6.1"
@@ -2799,32 +2584,35 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "open"
-version = "5.1.2"
+version = "5.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "449f0ff855d85ddbf1edd5b646d65249ead3f5e422aaa86b7d2d0b049b103e32"
+checksum = "61a877bf6abd716642a53ef1b89fb498923a4afca5c754f9050b4d081c05c4b3"
 dependencies = [
  "is-wsl",
  "libc",
  "pathdiff",
 ]
 
+[[package]]
+name = "ordered-float"
+version = "4.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19ff2cf528c6c03d9ed653d6c4ce1dc0582dc4af309790ad92f07c1cd551b0be"
+dependencies = [
+ "num-traits",
+]
+
 [[package]]
 name = "overload"
 version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
 
-[[package]]
-name = "owo-colors"
-version = "3.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f"
-
 [[package]]
 name = "palette"
-version = "0.7.5"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ebfc23a4b76642983d57e4ad00bb4504eb30a8ce3c70f4aee1f725610e36d97a"
+checksum = "4cbf71184cc5ecc2e4e1baccdb21026c20e5fc3dcf63028a086131b3ab00b6e6"
 dependencies = [
  "approx",
  "fast-srgb8",
@@ -2834,20 +2622,21 @@ dependencies = [
 
 [[package]]
 name = "palette_derive"
-version = "0.7.5"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e8890702dbec0bad9116041ae586f84805b13eecd1d8b1df27c29998a9969d6d"
+checksum = "f5030daf005bface118c096f510ffb781fc28f9ab6a32ab224d8631be6851d30"
 dependencies = [
+ "by_address",
  "proc-macro2",
  "quote",
- "syn 2.0.58",
+ "syn 2.0.72",
 ]
 
 [[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",
@@ -2857,9 +2646,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",
@@ -2869,9 +2658,9 @@ dependencies = [
 
 [[package]]
 name = "pangocairo"
-version = "0.19.2"
+version = "0.19.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6620c77967c62c7a84c6ca15ab855e8eecb248beb8ee43bc0eeaadd39123f687"
+checksum = "e4c8b43c02ec1c4e16daf7fc50fbce6b8ead5705c18ae56274f703233cce1cd9"
 dependencies = [
  "cairo-rs",
  "glib",
@@ -2882,9 +2671,9 @@ dependencies = [
 
 [[package]]
 name = "pangocairo-sys"
-version = "0.19.0"
+version = "0.19.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01bd0597ae45983f9e8b7f73afc42238426cd3fbb44a9cf14fd881a4ae08f1e4"
+checksum = "591904498438879785f5b7a2fdf7c38e9ec08c514b93c614b5c3b48cd11dd8d7"
 dependencies = [
  "cairo-sys-rs",
  "glib-sys",
@@ -2901,9 +2690,9 @@ checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae"
 
 [[package]]
 name = "parking_lot"
-version = "0.12.1"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
+checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
 dependencies = [
  "lock_api",
  "parking_lot_core",
@@ -2911,44 +2700,47 @@ dependencies = [
 
 [[package]]
 name = "parking_lot_core"
-version = "0.9.9"
+version = "0.9.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e"
+checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
 dependencies = [
  "cfg-if",
  "libc",
- "redox_syscall",
+ "redox_syscall 0.5.3",
  "smallvec",
- "windows-targets 0.48.5",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
 name = "parry2d-f64"
-version = "0.13.7"
+version = "0.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5565e2f28bad470868b5e5c146fd0e2716345b67d8b9f27e0fc147a1dd4790b5"
+checksum = "83cb2f7d0e018b2fc6c3cecfc05c82a198b9087534f16d2ea2a5552c2ac0fc2b"
 dependencies = [
  "approx",
  "arrayvec",
- "bitflags 1.3.2",
+ "bitflags 2.6.0",
  "downcast-rs",
  "either",
- "nalgebra",
+ "log",
+ "nalgebra 0.33.0",
  "num-derive",
  "num-traits",
- "rustc-hash",
+ "ordered-float",
+ "rustc-hash 2.0.0",
  "serde",
- "simba",
+ "simba 0.9.0",
  "slab",
  "smallvec",
  "spade",
+ "thiserror",
 ]
 
 [[package]]
 name = "paste"
-version = "1.0.14"
+version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c"
+checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
 
 [[package]]
 name = "path-absolutize"
@@ -2968,24 +2760,12 @@ dependencies = [
  "once_cell",
 ]
 
-[[package]]
-name = "path-slash"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e91099d4268b0e11973f036e885d652fb0b21fedcf69738c627f94db6a44f42"
-
 [[package]]
 name = "pathdiff"
 version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd"
 
-[[package]]
-name = "peeking_take_while"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
-
 [[package]]
 name = "percent-encoding"
 version = "2.3.1"
@@ -3051,7 +2831,7 @@ dependencies = [
  "phf_shared 0.11.2",
  "proc-macro2",
  "quote",
- "syn 2.0.58",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -3114,9 +2894,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",
@@ -3154,13 +2934,13 @@ dependencies = [
 
 [[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 0.3.9",
+ "hermit-abi 0.4.0",
  "pin-project-lite",
  "rustix",
  "tracing",
@@ -3196,9 +2976,9 @@ dependencies = [
 
 [[package]]
 name = "portable-atomic"
-version = "1.6.0"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0"
+checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265"
 
 [[package]]
 name = "ppv-lite86"
@@ -3212,16 +2992,6 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c"
 
-[[package]]
-name = "prettyplease"
-version = "0.2.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d3928fb5db768cb86f891ff014f0144589297e3c6a1aba6ed7cecfdace270c7"
-dependencies = [
- "proc-macro2",
- "syn 2.0.58",
-]
-
 [[package]]
 name = "proc-macro-crate"
 version = "3.1.0"
@@ -3231,39 +3001,34 @@ dependencies = [
  "toml_edit 0.21.1",
 ]
 
-[[package]]
-name = "proc-macro-error"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
-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",
-]
-
 [[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 = "qoi"
 version = "0.4.1"
@@ -3274,10 +3039,16 @@ dependencies = [
 ]
 
 [[package]]
-name = "quote"
-version = "1.0.35"
+name = "quick-error"
+version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3"
+
+[[package]]
+name = "quote"
+version = "1.0.36"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -3331,6 +3102,55 @@ dependencies = [
  "rand_core",
 ]
 
+[[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 0.12.1",
+ "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.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5797d09f9bd33604689e87e8380df4951d4912f01b63f71205e2abd4ae25e6b6"
+dependencies = [
+ "avif-serialize",
+ "imgref",
+ "loop9",
+ "quick-error",
+ "rav1e",
+ "rgb",
+]
+
 [[package]]
 name = "rawpointer"
 version = "0.2.1"
@@ -3373,15 +3193,24 @@ dependencies = [
 ]
 
 [[package]]
-name = "regex"
-version = "1.10.4"
+name = "redox_syscall"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c"
+checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4"
+dependencies = [
+ "bitflags 2.6.0",
+]
+
+[[package]]
+name = "regex"
+version = "1.10.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-automata 0.4.6",
- "regex-syntax 0.8.3",
+ "regex-automata 0.4.7",
+ "regex-syntax 0.8.4",
 ]
 
 [[package]]
@@ -3395,13 +3224,13 @@ dependencies = [
 
 [[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]]
@@ -3412,24 +3241,25 @@ 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 = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56"
+checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
 
 [[package]]
 name = "rgb"
-version = "0.8.37"
+version = "0.8.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05aaa8004b64fd573fc9d002f4e632d51ad4f026c2b5ba95fcb6c2f32c2c47d8"
+checksum = "ade4539f42266ded9e755c605bdddf546242b2c961b03b06a7375260788a0523"
 dependencies = [
  "bytemuck",
 ]
 
 [[package]]
 name = "rnote"
-version = "0.10.2"
+version = "0.11.0"
 dependencies = [
  "anyhow",
+ "approx",
  "async-fs",
  "base64",
  "cairo-rs",
@@ -3439,17 +3269,18 @@ dependencies = [
  "glib-build-tools",
  "gtk4",
  "ijson",
- "image",
- "itertools 0.12.1",
+ "image 0.25.2",
+ "itertools 0.13.0",
  "kurbo 0.10.4",
  "libadwaita",
- "nalgebra",
+ "nalgebra 0.33.0",
  "notify-debouncer-full",
  "num-derive",
  "num-traits",
  "numeric-sort",
  "once_cell",
  "open",
+ "palette",
  "parry2d-f64",
  "path-absolutize",
  "piet",
@@ -3477,14 +3308,14 @@ dependencies = [
 
 [[package]]
 name = "rnote-cli"
-version = "0.10.2"
+version = "0.11.0"
 dependencies = [
  "anyhow",
  "atty",
  "clap",
  "dialoguer",
  "indicatif",
- "nalgebra",
+ "nalgebra 0.33.0",
  "open",
  "parry2d-f64",
  "rnote-compose",
@@ -3496,7 +3327,7 @@ dependencies = [
 
 [[package]]
 name = "rnote-compose"
-version = "0.10.2"
+version = "0.11.0"
 dependencies = [
  "anyhow",
  "approx",
@@ -3504,7 +3335,7 @@ dependencies = [
  "clap",
  "ink-stroke-modeler-rs",
  "kurbo 0.10.4",
- "nalgebra",
+ "nalgebra 0.33.0",
  "num-derive",
  "num-traits",
  "once_cell",
@@ -3525,7 +3356,7 @@ dependencies = [
 
 [[package]]
 name = "rnote-engine"
-version = "0.10.2"
+version = "0.11.0"
 dependencies = [
  "anyhow",
  "approx",
@@ -3540,11 +3371,11 @@ dependencies = [
  "glib",
  "gtk4",
  "ijson",
- "image",
- "itertools 0.12.1",
+ "image 0.25.2",
+ "itertools 0.13.0",
  "kurbo 0.10.4",
  "librsvg",
- "nalgebra",
+ "nalgebra 0.33.0",
  "num-derive",
  "num-traits",
  "once_cell",
@@ -3561,7 +3392,7 @@ dependencies = [
  "rodio",
  "rough_piet",
  "roughr",
- "roxmltree",
+ "roxmltree 0.20.0",
  "rstar",
  "semver",
  "serde",
@@ -3583,12 +3414,13 @@ checksum = "cbf4a6aa5f6d6888f39e980649f3ad6b666acdce1d78e95b8a2cb076e687ae30"
 
 [[package]]
 name = "rodio"
-version = "0.17.3"
+version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b1bb7b48ee48471f55da122c0044fcc7600cfcc85db88240b89cb832935e611"
+checksum = "6006a627c1a38d37f3d3a85c6575418cfe34a5392d60a686d0071e1c8d427acb"
 dependencies = [
  "cpal",
  "symphonia",
+ "thiserror",
 ]
 
 [[package]]
@@ -3626,6 +3458,12 @@ version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3cd14fd5e3b777a7422cca79358c57a8f6e3a703d9ac187448d0daf220c2407f"
 
+[[package]]
+name = "roxmltree"
+version = "0.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c20b6793b5c2fa6553b250154b78d6d0db37e72700ae35fad9387a46f487c97"
+
 [[package]]
 name = "rstar"
 version = "0.12.0"
@@ -3637,18 +3475,18 @@ dependencies = [
  "smallvec",
 ]
 
-[[package]]
-name = "rustc-demangle"
-version = "0.1.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
-
 [[package]]
 name = "rustc-hash"
 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"
@@ -3660,30 +3498,24 @@ 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",
  "windows-sys 0.52.0",
 ]
 
-[[package]]
-name = "rustversion"
-version = "1.0.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4"
-
 [[package]]
 name = "rustybuzz"
-version = "0.13.0"
+version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88117946aa1bfb53c2ae0643ceac6506337f44887f8c9fbfb43587b1cc52ba49"
+checksum = "cfb9cf8877777222e4a3bc7eb247e398b56baba500c38c1c46842431adc8b55c"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "bytemuck",
  "smallvec",
  "ttf-parser",
@@ -3695,15 +3527,15 @@ dependencies = [
 
 [[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 = "safe_arch"
-version = "0.7.1"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f398075ce1e6a179b46f51bd88d0598b92b00d3551f1a2d4ac49e771b56ac354"
+checksum = "c3460605018fdc9612bce72735cba0d27efbcd9904780d44c7e3a9948f96148a"
 dependencies = [
  "bytemuck",
 ]
@@ -3729,7 +3561,7 @@ version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4eb30575f3638fc8f6815f448d50cb1a2e255b0897985c8c59f4d37b72a07b06"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "cssparser",
  "derive_more",
  "fxhash",
@@ -3744,38 +3576,38 @@ 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"
 dependencies = [
  "serde",
 ]
 
 [[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.58",
+ "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",
@@ -3784,9 +3616,9 @@ dependencies = [
 
 [[package]]
 name = "serde_spanned"
-version = "0.6.5"
+version = "0.6.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1"
+checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d"
 dependencies = [
  "serde",
 ]
@@ -3823,9 +3655,9 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
 
 [[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",
 ]
@@ -3843,12 +3675,34 @@ dependencies = [
  "wide",
 ]
 
+[[package]]
+name = "simba"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b3a386a501cd104797982c15ae17aafe8b9261315b5d07e3ec803f2ea26be0fa"
+dependencies = [
+ "approx",
+ "num-complex",
+ "num-traits",
+ "paste",
+ "wide",
+]
+
 [[package]]
 name = "simd-adler32"
 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 = "simplecss"
 version = "0.2.1"
@@ -3895,12 +3749,6 @@ version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
-[[package]]
-name = "smawk"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7c388c1b5e93756d0c740965c41e8822f866621d41acbdf6336a6a168f8840c"
-
 [[package]]
 name = "smol"
 version = "2.0.0"
@@ -3911,7 +3759,7 @@ dependencies = [
  "async-executor",
  "async-fs",
  "async-io",
- "async-lock 3.3.0",
+ "async-lock",
  "async-net",
  "async-process",
  "blocking",
@@ -3920,11 +3768,11 @@ dependencies = [
 
 [[package]]
 name = "spade"
-version = "2.6.0"
+version = "2.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61addf9117b11d1f5b4bf6fe94242ba25f59d2d4b2080544b771bd647024fd00"
+checksum = "7d676a3ce6cfd1e455199fefcf82db082f970872ce017df660f076a4e07a0d64"
 dependencies = [
- "hashbrown 0.14.3",
+ "hashbrown",
  "num-traits",
  "robust",
  "smallvec",
@@ -3992,52 +3840,11 @@ version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
 
-[[package]]
-name = "strum_macros"
-version = "0.24.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59"
-dependencies = [
- "heck 0.4.1",
- "proc-macro2",
- "quote",
- "rustversion",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "supports-color"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6398cde53adc3c4557306a96ce67b302968513830a77a95b2b17305d9719a89"
-dependencies = [
- "is-terminal",
- "is_ci",
-]
-
-[[package]]
-name = "supports-hyperlinks"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f84231692eb0d4d41e4cdd0cabfdd2e6cd9e255e65f80c9aa7c98dd502b4233d"
-dependencies = [
- "is-terminal",
-]
-
-[[package]]
-name = "supports-unicode"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f850c19edd184a205e883199a261ed44471c81e39bd95b1357f5febbef00e77a"
-dependencies = [
- "is-terminal",
-]
-
 [[package]]
 name = "svg"
-version = "0.16.0"
+version = "0.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "583e1c5c326fd6fede8797006de3b95ad6bcd60a592952952c5ba7ddd7e84c83"
+checksum = "700efb40f3f559c23c18b446e8ed62b08b56b2bb3197b36d57e0470b4102779e"
 
 [[package]]
 name = "svg_path_ops"
@@ -4059,9 +3866,9 @@ dependencies = [
 
 [[package]]
 name = "svgtypes"
-version = "0.15.0"
+version = "0.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d97ca9a891c9c70da8139ac9d8e8ea36a210fa21bb50eccd75d4a9561c83e87f"
+checksum = "fae3064df9b89391c9a76a0425a69d124aee9c5c28455204709e72c39868a43c"
 dependencies = [
  "kurbo 0.11.0",
  "siphasher 1.0.1",
@@ -4151,9 +3958,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.58"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44cfb93f38070beee36b3fef7d4f5a16f27751d94b187b666a5cc5e9b0d30687"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4167,17 +3974,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349"
 dependencies = [
  "cfg-expr",
- "heck 0.5.0",
+ "heck",
  "pkg-config",
- "toml 0.8.12",
+ "toml 0.8.16",
  "version-compare",
 ]
 
 [[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"
@@ -4208,54 +4015,24 @@ dependencies = [
  "utf-8",
 ]
 
-[[package]]
-name = "termcolor"
-version = "1.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755"
-dependencies = [
- "winapi-util",
-]
-
-[[package]]
-name = "terminal_size"
-version = "0.1.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "633c1a546cee861a1a6d0dc69ebeca693bf4296661ba7852b9d21d159e0506df"
-dependencies = [
- "libc",
- "winapi",
-]
-
-[[package]]
-name = "textwrap"
-version = "0.15.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7b3e525a49ec206798b40326a44121291b530c963cfb01018f63e135bac543d"
-dependencies = [
- "smawk",
- "unicode-linebreak",
- "unicode-width",
-]
-
 [[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.58",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -4292,9 +4069,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",
 ]
@@ -4319,21 +4096,21 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.8.12"
+version = "0.8.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3"
+checksum = "81967dd0dd2c1ab0bc3468bd7caecc32b8a4aa47d0c8c695d8c2b2108168d62c"
 dependencies = [
  "serde",
  "serde_spanned",
  "toml_datetime",
- "toml_edit 0.22.9",
+ "toml_edit 0.22.17",
 ]
 
 [[package]]
 name = "toml_datetime"
-version = "0.6.5"
+version = "0.6.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1"
+checksum = "f8fb9f64314842840f1d940ac544da178732128f1c78c21772e876579e0da1db"
 dependencies = [
  "serde",
 ]
@@ -4344,7 +4121,7 @@ version = "0.19.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
 dependencies = [
- "indexmap 2.2.6",
+ "indexmap",
  "serde",
  "serde_spanned",
  "toml_datetime",
@@ -4357,22 +4134,22 @@ version = "0.21.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1"
 dependencies = [
- "indexmap 2.2.6",
+ "indexmap",
  "toml_datetime",
  "winnow 0.5.40",
 ]
 
 [[package]]
 name = "toml_edit"
-version = "0.22.9"
+version = "0.22.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e40bb779c5187258fd7aad0eb68cb8706a0a81fa712fbea808ab43c4b8374c4"
+checksum = "8d9f8729f5aea9562aac1cc0441f5d6de3cff1ee0c5d67293eeca5eb36ee7c16"
 dependencies = [
- "indexmap 2.2.6",
+ "indexmap",
  "serde",
  "serde_spanned",
  "toml_datetime",
- "winnow 0.6.5",
+ "winnow 0.6.16",
 ]
 
 [[package]]
@@ -4394,7 +4171,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.58",
+ "syn 2.0.72",
 ]
 
 [[package]]
@@ -4438,9 +4215,9 @@ dependencies = [
 
 [[package]]
 name = "ttf-parser"
-version = "0.20.0"
+version = "0.21.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17f77d76d837a7830fe1d4f12b7b4ba4192c1888001c7164257e4bc6d21d96b4"
+checksum = "2c591d83f69777866b9126b24c6dd9a18351f177e49d625920d19f989fd31cf8"
 
 [[package]]
 name = "typenum"
@@ -4523,12 +4300,6 @@ version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
 
-[[package]]
-name = "unicode-linebreak"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f"
-
 [[package]]
 name = "unicode-normalization"
 version = "0.1.23"
@@ -4564,15 +4335,15 @@ checksum = "b1d386ff53b415b7fe27b50bb44679e2cc4660272694b7b6f3326d8480823a94"
 
 [[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 = "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",
@@ -4581,9 +4352,9 @@ dependencies = [
 
 [[package]]
 name = "usvg"
-version = "0.41.0"
+version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c704361d822337cfc00387672c7b59eaa72a1f0744f62b2a68aa228a0c6927d"
+checksum = "b84ea542ae85c715f07b082438a4231c3760539d902e11d093847a0b22963032"
 dependencies = [
  "base64",
  "data-url",
@@ -4593,12 +4364,12 @@ dependencies = [
  "kurbo 0.11.0",
  "log",
  "pico-args",
- "roxmltree",
+ "roxmltree 0.20.0",
  "rustybuzz",
  "simplecss",
  "siphasher 1.0.1",
  "strict-num",
- "svgtypes 0.15.0",
+ "svgtypes 0.15.1",
  "tiny-skia-path",
  "unicode-bidi",
  "unicode-script",
@@ -4614,9 +4385,20 @@ checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
 
 [[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 = "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 = "valuable"
@@ -4632,9 +4414,9 @@ checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b"
 
 [[package]]
 name = "version_check"
-version = "0.9.4"
+version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
 
 [[package]]
 name = "walkdir"
@@ -4673,7 +4455,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.58",
+ "syn 2.0.72",
  "wasm-bindgen-shared",
 ]
 
@@ -4707,7 +4489,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.58",
+ "syn 2.0.72",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -4734,23 +4516,11 @@ 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 = "wide"
-version = "0.7.15"
+version = "0.7.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89beec544f246e679fc25490e3f8e08003bc4bf612068f325120dad4cea02c1c"
+checksum = "901e8597c777fa042e9e245bd56c0dc4418c5db3f845b6ff94fbac732c6a0692"
 dependencies = [
  "bytemuck",
  "safe_arch",
@@ -4774,11 +4544,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 
 [[package]]
 name = "winapi-util"
-version = "0.1.6"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596"
+checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b"
 dependencies = [
- "winapi",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -4794,7 +4564,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9252e5725dbed82865af151df558e754e4a3c2c30818359eb17465f1346a1b49"
 dependencies = [
  "windows-core 0.54.0",
- "windows-targets 0.52.4",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -4803,7 +4573,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]]
@@ -4813,16 +4583,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "12661b9c89351d684a50a8a643ce5f608e20243b9fb84687800163429f161d65"
 dependencies = [
  "windows-result",
- "windows-targets 0.52.4",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
 name = "windows-result"
-version = "0.1.0"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd19df78e5168dfb0aedc343d1d1b8d422ab2db6756d2dc3fef75035402a3f64"
+checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8"
 dependencies = [
- "windows-targets 0.52.4",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -4849,7 +4619,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]]
@@ -4884,17 +4654,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]]
@@ -4911,9 +4682,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"
@@ -4929,9 +4700,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"
@@ -4947,9 +4718,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 = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
 
 [[package]]
 name = "windows_i686_msvc"
@@ -4965,9 +4742,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"
@@ -4983,9 +4760,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"
@@ -5001,9 +4778,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"
@@ -5019,9 +4796,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"
@@ -5034,9 +4811,9 @@ dependencies = [
 
 [[package]]
 name = "winnow"
-version = "0.6.5"
+version = "0.6.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8"
+checksum = "b480ae9340fc261e6be3e95a1ba86d54ae3f9171132a73ce8d4bbaf68339507c"
 dependencies = [
  "memchr",
 ]
@@ -5076,29 +4853,35 @@ checksum = "ec7a2a501ed189703dba8b08142f057e887dfc4b2cc4db2d343ac6376ba3e0b9"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.32"
+version = "0.7.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be"
+checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.32"
+version = "0.7.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
+checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.58",
+ "syn 2.0.72",
 ]
 
 [[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"
+
+[[package]]
+name = "zune-core"
+version = "0.4.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f423a2c17029964870cfaabb1f13dfab7d092a62a29a89264f4d36990ca414a"
 
 [[package]]
 name = "zune-inflate"
@@ -5108,3 +4891,12 @@ checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02"
 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",
+]
diff --git a/third_party/nixpkgs/pkgs/applications/graphics/rnote/default.nix b/third_party/nixpkgs/pkgs/by-name/rn/rnote/package.nix
similarity index 86%
rename from third_party/nixpkgs/pkgs/applications/graphics/rnote/default.nix
rename to third_party/nixpkgs/pkgs/by-name/rn/rnote/package.nix
index 1e189138eb..792c9faa04 100644
--- a/third_party/nixpkgs/pkgs/applications/graphics/rnote/default.nix
+++ b/third_party/nixpkgs/pkgs/by-name/rn/rnote/package.nix
@@ -9,7 +9,7 @@
 , desktop-file-utils
 , dos2unix
 , glib
-, gstreamer
+, gst_all_1
 , gtk4
 , libadwaita
 , libxml2
@@ -22,24 +22,24 @@
 , rustc
 , shared-mime-info
 , wrapGAppsHook4
-, AudioUnit
+, darwin
 }:
 
 stdenv.mkDerivation rec {
   pname = "rnote";
-  version = "0.10.2";
+  version = "0.11.0";
 
   src = fetchFromGitHub {
     owner = "flxzt";
     repo = "rnote";
     rev = "v${version}";
-    hash = "sha256-SqT8bJfJM+d5fewso3C22M4Qo7wY2g2QmEot/gCpwT4=";
+    hash = "sha256-RbuEgmly6Mjmx58zOV+tg6Mv5ghCNy/dE5FXYrEXtdg=";
   };
 
   cargoDeps = rustPlatform.importCargoLock {
     lockFile = ./Cargo.lock;
     outputHashes = {
-      "ink-stroke-modeler-rs-0.1.0" = "sha256-WfZwezohm8+ZXiKZlssTX+b/Izk1M4jFwxQejeTfc6M=";
+      "ink-stroke-modeler-rs-0.1.0" = "sha256-B6lT6qSOIHxqBpKTE4nO2+Xs9KF7JLVRUHOkYp8Sl+M=";
       "piet-0.6.2" = "sha256-3juXzuKwoLuxia6MoVwbcBJ3jXBQ9QRNVoxo3yFp2Iw=";
     };
   };
@@ -70,7 +70,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     appstream
     glib
-    gstreamer
+    gst_all_1.gstreamer
     gtk4
     libadwaita
     libxml2
@@ -78,7 +78,7 @@ stdenv.mkDerivation rec {
   ] ++ lib.optionals stdenv.isLinux [
     alsa-lib
   ] ++ lib.optionals stdenv.isDarwin [
-    AudioUnit
+    darwin.apple_sdk.frameworks.AudioUnit
   ];
 
   postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/development/tools/ronn/Gemfile b/third_party/nixpkgs/pkgs/by-name/ro/ronn/Gemfile
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/ronn/Gemfile
rename to third_party/nixpkgs/pkgs/by-name/ro/ronn/Gemfile
diff --git a/third_party/nixpkgs/pkgs/development/tools/ronn/Gemfile.lock b/third_party/nixpkgs/pkgs/by-name/ro/ronn/Gemfile.lock
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/ronn/Gemfile.lock
rename to third_party/nixpkgs/pkgs/by-name/ro/ronn/Gemfile.lock
diff --git a/third_party/nixpkgs/pkgs/development/tools/ronn/gemset.nix b/third_party/nixpkgs/pkgs/by-name/ro/ronn/gemset.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/ronn/gemset.nix
rename to third_party/nixpkgs/pkgs/by-name/ro/ronn/gemset.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/ronn/default.nix b/third_party/nixpkgs/pkgs/by-name/ro/ronn/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/ronn/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ro/ronn/package.nix
diff --git a/third_party/nixpkgs/pkgs/development/tools/ronn/test-reproducible-html.nix b/third_party/nixpkgs/pkgs/by-name/ro/ronn/test-reproducible-html.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/ronn/test-reproducible-html.nix
rename to third_party/nixpkgs/pkgs/by-name/ro/ronn/test-reproducible-html.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/ro/roslyn-ls/deps.nix b/third_party/nixpkgs/pkgs/by-name/ro/roslyn-ls/deps.nix
index 22f8b931cf..7eb95212be 100644
--- a/third_party/nixpkgs/pkgs/by-name/ro/roslyn-ls/deps.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/ro/roslyn-ls/package.nix b/third_party/nixpkgs/pkgs/by-name/ro/roslyn-ls/package.nix
index bc50c7f10c..b9b422cbbc 100644
--- a/third_party/nixpkgs/pkgs/by-name/ro/roslyn-ls/package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/ro/route-graph/package.nix b/third_party/nixpkgs/pkgs/by-name/ro/route-graph/package.nix
index 7e6e8d2bd6..8e1a4e183c 100644
--- a/third_party/nixpkgs/pkgs/by-name/ro/route-graph/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/ro/route-graph/package.nix
@@ -31,7 +31,7 @@ python3.pkgs.buildPythonApplication rec {
     scapy
     typer
     typing-extensions
-  ] ++ typer.optional-dependencies.all);
+  ]);
 
   # Project has no tests
   doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/by-name/rp/rpcs3/package.nix b/third_party/nixpkgs/pkgs/by-name/rp/rpcs3/package.nix
index a8fa2e5abb..5014c4c4e0 100644
--- a/third_party/nixpkgs/pkgs/by-name/rp/rpcs3/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/rp/rpcs3/package.nix
@@ -33,10 +33,10 @@
 
 let
   # Keep these separate so the update script can regex them
-  rpcs3GitVersion = "16659-33851d51a";
-  rpcs3Version = "0.0.32-16659-33851d51a";
-  rpcs3Revision = "33851d51ab93c3c73be18a6cb5ed7723219ee1e3";
-  rpcs3Hash = "sha256-Gv3zkvZdvnRUKvS0JhrvHOOz5OVSqxHBkbbOdYWzRvU=";
+  rpcs3GitVersion = "16711-501e9260b";
+  rpcs3Version = "0.0.32-16711-501e9260b";
+  rpcs3Revision = "501e9260b2f2c175c19e3a7e80a0afc7952a3f1e";
+  rpcs3Hash = "sha256-qCTaCRx3Q7gUHNvcBlbHtQbeCwDe9pehWAEYiihH+LA=";
 
   inherit (qt6Packages) qtbase qtmultimedia wrapQtAppsHook qtwayland;
 in
diff --git a/third_party/nixpkgs/pkgs/by-name/sa/sarasa-gothic/package.nix b/third_party/nixpkgs/pkgs/by-name/sa/sarasa-gothic/package.nix
index 17217e5f8e..6805ebac7f 100644
--- a/third_party/nixpkgs/pkgs/by-name/sa/sarasa-gothic/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/sa/sarasa-gothic/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "sarasa-gothic";
-  version = "1.0.15";
+  version = "1.0.16";
 
   src = fetchurl {
     # Use the 'ttc' files here for a smaller closure size.
     # (Using 'ttf' files gives a closure size about 15x larger, as of November 2021.)
     url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${finalAttrs.version}/Sarasa-TTC-${finalAttrs.version}.zip";
-    hash = "sha256-jN50v0N7wSL/F6qOSjp+nRmooR/mNiebsbe4Iy5YmeM=";
+    hash = "sha256-DivT1OEbjZQAV6anWzrYpgzQoYFFPFZAM33TdITZHAg=";
   };
 
   sourceRoot = ".";
diff --git a/third_party/nixpkgs/pkgs/by-name/sa/satty/package.nix b/third_party/nixpkgs/pkgs/by-name/sa/satty/package.nix
index 2dfb009c5c..54c434e975 100644
--- a/third_party/nixpkgs/pkgs/by-name/sa/satty/package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/sc/scenefx/package.nix b/third_party/nixpkgs/pkgs/by-name/sc/scenefx/package.nix
index ee92339b9a..6514cec7fc 100644
--- a/third_party/nixpkgs/pkgs/by-name/sc/scenefx/package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/build-managers/scons/env.patch b/third_party/nixpkgs/pkgs/by-name/sc/scons/env.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/build-managers/scons/env.patch
rename to third_party/nixpkgs/pkgs/by-name/sc/scons/env.patch
diff --git a/third_party/nixpkgs/pkgs/by-name/sc/scons/no-man-pages.patch b/third_party/nixpkgs/pkgs/by-name/sc/scons/no-man-pages.patch
new file mode 100644
index 0000000000..4dd459b826
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/by-name/sc/scons/no-man-pages.patch
@@ -0,0 +1,14 @@
+--- a/setup.cfg
++++ b/setup.cfg
+@@ -67,11 +67,6 @@ console_scripts =
+ SCons.Tool.docbook = *.*
+ 
+ 
+-[options.data_files]
+-. = scons.1
+-    scons-time.1
+-    sconsign.1
+-
+ [sdist]
+     dist_dir=build/dist
+ 
diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/scons/3.1.2.nix b/third_party/nixpkgs/pkgs/by-name/sc/scons/package.nix
similarity index 68%
rename from third_party/nixpkgs/pkgs/development/tools/build-managers/scons/3.1.2.nix
rename to third_party/nixpkgs/pkgs/by-name/sc/scons/package.nix
index a9d55f59ee..8ebc736097 100644
--- a/third_party/nixpkgs/pkgs/development/tools/build-managers/scons/3.1.2.nix
+++ b/third_party/nixpkgs/pkgs/by-name/sc/scons/package.nix
@@ -1,34 +1,32 @@
-{ lib, fetchFromGitHub, python3 }:
-
-let
+{ lib, fetchFromGitHub, python3Packages }:
+python3Packages.buildPythonApplication rec {
   pname = "scons";
-  version = "3.1.2";
+  version = "4.7.0";
+
   src = fetchFromGitHub {
     owner = "Scons";
     repo = "scons";
     rev = version;
-    hash = "sha256-C3U4N7+9vplzoJoevQe5Zeuz0TDmB6/miMwBJLzA3WA=";
+    hash = "sha256-7VzGuz9CAUF6MRCEpj5z1FkZD19/Ic+YBukYQocvkr0=";
   };
-in
-python3.pkgs.buildPythonApplication {
-  inherit pname version src;
 
-  outputs = [ "out" "man" ];
+  pyproject = true;
 
-  preConfigure = ''
-    python bootstrap.py
-    cd build/scons
-  '';
+  patches = [
+    ./env.patch
+    ./no-man-pages.patch
+  ];
+
+  build-system = [
+    python3Packages.setuptools
+  ];
 
   setupHook = ./setup-hook.sh;
 
-  doCheck = true;
-
   passthru = {
     # expose the used python version so tools using this (and extensing scos
     # with other python modules) can use the exact same python version.
-    inherit python3;
-    python = python3;
+    inherit (python3Packages) python;
   };
 
   meta = {
@@ -45,4 +43,3 @@ python3.pkgs.buildPythonApplication {
     maintainers = with lib.maintainers; [ AndersonTorres ];
   };
 }
-# TODO: patch to get rid of distutils and other deprecations
diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/scons/setup-hook.sh b/third_party/nixpkgs/pkgs/by-name/sc/scons/setup-hook.sh
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/tools/build-managers/scons/setup-hook.sh
rename to third_party/nixpkgs/pkgs/by-name/sc/scons/setup-hook.sh
diff --git a/third_party/nixpkgs/pkgs/by-name/se/selenium-manager/package.nix b/third_party/nixpkgs/pkgs/by-name/se/selenium-manager/package.nix
index d9f127a1c9..47b6e2c16c 100644
--- a/third_party/nixpkgs/pkgs/by-name/se/selenium-manager/package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/text/shab/default.nix b/third_party/nixpkgs/pkgs/by-name/sh/shab/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/text/shab/default.nix
rename to third_party/nixpkgs/pkgs/by-name/sh/shab/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/sk/sketchybar-app-font/package.nix b/third_party/nixpkgs/pkgs/by-name/sk/sketchybar-app-font/package.nix
index 91b050403a..56bdcfd493 100644
--- a/third_party/nixpkgs/pkgs/by-name/sk/sketchybar-app-font/package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/sk/skypeexport/package.nix b/third_party/nixpkgs/pkgs/by-name/sk/skypeexport/package.nix
index dffa1e4d7c..c8af575c78 100644
--- a/third_party/nixpkgs/pkgs/by-name/sk/skypeexport/package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/sk/skypilot/package.nix b/third_party/nixpkgs/pkgs/by-name/sk/skypilot/package.nix
index fe832ae334..8f24c5c58b 100644
--- a/third_party/nixpkgs/pkgs/by-name/sk/skypilot/package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/sm/smassh/package.nix b/third_party/nixpkgs/pkgs/by-name/sm/smassh/package.nix
index d723be41d2..15ca2dd6ac 100644
--- a/third_party/nixpkgs/pkgs/by-name/sm/smassh/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/sm/smassh/package.nix
@@ -1,29 +1,29 @@
-{ lib
-, fetchFromGitHub
-, smassh
-, python3
-, testers
+{
+  lib,
+  fetchFromGitHub,
+  smassh,
+  python311,
+  testers,
 }:
 
+let
+  python3 = python311;
+in
 python3.pkgs.buildPythonApplication rec {
   pname = "smassh";
-  version = "3.1.3";
+  version = "3.1.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "kraanzu";
     repo = "smassh";
     rev = "v${version}";
-    hash = "sha256-QE7TFf/5hdd2W2EsVbn3gV/FundhJNxHqv0JWV5dYDc=";
+    hash = "sha256-MeLub6zeviY7yyPP2FI9b37nUwHZbxW6onuFXSkmvqk";
   };
 
-  nativeBuildInputs = with python3.pkgs; [
-    poetry-core
-  ];
+  nativeBuildInputs = with python3.pkgs; [ poetry-core ];
 
-  pythonRelaxDeps = [
-    "textual"
-  ];
+  pythonRelaxDeps = [ "textual" ];
 
   propagatedBuildInputs = with python3.pkgs; [
     textual
diff --git a/third_party/nixpkgs/pkgs/by-name/sm/smile/package.nix b/third_party/nixpkgs/pkgs/by-name/sm/smile/package.nix
index 787e456845..a7d98caf20 100644
--- a/third_party/nixpkgs/pkgs/by-name/sm/smile/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/sm/smile/package.nix
@@ -8,6 +8,8 @@
 , ninja
 , wrapGAppsHook4
 , libadwaita
+, xdotool
+, wl-clipboard
 }:
 
 python3.pkgs.buildPythonApplication rec {
@@ -44,7 +46,13 @@ python3.pkgs.buildPythonApplication rec {
   dontWrapGApps = true;
 
   preFixup = ''
-    makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
+    makeWrapperArgs+=(
+      "''${gappsWrapperArgs[@]}"
+      --prefix PATH : ${lib.makeBinPath [
+        xdotool
+        wl-clipboard
+      ]}
+    )
   '';
 
   meta = {
diff --git a/third_party/nixpkgs/pkgs/by-name/sq/sqlite-vss/package.nix b/third_party/nixpkgs/pkgs/by-name/sq/sqlite-vss/package.nix
index e1c65b6340..5f25699c99 100644
--- a/third_party/nixpkgs/pkgs/by-name/sq/sqlite-vss/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/sq/sqlite-vss/package.nix
@@ -43,6 +43,9 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   meta = with lib;{
+    # Low maintenance mode, doesn't support up-to-date faiss
+    # https://github.com/NixOS/nixpkgs/pull/330191#issuecomment-2252965866
+    broken = lib.versionAtLeast faiss.version "1.8.0";
     description = "SQLite extension for efficient vector search based on Faiss";
     homepage = "https://github.com/asg017/sqlite-vss";
     changelog = "https://github.com/asg017/sqlite-vss/releases/tag/v${finalAttrs.version}";
diff --git a/third_party/nixpkgs/pkgs/by-name/sr/sratoolkit/package.nix b/third_party/nixpkgs/pkgs/by-name/sr/sratoolkit/package.nix
new file mode 100644
index 0000000000..f7aefdb968
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/sr/srb2kart/package.nix b/third_party/nixpkgs/pkgs/by-name/sr/srb2kart/package.nix
index 9601d99263..8260bdb394 100644
--- a/third_party/nixpkgs/pkgs/by-name/sr/srb2kart/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/sr/srb2kart/package.nix
@@ -100,7 +100,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://mb.srb2.org/threads/srb2kart.25868/";
     platforms = platforms.linux;
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ viric donovanglover ];
+    maintainers = with maintainers; [ donovanglover ];
     mainProgram = "srb2kart";
   };
 })
diff --git a/third_party/nixpkgs/pkgs/by-name/ss/ssm-session-manager-plugin/package.nix b/third_party/nixpkgs/pkgs/by-name/ss/ssm-session-manager-plugin/package.nix
index a3be748793..b50cfbd38a 100644
--- a/third_party/nixpkgs/pkgs/by-name/ss/ssm-session-manager-plugin/package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/st/stats/package.nix b/third_party/nixpkgs/pkgs/by-name/st/stats/package.nix
index 14073bc8d2..105ed52dbd 100644
--- a/third_party/nixpkgs/pkgs/by-name/st/stats/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/st/stats/package.nix
@@ -8,11 +8,11 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "stats";
-  version = "2.11.1";
+  version = "2.11.4";
 
   src = fetchurl {
     url = "https://github.com/exelban/stats/releases/download/v${finalAttrs.version}/Stats.dmg";
-    hash = "sha256-/6QFchDpWrJZEKuIsQi6FcGprVOa8J8THJ9Kt3ESrwY=";
+    hash = "sha256-Cm5gu+rL3eerAOnNcNUL2MlXsxV2jMiJLwgGtskIVP4=";
   };
 
   sourceRoot = ".";
diff --git a/third_party/nixpkgs/pkgs/by-name/st/stevenblack-blocklist/package.nix b/third_party/nixpkgs/pkgs/by-name/st/stevenblack-blocklist/package.nix
index 0fb108c57e..cac6c8ea3d 100644
--- a/third_party/nixpkgs/pkgs/by-name/st/stevenblack-blocklist/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/st/stevenblack-blocklist/package.nix
@@ -6,13 +6,13 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "stevenblack-blocklist";
-  version = "3.14.88";
+  version = "3.14.90";
 
   src = fetchFromGitHub {
     owner = "StevenBlack";
     repo = "hosts";
     rev = "refs/tags/${finalAttrs.version}";
-    hash = "sha256-tS7CDuotk+aAbtOR1x3u3ymyRvPgb3GZjuDcJNm6lZs=";
+    hash = "sha256-0/niQ0qWzGesqWIe/NZ2SD0Pdvk3GRsY1mT24eFMpt8=";
   };
 
   outputs = [
diff --git a/third_party/nixpkgs/pkgs/by-name/st/stu/package.nix b/third_party/nixpkgs/pkgs/by-name/st/stu/package.nix
index c1e2454a73..05c46f784a 100644
--- a/third_party/nixpkgs/pkgs/by-name/st/stu/package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/security/su-exec/default.nix b/third_party/nixpkgs/pkgs/by-name/su/su-exec/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/su-exec/default.nix
rename to third_party/nixpkgs/pkgs/by-name/su/su-exec/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/su/supersonic/package.nix b/third_party/nixpkgs/pkgs/by-name/su/supersonic/package.nix
index f789d28f90..52c6ad8ca0 100644
--- a/third_party/nixpkgs/pkgs/by-name/su/supersonic/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/su/supersonic/package.nix
@@ -20,16 +20,16 @@ assert waylandSupport -> stdenv.isLinux;
 
 buildGoModule rec {
   pname = "supersonic" + lib.optionalString waylandSupport "-wayland";
-  version = "0.12.0";
+  version = "0.13.0";
 
   src = fetchFromGitHub {
     owner = "dweymouth";
     repo = "supersonic";
     rev = "v${version}";
-    hash = "sha256-SbG5jzsR1ggGYbQ3kwrvKeGfkF+LlZwPV6L5/rKT49A=";
+    hash = "sha256-2TxtrfrwqxPQx7PWiWyJLmHtq/SEb2agAImpdsDeBDk=";
   };
 
-  vendorHash = "sha256-N2HdXGdb0OEfczPmc40jdx1rxKj2vxcEjbn+6K6vHhU=";
+  vendorHash = "sha256-bLQLRPu1Kvtx1+Lc8VpPAlOoGzYZo7dzEPwT0iauDWs=";
 
   nativeBuildInputs = [
     copyDesktopItems
diff --git a/third_party/nixpkgs/pkgs/by-name/sv/svelte-language-server/package.nix b/third_party/nixpkgs/pkgs/by-name/sv/svelte-language-server/package.nix
index fbb086c540..55d4c774a2 100644
--- a/third_party/nixpkgs/pkgs/by-name/sv/svelte-language-server/package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/sw/swaycons/package.nix b/third_party/nixpkgs/pkgs/by-name/sw/swaycons/package.nix
index b60b5a6115..c4f6e31a6a 100644
--- a/third_party/nixpkgs/pkgs/by-name/sw/swaycons/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/sw/swaycons/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-vyZcfBH2mry8Yd41QPX4+yLv0nS9J1yrgg7lpslJs7M=";
   };
 
-  cargoSha256 = "sha256-cdZ7DpH//c9TulvPYd6aaXpQHYC1b+T7BrxAyr56Pf0=";
+  cargoHash = "sha256-cdZ7DpH//c9TulvPYd6aaXpQHYC1b+T7BrxAyr56Pf0=";
 
   meta = with lib; {
     description = "Window Icons in Sway with Nerd Fonts!";
diff --git a/third_party/nixpkgs/pkgs/by-name/sw/swayfx-unwrapped/package.nix b/third_party/nixpkgs/pkgs/by-name/sw/swayfx-unwrapped/package.nix
index b90220a7c1..1edc6d3d4c 100644
--- a/third_party/nixpkgs/pkgs/by-name/sw/swayfx-unwrapped/package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/sw/swayws/package.nix b/third_party/nixpkgs/pkgs/by-name/sw/swayws/package.nix
index 75b88ad1ba..8041763ade 100644
--- a/third_party/nixpkgs/pkgs/by-name/sw/swayws/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/sw/swayws/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-f0kXy7/31imgHHqKPmW9K+QrLqroaPaXwlJkzOoezRU=";
   };
 
-  cargoSha256 = "sha256-VYT6wV59fraAoJgR/i6GlO8s7LUoehGtxPAggEL1eLo=";
+  cargoHash = "sha256-VYT6wV59fraAoJgR/i6GlO8s7LUoehGtxPAggEL1eLo=";
   # Required patch until upstream fixes https://gitlab.com/w0lff/swayws/-/issues/1
   cargoPatches = [
     ./ws-update-Cargo-lock.patch
diff --git a/third_party/nixpkgs/pkgs/by-name/sy/syncstorage-rs/package.nix b/third_party/nixpkgs/pkgs/by-name/sy/syncstorage-rs/package.nix
index 20b099e47a..9292cd1677 100644
--- a/third_party/nixpkgs/pkgs/by-name/sy/syncstorage-rs/package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/sy/syndicate_utils/lock.json b/third_party/nixpkgs/pkgs/by-name/sy/syndicate_utils/lock.json
index 4c58bce17c..3ffb3c36c3 100644
--- a/third_party/nixpkgs/pkgs/by-name/sy/syndicate_utils/lock.json
+++ b/third_party/nixpkgs/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": [
@@ -11,65 +33,110 @@
       "srcDir": "",
       "url": "https://github.com/ehmry/hashlib/archive/f9455d4be988e14e3dc7933eb7cc7d7c4820b7ac.tar.gz"
     },
-    {
-      "method": "fetchzip",
-      "packages": [
-        "illwill"
-      ],
-      "path": "/nix/store/3lmm3z36qn4gz7bfa209zv0pqrpm3di9-source",
-      "ref": "v0.3.2",
-      "rev": "1d12cb36ab7b76c31d2d25fa421013ecb382e625",
-      "sha256": "0f9yncl5gbdja18mrqf5ixrdgrh95k0khda923dm1jd1x1b7ar8z",
-      "srcDir": "",
-      "url": "https://github.com/johnnovak/illwill/archive/1d12cb36ab7b76c31d2d25fa421013ecb382e625.tar.gz"
-    },
-    {
-      "method": "fetchzip",
-      "packages": [
-        "nimcrypto"
-      ],
-      "path": "/nix/store/zyr8zwh7vaiycn1s4r8cxwc71f2k5l0h-source",
-      "ref": "traditional-api",
-      "rev": "602c5d20c69c76137201b5d41f788f72afb95aa8",
-      "sha256": "1dmdmgb6b9m5f8dyxk781nnd61dsk3hdxqks7idk9ncnpj9fng65",
-      "srcDir": "",
-      "url": "https://github.com/cheatfate/nimcrypto/archive/602c5d20c69c76137201b5d41f788f72afb95aa8.tar.gz"
-    },
-    {
-      "method": "fetchzip",
-      "packages": [
-        "npeg"
-      ],
-      "path": "/nix/store/ffkxmjmigfs7zhhiiqm0iw2c34smyciy-source",
-      "ref": "1.2.1",
-      "rev": "26d62fdc40feb84c6533956dc11d5ee9ea9b6c09",
-      "sha256": "0xpzifjkfp49w76qmaylan8q181bs45anmp46l4bwr3lkrr7bpwh",
-      "srcDir": "src",
-      "url": "https://github.com/zevv/npeg/archive/26d62fdc40feb84c6533956dc11d5ee9ea9b6c09.tar.gz"
-    },
     {
       "method": "fetchzip",
       "packages": [
         "preserves"
       ],
-      "path": "/nix/store/fmb2yckksz7iv3qdkk5gk1j060kppkq9-source",
-      "ref": "20231102",
-      "rev": "4faeb766dc3945bcfacaa1a836ef6ab29b20ceb0",
-      "sha256": "1a3g5bk1l1h250q3p6sqv6r1lpsplp330qqyp48r0i4a5r0jksq3",
+      "path": "/nix/store/hzb7af7lbd4kgd5y4hbgxv1lswig36yj-source",
+      "rev": "fd498c6457cb9ad2f3179daa40da69eec00326dd",
+      "sha256": "182xvw04vjw83mlcrkwkip29b44h0v8dapg2014k9011h90mdsj4",
       "srcDir": "src",
-      "url": "https://git.syndicate-lang.org/ehmry/preserves-nim/archive/4faeb766dc3945bcfacaa1a836ef6ab29b20ceb0.tar.gz"
+      "url": "https://git.syndicate-lang.org/ehmry/preserves-nim/archive/fd498c6457cb9ad2f3179daa40da69eec00326dd.tar.gz"
+    },
+    {
+      "method": "fetchzip",
+      "packages": [
+        "stew"
+      ],
+      "path": "/nix/store/mqg8qzsbcc8xqabq2yzvlhvcyqypk72c-source",
+      "rev": "3c91b8694e15137a81ec7db37c6c58194ec94a6a",
+      "sha256": "17lfhfxp5nxvld78xa83p258y80ks5jb4n53152cdr57xk86y07w",
+      "srcDir": "",
+      "url": "https://github.com/status-im/nim-stew/archive/3c91b8694e15137a81ec7db37c6c58194ec94a6a.tar.gz"
     },
     {
       "method": "fetchzip",
       "packages": [
         "syndicate"
       ],
-      "path": "/nix/store/nhpvl223vbzdrlzikw7pgyfxs344w7ma-source",
-      "ref": "20231108",
-      "rev": "095418032180e360ea27ec7fcd63193944b68e2c",
-      "sha256": "09pbml2chzz0v5zpz67fs7raj0mfmg8qrih2vz85xxc51h7ncqvw",
+      "path": "/nix/store/dw30cq9gxz3353zgaq4a36ajq6chvbwc-source",
+      "rev": "3a4dc1f13392830b587138199643d30fdbec8541",
+      "sha256": "1mbd17rjm1fsx7d0ckzyjih2nzdjqs52ck9wscqcg9nvf3ib5mvh",
       "srcDir": "src",
-      "url": "https://git.syndicate-lang.org/ehmry/syndicate-nim/archive/095418032180e360ea27ec7fcd63193944b68e2c.tar.gz"
+      "url": "https://git.syndicate-lang.org/ehmry/syndicate-nim/archive/3a4dc1f13392830b587138199643d30fdbec8541.tar.gz"
+    },
+    {
+      "method": "fetchzip",
+      "packages": [
+        "sys"
+      ],
+      "path": "/nix/store/syhxsjlsdqfap0hk4qp3s6kayk8cqknd-source",
+      "rev": "4ef3b624db86e331ba334e705c1aa235d55b05e1",
+      "sha256": "1q4qgw4an4mmmcbx48l6xk1jig1vc8p9cq9dbx39kpnb0890j32q",
+      "srcDir": "src",
+      "url": "https://github.com/ehmry/nim-sys/archive/4ef3b624db86e331ba334e705c1aa235d55b05e1.tar.gz"
+    },
+    {
+      "method": "fetchzip",
+      "packages": [
+        "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/xpn694ibgipj8xak3j4bky6b3k0vp7hh-source",
+      "rev": "ec0cc6e64ea4c62d2aa382b176a4838474238f8d",
+      "sha256": "1fi9ls3xl20bmv1ikillxywl96i9al6zmmxrbffx448gbrxs86kg",
+      "srcDir": "src",
+      "url": "https://github.com/zevv/npeg/archive/ec0cc6e64ea4c62d2aa382b176a4838474238f8d.tar.gz"
     }
   ]
 }
diff --git a/third_party/nixpkgs/pkgs/by-name/sy/syndicate_utils/package.nix b/third_party/nixpkgs/pkgs/by-name/sy/syndicate_utils/package.nix
index a467c3925f..943b5ab4e8 100644
--- a/third_party/nixpkgs/pkgs/by-name/sy/syndicate_utils/package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/sy/syslogng/package.nix b/third_party/nixpkgs/pkgs/by-name/sy/syslogng/package.nix
index c8f45f834a..87e556dbab 100644
--- a/third_party/nixpkgs/pkgs/by-name/sy/syslogng/package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/ta/tabiew/package.nix b/third_party/nixpkgs/pkgs/by-name/ta/tabiew/package.nix
index a4367bdf43..bc5bf7e69c 100644
--- a/third_party/nixpkgs/pkgs/by-name/ta/tabiew/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/ta/tabiew/package.nix
@@ -5,16 +5,16 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "tabiew";
-  version = "0.6.0";
+  version = "0.6.1";
 
   src = fetchFromGitHub {
     owner = "shshemi";
     repo = "tabiew";
     rev = "v${version}";
-    hash = "sha256-Sui2UX2EWXgtkU83tb2QP0EQCImAvWrR2dYkfXjqDdc=";
+    hash = "sha256-WnIlGWfIoCq9jrMG9SI3zYFs6ItjrMFF6KiNYkiA9Ag=";
   };
 
-  cargoHash = "sha256-QEuO5Jtv9xw9W2jI2g3pJENi/CQcFsC3PCc63v2Cd40=";
+  cargoHash = "sha256-lB6EaJnPoUxB+cs6rmiiOmgoOo+kzETRwKWbtsik42A=";
 
   nativeBuildInputs = [ installShellFiles ];
 
diff --git a/third_party/nixpkgs/pkgs/by-name/ta/tailscale-gitops-pusher/package.nix b/third_party/nixpkgs/pkgs/by-name/ta/tailscale-gitops-pusher/package.nix
new file mode 100644
index 0000000000..f0ddde526f
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/te/tenv/package.nix b/third_party/nixpkgs/pkgs/by-name/te/tenv/package.nix
index 027da48e36..93ce7d68e8 100644
--- a/third_party/nixpkgs/pkgs/by-name/te/tenv/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/te/tenv/package.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "tenv";
-  version = "2.6.1";
+  version = "2.7.9";
 
   src = fetchFromGitHub {
     owner = "tofuutils";
     repo = "tenv";
     rev = "v${version}";
-    hash = "sha256-qGb7Wj0qH9yh/C0H9Yd0NppoqtjCxnbaTYpv6T8KoL4=";
+    hash = "sha256-oeMbpnYCkJ5GjfgOlNyQpwy80DbrupXIFS2dx4W2xo4=";
   };
 
   vendorHash = "sha256-/4RiOF9YU4GEZlJcx2S2bLhJ1Q6F+8To3XiyWzGGHUU=";
diff --git a/third_party/nixpkgs/pkgs/by-name/te/termsnap/package.nix b/third_party/nixpkgs/pkgs/by-name/te/termsnap/package.nix
index 55648f690d..203b4d751e 100644
--- a/third_party/nixpkgs/pkgs/by-name/te/termsnap/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/te/termsnap/package.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-FTgbbiDlHXGjkv3a2TAxjAqdClWkuteyUrtjQ8fMSIs=";
   };
 
-  cargoSha256 = "sha256-hXlRkqcMHFEAnm883Q8sR8gcEbSNMutoJQsMW2M5wOY=";
+  cargoHash = "sha256-hXlRkqcMHFEAnm883Q8sR8gcEbSNMutoJQsMW2M5wOY=";
 
   meta = with lib; {
     description = "Create SVGs from terminal output";
diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-docs/default.nix b/third_party/nixpkgs/pkgs/by-name/te/terraform-docs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-docs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/te/terraform-docs/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/te/tetrio-desktop/package.nix b/third_party/nixpkgs/pkgs/by-name/te/tetrio-desktop/package.nix
index f07299b37c..56e2f60acc 100644
--- a/third_party/nixpkgs/pkgs/by-name/te/tetrio-desktop/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/te/tetrio-desktop/package.nix
@@ -4,7 +4,7 @@
 , dpkg
 , makeWrapper
 , callPackage
-, addOpenGLRunpath
+, addDriverRunpath
 , electron
 , withTetrioPlus ? false
 , tetrio-plus ? null
@@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   postFixup = ''
     makeShellWrapper '${lib.getExe electron}' $out/bin/tetrio \
-      --prefix LD_LIBRARY_PATH : ${addOpenGLRunpath.driverLink}/lib \
+      --prefix LD_LIBRARY_PATH : ${addDriverRunpath.driverLink}/lib \
       --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \
       --add-flags $out/share/TETR.IO/app.asar
   '';
diff --git a/third_party/nixpkgs/pkgs/by-name/th/themix-gui/package.nix b/third_party/nixpkgs/pkgs/by-name/th/themix-gui/package.nix
index 8393884cb5..a70c576cac 100644
--- a/third_party/nixpkgs/pkgs/by-name/th/themix-gui/package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/ti/tiny-dfr/package.nix b/third_party/nixpkgs/pkgs/by-name/ti/tiny-dfr/package.nix
index c2e3de8628..ec737de3e5 100644
--- a/third_party/nixpkgs/pkgs/by-name/ti/tiny-dfr/package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/ti/tio/package.nix b/third_party/nixpkgs/pkgs/by-name/ti/tio/package.nix
index 72535c57fb..ce14065456 100644
--- a/third_party/nixpkgs/pkgs/by-name/ti/tio/package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/ti/tippecanoe/package.nix b/third_party/nixpkgs/pkgs/by-name/ti/tippecanoe/package.nix
index c0da907968..b588212f6f 100644
--- a/third_party/nixpkgs/pkgs/by-name/ti/tippecanoe/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/ti/tippecanoe/package.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "tippecanoe";
-  version = "2.56.0";
+  version = "2.57.0";
 
   src = fetchFromGitHub {
     owner = "felt";
     repo = "tippecanoe";
     rev = finalAttrs.version;
-    hash = "sha256-n1ZhOlhrI1cSOwv7NP2VDAPC/2HmMJBkNLH6NPY3BnM=";
+    hash = "sha256-IFyewy/is5BNJ7/LzhHXLwLaSrMAJ6II1aSY9AspEk4=";
   };
 
   buildInputs = [ sqlite zlib ];
diff --git a/third_party/nixpkgs/pkgs/by-name/tl/tlrc/package.nix b/third_party/nixpkgs/pkgs/by-name/tl/tlrc/package.nix
index 247f345bd7..4faeff53e3 100644
--- a/third_party/nixpkgs/pkgs/by-name/tl/tlrc/package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/tmux-cssh/default.nix b/third_party/nixpkgs/pkgs/by-name/tm/tmux-cssh/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/misc/tmux-cssh/default.nix
rename to third_party/nixpkgs/pkgs/by-name/tm/tmux-cssh/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/tr/tracy/package.nix b/third_party/nixpkgs/pkgs/by-name/tr/tracy/package.nix
index 82d4b9c285..4e462bae4a 100644
--- a/third_party/nixpkgs/pkgs/by-name/tr/tracy/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/tr/tracy/package.nix
@@ -56,9 +56,7 @@ stdenv.mkDerivation rec {
     # ../../../server/TracyView.cpp:649:34, preventing building.
     ++ lib.optional stdenv.isDarwin "-Wno-format-security"
     ++ lib.optional stdenv.isLinux "-ltbb"
-    ++ lib.optional stdenv.cc.isClang "-faligned-allocation"
-    # workaround issue #19098
-    ++ lib.optional (stdenv.cc.isClang && stdenv.isDarwin) "-fno-lto");
+    ++ lib.optional stdenv.cc.isClang "-faligned-allocation");
 
   buildPhase = ''
     runHook preBuild
diff --git a/third_party/nixpkgs/pkgs/by-name/tr/trak/package.nix b/third_party/nixpkgs/pkgs/by-name/tr/trak/package.nix
index 2129850159..46323b4b47 100644
--- a/third_party/nixpkgs/pkgs/by-name/tr/trak/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/tr/trak/package.nix
@@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec {
   dependencies = with python3Packages; [
     questionary
     typer
-  ] ++ typer.optional-dependencies.all;
+  ];
 
   build-system = [ python3Packages.poetry-core ];
 
diff --git a/third_party/nixpkgs/pkgs/by-name/tr/treefmt1/package.nix b/third_party/nixpkgs/pkgs/by-name/tr/treefmt1/package.nix
index 48fc4b4496..ab61a50bd9 100644
--- a/third_party/nixpkgs/pkgs/by-name/tr/treefmt1/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/tr/treefmt1/package.nix
@@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-icAe54Mv1xpOjUPSk8QDZaMk2ueNvjER6UyJ9uyUL6s=";
   };
 
-  cargoSha256 = "sha256-bpNIGuh74nwEmHPeXtPmsML9vJOb00xkdjK0Nd7esAc=";
+  cargoHash = "sha256-bpNIGuh74nwEmHPeXtPmsML9vJOb00xkdjK0Nd7esAc=";
 
   meta = {
     description = "one CLI to format the code tree";
diff --git a/third_party/nixpkgs/pkgs/by-name/tr/tribler/package.nix b/third_party/nixpkgs/pkgs/by-name/tr/tribler/package.nix
index bdc4090c49..3d30b91cfc 100644
--- a/third_party/nixpkgs/pkgs/by-name/tr/tribler/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/tr/tribler/package.nix
@@ -118,7 +118,7 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.lgpl21Plus;
     maintainers = with lib.maintainers; [
       xvapx
-      viric
+
       mkg20001
     ];
     platforms = lib.platforms.linux;
diff --git a/third_party/nixpkgs/pkgs/by-name/tr/trrntzip/package.nix b/third_party/nixpkgs/pkgs/by-name/tr/trrntzip/package.nix
index baa671ce21..633de93797 100644
--- a/third_party/nixpkgs/pkgs/by-name/tr/trrntzip/package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/tt/ttf-indic/package.nix b/third_party/nixpkgs/pkgs/by-name/tt/ttf-indic/package.nix
new file mode 100644
index 0000000000..52c980660c
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/by-name/tt/ttf-indic/package.nix
@@ -0,0 +1,31 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchurl,
+}:
+
+stdenvNoCC.mkDerivation rec {
+  pname = "ttf-indic";
+  version = "0.2";
+
+  src = fetchurl {
+    url = "https://www.indlinux.org/downloads/files/indic-otf-${version}.tar.gz";
+    hash = "sha256-ZFmg1JanAf3eeF7M+yohrXYSUb0zLgNSFldEMzkhXnI=";
+  };
+
+  installPhase = ''
+    runHook preInstall
+
+    install -m444 -Dt $out/share/fonts/truetype OpenType/*.ttf
+
+    runHook postInstall
+  '';
+
+  meta = {
+    homepage = "https://www.indlinux.org/wiki/index.php/Downloads";
+    description = "Indic Opentype Fonts collection";
+    license = lib.licenses.gpl2Only;
+    maintainers = [ lib.maintainers.akssri ];
+    platforms = lib.platforms.all;
+  };
+}
diff --git a/third_party/nixpkgs/pkgs/by-name/tu/tuxclocker-nvidia-plugin/package.nix b/third_party/nixpkgs/pkgs/by-name/tu/tuxclocker-nvidia-plugin/package.nix
index a3bbf153aa..50f98eb550 100644
--- a/third_party/nixpkgs/pkgs/by-name/tu/tuxclocker-nvidia-plugin/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/tu/tuxclocker-nvidia-plugin/package.nix
@@ -10,7 +10,7 @@
 stdenv.mkDerivation {
   pname = "tuxclocker-nvidia-plugin";
 
-  inherit (tuxclocker-plugins) src version meta BOOST_INCLUDEDIR BOOST_LIBRARYDIR nativeBuildInputs;
+  inherit (tuxclocker-plugins) src version meta nativeBuildInputs;
 
   buildInputs = [
     boost
diff --git a/third_party/nixpkgs/pkgs/by-name/tu/tuxclocker-plugins/package.nix b/third_party/nixpkgs/pkgs/by-name/tu/tuxclocker-plugins/package.nix
index 2da3202e23..3cb8ef84d6 100644
--- a/third_party/nixpkgs/pkgs/by-name/tu/tuxclocker-plugins/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/tu/tuxclocker-plugins/package.nix
@@ -11,7 +11,7 @@
 }:
 
 stdenv.mkDerivation {
-  inherit (tuxclocker) src version meta BOOST_INCLUDEDIR BOOST_LIBRARYDIR;
+  inherit (tuxclocker) src version meta;
 
   pname = "tuxclocker-plugins";
 
diff --git a/third_party/nixpkgs/pkgs/by-name/tw/twiggy/package.nix b/third_party/nixpkgs/pkgs/by-name/tw/twiggy/package.nix
index b4e77337f0..dd34321c81 100644
--- a/third_party/nixpkgs/pkgs/by-name/tw/twiggy/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/tw/twiggy/package.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-NbtS7A5Zl8634Q3xyjVzNraNszjt1uIXqmctArfnqkk=";
   };
 
-  cargoSha256 = "sha256-94pfhVZ0CNMn+lCl5O+wOyE+D6fVXbH4NAPx92nMNbM=";
+  cargoHash = "sha256-94pfhVZ0CNMn+lCl5O+wOyE+D6fVXbH4NAPx92nMNbM=";
 
   meta = with lib; {
     homepage = "https://rustwasm.github.io/twiggy/";
diff --git a/third_party/nixpkgs/pkgs/by-name/ub/ubuntu-sans-mono/package.nix b/third_party/nixpkgs/pkgs/by-name/ub/ubuntu-sans-mono/package.nix
index adc76824ef..c74bc57395 100644
--- a/third_party/nixpkgs/pkgs/by-name/ub/ubuntu-sans-mono/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/ub/ubuntu-sans-mono/package.nix
@@ -8,13 +8,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "ubuntu-sans-mono";
-  version = "1.004";
+  version = "1.006";
 
   src = fetchFromGitHub {
     owner = "canonical";
     repo = "Ubuntu-Sans-Mono-fonts";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-IjfjFsXRYK2l6i4Q/LoYuwu5t18TmVXXJQDSsW45qNc=";
+    hash = "sha256-EFZZnMZTQHo2Tr9/rtb7C5gAlQ/0uYT+MQ1gKkqQ5hE=";
   };
 
   installPhase = ''
diff --git a/third_party/nixpkgs/pkgs/by-name/un/unison/package.nix b/third_party/nixpkgs/pkgs/by-name/un/unison/package.nix
index f512d775ea..400c73e105 100644
--- a/third_party/nixpkgs/pkgs/by-name/un/unison/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/un/unison/package.nix
@@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://www.cis.upenn.edu/~bcpierce/unison/";
     description = "Bidirectional file synchronizer";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ viric nevivurn ];
+    maintainers = with maintainers; [ nevivurn ];
     platforms = platforms.unix;
     broken = stdenv.isDarwin && enableX11; # unison-gui and uimac are broken on darwin
     mainProgram = if enableX11 then "unison-gui" else "unison";
diff --git a/third_party/nixpkgs/pkgs/by-name/ur/urban-cli/package.nix b/third_party/nixpkgs/pkgs/by-name/ur/urban-cli/package.nix
new file mode 100644
index 0000000000..fb05c8e768
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/by-name/ur/urban-cli/package.nix
@@ -0,0 +1,32 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+}:
+
+buildGoModule rec {
+  pname = "urban-cli";
+  version = "0.2.4";
+
+  src = fetchFromGitHub {
+    owner = "tfkhdyt";
+    repo = "urban-cli";
+    rev = "v${version}";
+    hash = "sha256-URTEhtOiwb3IDyjRUtUmVTaeDXw4Beg0woWdGxeq098=";
+  };
+
+  vendorHash = "sha256-fEZzX+ecSWKITXczcwm5BGw5OWuixa4XKrEx8z0pxXQ=";
+
+  ldflags = [
+    "-s"
+    "-w"
+  ];
+
+  meta = {
+    description = "Blazingly fast command line interface for Urban Dictionary";
+    homepage = "https://github.com/tfkhdyt/urban-cli";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ tfkhdyt ];
+    mainProgram = "urban-cli";
+  };
+}
diff --git a/third_party/nixpkgs/pkgs/by-name/uw/uwsm/package.nix b/third_party/nixpkgs/pkgs/by-name/uw/uwsm/package.nix
index 669cbd123a..2ec573bbe5 100644
--- a/third_party/nixpkgs/pkgs/by-name/uw/uwsm/package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/ux/uxn/package.nix b/third_party/nixpkgs/pkgs/by-name/ux/uxn/package.nix
index 0c6f291835..72ad80374b 100644
--- a/third_party/nixpkgs/pkgs/by-name/ux/uxn/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/ux/uxn/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "uxn";
-  version = "1.0-unstable-2024-06-15";
+  version = "1.0-unstable-2024-07-26";
 
   src = fetchFromSourcehut {
     owner = "~rabbits";
     repo = "uxn";
-    rev = "1c74aa173147b19135f1bf21af5fb30f9b76e02d";
-    hash = "sha256-xhMXDAc/laQKZtYBFvFSyVtJv5AkvugV8olHmB6Mt4g=";
+    rev = "bf10311d5aad4184098c84a96845e30b1f53634d";
+    hash = "sha256-OVITP8AbWchcFaVOHkck8hwGlEl/TgtbtkApoKex4ig=";
   };
 
   outputs = [ "out" "projects" ];
diff --git a/third_party/nixpkgs/pkgs/by-name/va/vatprism/0001-Fix-build-on-JDK-21.patch b/third_party/nixpkgs/pkgs/by-name/va/vatprism/0001-Fix-build-on-JDK-21.patch
new file mode 100644
index 0000000000..6e6302662c
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/by-name/va/vatprism/0001-Fix-build-on-JDK-21.patch
@@ -0,0 +1,25 @@
+From 78e78dc10e2a4fd84ef0041d346d8f6d162f22c6 Mon Sep 17 00:00:00 2001
+From: ThePuzzlemaker <tpzker@thepuzzlemaker.info>
+Date: Wed, 24 Jul 2024 21:18:04 -0500
+Subject: [PATCH] Fix build on JDK 21+
+
+---
+ pom.xml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/pom.xml b/pom.xml
+index 5a3254b..42b1405 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -59,7 +59,7 @@
+         <maven.compiler.target>${java.version}</maven.compiler.target>
+ 
+         <java.version>15</java.version>
+-        <lombok.version>1.18.22</lombok.version>
++        <lombok.version>1.18.30</lombok.version>
+         <javafx.version>17.0.1</javafx.version>
+         <slf4j.version>1.7.32</slf4j.version>
+         <mvvmfx.version>1.9.0-SNAPSHOT</mvvmfx.version>
+-- 
+2.44.1
+
diff --git a/third_party/nixpkgs/pkgs/by-name/va/vatprism/package.nix b/third_party/nixpkgs/pkgs/by-name/va/vatprism/package.nix
new file mode 100644
index 0000000000..5995e26fef
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/by-name/va/vatprism/package.nix
@@ -0,0 +1,102 @@
+{
+  lib,
+  stdenv,
+  jdk,
+  maven,
+  makeWrapper,
+  fetchFromGitHub,
+  libGL,
+  libxkbcommon,
+  wayland,
+  fontconfig,
+  libX11,
+  libXcursor,
+  libXi,
+  libXrandr,
+  libXxf86vm,
+  libXtst,
+  copyDesktopItems,
+  makeDesktopItem,
+}:
+let
+  libPath = lib.makeLibraryPath [
+    libGL
+    libxkbcommon
+    wayland
+    libX11
+    libXcursor
+    libXi
+    libXrandr
+    libXxf86vm
+    libXtst
+    fontconfig
+  ];
+in
+maven.buildMavenPackage rec {
+  pname = "vatprism";
+  version = "0.3.5";
+  src = fetchFromGitHub {
+    owner = "marvk";
+    repo = "vatprism";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-ofEwHUCm79roHe2bawmKFw2QHhIonnlkFG5nhE6uN+g=";
+  };
+
+  nativeBuildInputs = [
+    makeWrapper
+    copyDesktopItems
+  ];
+  # https://github.com/marvk/vatprism/pull/141
+  patches = [ ./0001-Fix-build-on-JDK-21.patch ];
+
+  desktopItems = [
+    (makeDesktopItem {
+      name = "vatprism";
+      desktopName = "VATprism";
+      exec = "vatprism";
+      terminal = false;
+      icon = "vatprism";
+    })
+  ];
+
+  mvnHash =
+    if (stdenv.isLinux && stdenv.isAarch64) then
+      "sha256-x0nFt2C7dZqMdllI1+Io9SPBY2J/dVgBTVb9T24vFFI="
+    else
+      "sha256-9uyNCUqnMgpiwm2kz544pWNB/SkRpASm2Dln0e4yZos=";
+
+  installPhase = ''
+    runHook preInstall
+    # create the bin directory
+    mkdir -p $out/bin $out/share/icons/hicolor/256x256/apps
+
+    # copy out the JAR
+    # Maven already setup the classpath to use m2 repository layout
+    # with the prefix of lib/
+    cp target-fat-jar/vatsim-map-${version}-fat.jar $out/
+    cp src/main/resources/net/marvk/fs/vatsim/map/icon-256.png $out/share/icons/hicolor/256x256/apps/vatprism.png
+
+    # create a wrapper that will automatically set the classpath
+    # this should be the paths from the dependency derivation
+    makeWrapper ${jdk}/bin/java $out/bin/${pname} \
+        --add-flags "-jar $out/vatsim-map-${version}-fat.jar" \
+        --set JAVA_HOME ${jdk.home} \
+        --suffix LD_LIBRARY_PATH : ${libPath}
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "VATSIM map and data explorer";
+    longDescription = ''
+      VATprism is a VATSIM Map and VATSIM Data Explorer, VATSIM being the
+      Virtual Air Traffic Simulation Network. VATprism allows users to explore
+      available ATC services, connected pilots, Airports, Flight and Upper
+      Information Regions and more!
+    '';
+    homepage = "https://vatprism.org/";
+    mainProgram = "vatprism";
+    license = lib.licenses.agpl3Plus;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ thepuzzlemaker ];
+  };
+}
diff --git a/third_party/nixpkgs/pkgs/by-name/vc/vcpkg/package.nix b/third_party/nixpkgs/pkgs/by-name/vc/vcpkg/package.nix
index 74e16ebf84..f92719cb0c 100644
--- a/third_party/nixpkgs/pkgs/by-name/vc/vcpkg/package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/security/verifpal/default.nix b/third_party/nixpkgs/pkgs/by-name/ve/verifpal/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/security/verifpal/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ve/verifpal/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/vpsfree-client/Gemfile b/third_party/nixpkgs/pkgs/by-name/vp/vpsfree-client/Gemfile
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/virtualization/vpsfree-client/Gemfile
rename to third_party/nixpkgs/pkgs/by-name/vp/vpsfree-client/Gemfile
diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/vpsfree-client/Gemfile.lock b/third_party/nixpkgs/pkgs/by-name/vp/vpsfree-client/Gemfile.lock
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/virtualization/vpsfree-client/Gemfile.lock
rename to third_party/nixpkgs/pkgs/by-name/vp/vpsfree-client/Gemfile.lock
diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/vpsfree-client/gemset.nix b/third_party/nixpkgs/pkgs/by-name/vp/vpsfree-client/gemset.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/virtualization/vpsfree-client/gemset.nix
rename to third_party/nixpkgs/pkgs/by-name/vp/vpsfree-client/gemset.nix
diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/vpsfree-client/default.nix b/third_party/nixpkgs/pkgs/by-name/vp/vpsfree-client/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/virtualization/vpsfree-client/default.nix
rename to third_party/nixpkgs/pkgs/by-name/vp/vpsfree-client/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/vv/vvvvvv/package.nix b/third_party/nixpkgs/pkgs/by-name/vv/vvvvvv/package.nix
index 848a239195..15fbab6fdb 100644
--- a/third_party/nixpkgs/pkgs/by-name/vv/vvvvvv/package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/wa/wapm/package.nix b/third_party/nixpkgs/pkgs/by-name/wa/wapm/package.nix
index f93867c59d..afaaed863d 100644
--- a/third_party/nixpkgs/pkgs/by-name/wa/wapm/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/wa/wapm/package.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-T7YEe8xg5iwI/npisW0m+6FLi+eaAQVgYNe6TvMlhAs=";
   };
 
-  cargoSha256 = "sha256-r4123NJ+nxNOVIg6svWr636xbxOJQ7tp76JoAi2m9p8=";
+  cargoHash = "sha256-r4123NJ+nxNOVIg6svWr636xbxOJQ7tp76JoAi2m9p8=";
 
   nativeBuildInputs = [ perl ];
 
diff --git a/third_party/nixpkgs/pkgs/servers/http/webfs/ls.c.patch b/third_party/nixpkgs/pkgs/by-name/we/webfs/ls.c.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/http/webfs/ls.c.patch
rename to third_party/nixpkgs/pkgs/by-name/we/webfs/ls.c.patch
diff --git a/third_party/nixpkgs/pkgs/servers/http/webfs/default.nix b/third_party/nixpkgs/pkgs/by-name/we/webfs/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/servers/http/webfs/default.nix
rename to third_party/nixpkgs/pkgs/by-name/we/webfs/package.nix
diff --git a/third_party/nixpkgs/pkgs/by-name/wh/where-is-my-sddm-theme/package.nix b/third_party/nixpkgs/pkgs/by-name/wh/where-is-my-sddm-theme/package.nix
index 02b5f797cc..9862909bf5 100644
--- a/third_party/nixpkgs/pkgs/by-name/wh/where-is-my-sddm-theme/package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/wh/whistle/package.nix b/third_party/nixpkgs/pkgs/by-name/wh/whistle/package.nix
index 69b68648d8..7cbe05f6ce 100644
--- a/third_party/nixpkgs/pkgs/by-name/wh/whistle/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/wh/whistle/package.nix
@@ -2,16 +2,16 @@
 
 buildNpmPackage rec {
   pname = "whistle";
-  version = "2.9.78";
+  version = "2.9.80";
 
   src = fetchFromGitHub {
     owner = "avwo";
     repo = "whistle";
     rev = "v${version}";
-    hash = "sha256-OQ0dVxWlPvquaApdpHEXmDzzG7NjbLducR9jkhXDsGw=";
+    hash = "sha256-nBjVPWs9ZTs35UHysITlJc/SEA7nJ16ZF7qWQGzrp70=";
   };
 
-  npmDepsHash = "sha256-3ILtxRI8hvYanXmKZjld7zN127KaCKmWm96nrdSah/E=";
+  npmDepsHash = "sha256-kWlScRM6vkSQgH3Z4voIsjV+wRbaKL4ApSdP58u9cxg=";
 
   dontNpmBuild = true;
 
diff --git a/third_party/nixpkgs/pkgs/by-name/wi/wiremock/package.nix b/third_party/nixpkgs/pkgs/by-name/wi/wiremock/package.nix
index bd83004830..75e4c30f64 100644
--- a/third_party/nixpkgs/pkgs/by-name/wi/wiremock/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/wi/wiremock/package.nix
@@ -10,11 +10,11 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "wiremock";
-  version = "3.8.0";
+  version = "3.9.1";
 
   src = fetchurl {
     url = "mirror://maven/org/wiremock/wiremock-standalone/${finalAttrs.version}/wiremock-standalone-${finalAttrs.version}.jar";
-    hash = "sha256-cEsa2xg8ZDb5/LQO5Gj+LCuV18D+LbEK7nrGT+cm158=";
+    hash = "sha256-cjqIDVDTsKFFrw3wfleMLLhed/6yIx5pkcmhNmkmkSw=";
   };
 
   dontUnpack = true;
diff --git a/third_party/nixpkgs/pkgs/by-name/wl/wldash/package.nix b/third_party/nixpkgs/pkgs/by-name/wl/wldash/package.nix
index 50dcbeea35..5b2aa6b682 100644
--- a/third_party/nixpkgs/pkgs/by-name/wl/wldash/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/wl/wldash/package.nix
@@ -56,7 +56,7 @@ rustPlatform.buildRustPackage {
     ./0002-Update-fontconfig.patch
   ];
 
-  cargoSha256 = "sha256-Y7nhj8VpO6sEzVkM3uPv8Tlk2jPn3c/uPJqFc/HjHI0=";
+  cargoHash = "sha256-Y7nhj8VpO6sEzVkM3uPv8Tlk2jPn3c/uPJqFc/HjHI0=";
 
   dontPatchELF = true;
 
diff --git a/third_party/nixpkgs/pkgs/by-name/wv/wvdial/package.nix b/third_party/nixpkgs/pkgs/by-name/wv/wvdial/package.nix
new file mode 100644
index 0000000000..c71addca1a
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/by-name/wv/wvdial/package.nix
@@ -0,0 +1,44 @@
+{
+  stdenv,
+  fetchFromGitea,
+  fetchpatch,
+  wvstreams,
+  pkg-config,
+  lib,
+}:
+
+stdenv.mkDerivation {
+  pname = "wvdial";
+  version = "unstable-2016-06-15";
+
+  src = fetchFromGitea {
+    domain = "gitea.osmocom.org";
+    owner = "retronetworking";
+    repo = "wvdial";
+    rev = "42d084173cc939586c1963b8835cb00ec56b2823";
+    hash = "sha256-q7pFvpJvv+ZvbN4xxolI9ZRULr+N5sqO9BOXUqSG5v4=";
+  };
+
+  patches = [
+    (fetchpatch {
+      url = "https://git.openembedded.org/meta-openembedded/plain/meta-oe/recipes-connectivity/wvdial/wvdial/typo_pon.wvdial.1.patch?h=73a68490efe05cdbec540ec6f17782816632a24d";
+      hash = "sha256-fsneoB5GeKH/nxwW0z8Mk6892PtnZ3J77wP4BGo3Tj8=";
+    })
+  ];
+
+  buildInputs = [ wvstreams ];
+  nativeBuildInputs = [ pkg-config ];
+
+  makeFlags = [
+    "prefix=${placeholder "out"}"
+    "PPPDIR=${placeholder "out"}/etc/ppp/peers"
+  ];
+
+  meta = {
+    description = "A dialer that automatically recognises the modem";
+    homepage = "https://gitea.osmocom.org/retronetworking/wvdial";
+    license = lib.licenses.lgpl2;
+    maintainers = with lib.maintainers; [ flokli ];
+    platforms = lib.platforms.linux;
+  };
+}
diff --git a/third_party/nixpkgs/pkgs/by-name/wv/wvstreams/package.nix b/third_party/nixpkgs/pkgs/by-name/wv/wvstreams/package.nix
new file mode 100644
index 0000000000..347b673130
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/by-name/wv/wvstreams/package.nix
@@ -0,0 +1,110 @@
+{
+  stdenv,
+  fetchpatch,
+  fetchurl,
+  dbus,
+  zlib,
+  openssl,
+  readline,
+  lib,
+  perl,
+}:
+
+stdenv.mkDerivation {
+  pname = "wvstreams";
+  version = "4.6.1";
+
+  # See https://layers.openembedded.org/layerindex/recipe/190863/
+  src = fetchurl {
+    url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/wvstreams/wvstreams-4.6.1.tar.gz";
+    hash = "sha256-hAP1+/g6qawMbOFdl/2FYHSIFSqoTgB7fQYhuOvAdjM=";
+  };
+
+  patches = [
+    (fetchpatch {
+      url = "https://cgit.openembedded.org/meta-openembedded/plain/meta-oe/recipes-connectivity/wvdial/wvstreams/04_signed_request.diff?id=0e6c34f82ca4d43cbca3754c5fe37c5b3bdd0f37";
+      hash = "sha256-zlPiME+KYjesmKt3a+JoE087qE1MbnlVPjC75qQoIks=";
+    })
+    (fetchpatch {
+      url = "https://cgit.openembedded.org/meta-openembedded/plain/meta-oe/recipes-connectivity/wvdial/wvstreams/05_gcc.diff?id=0e6c34f82ca4d43cbca3754c5fe37c5b3bdd0f37";
+      hash = "sha256-Twqk0J8E05kAvhHjAoAuYEpS445t3mb/BvuxTmaaGoM=";
+    })
+    (fetchpatch {
+      url = "https://cgit.openembedded.org/meta-openembedded/plain/meta-oe/recipes-connectivity/wvdial/wvstreams/06_gcc-4.7.diff?id=0e6c34f82ca4d43cbca3754c5fe37c5b3bdd0f37";
+      hash = "sha256-JMPNUdfAJ/gq+am/F1DE2q3+35ItiLAve1+LLl8+Oe4=";
+    })
+    (fetchpatch {
+      url = "https://cgit.openembedded.org/meta-openembedded/plain/meta-oe/recipes-connectivity/wvdial/wvstreams/07_buildflags.diff?id=0e6c34f82ca4d43cbca3754c5fe37c5b3bdd0f37";
+      hash = "sha256-N3HmuBakD5VHoToOqU6EmTHlgFG6A7x84Gbf2P2u+s8=";
+    })
+    (fetchpatch {
+      url = "https://cgit.openembedded.org/meta-openembedded/plain/meta-oe/recipes-connectivity/wvdial/wvstreams/gcc-6.patch?id=0e6c34f82ca4d43cbca3754c5fe37c5b3bdd0f37";
+      hash = "sha256-fXhBUKaHD27mspwrKNY5G7F6UHqq/dmnPlf9cIvM7hM=";
+    })
+    (fetchpatch {
+      url = "https://cgit.openembedded.org/meta-openembedded/plain/meta-oe/recipes-connectivity/wvdial/wvstreams/argp.patch?id=0e6c34f82ca4d43cbca3754c5fe37c5b3bdd0f37";
+      hash = "sha256-55vWFfd/SDa9dE+GmSHDMU2kTrn+tNUW2clPknSdi7g=";
+    })
+    (fetchpatch {
+      url = "https://cgit.openembedded.org/meta-openembedded/plain/meta-oe/recipes-connectivity/wvdial/wvstreams/0001-Check-for-limits.h-during-configure.patch?id=0e6c34f82ca4d43cbca3754c5fe37c5b3bdd0f37";
+      hash = "sha256-XRJCZMnygcQie9sUc1iCe9HVE9lEFCed4JRDtd/C/84=";
+    })
+    (fetchpatch {
+      url = "https://cgit.openembedded.org/meta-openembedded/plain/meta-oe/recipes-connectivity/wvdial/wvstreams/0003-wvtask-Check-for-HAVE_LIBC_STACK_END-only-on-glibc-s.patch?id=0e6c34f82ca4d43cbca3754c5fe37c5b3bdd0f37";
+      hash = "sha256-v0WAFyWwQ70dpq1BEXQjkOrdUUk4tBFJVKeHffs4FmA=";
+    })
+    (fetchpatch {
+      url = "https://cgit.openembedded.org/meta-openembedded/plain/meta-oe/recipes-connectivity/wvdial/wvstreams/0004-wvcrash-Replace-use-of-basename-API.patch?id=0e6c34f82ca4d43cbca3754c5fe37c5b3bdd0f37";
+      hash = "sha256-1UZziDaE0BCM/YmYjBgFA2Q8zfnWpQcal08a0qcClmo=";
+    })
+    (fetchpatch {
+      url = "https://cgit.openembedded.org/meta-openembedded/plain/meta-oe/recipes-connectivity/wvdial/wvstreams/0005-check-for-libexecinfo-during-configure.patch?id=0e6c34f82ca4d43cbca3754c5fe37c5b3bdd0f37";
+      hash = "sha256-4Ad10pijea/qusrdCJAEjpc1/qfQNE32t/M2YMk5jNg=";
+    })
+    (fetchpatch {
+      url = "https://cgit.openembedded.org/meta-openembedded/plain/meta-oe/recipes-connectivity/wvdial/wvstreams/0001-build-fix-parallel-make.patch?id=0e6c34f82ca4d43cbca3754c5fe37c5b3bdd0f37";
+      hash = "sha256-zWREskvLoAH2sYn6kbemTC1V5KrF9jX0B0d+ASExQBA=";
+    })
+    (fetchpatch {
+      url = "https://cgit.openembedded.org/meta-openembedded/plain/meta-oe/recipes-connectivity/wvdial/wvstreams/0002-wvrules.mk-Use-_DEFAULT_SOURCE.patch?id=0e6c34f82ca4d43cbca3754c5fe37c5b3bdd0f37";
+      hash = "sha256-ACiuwqwg5nUbzqoJR5h9GENXmN3ELzkBjujZivBoM4g=";
+    })
+    (fetchpatch {
+      url = "https://cgit.openembedded.org/meta-openembedded/plain/meta-oe/recipes-connectivity/wvdial/wvstreams/openssl-buildfix.patch?id=0e6c34f82ca4d43cbca3754c5fe37c5b3bdd0f37";
+      hash = "sha256-pMHopuBEge7Llq1Syb8sZJArhUOWBNmcOvVcNtFgnbA=";
+    })
+    (fetchpatch {
+      url = "https://cgit.openembedded.org/meta-openembedded/plain/meta-oe/recipes-connectivity/wvdial/wvstreams/0001-Forward-port-to-OpenSSL-1.1.x.patch?id=0e6c34f82ca4d43cbca3754c5fe37c5b3bdd0f37";
+      hash = "sha256-R5pfYxefEvvxB1k+gZzRQgsbmkgpK9cBqZxCXHQnQlM=";
+    })
+    (fetchpatch {
+      url = "https://cgit.openembedded.org/meta-openembedded/plain/meta-oe/recipes-connectivity/wvdial/wvstreams/0001-Fix-narrowing-conversion-error.patch?id=0e6c34f82ca4d43cbca3754c5fe37c5b3bdd0f37";
+      hash = "sha256-esCD7jMVxD1sC2C4jx+pnnIWHpXAVGF/CGXvwHc9rhU=";
+    })
+  ];
+
+  outputs = [
+    "bin"
+    "dev"
+    "lib"
+    "out"
+  ];
+
+  enableParallelBuilding = true;
+
+  buildInputs = [
+    dbus
+    zlib
+    openssl
+    readline
+    perl
+  ];
+
+  meta = {
+    description = "Network programming library in C++";
+    homepage = "http://alumnit.ca/wiki/index.php?page=WvStreams";
+    license = lib.licenses.lgpl2;
+    maintainers = [ lib.maintainers.flokli ];
+    platforms = lib.platforms.linux;
+  };
+}
diff --git a/third_party/nixpkgs/pkgs/by-name/xd/xdg-terminal-exec/package.nix b/third_party/nixpkgs/pkgs/by-name/xd/xdg-terminal-exec/package.nix
index c9fb720328..b1823d2fcf 100644
--- a/third_party/nixpkgs/pkgs/by-name/xd/xdg-terminal-exec/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/xd/xdg-terminal-exec/package.nix
@@ -3,22 +3,31 @@
   stdenvNoCC,
   fetchFromGitHub,
   dash,
+  scdoc,
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "xdg-terminal-exec";
-  version = "0.10.0";
+  version = "0.10.1";
 
   src = fetchFromGitHub {
     owner = "Vladimir-csp";
     repo = "xdg-terminal-exec";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-u/BYhae6xf5rVhYi8uPxZeQTN7skjLbmOC8xoDcUDQk=";
+    hash = "sha256-bZsyHv4qbL3pdx5gW1sPG/vn6luKG1mvgR4ZmzYDDwE=";
   };
 
-  dontBuild = true;
+  nativeBuildInputs = [ scdoc ];
+
+  buildPhase = ''
+    runHook preBuild
+    scdoc < xdg-terminal-exec.1.scd > xdg-terminal-exec.1
+    runHook postBuild
+  '';
+
   installPhase = ''
     runHook preInstall
     install -Dm555 xdg-terminal-exec -t $out/bin
+    install -Dm444 xdg-terminal-exec.1 -t $out/share/man/man1
     runHook postInstall
   '';
 
diff --git a/third_party/nixpkgs/pkgs/by-name/xe/xevd/package.nix b/third_party/nixpkgs/pkgs/by-name/xe/xevd/package.nix
index c25e5b6029..64e5a70d0e 100644
--- a/third_party/nixpkgs/pkgs/by-name/xe/xevd/package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/xe/xeve/package.nix b/third_party/nixpkgs/pkgs/by-name/xe/xeve/package.nix
index f8d44b4a2f..0788061df4 100644
--- a/third_party/nixpkgs/pkgs/by-name/xe/xeve/package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/xilinx-bootgen/default.nix b/third_party/nixpkgs/pkgs/by-name/xi/xilinx-bootgen/package.nix
similarity index 67%
rename from third_party/nixpkgs/pkgs/tools/misc/xilinx-bootgen/default.nix
rename to third_party/nixpkgs/pkgs/by-name/xi/xilinx-bootgen/package.nix
index 1eece16d35..9190d87986 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/xilinx-bootgen/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/by-name/xm/xmldiff/package.nix b/third_party/nixpkgs/pkgs/by-name/xm/xmldiff/package.nix
index 1cacb6ac27..dc0885a71f 100644
--- a/third_party/nixpkgs/pkgs/by-name/xm/xmldiff/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/xm/xmldiff/package.nix
@@ -32,7 +32,7 @@ python3.pkgs.buildPythonApplication {
       computer readable data, it is also often used as a format for hierarchical
       data that can be rendered into human readable formats. A traditional diff
       on such a format would tell you line by line the differences, but this
-      would not be be readable by a human. xmldiff provides tools to make human
+      would not be readable by a human. xmldiff provides tools to make human
       readable diffs in those situations.
     '';
     license = lib.licenses.mit;
diff --git a/third_party/nixpkgs/pkgs/by-name/ya/yamlscript/package.nix b/third_party/nixpkgs/pkgs/by-name/ya/yamlscript/package.nix
index 587bbccdba..08960e07be 100644
--- a/third_party/nixpkgs/pkgs/by-name/ya/yamlscript/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/ya/yamlscript/package.nix
@@ -2,11 +2,11 @@
 
 buildGraalvmNativeImage rec {
   pname = "yamlscript";
-  version = "0.1.66";
+  version = "0.1.68";
 
   src = fetchurl {
     url = "https://github.com/yaml/yamlscript/releases/download/${version}/yamlscript.cli-${version}-standalone.jar";
-    hash = "sha256-FsSMH4kdfMjWe3sMsCkdTf5bhYX0abqGOQvNdHYBu80=";
+    hash = "sha256-NeiG8o5Le549kYILw9vA1EmQ1PcHjCAdwQAnKdYNMwk=";
   };
 
   executable = "ys";
diff --git a/third_party/nixpkgs/pkgs/by-name/ya/yazi-unwrapped/package.nix b/third_party/nixpkgs/pkgs/by-name/ya/yazi-unwrapped/package.nix
index a9b89f1bd8..68b15123b9 100644
--- a/third_party/nixpkgs/pkgs/by-name/ya/yazi-unwrapped/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/ya/yazi-unwrapped/package.nix
@@ -7,8 +7,6 @@
   stdenv,
   Foundation,
   rust-jemalloc-sys,
-
-  nix-update-script,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -25,6 +23,8 @@ rustPlatform.buildRustPackage rec {
   cargoHash = "sha256-qnbinuTuaPiD7ib3aCJzSwuA4s3naFzi+txqX7jkHIo=";
 
   env.YAZI_GEN_COMPLETIONS = true;
+  env.VERGEN_GIT_SHA = "Nixpkgs";
+  env.VERGEN_BUILD_DATE = "2024-04-23";
 
   # TODO: remove in the next release
   cargoBuildFlags = [
@@ -47,7 +47,7 @@ rustPlatform.buildRustPackage rec {
     install -Dm444 assets/logo.png $out/share/pixmaps/yazi.png
   '';
 
-  passthru.updateScript = nix-update-script { };
+  passthru.updateScript.command = [ ./update.sh ];
 
   meta = {
     description = "Blazing fast terminal file manager written in Rust, based on async I/O";
diff --git a/third_party/nixpkgs/pkgs/by-name/ya/yazi-unwrapped/update.sh b/third_party/nixpkgs/pkgs/by-name/ya/yazi-unwrapped/update.sh
new file mode 100755
index 0000000000..e87b94dfc2
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/by-name/ya/yazi-unwrapped/update.sh
@@ -0,0 +1,41 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p bash nix-update curl coreutils jq common-updater-scripts nix-prefetch
+
+set -eux
+
+NIXPKGS_DIR="$PWD"
+SCRIPT_DIR="$(dirname "${BASH_SOURCE[0]}")"
+
+# Get latest release
+YAZI_RELEASE=$(
+    curl --silent ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \
+        https://api.github.com/repos/sxyazi/yazi/releases/latest
+)
+
+# Get release information
+latestBuildDate=$(echo "$YAZI_RELEASE" | jq -r ".published_at")
+latestVersion=$(echo "$YAZI_RELEASE" | jq -r ".tag_name")
+
+latestBuildDate="${latestBuildDate%T*}" # remove the timestamp and get the date
+latestVersion="${latestVersion:1}"      # remove first char 'v'
+
+oldVersion=$(nix eval --raw -f "$NIXPKGS_DIR" yazi-unwrapped.version)
+
+if [[ "$oldVersion" == "$latestVersion" ]]; then
+    echo "Yazi is up-to-date: ${oldVersion}"
+    exit 0
+fi
+
+echo "Updating Yazi"
+
+# Version
+update-source-version yazi-unwrapped "${latestVersion}"
+
+pushd "$SCRIPT_DIR"
+# Build date
+sed -i 's#env.VERGEN_BUILD_DATE = "[^"]*"#env.VERGEN_BUILD_DATE = "'"${latestBuildDate}"'"#' package.nix
+
+# Hashes
+cargoHash=$(nix-prefetch "{ sha256 }: (import $NIXPKGS_DIR {}).yazi-unwrapped.cargoDeps.overrideAttrs (_: { outputHash = sha256; })")
+sed -i -E 's#\bcargoHash = ".*?"#cargoHash = "'"$cargoHash"'"#' package.nix
+popd
diff --git a/third_party/nixpkgs/pkgs/by-name/ze/zed-editor/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/ze/zed-editor/Cargo.lock
index 4488e24f16..738ab3da1c 100644
--- a/third_party/nixpkgs/pkgs/by-name/ze/zed-editor/Cargo.lock
+++ b/third_party/nixpkgs/pkgs/by-name/ze/zed-editor/Cargo.lock
@@ -34,12 +34,6 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 
-[[package]]
-name = "adler32"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234"
-
 [[package]]
 name = "aes"
 version = "0.8.4"
@@ -93,7 +87,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f6d1ea4484c8676f295307a4892d478c70ac8da1dbd8c7c10830a504b7f1022f"
 dependencies = [
  "base64 0.22.0",
- "bitflags 2.4.2",
+ "bitflags 2.6.0",
  "home",
  "libc",
  "log",
@@ -116,7 +110,7 @@ version = "0.24.1-dev"
 source = "git+https://github.com/alacritty/alacritty?rev=cacdb5bb3b72bad2c729227537979d95af75978f#cacdb5bb3b72bad2c729227537979d95af75978f"
 dependencies = [
  "base64 0.22.0",
- "bitflags 2.4.2",
+ "bitflags 2.6.0",
  "home",
  "libc",
  "log",
@@ -139,6 +133,12 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd"
 
+[[package]]
+name = "aligned-vec"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4aa90d7ce82d4be67b64039a3d588d38dbcc6736577de4a847025ce5b0c468d1"
+
 [[package]]
 name = "allocator-api2"
 version = "0.2.16"
@@ -284,6 +284,17 @@ version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 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.59",
+]
+
 [[package]]
 name = "arrayref"
 version = "0.3.7"
@@ -330,9 +341,9 @@ dependencies = [
 
 [[package]]
 name = "ashpd"
-version = "0.8.1"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd884d7c72877a94102c3715f3b1cd09ff4fac28221add3e57cfbe25c236d093"
+checksum = "bfe7e0dd0ac5a401dc116ed9f9119cf9decc625600474cb41f0fc0a0050abc9a"
 dependencies = [
  "async-fs 2.1.1",
  "async-net 2.0.0",
@@ -362,22 +373,26 @@ dependencies = [
  "anthropic",
  "anyhow",
  "assistant_slash_command",
+ "async-watch",
+ "breadcrumbs",
  "cargo_toml",
  "chrono",
  "client",
+ "clock",
  "collections",
  "command_palette_hooks",
  "ctor",
  "editor",
  "env_logger",
- "file_icons",
+ "feature_flags",
  "fs",
  "futures 0.3.28",
  "fuzzy",
  "gpui",
  "heed",
- "html_to_markdown",
+ "html_to_markdown 0.1.0",
  "http 0.1.0",
+ "indexed_docs",
  "indoc",
  "language",
  "log",
@@ -393,7 +408,6 @@ dependencies = [
  "rand 0.8.5",
  "regex",
  "rope",
- "rustdoc",
  "schemars",
  "search",
  "semantic_index",
@@ -405,6 +419,9 @@ dependencies = [
  "strsim 0.11.1",
  "strum",
  "telemetry_events",
+ "terminal",
+ "terminal_view",
+ "text",
  "theme",
  "tiktoken-rs",
  "toml 0.8.10",
@@ -872,6 +889,15 @@ dependencies = [
  "tungstenite 0.16.0",
 ]
 
+[[package]]
+name = "async-watch"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a078faf4e27c0c6cc0efb20e5da59dcccc04968ebf2801d8e0b2195124cdcdb2"
+dependencies = [
+ "event-listener 2.5.3",
+]
+
 [[package]]
 name = "async_zip"
 version = "0.0.17"
@@ -975,6 +1001,29 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
+[[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 = "876c75a42f6364451a033496a14c44bffe41f5f4a8236f697391f11024e596d2"
+dependencies = [
+ "arrayvec",
+]
+
 [[package]]
 name = "aws-config"
 version = "1.1.5"
@@ -1421,7 +1470,7 @@ dependencies = [
  "cc",
  "cfg-if",
  "libc",
- "miniz_oxide 0.7.1",
+ "miniz_oxide",
  "object",
  "rustc-demangle",
 ]
@@ -1535,7 +1584,16 @@ version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1"
 dependencies = [
- "bit-vec",
+ "bit-vec 0.6.3",
+]
+
+[[package]]
+name = "bit-set"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0481a0e032742109b1133a095184ee93d88f3dc9e0d28a5d033dc77a073f44f"
+dependencies = [
+ "bit-vec 0.7.0",
 ]
 
 [[package]]
@@ -1544,6 +1602,18 @@ version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb"
 
+[[package]]
+name = "bit-vec"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d2c54ff287cfc0a34f38a6b832ea1bd8e448a330b3e40a50859e6488bee07f22"
+
+[[package]]
+name = "bit_field"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61"
+
 [[package]]
 name = "bitflags"
 version = "1.3.2"
@@ -1552,13 +1622,19 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.4.2"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "bitstream-io"
+version = "2.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "415f8399438eb5e4b2f73ed3152a3448b98149dda642a957ee704e1daa5cf1d8"
+
 [[package]]
 name = "bitvec"
 version = "1.0.1"
@@ -1574,11 +1650,11 @@ dependencies = [
 [[package]]
 name = "blade-graphics"
 version = "0.4.0"
-source = "git+https://github.com/zed-industries/blade?rev=33fd51359d113c03b785e28f4a6cf75bacb0b26d#33fd51359d113c03b785e28f4a6cf75bacb0b26d"
+source = "git+https://github.com/zed-industries/blade?rev=a477c2008db27db0b9f745715e119b3ee7ab7818#a477c2008db27db0b9f745715e119b3ee7ab7818"
 dependencies = [
  "ash",
  "ash-window",
- "bitflags 2.4.2",
+ "bitflags 2.6.0",
  "block",
  "bytemuck",
  "codespan-reporting",
@@ -1604,7 +1680,7 @@ dependencies = [
 [[package]]
 name = "blade-macros"
 version = "0.2.1"
-source = "git+https://github.com/zed-industries/blade?rev=33fd51359d113c03b785e28f4a6cf75bacb0b26d#33fd51359d113c03b785e28f4a6cf75bacb0b26d"
+source = "git+https://github.com/zed-industries/blade?rev=a477c2008db27db0b9f745715e119b3ee7ab7818#a477c2008db27db0b9f745715e119b3ee7ab7818"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1614,7 +1690,7 @@ dependencies = [
 [[package]]
 name = "blade-util"
 version = "0.1.0"
-source = "git+https://github.com/zed-industries/blade?rev=33fd51359d113c03b785e28f4a6cf75bacb0b26d#33fd51359d113c03b785e28f4a6cf75bacb0b26d"
+source = "git+https://github.com/zed-industries/blade?rev=a477c2008db27db0b9f745715e119b3ee7ab7818#a477c2008db27db0b9f745715e119b3ee7ab7818"
 dependencies = [
  "blade-graphics",
  "bytemuck",
@@ -1740,6 +1816,12 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "built"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c6a6c0b39c38fd754ac338b00a88066436389c0f029da5d37d1e01091d9b7c17"
+
 [[package]]
 name = "bumpalo"
 version = "3.14.0"
@@ -1794,6 +1876,12 @@ version = "1.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
 
+[[package]]
+name = "byteorder-lite"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495"
+
 [[package]]
 name = "bytes"
 version = "0.4.12"
@@ -1850,7 +1938,7 @@ version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b99da2f8558ca23c71f4fd15dc57c906239752dd27ff3c00a1d56b685b7cbfec"
 dependencies = [
- "bitflags 2.4.2",
+ "bitflags 2.6.0",
  "log",
  "polling 3.3.2",
  "rustix 0.38.32",
@@ -2022,6 +2110,16 @@ dependencies = [
  "nom",
 ]
 
+[[package]]
+name = "cfg-expr"
+version = "0.15.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d067ad48b8650848b989a59a86c6c36a995d02d2bf778d45c3c5d57bc2718f02"
+dependencies = [
+ "smallvec",
+ "target-lexicon",
+]
+
 [[package]]
 name = "cfg-if"
 version = "1.0.0"
@@ -2212,6 +2310,7 @@ dependencies = [
  "fork",
  "ipc-channel",
  "once_cell",
+ "parking_lot",
  "paths",
  "plist",
  "release_channel",
@@ -2279,6 +2378,7 @@ dependencies = [
  "futures 0.3.28",
  "gpui",
  "http 0.1.0",
+ "isahc",
  "lazy_static",
  "log",
  "once_cell",
@@ -2307,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",
 ]
 
@@ -2381,6 +2472,7 @@ version = "0.44.0"
 dependencies = [
  "anthropic",
  "anyhow",
+ "assistant",
  "async-trait",
  "async-tungstenite",
  "audio",
@@ -2470,18 +2562,13 @@ name = "collab_ui"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "auto_update",
  "call",
  "channel",
  "client",
  "collections",
- "command_palette",
  "db",
- "dev_server_projects",
  "editor",
  "emojis",
- "extensions_ui",
- "feedback",
  "futures 0.3.28",
  "fuzzy",
  "gpui",
@@ -2494,7 +2581,6 @@ dependencies = [
  "picker",
  "pretty_assertions",
  "project",
- "recent_projects",
  "release_channel",
  "rich_text",
  "rpc",
@@ -2506,15 +2592,14 @@ dependencies = [
  "smallvec",
  "story",
  "theme",
- "theme_selector",
  "time",
  "time_format",
+ "title_bar",
  "tree-sitter-markdown",
  "ui",
  "util",
  "vcs_menu",
  "workspace",
- "zed_actions",
 ]
 
 [[package]]
@@ -2780,7 +2865,7 @@ name = "cosmic-text"
 version = "0.11.2"
 source = "git+https://github.com/pop-os/cosmic-text?rev=542b20c#542b20ca4376a3b5de5fa629db1a4ace44e18e0c"
 dependencies = [
- "bitflags 2.4.2",
+ "bitflags 2.6.0",
  "fontdb",
  "log",
  "rangemap",
@@ -3225,16 +3310,6 @@ dependencies = [
  "util",
 ]
 
-[[package]]
-name = "deflate"
-version = "0.8.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73770f8e1fe7d64df17ca66ad28994a0a623ea497fa69486e14984e715c5d174"
-dependencies = [
- "adler32",
- "byteorder",
-]
-
 [[package]]
 name = "deflate64"
 version = "0.1.8"
@@ -3327,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",
@@ -3536,6 +3613,7 @@ dependencies = [
  "linkify",
  "log",
  "lsp",
+ "markdown",
  "multi_buffer",
  "ordered-float 2.10.0",
  "parking_lot",
@@ -3817,6 +3895,22 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "exr"
+version = "1.72.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "887d93f60543e9a9362ef8a21beedd0a833c5d9610e18c67abe15a5963dcb1a4"
+dependencies = [
+ "bit_field",
+ "flume",
+ "half",
+ "lebe",
+ "miniz_oxide",
+ "rayon-core",
+ "smallvec",
+ "zune-inflate",
+]
+
 [[package]]
 name = "extension"
 version = "0.1.0"
@@ -3835,6 +3929,7 @@ dependencies = [
  "futures 0.3.28",
  "gpui",
  "http 0.1.0",
+ "indexed_docs",
  "isahc",
  "language",
  "log",
@@ -3850,6 +3945,7 @@ dependencies = [
  "serde_json",
  "serde_json_lenient",
  "settings",
+ "snippet_provider",
  "task",
  "theme",
  "toml 0.8.10",
@@ -3891,6 +3987,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "client",
+ "collections",
  "db",
  "editor",
  "extension",
@@ -3910,6 +4007,7 @@ dependencies = [
  "theme_selector",
  "ui",
  "util",
+ "vim",
  "workspace",
 ]
 
@@ -3925,7 +4023,7 @@ version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7493d4c459da9f84325ad297371a6b2b8a162800873a22e3b6b6512e61d18c05"
 dependencies = [
- "bit-set",
+ "bit-set 0.5.3",
  "regex",
 ]
 
@@ -3982,7 +4080,7 @@ name = "feedback"
 version = "0.1.0"
 dependencies = [
  "anyhow",
- "bitflags 2.4.2",
+ "bitflags 2.6.0",
  "client",
  "db",
  "editor",
@@ -4099,7 +4197,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010"
 dependencies = [
  "crc32fast",
- "miniz_oxide 0.7.1",
+ "miniz_oxide",
 ]
 
 [[package]]
@@ -4182,7 +4280,7 @@ checksum = "e32eac81c1135c1df01d4e6d4233c47ba11f6a6d07f33e0bba09d18797077770"
 dependencies = [
  "fontconfig-parser",
  "log",
- "memmap2 0.9.4",
+ "memmap2",
  "slotmap",
  "tinyvec",
  "ttf-parser",
@@ -4316,7 +4414,7 @@ dependencies = [
 name = "fsevent"
 version = "0.1.0"
 dependencies = [
- "bitflags 2.4.2",
+ "bitflags 2.6.0",
  "core-foundation",
  "fsevent-sys 3.1.0",
  "parking_lot",
@@ -4573,9 +4671,9 @@ dependencies = [
 
 [[package]]
 name = "gif"
-version = "0.11.4"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3edd93c6756b4dfaf2709eafcc345ba2636565295c198a9cfbf75fa5e3e00b06"
+checksum = "3fb2d69b19215e18bb912fa30f7ce15846e301408695e44e0ef719f1da9e19f2"
 dependencies = [
  "color_quant",
  "weezl",
@@ -4627,7 +4725,7 @@ version = "0.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b903b73e45dc0c6c596f2d37eccece7c1c8bb6e4407b001096387c63d0d93724"
 dependencies = [
- "bitflags 2.4.2",
+ "bitflags 2.6.0",
  "libc",
  "libgit2-sys",
  "log",
@@ -4738,7 +4836,7 @@ version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fbcd2dba93594b227a1f57ee09b8b9da8892c34d55aa332e034a228d0fe6a171"
 dependencies = [
- "bitflags 2.4.2",
+ "bitflags 2.6.0",
  "gpu-alloc-types",
 ]
 
@@ -4759,7 +4857,7 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "98ff03b468aa837d70984d55f5d3f846f6ec31fe34bbb97c4f85219caeee1ca4"
 dependencies = [
- "bitflags 2.4.2",
+ "bitflags 2.6.0",
 ]
 
 [[package]]
@@ -4780,7 +4878,6 @@ dependencies = [
  "calloop",
  "calloop-wayland-source",
  "cbindgen",
- "clipboard-win",
  "cocoa",
  "collections",
  "core-foundation",
@@ -4832,6 +4929,7 @@ dependencies = [
  "taffy",
  "thiserror",
  "time",
+ "unicode-segmentation",
  "usvg",
  "util",
  "uuid",
@@ -4971,6 +5069,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "client",
+ "extension",
  "fs",
  "futures 0.3.28",
  "gpui",
@@ -5004,13 +5103,19 @@ dependencies = [
  "unicode-segmentation",
 ]
 
+[[package]]
+name = "heck"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
+
 [[package]]
 name = "heed"
 version = "0.20.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6f7acb9683d7c7068aa46d47557bfa4e35a277964b350d9504a87b03610163fd"
 dependencies = [
- "bitflags 2.4.2",
+ "bitflags 2.6.0",
  "byteorder",
  "heed-traits",
  "heed-types",
@@ -5053,9 +5158,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"
@@ -5149,6 +5254,18 @@ dependencies = [
  "regex",
 ]
 
+[[package]]
+name = "html_to_markdown"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e608e8dd0939bfb6b516d96a5919751b835297a02230aecb88d2fc84ebebaa8a"
+dependencies = [
+ "anyhow",
+ "html5ever",
+ "markup5ever_rcdom",
+ "regex",
+]
+
 [[package]]
 name = "http"
 version = "0.1.0"
@@ -5336,21 +5453,35 @@ dependencies = [
 
 [[package]]
 name = "image"
-version = "0.23.14"
+version = "0.25.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24ffcb7e7244a9bf19d35bf2883b9c080c4ced3c07a9895572178cdb8f13f6a1"
+checksum = "fd54d660e773627692c524beaad361aca785a4f9f5730ce91f42aabe5bce3d11"
 dependencies = [
  "bytemuck",
  "byteorder",
  "color_quant",
+ "exr",
  "gif",
- "jpeg-decoder",
- "num-iter",
- "num-rational 0.3.2",
+ "image-webp",
  "num-traits",
- "png 0.16.8",
- "scoped_threadpool",
+ "png",
+ "qoi",
+ "ravif",
+ "rayon",
+ "rgb",
  "tiff",
+ "zune-core",
+ "zune-jpeg",
+]
+
+[[package]]
+name = "image-webp"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d730b085583c4d789dfd07fdcf185be59501666a90c97c40162b37e4fdad272d"
+dependencies = [
+ "byteorder-lite",
+ "thiserror",
 ]
 
 [[package]]
@@ -5372,6 +5503,37 @@ version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "029d73f573d8e8d63e6d5020011d3255b28c3ba85d6cf870a07184ed23de9284"
 
+[[package]]
+name = "imgref"
+version = "1.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44feda355f4159a7c757171a77de25daf6411e217b4cabd03bd6650690468126"
+
+[[package]]
+name = "indexed_docs"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "async-trait",
+ "collections",
+ "derive_more",
+ "fs",
+ "futures 0.3.28",
+ "fuzzy",
+ "gpui",
+ "heed",
+ "html_to_markdown 0.1.0",
+ "http 0.1.0",
+ "indexmap 1.9.3",
+ "indoc",
+ "parking_lot",
+ "paths",
+ "pretty_assertions",
+ "serde",
+ "strum",
+ "util",
+]
+
 [[package]]
 name = "indexmap"
 version = "1.9.3"
@@ -5485,6 +5647,17 @@ dependencies = [
  "cfg-if",
 ]
 
+[[package]]
+name = "interpolate_name"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.59",
+]
+
 [[package]]
 name = "io-extras"
 version = "0.18.1"
@@ -5501,7 +5674,7 @@ version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"
 dependencies = [
- "hermit-abi 0.3.3",
+ "hermit-abi 0.3.9",
  "libc",
  "windows-sys 0.48.0",
 ]
@@ -5686,12 +5859,9 @@ dependencies = [
 
 [[package]]
 name = "jpeg-decoder"
-version = "0.1.22"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "229d53d58899083193af11e15917b5640cd40b29ff475a1fe4ef725deb02d0f2"
-dependencies = [
- "rayon",
-]
+checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0"
 
 [[package]]
 name = "js-sys"
@@ -5913,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"
@@ -5940,12 +6104,29 @@ version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67"
 
+[[package]]
+name = "lebe"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8"
+
 [[package]]
 name = "libc"
 version = "0.2.153"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
 
+[[package]]
+name = "libfuzzer-sys"
+version = "0.4.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a96cfd5557eb82f2b83fed4955246c988d331975a002961b07c81584d107e7f7"
+dependencies = [
+ "arbitrary",
+ "cc",
+ "once_cell",
+]
+
 [[package]]
 name = "libgit2-sys"
 version = "0.17.0+1.8.1"
@@ -6138,6 +6319,15 @@ dependencies = [
  "value-bag",
 ]
 
+[[package]]
+name = "loop9"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fae87c125b03c1d2c0150c90365d7d6bcc53fb73a9acaef207d2d065860f062"
+dependencies = [
+ "imgref",
+]
+
 [[package]]
 name = "lsp"
 version = "0.1.0"
@@ -6313,6 +6503,16 @@ version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4facc753ae494aeb6e3c22f839b158aebd4f9270f55cd3c79906c45476c47ab4"
 
+[[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.5"
@@ -6349,15 +6549,6 @@ dependencies = [
  "rustix 0.38.32",
 ]
 
-[[package]]
-name = "memmap2"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a5a03cefb0d953ec0be133036f14e109412fa594edc2f77227249db66cc3ed"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "memmap2"
 version = "0.9.4"
@@ -6420,25 +6611,6 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
-[[package]]
-name = "miniz_oxide"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "791daaae1ed6889560f8c4359194f56648355540573244a5448a83ba1ecc7435"
-dependencies = [
- "adler32",
-]
-
-[[package]]
-name = "miniz_oxide"
-version = "0.4.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b"
-dependencies = [
- "adler",
- "autocfg",
-]
-
 [[package]]
 name = "miniz_oxide"
 version = "0.7.1"
@@ -6510,17 +6682,17 @@ checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a"
 
 [[package]]
 name = "naga"
-version = "0.14.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae585df4b6514cf8842ac0f1ab4992edc975892704835b549cf818dc0191249e"
+version = "0.20.0"
+source = "git+https://github.com/gfx-rs/wgpu?rev=425526828f738c95ec50b016c6a761bc00d2fb25#425526828f738c95ec50b016c6a761bc00d2fb25"
 dependencies = [
- "bit-set",
- "bitflags 2.4.2",
+ "arrayvec",
+ "bit-set 0.6.0",
+ "bitflags 2.6.0",
+ "cfg_aliases",
  "codespan-reporting",
  "hexf-parse",
  "indexmap 2.2.6",
  "log",
- "num-traits",
  "rustc-hash",
  "spirv",
  "termcolor",
@@ -6616,7 +6788,7 @@ version = "0.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053"
 dependencies = [
- "bitflags 2.4.2",
+ "bitflags 2.6.0",
  "cfg-if",
  "libc",
  "memoffset",
@@ -6628,7 +6800,7 @@ version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4"
 dependencies = [
- "bitflags 2.4.2",
+ "bitflags 2.6.0",
  "cfg-if",
  "cfg_aliases",
  "libc",
@@ -6668,6 +6840,12 @@ 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 = "notifications"
 version = "0.1.0"
@@ -6691,7 +6869,7 @@ version = "6.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d"
 dependencies = [
- "bitflags 2.4.2",
+ "bitflags 2.6.0",
  "crossbeam-channel",
  "filetime",
  "fsevent-sys 4.1.0",
@@ -6733,7 +6911,7 @@ dependencies = [
  "num-complex",
  "num-integer",
  "num-iter",
- "num-rational 0.4.1",
+ "num-rational",
  "num-traits",
 ]
 
@@ -6809,6 +6987,17 @@ dependencies = [
  "syn 1.0.109",
 ]
 
+[[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.59",
+]
+
 [[package]]
 name = "num-format"
 version = "0.4.4"
@@ -6840,17 +7029,6 @@ dependencies = [
  "num-traits",
 ]
 
-[[package]]
-name = "num-rational"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07"
-dependencies = [
- "autocfg",
- "num-integer",
- "num-traits",
-]
-
 [[package]]
 name = "num-rational"
 version = "0.4.1"
@@ -6879,7 +7057,7 @@ version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
 dependencies = [
- "hermit-abi 0.3.3",
+ "hermit-abi 0.3.9",
  "libc",
 ]
 
@@ -6904,6 +7082,15 @@ dependencies = [
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "num_threads"
+version = "0.1.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c7398b9c8b70908f6371f47ed36737907c87c52af34c268fed0bf0ceb92ead9"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "nvim-rs"
 version = "0.6.0-pre"
@@ -6959,7 +7146,7 @@ dependencies = [
  "jni 0.20.0",
  "ndk",
  "ndk-context",
- "num-derive",
+ "num-derive 0.3.3",
  "num-traits",
  "oboe-sys",
 ]
@@ -7035,9 +7222,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
 
 [[package]]
 name = "open"
-version = "5.1.2"
+version = "5.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "449f0ff855d85ddbf1edd5b646d65249ead3f5e422aaa86b7d2d0b049b103e32"
+checksum = "61a877bf6abd716642a53ef1b89fb498923a4afca5c754f9050b4d081c05c4b3"
 dependencies = [
  "is-wsl",
  "libc",
@@ -7064,7 +7251,7 @@ version = "0.10.57"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c"
 dependencies = [
- "bitflags 2.4.2",
+ "bitflags 2.6.0",
  "cfg-if",
  "foreign-types 0.3.2",
  "libc",
@@ -7092,9 +7279,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
 [[package]]
 name = "openssl-src"
-version = "300.2.3+3.2.1"
+version = "300.3.0+3.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cff92b6f71555b61bb9315f7c64da3ca43d87531622120fea0195fc761b4843"
+checksum = "eba8804a1c5765b18c4b3f907e6897ebabeedebc9830e1a0046c4a4cf44663e1"
 dependencies = [
  "cc",
 ]
@@ -7209,6 +7396,7 @@ dependencies = [
  "db",
  "editor",
  "file_icons",
+ "fuzzy",
  "gpui",
  "itertools 0.11.0",
  "language",
@@ -7358,7 +7546,7 @@ dependencies = [
 [[package]]
 name = "pathfinder_simd"
 version = "0.5.3"
-source = "git+https://github.com/servo/pathfinder.git?rev=30419d07660dc11a21e42ef4a7fa329600cff152#30419d07660dc11a21e42ef4a7fa329600cff152"
+source = "git+https://github.com/servo/pathfinder.git?rev=4968e819c0d9b015437ffc694511e175801a17c7#4968e819c0d9b015437ffc694511e175801a17c7"
 dependencies = [
  "rustc_version",
 ]
@@ -7647,18 +7835,6 @@ dependencies = [
  "plotters-backend",
 ]
 
-[[package]]
-name = "png"
-version = "0.16.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c3287920cb847dee3de33d301c463fba14dda99db24214ddf93f83d3021f4c6"
-dependencies = [
- "bitflags 1.3.2",
- "crc32fast",
- "deflate",
- "miniz_oxide 0.3.7",
-]
-
 [[package]]
 name = "png"
 version = "0.17.13"
@@ -7669,7 +7845,7 @@ dependencies = [
  "crc32fast",
  "fdeflate",
  "flate2",
- "miniz_oxide 0.7.1",
+ "miniz_oxide",
 ]
 
 [[package]]
@@ -7902,10 +8078,12 @@ dependencies = [
  "serde_json",
  "settings",
  "sha2 0.10.7",
+ "shellexpand 2.1.2",
  "shlex",
  "similar",
  "smol",
  "snippet",
+ "snippet_provider",
  "task",
  "tempfile",
  "terminal",
@@ -8042,6 +8220,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "collections",
+ "futures 0.3.28",
  "prost",
  "prost-build",
  "serde",
@@ -8088,11 +8267,26 @@ version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dce76ce678ffc8e5675b22aa1405de0b7037e2fdf8913fea40d1926c6fe1e6e7"
 dependencies = [
- "bitflags 2.4.2",
+ "bitflags 2.6.0",
  "memchr",
  "unicase",
 ]
 
+[[package]]
+name = "qoi"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001"
+dependencies = [
+ "bytemuck",
+]
+
+[[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.30.0"
@@ -8118,10 +8312,13 @@ dependencies = [
  "assistant",
  "editor",
  "gpui",
+ "repl",
  "search",
  "settings",
  "ui",
+ "util",
  "workspace",
+ "zed_actions",
 ]
 
 [[package]]
@@ -8216,6 +8413,56 @@ version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "977b1e897f9d764566891689e642653e5ed90c6895106acd005eb4c1d0203991"
 
+[[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 0.12.1",
+ "libc",
+ "libfuzzer-sys",
+ "log",
+ "maybe-rayon",
+ "new_debug_unreachable",
+ "noop_proc_macro",
+ "num-derive 0.4.2",
+ "num-traits",
+ "once_cell",
+ "paste",
+ "profiling",
+ "rand 0.8.5",
+ "rand_chacha 0.3.1",
+ "simd_helpers",
+ "system-deps",
+ "thiserror",
+ "v_frame",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "ravif"
+version = "0.11.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bc13288f5ab39e6d7c9d501759712e6969fcc9734220846fc9ed26cae2cc4234"
+dependencies = [
+ "avif-serialize",
+ "imgref",
+ "loop9",
+ "quick-error",
+ "rav1e",
+ "rayon",
+ "rgb",
+]
+
 [[package]]
 name = "raw-window-handle"
 version = "0.5.2"
@@ -8278,7 +8525,6 @@ dependencies = [
  "client",
  "dev_server_projects",
  "editor",
- "feature_flags",
  "fuzzy",
  "gpui",
  "language",
@@ -8294,7 +8540,7 @@ dependencies = [
  "task",
  "terminal_view",
  "ui",
- "ui_text_field",
+ "ui_input",
  "util",
  "workspace",
 ]
@@ -8456,6 +8702,7 @@ dependencies = [
  "image",
  "language",
  "log",
+ "multi_buffer",
  "project",
  "runtimelib",
  "schemars",
@@ -8814,31 +9061,6 @@ dependencies = [
  "semver",
 ]
 
-[[package]]
-name = "rustdoc"
-version = "0.1.0"
-dependencies = [
- "anyhow",
- "async-trait",
- "collections",
- "derive_more",
- "fs",
- "futures 0.3.28",
- "fuzzy",
- "gpui",
- "heed",
- "html_to_markdown",
- "http 0.1.0",
- "indexmap 1.9.3",
- "indoc",
- "parking_lot",
- "paths",
- "pretty_assertions",
- "serde",
- "strum",
- "util",
-]
-
 [[package]]
 name = "rustix"
 version = "0.37.23"
@@ -8859,7 +9081,7 @@ version = "0.38.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89"
 dependencies = [
- "bitflags 2.4.2",
+ "bitflags 2.6.0",
  "errno 0.3.8",
  "itoa",
  "libc",
@@ -8934,7 +9156,7 @@ version = "0.14.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cfb9cf8877777222e4a3bc7eb247e398b56baba500c38c1c46842431adc8b55c"
 dependencies = [
- "bitflags 2.4.2",
+ "bitflags 2.6.0",
  "bytemuck",
  "libm",
  "smallvec",
@@ -9015,12 +9237,6 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294"
 
-[[package]]
-name = "scoped_threadpool"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d51f5df5af43ab3f1360b429fa5e0152ac5ce8c0bd6485cae490332e96846a8"
-
 [[package]]
 name = "scopeguard"
 version = "1.2.0"
@@ -9163,7 +9379,7 @@ version = "0.1.0"
 dependencies = [
  "any_vec",
  "anyhow",
- "bitflags 2.4.2",
+ "bitflags 2.6.0",
  "client",
  "collections",
  "editor",
@@ -9547,6 +9763,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 = "simdutf8"
 version = "0.1.4"
@@ -9582,13 +9807,13 @@ dependencies = [
 
 [[package]]
 name = "simplelog"
-version = "0.9.0"
+version = "0.12.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bc0ffd69814a9b251d43afcabf96dad1b29f5028378056257be9e3fecc9f720"
+checksum = "16257adbfaef1ee58b1363bdc0664c9b8e1e30aed86049635fb5f147d065a9c0"
 dependencies = [
- "chrono",
  "log",
  "termcolor",
+ "time",
 ]
 
 [[package]]
@@ -9679,6 +9904,22 @@ dependencies = [
  "smallvec",
 ]
 
+[[package]]
+name = "snippet_provider"
+version = "0.1.0"
+dependencies = [
+ "anyhow",
+ "collections",
+ "fs",
+ "futures 0.3.28",
+ "gpui",
+ "parking_lot",
+ "serde",
+ "serde_json",
+ "snippet",
+ "util",
+]
+
 [[package]]
 name = "socket2"
 version = "0.4.9"
@@ -9725,12 +9966,11 @@ dependencies = [
 
 [[package]]
 name = "spirv"
-version = "0.2.0+1.5.4"
+version = "0.3.0+sdk-1.3.268.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "246bfa38fe3db3f1dfc8ca5a2cdeb7348c78be2112740cc0ec8ef18b6d94f830"
+checksum = "eda41003dc44290527a59b13432d4a0379379fa074b70174882adfbdfd917844"
 dependencies = [
- "bitflags 1.3.2",
- "num-traits",
+ "bitflags 2.6.0",
 ]
 
 [[package]]
@@ -9906,7 +10146,7 @@ dependencies = [
  "atoi",
  "base64 0.21.7",
  "bigdecimal",
- "bitflags 2.4.2",
+ "bitflags 2.6.0",
  "byteorder",
  "bytes 1.5.0",
  "chrono",
@@ -9953,7 +10193,7 @@ dependencies = [
  "atoi",
  "base64 0.21.7",
  "bigdecimal",
- "bitflags 2.4.2",
+ "bitflags 2.6.0",
  "byteorder",
  "chrono",
  "crc",
@@ -10059,6 +10299,7 @@ dependencies = [
  "story",
  "strum",
  "theme",
+ "title_bar",
  "ui",
 ]
 
@@ -10355,13 +10596,26 @@ dependencies = [
  "windows 0.52.0",
 ]
 
+[[package]]
+name = "system-deps"
+version = "6.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a3e535eb8dded36d55ec13eddacd30dec501792ff23a0b1682c38601b8cf2349"
+dependencies = [
+ "cfg-expr",
+ "heck 0.5.0",
+ "pkg-config",
+ "toml 0.8.10",
+ "version-compare",
+]
+
 [[package]]
 name = "system-interface"
 version = "0.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9aef1f9d4c1dbdd1cb3a63be9efd2f04d8ddbc919d46112982c76818ffc2f1a7"
 dependencies = [
- "bitflags 2.4.2",
+ "bitflags 2.6.0",
  "cap-fs-ext",
  "cap-std",
  "fd-lock",
@@ -10502,9 +10756,9 @@ dependencies = [
 
 [[package]]
 name = "termcolor"
-version = "1.1.3"
+version = "1.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755"
+checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755"
 dependencies = [
  "winapi-util",
 ]
@@ -10521,6 +10775,7 @@ dependencies = [
  "gpui",
  "libc",
  "rand 0.8.5",
+ "release_channel",
  "schemars",
  "serde",
  "serde_derive",
@@ -10664,18 +10919,18 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.60"
+version = "1.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "579e9083ca58dd9dcf91a9923bb9054071b9ebbd800b342194c9feb0ee89fc18"
+checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.60"
+version = "1.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2470041c06ec3ac1ab38d0356a6119054dedaea53e12fbefc0de730a1c08524"
+checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -10694,12 +10949,12 @@ dependencies = [
 
 [[package]]
 name = "tiff"
-version = "0.6.1"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a53f4706d65497df0c4349241deddf35f84cee19c87ed86ea8ca590f4464437"
+checksum = "ba1310fcea54c6a9a4fd1aad794ecc02c31682f6bfbecdf460bf19533eed1e3e"
 dependencies = [
+ "flate2",
  "jpeg-decoder",
- "miniz_oxide 0.4.4",
  "weezl",
 ]
 
@@ -10726,7 +10981,9 @@ checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
 dependencies = [
  "deranged",
  "itoa",
+ "libc",
  "num-conv",
+ "num_threads",
  "powerfmt",
  "serde",
  "time-core",
@@ -10779,7 +11036,7 @@ dependencies = [
  "bytemuck",
  "cfg-if",
  "log",
- "png 0.17.13",
+ "png",
  "tiny-skia-path",
 ]
 
@@ -10832,6 +11089,41 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
+[[package]]
+name = "title_bar"
+version = "0.1.0"
+dependencies = [
+ "auto_update",
+ "call",
+ "client",
+ "collections",
+ "command_palette",
+ "dev_server_projects",
+ "editor",
+ "extensions_ui",
+ "feedback",
+ "gpui",
+ "http 0.1.0",
+ "notifications",
+ "pretty_assertions",
+ "project",
+ "recent_projects",
+ "rpc",
+ "serde",
+ "settings",
+ "smallvec",
+ "story",
+ "theme",
+ "theme_selector",
+ "tree-sitter-markdown",
+ "ui",
+ "util",
+ "vcs_menu",
+ "windows 0.57.0",
+ "workspace",
+ "zed_actions",
+]
+
 [[package]]
 name = "tokio"
 version = "1.37.0"
@@ -11050,7 +11342,7 @@ version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "61c5bb1d698276a2443e5ecfabc1008bf15a36c12e6a7176e7bf089ea9131140"
 dependencies = [
- "bitflags 2.4.2",
+ "bitflags 2.6.0",
  "bytes 1.5.0",
  "futures-core",
  "futures-util",
@@ -11466,7 +11758,7 @@ dependencies = [
 ]
 
 [[package]]
-name = "ui_text_field"
+name = "ui_input"
 version = "0.1.0"
 dependencies = [
  "editor",
@@ -11659,6 +11951,17 @@ dependencies = [
  "sha1_smol",
 ]
 
+[[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 = "valuable"
 version = "0.1.0"
@@ -11721,6 +12024,12 @@ dependencies = [
  "workspace",
 ]
 
+[[package]]
+name = "version-compare"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "852e951cb7832cb45cb1169900d19760cfa39b82bc0ea9c0e5a14ae88411c98b"
+
 [[package]]
 name = "version_check"
 version = "0.9.4"
@@ -11804,7 +12113,7 @@ version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "40eb22ae96f050e0c0d6f7ce43feeae26c348fc4dea56928ca81537cfaa6188b"
 dependencies = [
- "bitflags 2.4.2",
+ "bitflags 2.6.0",
  "cursor-icon",
  "log",
  "serde",
@@ -11956,7 +12265,7 @@ version = "0.201.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "84e5df6dba6c0d7fafc63a450f1738451ed7a0b52295d83e868218fa286bf708"
 dependencies = [
- "bitflags 2.4.2",
+ "bitflags 2.6.0",
  "indexmap 2.2.6",
  "semver",
 ]
@@ -12223,7 +12532,7 @@ checksum = "371d828b6849ea06d598ae7dd1c316e8dd9e99b76f77d93d5886cb25c7f8e188"
 dependencies = [
  "anyhow",
  "async-trait",
- "bitflags 2.4.2",
+ "bitflags 2.6.0",
  "bytes 1.5.0",
  "cap-fs-ext",
  "cap-net-ext",
@@ -12310,7 +12619,7 @@ version = "0.31.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "82fb96ee935c2cea6668ccb470fb7771f6215d1691746c2d896b447a00ad3f1f"
 dependencies = [
- "bitflags 2.4.2",
+ "bitflags 2.6.0",
  "rustix 0.38.32",
  "wayland-backend",
  "wayland-scanner",
@@ -12333,7 +12642,7 @@ version = "0.31.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8f81f365b8b4a97f422ac0e8737c438024b5951734506b0e1d775c73030561f4"
 dependencies = [
- "bitflags 2.4.2",
+ "bitflags 2.6.0",
  "wayland-backend",
  "wayland-client",
  "wayland-scanner",
@@ -12345,7 +12654,7 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "23803551115ff9ea9bce586860c5c5a971e360825a0309264102a9495a5ff479"
 dependencies = [
- "bitflags 2.4.2",
+ "bitflags 2.6.0",
  "wayland-backend",
  "wayland-client",
  "wayland-protocols",
@@ -12464,7 +12773,7 @@ checksum = "ae1136a209614ace00b0c11f04dc7cf42540773be3b22eff6ad165110aba29c1"
 dependencies = [
  "anyhow",
  "async-trait",
- "bitflags 2.4.2",
+ "bitflags 2.6.0",
  "thiserror",
  "tracing",
  "wasmtime",
@@ -12894,7 +13203,7 @@ version = "0.36.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f9643b83820c0cd246ecabe5fa454dd04ba4fa67996369466d0747472d337346"
 dependencies = [
- "bitflags 2.4.2",
+ "bitflags 2.6.0",
  "windows-sys 0.52.0",
 ]
 
@@ -12913,7 +13222,7 @@ version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "288f992ea30e6b5c531b52cdd5f3be81c148554b09ea416f058d16556ba92c27"
 dependencies = [
- "bitflags 2.4.2",
+ "bitflags 2.6.0",
  "wit-bindgen-rt",
  "wit-bindgen-rust-macro",
 ]
@@ -12969,7 +13278,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "421c0c848a0660a8c22e2fd217929a0191f14476b68962afd2af89fd22e39825"
 dependencies = [
  "anyhow",
- "bitflags 2.4.2",
+ "bitflags 2.6.0",
  "indexmap 2.2.6",
  "log",
  "serde",
@@ -13027,6 +13336,7 @@ dependencies = [
  "derive_more",
  "dev_server_projects",
  "env_logger",
+ "file_icons",
  "fs",
  "futures 0.3.28",
  "gpui",
@@ -13071,6 +13381,7 @@ dependencies = [
  "language",
  "log",
  "parking_lot",
+ "paths",
  "postage",
  "pretty_assertions",
  "rand 0.8.5",
@@ -13174,18 +13485,17 @@ name = "xim-parser"
 version = "0.2.1"
 source = "git+https://github.com/npmania/xim-rs?rev=27132caffc5b9bc9c432ca4afad184ab6e7c16af#27132caffc5b9bc9c432ca4afad184ab6e7c16af"
 dependencies = [
- "bitflags 2.4.2",
+ "bitflags 2.6.0",
 ]
 
 [[package]]
 name = "xkbcommon"
 version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13867d259930edc7091a6c41b4ce6eee464328c6ff9659b7e4c668ca20d4c91e"
+source = "git+https://github.com/ConradIrwin/xkbcommon-rs?rev=fcbb4612185cc129ceeff51d22f7fb51810a03b2#fcbb4612185cc129ceeff51d22f7fb51810a03b2"
 dependencies = [
  "as-raw-xcb-connection",
  "libc",
- "memmap2 0.8.0",
+ "memmap2",
  "xkeysym",
 ]
 
@@ -13318,7 +13628,7 @@ dependencies = [
 
 [[package]]
 name = "zed"
-version = "0.141.3"
+version = "0.145.1"
 dependencies = [
  "activity_indicator",
  "anyhow",
@@ -13393,6 +13703,7 @@ dependencies = [
  "settings",
  "simplelog",
  "smol",
+ "snippet_provider",
  "supermaven",
  "tab_switcher",
  "task",
@@ -13431,9 +13742,9 @@ dependencies = [
 
 [[package]]
 name = "zed_clojure"
-version = "0.0.2"
+version = "0.0.3"
 dependencies = [
- "zed_extension_api 0.0.4",
+ "zed_extension_api 0.0.6",
 ]
 
 [[package]]
@@ -13445,7 +13756,7 @@ dependencies = [
 
 [[package]]
 name = "zed_dart"
-version = "0.0.2"
+version = "0.0.3"
 dependencies = [
  "zed_extension_api 0.0.6",
 ]
@@ -13459,7 +13770,7 @@ dependencies = [
 
 [[package]]
 name = "zed_elixir"
-version = "0.0.5"
+version = "0.0.6"
 dependencies = [
  "zed_extension_api 0.0.6",
 ]
@@ -13518,6 +13829,7 @@ dependencies = [
 name = "zed_gleam"
 version = "0.1.3"
 dependencies = [
+ "html_to_markdown 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "zed_extension_api 0.0.7",
 ]
 
@@ -13544,28 +13856,28 @@ dependencies = [
 
 [[package]]
 name = "zed_lua"
-version = "0.0.2"
+version = "0.0.3"
 dependencies = [
  "zed_extension_api 0.0.6",
 ]
 
 [[package]]
 name = "zed_ocaml"
-version = "0.0.1"
+version = "0.0.2"
 dependencies = [
  "zed_extension_api 0.0.6",
 ]
 
 [[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]]
 name = "zed_prisma"
-version = "0.0.2"
+version = "0.0.3"
 dependencies = [
  "zed_extension_api 0.0.4",
 ]
@@ -13586,7 +13898,7 @@ dependencies = [
 
 [[package]]
 name = "zed_snippets"
-version = "0.0.3"
+version = "0.0.5"
 dependencies = [
  "serde_json",
  "zed_extension_api 0.0.6",
@@ -13594,7 +13906,7 @@ dependencies = [
 
 [[package]]
 name = "zed_svelte"
-version = "0.0.1"
+version = "0.0.3"
 dependencies = [
  "zed_extension_api 0.0.6",
 ]
@@ -13606,6 +13918,13 @@ dependencies = [
  "zed_extension_api 0.0.6",
 ]
 
+[[package]]
+name = "zed_test_extension"
+version = "0.1.0"
+dependencies = [
+ "zed_extension_api 0.0.6",
+]
+
 [[package]]
 name = "zed_toml"
 version = "0.1.1"
@@ -13629,9 +13948,9 @@ dependencies = [
 
 [[package]]
 name = "zed_zig"
-version = "0.1.2"
+version = "0.1.4"
 dependencies = [
- "zed_extension_api 0.0.7",
+ "zed_extension_api 0.0.6",
 ]
 
 [[package]]
@@ -13737,6 +14056,30 @@ dependencies = [
  "pkg-config",
 ]
 
+[[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"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02"
+dependencies = [
+ "simd-adler32",
+]
+
+[[package]]
+name = "zune-jpeg"
+version = "0.4.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec866b44a2a1fd6133d363f073ca1b179f438f99e7e5bfb1e33f7181facfe448"
+dependencies = [
+ "zune-core",
+]
+
 [[package]]
 name = "zvariant"
 version = "4.0.2"
diff --git a/third_party/nixpkgs/pkgs/by-name/ze/zed-editor/package.nix b/third_party/nixpkgs/pkgs/by-name/ze/zed-editor/package.nix
index be95732a6f..b6d8cd3ec0 100644
--- a/third_party/nixpkgs/pkgs/by-name/ze/zed-editor/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/ze/zed-editor/package.nix
@@ -35,13 +35,13 @@ assert withGLES -> stdenv.isLinux;
 
 rustPlatform.buildRustPackage rec {
   pname = "zed";
-  version = "0.141.3";
+  version = "0.145.1";
 
   src = fetchFromGitHub {
     owner = "zed-industries";
     repo = "zed";
     rev = "refs/tags/v${version}";
-    hash = "sha256-D4wVHMNy7xESuEORULyKf3ZxFfRSKfWEXjBnjh3yBVU=";
+    hash = "sha256-fO1VT2LiZa9XkQxP7QcEG9uCTtEm3soces7FCFwosbU=";
     fetchSubmodules = true;
   };
 
@@ -50,12 +50,13 @@ rustPlatform.buildRustPackage rec {
     outputHashes = {
       "alacritty_terminal-0.24.1-dev" = "sha256-aVB1CNOLjNh6AtvdbomODNrk00Md8yz8QzldzvDo1LI=";
       "async-pipe-0.1.3" = "sha256-g120X88HGT8P6GNCrzpS5SutALx5H+45Sf4iSSxzctE=";
-      "blade-graphics-0.4.0" = "sha256-khJke3tIO8V7tT3MBk9vQhBKTiJEWTY6Qr4vzeuKnOk=";
+      "blade-graphics-0.4.0" = "sha256-c0KhzG/FCpAyiafGZTbxDMz1ktCTURNDxO3fkB16nUw=";
       "cosmic-text-0.11.2" = "sha256-TLPDnqixuW+aPAhiBhSvuZIa69vgV3xLcw32OlkdCcM=";
       "font-kit-0.11.0" = "sha256-+4zMzjFyMS60HfLMEXGfXqKn6P+pOngLA45udV09DM8=";
       "lsp-types-0.95.1" = "sha256-N4MKoU9j1p/Xeowki/+XiNQPwIcTm9DgmfM/Eieq4js=";
+      "naga-0.20.0" = "sha256-07lLKQLfWYyOwWmvzFQ0vMeuC5pxmclz6Ub72ooSmwk=";
       "nvim-rs-0.6.0-pre" = "sha256-bdWWuCsBv01mnPA5e5zRpq48BgOqaqIcAu+b7y1NnM8=";
-      "pathfinder_simd-0.5.3" = "sha256-bakBcAQZJdHQPXybe0zoMzE49aOHENQY7/ZWZUMt+pM=";
+      "pathfinder_simd-0.5.3" = "sha256-94/qS5d0UKYXAdx+Lswj6clOTuuK2yxqWuhpYZ8x1nI=";
       "tree-sitter-0.20.100" = "sha256-xZDWAjNIhWC2n39H7jJdKDgyE/J6+MAVSa8dHtZ6CLE=";
       "tree-sitter-go-0.20.0" = "sha256-/mE21JSa3LWEiOgYPJcq0FYzTbBuNwp9JdZTZqmDIUU=";
       "tree-sitter-gowork-0.0.1" = "sha256-lM4L4Ap/c8uCr4xUw9+l/vaGb3FxxnuZI0+xKYFDPVg=";
@@ -64,6 +65,7 @@ rustPlatform.buildRustPackage rec {
       "tree-sitter-markdown-0.0.1" = "sha256-F8VVd7yYa4nCrj/HEC13BTC7lkV3XSb2Z3BNi/VfSbs=";
       "tree-sitter-proto-0.0.2" = "sha256-W0diP2ByAXYrc7Mu/sbqST6lgVIyHeSBmH7/y/X3NhU=";
       "xim-0.4.0" = "sha256-vxu3tjkzGeoRUj7vyP0vDGI7fweX8Drgy9hwOUOEQIA=";
+      "xkbcommon-0.7.0" = "sha256-2RjZWiAaz8apYTrZ82qqH4Gv20WyCtPT+ldOzm0GWMo=";
     };
   };
 
diff --git a/third_party/nixpkgs/pkgs/tools/networking/zerotierone/0001-darwin-disable-link-time-optimization.patch b/third_party/nixpkgs/pkgs/by-name/ze/zerotierone/0001-darwin-disable-link-time-optimization.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/zerotierone/0001-darwin-disable-link-time-optimization.patch
rename to third_party/nixpkgs/pkgs/by-name/ze/zerotierone/0001-darwin-disable-link-time-optimization.patch
diff --git a/third_party/nixpkgs/pkgs/tools/networking/zerotierone/Cargo.lock b/third_party/nixpkgs/pkgs/by-name/ze/zerotierone/Cargo.lock
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/zerotierone/Cargo.lock
rename to third_party/nixpkgs/pkgs/by-name/ze/zerotierone/Cargo.lock
diff --git a/third_party/nixpkgs/pkgs/tools/networking/zerotierone/default.nix b/third_party/nixpkgs/pkgs/by-name/ze/zerotierone/package.nix
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/zerotierone/default.nix
rename to third_party/nixpkgs/pkgs/by-name/ze/zerotierone/package.nix
diff --git a/third_party/nixpkgs/pkgs/tools/networking/zerotierone/update.sh b/third_party/nixpkgs/pkgs/by-name/ze/zerotierone/update.sh
similarity index 100%
rename from third_party/nixpkgs/pkgs/tools/networking/zerotierone/update.sh
rename to third_party/nixpkgs/pkgs/by-name/ze/zerotierone/update.sh
diff --git a/third_party/nixpkgs/pkgs/by-name/zi/zig-shell-completions/package.nix b/third_party/nixpkgs/pkgs/by-name/zi/zig-shell-completions/package.nix
index f9ba4d0886..54839e16ed 100644
--- a/third_party/nixpkgs/pkgs/by-name/zi/zig-shell-completions/package.nix
+++ b/third_party/nixpkgs/pkgs/by-name/zi/zig-shell-completions/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "zig-shell-completions";
-  version = "0-unstable-2023-11-18";
+  version = "0-unstable-2024-07-08";
 
   src = fetchFromGitHub {
     owner = "ziglang";
     repo = "shell-completions";
-    rev = "31d3ad12890371bf467ef7143f5c2f31cfa7b7c1";
-    hash = "sha256-ID/K0vdg7BTKGgozISk/X4RBxCVfhSkVD6GSZUoP9Ls=";
+    rev = "8d3db71e9a0497de98946b2ca2ee7e87d106607e";
+    hash = "sha256-iil6M59S94f9SojTnwdWGOlIO/QOV77fJOUjyBa7jMk=";
   };
 
   nativeBuildInputs = [ installShellFiles ];
diff --git a/third_party/nixpkgs/pkgs/data/fonts/agave/default.nix b/third_party/nixpkgs/pkgs/data/fonts/agave/default.nix
index 83efef0ab9..cd0344afb3 100644
--- a/third_party/nixpkgs/pkgs/data/fonts/agave/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/data/fonts/ankacoder/condensed.nix b/third_party/nixpkgs/pkgs/data/fonts/ankacoder/condensed.nix
index bf56f5abc0..891e0e3c0e 100644
--- a/third_party/nixpkgs/pkgs/data/fonts/ankacoder/condensed.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/data/fonts/ankacoder/default.nix b/third_party/nixpkgs/pkgs/data/fonts/ankacoder/default.nix
index 8497cbdee3..12a953f72d 100644
--- a/third_party/nixpkgs/pkgs/data/fonts/ankacoder/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/data/fonts/cantarell-fonts/default.nix b/third_party/nixpkgs/pkgs/data/fonts/cantarell-fonts/default.nix
index e1c18695db..4dc5cc2d73 100644
--- a/third_party/nixpkgs/pkgs/data/fonts/cantarell-fonts/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/data/fonts/cherry/default.nix b/third_party/nixpkgs/pkgs/data/fonts/cherry/default.nix
index 8bdfb6f94f..c69bb0715d 100644
--- a/third_party/nixpkgs/pkgs/data/fonts/cherry/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/data/fonts/creep/default.nix b/third_party/nixpkgs/pkgs/data/fonts/creep/default.nix
index 2c48756413..fa4938798e 100644
--- a/third_party/nixpkgs/pkgs/data/fonts/creep/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/data/fonts/d2coding/default.nix b/third_party/nixpkgs/pkgs/data/fonts/d2coding/default.nix
index e5b6a59af4..867345c3a8 100644
--- a/third_party/nixpkgs/pkgs/data/fonts/d2coding/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/data/fonts/font-awesome/default.nix b/third_party/nixpkgs/pkgs/data/fonts/font-awesome/default.nix
index 8705a07d25..f0622f56cd 100644
--- a/third_party/nixpkgs/pkgs/data/fonts/font-awesome/default.nix
+++ b/third_party/nixpkgs/pkgs/data/fonts/font-awesome/default.nix
@@ -1,35 +1,48 @@
-{ lib, stdenvNoCC, fetchFromGitHub }:
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+}:
 let
-  font-awesome = { version, hash, rev ? version }: stdenvNoCC.mkDerivation {
-    pname = "font-awesome";
-    inherit version;
+  font-awesome =
+    {
+      version,
+      hash,
+      rev ? version,
+    }:
+    stdenvNoCC.mkDerivation {
+      pname = "font-awesome";
+      inherit version;
 
-    src = fetchFromGitHub {
-      owner = "FortAwesome";
-      repo = "Font-Awesome";
-      inherit rev hash;
-    };
+      src = fetchFromGitHub {
+        owner = "FortAwesome";
+        repo = "Font-Awesome";
+        inherit rev hash;
+      };
 
-    installPhase = ''
-      runHook preInstall
+      installPhase = ''
+        runHook preInstall
 
-      install -m444 -Dt $out/share/fonts/opentype {fonts,otfs}/*.otf
+        install -m444 -Dt $out/share/fonts/opentype {fonts,otfs}/*.otf
 
-      runHook postInstall
-    '';
-
-    meta = with lib; {
-      description = "Font Awesome - OTF font";
-      longDescription = ''
-        Font Awesome gives you scalable vector icons that can instantly be customized.
-        This package includes only the OTF font. For full CSS etc. see the project website.
+        runHook postInstall
       '';
-      homepage = "https://fontawesome.com/";
-      license = licenses.ofl;
-      platforms = platforms.all;
-      maintainers = with maintainers; [ abaldeau johnazoidberg ];
+
+      meta = with lib; {
+        description = "Font Awesome - OTF font";
+        longDescription = ''
+          Font Awesome gives you scalable vector icons that can instantly be customized.
+          This package includes only the OTF font. For full CSS etc. see the project website.
+        '';
+        homepage = "https://fontawesome.com/";
+        license = licenses.ofl;
+        platforms = platforms.all;
+        maintainers = with maintainers; [
+          abaldeau
+          johnazoidberg
+        ];
+      };
     };
-  };
 in
 {
   # Keeping version 4 and 5 because version 6 is incompatible for some icons. That
@@ -48,7 +61,7 @@ in
     hash = "sha256-gd23ZplNY56sm1lfkU3kPXUOmNmY5SRnT0qlQZRNuBo=";
   };
   v6 = font-awesome {
-    version = "6.5.2";
-    hash = "sha256-kUa/L/Krxb5v8SmtACCSC6CI3qTTOTr4Ss/FMRBlKuw=";
+    version = "6.6.0";
+    hash = "sha256-tQ9Hxph5YiPZMiO9gs2HCkRJ8cdECa2swgS++cytEnM=";
   };
 }
diff --git a/third_party/nixpkgs/pkgs/data/fonts/gentium-book-basic/default.nix b/third_party/nixpkgs/pkgs/data/fonts/gentium-book-basic/default.nix
index c9541b307f..5247e9e6d8 100644
--- a/third_party/nixpkgs/pkgs/data/fonts/gentium-book-basic/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/data/fonts/hermit/default.nix b/third_party/nixpkgs/pkgs/data/fonts/hermit/default.nix
index ce69b00809..8a0e5479f1 100644
--- a/third_party/nixpkgs/pkgs/data/fonts/hermit/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/data/fonts/iosevka/bin.nix b/third_party/nixpkgs/pkgs/data/fonts/iosevka/bin.nix
index baf96a2a79..944c92c050 100644
--- a/third_party/nixpkgs/pkgs/data/fonts/iosevka/bin.nix
+++ b/third_party/nixpkgs/pkgs/data/fonts/iosevka/bin.nix
@@ -17,7 +17,7 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "${name}-bin";
-  version = "30.3.2";
+  version = "30.3.3";
 
   src = fetchurl {
     url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/PkgTTC-${name}-${version}.zip";
diff --git a/third_party/nixpkgs/pkgs/data/fonts/iosevka/default.nix b/third_party/nixpkgs/pkgs/data/fonts/iosevka/default.nix
index 64da2cb722..f1dadcb0d3 100644
--- a/third_party/nixpkgs/pkgs/data/fonts/iosevka/default.nix
+++ b/third_party/nixpkgs/pkgs/data/fonts/iosevka/default.nix
@@ -2,7 +2,7 @@
 , lib
 , buildNpmPackage
 , fetchFromGitHub
-, darwin
+, cctools
 , remarshal
 , ttfautohint-nox
   # Custom font set options.
@@ -71,7 +71,7 @@ buildNpmPackage rec {
     ttfautohint-nox
   ] ++ lib.optionals stdenv.isDarwin [
     # libtool
-    darwin.cctools
+    cctools
   ];
 
   buildPlan =
diff --git a/third_party/nixpkgs/pkgs/data/fonts/iosevka/variants.nix b/third_party/nixpkgs/pkgs/data/fonts/iosevka/variants.nix
index f6c92246ba..40487bceb6 100644
--- a/third_party/nixpkgs/pkgs/data/fonts/iosevka/variants.nix
+++ b/third_party/nixpkgs/pkgs/data/fonts/iosevka/variants.nix
@@ -1,93 +1,93 @@
 # This file was autogenerated. DO NOT EDIT!
 {
-  Iosevka = "1d8ial7bmqwg7msmz5gqfddfp0dnqck9v02h8ghjnkf3gwc1myn1";
-  IosevkaAile = "1wl05qa21rzbir80ig4li7mym9w8gbx7fnxi3mm4g6r32a397p4v";
-  IosevkaCurly = "1anyvcixknxf9vld83yv7w2mn63rvmanq1a1hy3kgjyk9d67gxfi";
-  IosevkaCurlySlab = "01byfnvyypacwk5mmlhzz769d6l81z4px5ywn2m9zrphcfvvy42k";
-  IosevkaEtoile = "1k6s4x7j9yiv62lc4bxp122x13b126xgy0d8jz4fyawnzzcqwadq";
-  IosevkaSlab = "0rq1gdrz89vlvk41wmlghfnlkmfrwl18lh1glki87wkpyc303wnz";
-  IosevkaSS01 = "1yfbangcfqmf8k5iw7if9zgb4f4rxr60wyi2gah79bab4aamqifd";
-  IosevkaSS02 = "1qpdkr9qw0n04j80gi8x6w0qn7z3s71lg1asxpg11jpba6hqb57y";
-  IosevkaSS03 = "12jwd3falkl58dhn2bdr01s08s9cxff20apfz2p29245arb7gppz";
-  IosevkaSS04 = "1k4kq83cnxm3sprzrx8gbqf7vhlrs8hcaby7iw5llzrf3nyh7ipq";
-  IosevkaSS05 = "0bfr9ngicz01jlmcrcsw173h33bp2xc9c7p6bcb86gf6fgqq38rw";
-  IosevkaSS06 = "13whqch4mf5zznq30xya240qsi8zsd2s56zl4df86vfzv4l5yr4v";
-  IosevkaSS07 = "19q0pi54ch3bsw3h5bngk57rj8p6pm4h6zzq08avcwzid3cz4rik";
-  IosevkaSS08 = "0j7lrj3hzcc7j3hz6p2pnh5fjf5ajgmsmbzac7fa23j5mhg71vi6";
-  IosevkaSS09 = "143gj6mzwn7267h8dp8p8cm0yqq2kjm8gdyf6v9pdr3yq3g0dmwy";
-  IosevkaSS10 = "1v94gf7rbapf7rp2r9yb11k2qqxn4p5cdb0fbws0wshhjd2akb09";
-  IosevkaSS11 = "049z96078fl98kidp6mm3535d9fq53jmipz51hsz64ba91azj82l";
-  IosevkaSS12 = "0f827rvzndzkb5w69piydd6vygmzj7gkaffk0wnh1ksz561x4nmc";
-  IosevkaSS13 = "1mrrl8szsmnxyys9r5y6a6ziagrcrvgikw845whs25p6v2vrz7ag";
-  IosevkaSS14 = "088sga3clabsffwd2asdxcn0nzn2jm4njp3sf7rfi9xrcy4nvwrr";
-  IosevkaSS15 = "08p7zaj977yssn2x7rd00ij9j53jg1322ni36a4narhsbikms32j";
-  IosevkaSS16 = "12zbdlpnvp9cx2x0x7xr929z0qxk3w4waam5m54ycrkjkx5qbjzb";
-  IosevkaSS17 = "1b57w2zqplrfjhxd4ylwl6gbzza3msyccm843v90yhzyazdhbl30";
-  IosevkaSS18 = "1wi65nlw0ag2haqcjikvw2vzgpy7n60cqnh0c06dfvvv8b499k3i";
-  SGr-Iosevka = "01hisr1h4ipxhcaqbvyq1cbwmwi5l74q8k0k3smc0b66icar3yqx";
-  SGr-IosevkaCurly = "166mhny2kl4cfpaiid1dqmjr6pm9di1cf7n1v998ddzdz8i4jnyi";
-  SGr-IosevkaCurlySlab = "0c3argr2dsg9z9xjpl6rhnvarz6mbhi8ar1d0w937l1sj4rnqs7w";
-  SGr-IosevkaFixed = "0wrw3swn07w907x7hwq0mciki07dhqzr0zdkirq2f61a87hdfkl8";
-  SGr-IosevkaFixedCurly = "12nycck76j9aj6n052f2s2ygfhvn3r2xscnpl757klhfvzfcdvjy";
-  SGr-IosevkaFixedCurlySlab = "032jax5aj0k0qdqa3184xqnczsvsqkw15z5dpygxbnrz6s0s7999";
-  SGr-IosevkaFixedSlab = "1lv6ys56m5fry5ngzn1gjipi75a1ivcszlx4dywriasmqg84b16x";
-  SGr-IosevkaFixedSS01 = "1cbjx7a721a7vinrrz7wcq2hzkqjhwwvipny061p6m6fsci5pnzz";
-  SGr-IosevkaFixedSS02 = "02rqfz0b8pfny2np4cv9ba4f1bv1ciplxhpjf67c3q80vlgljmcr";
-  SGr-IosevkaFixedSS03 = "089w4r5xv4xvcr4id2nl78syak83zx7qzbg7kl4bm50n7xfm794w";
-  SGr-IosevkaFixedSS04 = "0cgadjx4gxlhqd93lnq87y201qpcf1v6v8sqnkwv0az5biil7pbc";
-  SGr-IosevkaFixedSS05 = "146v7y49gg0jb5x6isqsmjandq5ya4nil0zcmiadqxrmyhx40lvh";
-  SGr-IosevkaFixedSS06 = "1x9lykvkhjzz084i7ndq5gpd2hy2s19vqyvrgja79qddifir3k3k";
-  SGr-IosevkaFixedSS07 = "1b0m46c4kq639y0csckd5f6hcl9d9i6b0745i8aynfhla2wva3j9";
-  SGr-IosevkaFixedSS08 = "0ysy7xiismi3pr7sk3b9nn4nh1dw6jr5l0wllvj30f8rh8z05a0s";
-  SGr-IosevkaFixedSS09 = "1b36n1lv6c5k2asv4xrcmgyc09n704slfbzsi4g2q20c032nax1l";
-  SGr-IosevkaFixedSS10 = "1f1gscpfzqghmmdygvy5v39vj38rsi4k1hx3dp4zl08nbvfic0rb";
-  SGr-IosevkaFixedSS11 = "1vxy002j4vqi8xqpm551kw804j8vllsw1hs3p4xfqn8qfkqklb3v";
-  SGr-IosevkaFixedSS12 = "1w4r2w60d962f48xlyg3yfl6q4fn90cwmfjpgf1nlhnpalcpqq99";
-  SGr-IosevkaFixedSS13 = "16bh6wa06nybqg017hp2k35dphxh1sqzzqnspqkkkssp0pqrljl3";
-  SGr-IosevkaFixedSS14 = "15jwzgjcsy6agvacn4xz46ijkkwxsgsr5nbvsbhxa3al0yhbkl89";
-  SGr-IosevkaFixedSS15 = "036aph9qixsrb657n6qzckcbcpf6rswyc945j8m94rx4lar6k10r";
-  SGr-IosevkaFixedSS16 = "0hx2vz7lpfbxhvs3g8psmlfywzmjksxr5s0d36m4mnga90scwjiw";
-  SGr-IosevkaFixedSS17 = "1s5hl874bskix5vdxz0w37wmqf5yj633k779gccyq5mlwy9yjmrl";
-  SGr-IosevkaFixedSS18 = "1zbmpkm17vcrg53qv8sqcpasc97hlz4lh2i0pjz58qsidfsqhcgr";
-  SGr-IosevkaSlab = "1lhfhag73bhpfzr5fapgcn68awjzk960dc08481p3qb4aphqczlw";
-  SGr-IosevkaSS01 = "15j23226497zvsk8s9dkgh1dbxjxcc1mdqpc9p7868vl4qjgcyg6";
-  SGr-IosevkaSS02 = "0cr4h84w9429ypwf1i8h289gfv3k2ls9lfyxgqhdy99ckqgmy8gz";
-  SGr-IosevkaSS03 = "0am1lck3l2m7pw7nwv62xjcvi5yz94hpx3rmzj4ji22qn6l633zq";
-  SGr-IosevkaSS04 = "1ggjsdczpjqnhikbp88kch7sai29r4m557y4f9xr7njfzwqkssdy";
-  SGr-IosevkaSS05 = "0s3iwasn8p72snyp9r4c7bwzxwg5lh6sj2vvwv48clp0aynqj9nm";
-  SGr-IosevkaSS06 = "1yh2qh718w94dsvm4bf6j4lqbamc0p8054f71kmk4d8zj9iijjy5";
-  SGr-IosevkaSS07 = "0njr2mgr5gpa5yiymzg3n52xw6zi5zpswmsfhlq3gxw5xgjfv4q9";
-  SGr-IosevkaSS08 = "0kf3p5yf202s45vkxn6zjk5im2rlmqpqcwn2p6vwanj2r4c0mq6j";
-  SGr-IosevkaSS09 = "15zvggmz43fq9p9jqp40f7s7sa63sk8ss6qk5hpj7661lmw95cli";
-  SGr-IosevkaSS10 = "1fnkrklrk6rz6nl0l9xwbz5rpjsizfan0rw3b1ylzbv7s6hjm3z6";
-  SGr-IosevkaSS11 = "06j98fzfi3wqsm1vsc6b3prascfh9ycrfgg240471qx7fyynsnzs";
-  SGr-IosevkaSS12 = "1a689igs4ygqq87g1yx2v0h29hvv69n78a3dlnyab2p9likidzhi";
-  SGr-IosevkaSS13 = "124v6asig6in0vwh513yk9a93sl3j3vbnbgx85zk24601r6j4sgd";
-  SGr-IosevkaSS14 = "017pjpj9m9l8hgpy5d801kdy1xvsyddyb0lzizqj0wlwgwafgayh";
-  SGr-IosevkaSS15 = "1wf7wvcxfjcywaxjjwa97iy103vfihgmap585kkmjsign72gvhnd";
-  SGr-IosevkaSS16 = "0069a898ba44460j94jbyiah5i0k8frr84njp75dhm3rbx9xrqh3";
-  SGr-IosevkaSS17 = "0yqb51y1zfxbzvpmvy08r9q1al4gvmwsnbsj5b5ixspmvda475rn";
-  SGr-IosevkaSS18 = "1ss8b6dn08a8ch3qcjqrnmh3v205nrr3q7727zvl0xcv47l54kr0";
-  SGr-IosevkaTerm = "1hygc8cq3qlw5yc2399g6h95bgkwniy3wmcmppr5dd72mhr5ghvn";
-  SGr-IosevkaTermCurly = "0cyfbmp7ns2jjzcgi1xw92cip3gk7j5imzx1846xdjdb2xima806";
-  SGr-IosevkaTermCurlySlab = "1vqlqphj860bzs90jci8kmd8dvpd9ggl97r5dwfb3jh8nshyi56c";
-  SGr-IosevkaTermSlab = "1n61lybs2v9n61mrdg1s7a9yy0ai5p1qqsgj16rh05k72zan66mn";
-  SGr-IosevkaTermSS01 = "1cgqcz318dl85y8mmqrlr946c7w686bfgbankyqbkda7503xl18c";
-  SGr-IosevkaTermSS02 = "0yb5c0iphlcwv8k4bh3p6vk2yk8gpyy213vsvb95sxa6838x27pp";
-  SGr-IosevkaTermSS03 = "0b00s45xfg25ffnfylkiz4ba6acn8b4p64c5q4pans8gfjfnb275";
-  SGr-IosevkaTermSS04 = "0icmi402xwrd1qn35qpacqzvcxgj42imm1kgixjgmnvbzs508h6a";
-  SGr-IosevkaTermSS05 = "0qd7jrfgj5niaw8a8l3qf3z4m87hvb3wwcy3fndg1zlmwlbg2cfd";
-  SGr-IosevkaTermSS06 = "0pg13v5q22k5hfy8vwk1hwh28v52wnfc28amgbkjxgcjyvd5m2xl";
-  SGr-IosevkaTermSS07 = "0vww5dwpakmwhq5l0g371ha3hy1p0arnfp0f47lw9qsahyl0hhw2";
-  SGr-IosevkaTermSS08 = "0y3gvmh4fyx2xxyn008i873m3fjwssalg8ib10zjj6mbz767az3l";
-  SGr-IosevkaTermSS09 = "10jkdw8i4jz16x2kfsh7cmg1s6si3n3d5n65yr9n9ipmgdk2qj2r";
-  SGr-IosevkaTermSS10 = "0wp9f6982dqha5dwyb4r09bm4fg690pqmb337i9237vzp6q6w0lq";
-  SGr-IosevkaTermSS11 = "00qqyi4xxgfhcyr2qf5jn42rmnhdn0fpn66qh99v15fa7b8r7iz7";
-  SGr-IosevkaTermSS12 = "0pz3c13zzvpxd2v2vlvgwk0j4fki1yfd95kycgafrijk2s2g9684";
-  SGr-IosevkaTermSS13 = "1l5d59vh9ji0rmdixinix10nxcglbll55ad2syra5hvb9rfb6q2q";
-  SGr-IosevkaTermSS14 = "0nqp05vhjjjg4aci5gaf6zf4w1z973y3wzxv3ndwkagn4gzq7y15";
-  SGr-IosevkaTermSS15 = "019nzx7azrkgxvlrj2f3gfxjhjdf4ywy2gwan7fwj3kv983s4s6f";
-  SGr-IosevkaTermSS16 = "16j3v6sbvav27p3i8q2qz76sw5i8bqr6i08khjc5cfx9pf9kfh2f";
-  SGr-IosevkaTermSS17 = "0gd32ddi0q60scvv10qx5fwmgwwdjrx6j0ymsimmnd4gi3n3ylbr";
-  SGr-IosevkaTermSS18 = "04j17062cs4h7dcrqb2qzx94wkq8n633j63vdqk72las513535xa";
+  Iosevka = "0mma97rhjpfq20mq6dji50mxbdgaz72ccfqhrqim6hj5x5pkc2w2";
+  IosevkaAile = "1frmm1q57xqsxqvz1vmz5fzammpgkgk2lspnkilb1adavla5a5j6";
+  IosevkaCurly = "0zq07z1nx6b52mxh9kqr880p9aw10whjs0qgwzlyyij7jnk4mx2l";
+  IosevkaCurlySlab = "0g6p9gpjqmdan81cv9rg2bppcdg7s8iiyn8whxqmxf0prbsyxcw6";
+  IosevkaEtoile = "1sh3d69m0p8glr8szjd1cyxzsi66qsbmasjlmkwc1fhbw9w5kb5c";
+  IosevkaSlab = "0sk90cq1zl4d0yjh0p78idjpi2hmr0hy4c4650xls9js0nzszjyj";
+  IosevkaSS01 = "10f63fkyfcr0mngjql69zsfmy2wffbdzxkacw5jwlcnnpw6lwrz2";
+  IosevkaSS02 = "0ydmp0mp5n6rh9s48pixrk41vdai3ys4q2wz60rpp8pl2sl7l58f";
+  IosevkaSS03 = "0k2k54jh2w1pf2hhdx5m1bkk4pj9p541ddnvkw8jxdc30ab9pg0x";
+  IosevkaSS04 = "12j2d7h1hp1m16m893rn79v56a13kvsz2vabp395fdhjswffpjly";
+  IosevkaSS05 = "1cvl4hg058675h9amvvjw2qkjk7fs9zs3prdqvllpch77fkznbv3";
+  IosevkaSS06 = "19cvfxrgqwyaan8xdyfrz1wsnr7cd43szcq0ijwsjxv0afvadp03";
+  IosevkaSS07 = "1kd3s41nqiihl2wf0944mw7x1gq7xa5jfgis0z23snb9p25gyzli";
+  IosevkaSS08 = "02yd5s4gvvl2xg68cznj00giqzngmdhmjz290q5d7kkzgzf8v6d4";
+  IosevkaSS09 = "13hd8f38b0882paqr4pw2wx6raqr9m5d9ndphs8fvyadhsh70xaf";
+  IosevkaSS10 = "1j0lbwvzqx0lmj3irf01aywqny94sidz8m06xl8vrljczhhz619w";
+  IosevkaSS11 = "19kndxn9lynx3ambah3gn63d8fdqq5p7i5yxjlsn7g0d5vgvaa9h";
+  IosevkaSS12 = "0jbsmsh6c2kzrn4kbkj4klc2pk1z54c1pf3c7y1vr8xyqkg43bjs";
+  IosevkaSS13 = "0jgf400xl1hnd78vi3vdvxmax415rq475v1shfrf0ms3hm0kbrp0";
+  IosevkaSS14 = "0acrv8frx88292iw55944mfp814iskafyknymiayxnpmmppn078g";
+  IosevkaSS15 = "18jzzd5jsb9yvv5gcybnn8gcp03x7rhl2z40d16ln9cx150336sx";
+  IosevkaSS16 = "0405qngdwkxxzyjxx9qy18p37jz1sc5f32ynaiiif0zg0c8bbsrb";
+  IosevkaSS17 = "0f8is0b4rvy8n2fnydc9f2g958y9xnrww44fhb28vglgwil6pvya";
+  IosevkaSS18 = "12hz34zfvdlw0dxni23j5knsxcrkvnpvankidkd0y500zisx4i46";
+  SGr-Iosevka = "1izcklbrm8f993vhdqvyiy9c33d7aykvj4vv2sqwvwid2mv0rvdn";
+  SGr-IosevkaCurly = "1r7cy3scf8gjp7hp3q80xf28d3px9vmsis8g0a8nr0vrg7wvc0p7";
+  SGr-IosevkaCurlySlab = "0ja6i81fnz8kvzlfasvm5gx5c7l2hkvl1qfdan9knj6p5390rp25";
+  SGr-IosevkaFixed = "1gcd6jms5z6pgclr8lgb0ip6z0y6vx9c79wvf0w7ixjcyafb1aq4";
+  SGr-IosevkaFixedCurly = "1q415xikr2ihrxl3xvpfj7ix1kn1sva089abpjf0yp76rjfx5v9x";
+  SGr-IosevkaFixedCurlySlab = "1cfii72ci508m7lrv701hsz5bzphjswdpcaccyhzkjqyjbajgvj4";
+  SGr-IosevkaFixedSlab = "128rcxi2zjaxcbi7a6w739lvxcbaw6ph8q6a1gy20pgapna1l9xf";
+  SGr-IosevkaFixedSS01 = "0pbv1x4mm7h43sz4r7rb0hkhsm6g7i4pkpi0lbnx2awiafzzlg3s";
+  SGr-IosevkaFixedSS02 = "11d0si4bmgvz3pl43qbpszj9h9x4g53r29359y2mi5rmw5jym01l";
+  SGr-IosevkaFixedSS03 = "1nmw3g30hm2rgy0lji0lbihi08iphy943pkrs5fl2c36yf9qxl0d";
+  SGr-IosevkaFixedSS04 = "18jhd61d4vrmq9ck3wass07ph8frxnq8knl0cdpgqx6izk3fk0ss";
+  SGr-IosevkaFixedSS05 = "0x9q7jvzsrs71frx662cb4872z9alc2y0r7cjaxpaifc420826z6";
+  SGr-IosevkaFixedSS06 = "17f9c4cwi46c5jlrj6r6xw6gwjq2cmkjm4832cyjw9fqh4kpb0ih";
+  SGr-IosevkaFixedSS07 = "1x3j7lp88zrxkmak3fnglin2sp450lmlyv92n56dz2a7gvw0nbs9";
+  SGr-IosevkaFixedSS08 = "03m7wmwlajhjw3ifhmxl4cxkjjfyldw0bbybhk4cdsw9qni0cbhi";
+  SGr-IosevkaFixedSS09 = "127466bq6m3k7is2jh45j9c3iik2ckgajhrkhgmhk3fr272ip00z";
+  SGr-IosevkaFixedSS10 = "1qczqa9lv0hlqjhh5n3j32ampflriwyhp7cvk8vraxp8w01f20vv";
+  SGr-IosevkaFixedSS11 = "0pm10asyl566l9s00hxb1r43yvhb24hqn3z5akirfxxp5klp9hf3";
+  SGr-IosevkaFixedSS12 = "0lsy3097aid17hqxljkxj9lpswxvlmk5gv047dh7m6m8vxm3dzcy";
+  SGr-IosevkaFixedSS13 = "1h5bv9c6yvbvfslx3wm5657f982f17pb2q8j2hl5c50114dbkdib";
+  SGr-IosevkaFixedSS14 = "1lglsqhcy22hf4zbczpwc7pkmyaglknqpkv9bgckphpzaqgmavln";
+  SGr-IosevkaFixedSS15 = "18hc5kfj4m57k8p90jc2fnr89ji6q34q6v3b1xkyb0lv9bagq2nl";
+  SGr-IosevkaFixedSS16 = "0k4nrdqnh6jg40q5xvkrm1jx0iplwybhxy8bn3q7k461d3rn9smv";
+  SGr-IosevkaFixedSS17 = "02higr5lxiyi6z8b916pkgch2dq0si7m7bf0vxb86daplgljbrna";
+  SGr-IosevkaFixedSS18 = "0b4ljypil31n0861k43k0dxrmj9djgy8qffwy5vv856lcrdipy8h";
+  SGr-IosevkaSlab = "18y0j05jjkdkavidrn2bpfd1319yzxp7m0zyhn08394d4m74m8w2";
+  SGr-IosevkaSS01 = "0k9l74q9lijhxq1slxxkq7wb71nsrdv2bkqsbdxxb5gypqjh136y";
+  SGr-IosevkaSS02 = "1gzjf6j6ljxnqi3xzcs1q1qzazyzw9d4az4l1nmsbkk5nfw3skbi";
+  SGr-IosevkaSS03 = "1d8ihwf8m47lvlyyar4wd2xqjn4g5qmy1pp81dd2p999j47fzz84";
+  SGr-IosevkaSS04 = "0dwhmlsv4x3z2xmnqwdciys0j22z25vcwqrb7wmy7c5sdhfkd4pn";
+  SGr-IosevkaSS05 = "02nid5vi8q71lcaxwllyaa7j2qdb8hycw5k3b9fiw9bvliip7bwl";
+  SGr-IosevkaSS06 = "1vx6nqv2m1f32xqgv6px2r0rr60rb8rns6f2y2dmnz1b55j4ap84";
+  SGr-IosevkaSS07 = "0rgk9z2mrz990szq1m5664x1jq3056df9warjpj0nnr0d3a8406q";
+  SGr-IosevkaSS08 = "1sv09fsd3xwwjdkiw93v7pvs3a1r7mbxqgyw73l4v8k5c8f16q14";
+  SGr-IosevkaSS09 = "1hrk9pn407f57bx6zjc9mxzr7286vz2llyrkn808q1dlvisp3gc9";
+  SGr-IosevkaSS10 = "1sk339gl5r004pd52daclk2zl5zybcfra2hdafvrmc81fkd2pz7b";
+  SGr-IosevkaSS11 = "0rp7488skw396qdw8lyv69fgkz3b5i5nbjzkbrlfjasp2sgyg1i9";
+  SGr-IosevkaSS12 = "04446s3bjdpvk25361n88xmcc3ylh9frabb11wgs79brm2i8qf57";
+  SGr-IosevkaSS13 = "1xsdp07272bmp6fj68ky40hs53lhsm9y9c6fpk2cqvm25mv5w7fn";
+  SGr-IosevkaSS14 = "1r3d7g4kqrj6zwpivzsjvhvv9q4gysb6a8s0m1fvaarsxhcrvkf1";
+  SGr-IosevkaSS15 = "0cy8jg4g95zxbcq8y6bksmjbfz5dbp3c7qv16z533n2b5fn5h912";
+  SGr-IosevkaSS16 = "05rs3hkv92h2s3p3v4v33jrfx5b6vk5v5d8kbwg989y8azzsj52m";
+  SGr-IosevkaSS17 = "1i28qsazi4q51x1rk9p6h6zvk6pbbm9g5fs567a5wwlhagjha2cd";
+  SGr-IosevkaSS18 = "0ghs5b6zg1jmibgypqwgnl8vpvzhj5c8di4izp5rgw8lzsi5n9yb";
+  SGr-IosevkaTerm = "1vxs9sxc8q54cg4ydln1zqqwj8rs7x87xn3yz7nhgswk2zdyfxnr";
+  SGr-IosevkaTermCurly = "1v4hwghycmlzi57m7qnp60v618x4wkqg3pbzpvm80v528lvrsrsh";
+  SGr-IosevkaTermCurlySlab = "0z2z117saryawik1xnklzn8schgy4q10yqax1ypl1sj0lq80b6dm";
+  SGr-IosevkaTermSlab = "04qbdia36haqisrm8z4waknpfvgrxb2cymjk6pwdqgk4jbfd6yh8";
+  SGr-IosevkaTermSS01 = "1y3ggssvk39kv4igli2q7qy35spj5vddngsn4izh089a4irr7462";
+  SGr-IosevkaTermSS02 = "06ddjjfj2h83ya4hw4yla6fzd3kpv3q6fnscx2aydxc4qjryqws7";
+  SGr-IosevkaTermSS03 = "03jjlllq4x9h6pkg67vfivvc3p0swawah94yi10ar1hbgaljqhn4";
+  SGr-IosevkaTermSS04 = "0n36y3pz660j0rv1zhyjrahcz87a65fw59s9x320aix502msaqn2";
+  SGr-IosevkaTermSS05 = "0h71560ln3my53giyw75mq9cynjnnj6dkvdd4anbkvyw2j133497";
+  SGr-IosevkaTermSS06 = "0fhmzjzxy8hjcdk3rjl9igykfmlgji7v5lyzm1p04fs4wa289bh6";
+  SGr-IosevkaTermSS07 = "0girzhdwgwsjqqrhz0bky81rrqj62hxgkqy3sklr1w55snhq9yb4";
+  SGr-IosevkaTermSS08 = "08rz3bjimxmn6xp4dqv9177bhyyqv10rdfxz697fkajq0wxvy4xc";
+  SGr-IosevkaTermSS09 = "095bzk8ir4zxmrikr48fbfhsdhhnrcwg3xrkvqxhqancgqj4rzsz";
+  SGr-IosevkaTermSS10 = "0kb3nhdy1pilhvdyfb3igaalf888qx55vhigvail05dnkp23iyaw";
+  SGr-IosevkaTermSS11 = "1sxihqvswi66pbjnixfv1f4gv08x6n28qfzyj03lzw1d7sz3m1gp";
+  SGr-IosevkaTermSS12 = "0w2sh563azjam2fcdbpxh466ddlc4h6vpc2xlawl78w5n63wsnys";
+  SGr-IosevkaTermSS13 = "00h1kq3a2kbippqcy49jiagh6zl01qb40489njdg1vpd6s04x50c";
+  SGr-IosevkaTermSS14 = "0k97x43appi5azlnghinwmyq13h5fqkj0p2rysnz28v5r6razikm";
+  SGr-IosevkaTermSS15 = "1ziqhmp9af9b0djm9mhh2yy5f85rwwk82xhwsd84y9bl3mwil5cr";
+  SGr-IosevkaTermSS16 = "00lyihlkv7h5pr2w74rb56kwzjqwh1kh7cp7dfzhwhwicy5bxc50";
+  SGr-IosevkaTermSS17 = "03zgm0qsw5p8i1567ghslgb3cqwxznc9rbwnx9xiwv4972lbad6w";
+  SGr-IosevkaTermSS18 = "1dmvvn1ny1bym8k32nvp2qzrzmy0qy4l6w1clfza4g6c23k6d4dd";
 }
diff --git a/third_party/nixpkgs/pkgs/data/fonts/last-resort/default.nix b/third_party/nixpkgs/pkgs/data/fonts/last-resort/default.nix
index 4ca0673605..10d820bf5f 100644
--- a/third_party/nixpkgs/pkgs/data/fonts/last-resort/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/data/fonts/luculent/default.nix b/third_party/nixpkgs/pkgs/data/fonts/luculent/default.nix
index 09d07a2a1d..e268f559df 100644
--- a/third_party/nixpkgs/pkgs/data/fonts/luculent/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/data/fonts/manrope/default.nix b/third_party/nixpkgs/pkgs/data/fonts/manrope/default.nix
index 90982efbc8..1bde4e8692 100644
--- a/third_party/nixpkgs/pkgs/data/fonts/manrope/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/data/fonts/meslo-lg/default.nix b/third_party/nixpkgs/pkgs/data/fonts/meslo-lg/default.nix
index 0712248dc5..e0dc649bc7 100644
--- a/third_party/nixpkgs/pkgs/data/fonts/meslo-lg/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/data/fonts/nanum-gothic-coding/default.nix b/third_party/nixpkgs/pkgs/data/fonts/nanum-gothic-coding/default.nix
index 74741f6a7d..f27f487bd6 100644
--- a/third_party/nixpkgs/pkgs/data/fonts/nanum-gothic-coding/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/data/fonts/national-park/default.nix b/third_party/nixpkgs/pkgs/data/fonts/national-park/default.nix
index 0a1e320f78..eab325af54 100644
--- a/third_party/nixpkgs/pkgs/data/fonts/national-park/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/data/fonts/public-sans/default.nix b/third_party/nixpkgs/pkgs/data/fonts/public-sans/default.nix
index 45a8540d08..7a8538c027 100644
--- a/third_party/nixpkgs/pkgs/data/fonts/public-sans/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/data/fonts/redhat-official/default.nix b/third_party/nixpkgs/pkgs/data/fonts/redhat-official/default.nix
index df0f867b7a..dcfe0c789b 100644
--- a/third_party/nixpkgs/pkgs/data/fonts/redhat-official/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/data/fonts/smiley-sans/default.nix b/third_party/nixpkgs/pkgs/data/fonts/smiley-sans/default.nix
index 7a863c3d10..d136695c8a 100644
--- a/third_party/nixpkgs/pkgs/data/fonts/smiley-sans/default.nix
+++ b/third_party/nixpkgs/pkgs/data/fonts/smiley-sans/default.nix
@@ -25,7 +25,7 @@ stdenvNoCC.mkDerivation rec {
     homepage = "https://atelier-anchor.com/typefaces/smiley-sans/";
     changelog = "https://github.com/atelier-anchor/smiley-sans/blob/main/CHANGELOG.md";
     license = licenses.ofl;
-    maintainers = [];
+    maintainers = [ ];
     platforms = platforms.all;
   };
 }
diff --git a/third_party/nixpkgs/pkgs/data/fonts/spleen/default.nix b/third_party/nixpkgs/pkgs/data/fonts/spleen/default.nix
index c5edbc5051..48b920a576 100644
--- a/third_party/nixpkgs/pkgs/data/fonts/spleen/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/data/fonts/sudo/default.nix b/third_party/nixpkgs/pkgs/data/fonts/sudo/default.nix
index a69c947ce4..49df566c18 100644
--- a/third_party/nixpkgs/pkgs/data/fonts/sudo/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/data/fonts/terminus-font-ttf/default.nix b/third_party/nixpkgs/pkgs/data/fonts/terminus-font-ttf/default.nix
index eb6d139b33..6591fa0d32 100644
--- a/third_party/nixpkgs/pkgs/data/fonts/terminus-font-ttf/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/data/fonts/tex-gyre/default.nix b/third_party/nixpkgs/pkgs/data/fonts/tex-gyre/default.nix
index c0ec9ee752..a93beaccb0 100644
--- a/third_party/nixpkgs/pkgs/data/fonts/tex-gyre/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/data/fonts/times-newer-roman/default.nix b/third_party/nixpkgs/pkgs/data/fonts/times-newer-roman/default.nix
index 6f856558cb..a12ba2cbe3 100644
--- a/third_party/nixpkgs/pkgs/data/fonts/times-newer-roman/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/data/icons/flat-remix-icon-theme/default.nix b/third_party/nixpkgs/pkgs/data/icons/flat-remix-icon-theme/default.nix
index 9907b18203..d8d36e6a8e 100644
--- a/third_party/nixpkgs/pkgs/data/icons/flat-remix-icon-theme/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/data/icons/phinger-cursors/default.nix b/third_party/nixpkgs/pkgs/data/icons/phinger-cursors/default.nix
index 8baec5add0..03ec5d53bc 100644
--- a/third_party/nixpkgs/pkgs/data/icons/phinger-cursors/default.nix
+++ b/third_party/nixpkgs/pkgs/data/icons/phinger-cursors/default.nix
@@ -2,11 +2,11 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "phinger-cursors";
-  version = "2.0";
+  version = "2.1";
 
   src = fetchurl {
     url = "https://github.com/phisch/phinger-cursors/releases/download/v${version}/phinger-cursors-variants.tar.bz2";
-    sha256 = "sha256-A12BGtc0+wDqeSGN4lbUe5G3Pv4IsQB4TkvWHnDU6bE=";
+    sha256 = "sha256-3bcxDGK/jg4nmKJPioZ+Svexejl1e6RcheE/OYj2Rvw=";
   };
 
   sourceRoot = ".";
diff --git a/third_party/nixpkgs/pkgs/data/icons/vanilla-dmz/default.nix b/third_party/nixpkgs/pkgs/data/icons/vanilla-dmz/default.nix
index bcfbc579da..23253eef72 100644
--- a/third_party/nixpkgs/pkgs/data/icons/vanilla-dmz/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/data/misc/cacert/default.nix b/third_party/nixpkgs/pkgs/data/misc/cacert/default.nix
index 7a332e8087..be45a9c464 100644
--- a/third_party/nixpkgs/pkgs/data/misc/cacert/default.nix
+++ b/third_party/nixpkgs/pkgs/data/misc/cacert/default.nix
@@ -20,7 +20,7 @@ let
   blocklist = writeText "cacert-blocklist.txt" (lib.concatStringsSep "\n" blacklist);
   extraCertificatesBundle = writeText "cacert-extra-certificates-bundle.crt" (lib.concatStringsSep "\n\n" extraCertificateStrings);
 
-  srcVersion = "3.101";
+  srcVersion = "3.101.1";
   version = if nssOverride != null then nssOverride.version else srcVersion;
   meta = with lib; {
     homepage = "https://curl.haxx.se/docs/caextract.html";
@@ -37,7 +37,7 @@ let
       owner = "nss-dev";
       repo = "nss";
       rev = "NSS_${lib.replaceStrings ["."] ["_"] version}_RTM";
-      hash = "sha256-lO+81zYBBFwqcjh4cd/fpiznHZ9rTJpfDW/yF8phYts=";
+      hash = "sha256-KcRiOUbdFnH618MFM6uxmRn+/Jn4QMHtv1BELXrCAX4=";
     };
 
     dontBuild = true;
diff --git a/third_party/nixpkgs/pkgs/data/misc/clash-geoip/default.nix b/third_party/nixpkgs/pkgs/data/misc/clash-geoip/default.nix
index 005f44edec..a477984c52 100644
--- a/third_party/nixpkgs/pkgs/data/misc/clash-geoip/default.nix
+++ b/third_party/nixpkgs/pkgs/data/misc/clash-geoip/default.nix
@@ -26,7 +26,7 @@ stdenvNoCC.mkDerivation rec {
     description = "GeoLite2 data created by MaxMind";
     homepage = "https://github.com/Dreamacro/maxmind-geoip";
     license = licenses.unfree;
-    maintainers = [];
+    maintainers = [ ];
     platforms = platforms.all;
   };
 }
diff --git a/third_party/nixpkgs/pkgs/data/misc/dns-root-data/default.nix b/third_party/nixpkgs/pkgs/data/misc/dns-root-data/default.nix
index 1c6121473c..4d07bce350 100644
--- a/third_party/nixpkgs/pkgs/data/misc/dns-root-data/default.nix
+++ b/third_party/nixpkgs/pkgs/data/misc/dns-root-data/default.nix
@@ -20,7 +20,7 @@ in
 
 stdenv.mkDerivation {
   pname = "dns-root-data";
-  version = "2023-11-27";
+  version = "2024-06-20";
 
   buildCommand = ''
     mkdir $out
diff --git a/third_party/nixpkgs/pkgs/data/misc/dns-root-data/root.ds b/third_party/nixpkgs/pkgs/data/misc/dns-root-data/root.ds
index e292b5a7bf..3009e81f27 100644
--- a/third_party/nixpkgs/pkgs/data/misc/dns-root-data/root.ds
+++ b/third_party/nixpkgs/pkgs/data/misc/dns-root-data/root.ds
@@ -1 +1,2 @@
 . IN DS 20326 8 2 E06D44B80B8F1D39A95C0B0D7C65D08458E880409BBC683457104237C7F8EC8D
+. IN DS 38696 8 2 683D2D0ACB8C9B712A1948B27F741219298D0A450D612C483AF444A4C0FB2B16
diff --git a/third_party/nixpkgs/pkgs/data/misc/fedora-backgrounds/generic.nix b/third_party/nixpkgs/pkgs/data/misc/fedora-backgrounds/generic.nix
index 954328c8d4..716fe1d060 100644
--- a/third_party/nixpkgs/pkgs/data/misc/fedora-backgrounds/generic.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/data/misc/mailcap/default.nix b/third_party/nixpkgs/pkgs/data/misc/mailcap/default.nix
index 06c8047e1c..b3560ecc50 100644
--- a/third_party/nixpkgs/pkgs/data/misc/mailcap/default.nix
+++ b/third_party/nixpkgs/pkgs/data/misc/mailcap/default.nix
@@ -1,12 +1,23 @@
-{ lib, stdenv, fetchurl }:
+{ lib
+, stdenv
+, fetchurl
+
+# updater
+, git
+, coreutils
+, gawk
+, gnused
+, writeScript
+, nix-update
+}:
 
 stdenv.mkDerivation rec {
   pname = "mailcap";
-  version = "2.1.53";
+  version = "2.1.54";
 
   src = fetchurl {
     url = "https://releases.pagure.org/mailcap/mailcap-${version}.tar.xz";
-    sha256 = "sha256-Xuou8XswSXe6PsuHr61DGfoEQPgl5Pb7puj6L/64h4U=";
+    hash = "sha256-mkAyIC/A0rCFj0GxZzianP5SrCTsKC5kebkHZTGd4RM=";
   };
 
   installPhase = ''
@@ -22,6 +33,17 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
+  passthru.updateScript = writeScript "update-mailcap" ''
+    export PATH=${lib.makeBinPath [ git coreutils gawk gnused nix-update ]}:$PATH
+    VERSION="$(git ls-remote --tags --sort="v:refname" https://pagure.io/mailcap.git | \
+      awk '{ print $2 }' | \
+      grep "refs/tags/r" | \
+      sed -E -e "s,refs/tags/r(.*)$,\1," -e "s/-/./g" | \
+      sort --version-sort --reverse | \
+      head -n1)"
+    exec nix-update --version "$VERSION" "$@"
+  '';
+
   meta = with lib; {
     description = "Helper application and MIME type associations for file types";
     homepage = "https://pagure.io/mailcap";
diff --git a/third_party/nixpkgs/pkgs/data/misc/nixos-artwork/icons.nix b/third_party/nixpkgs/pkgs/data/misc/nixos-artwork/icons.nix
index 75c7075bae..89af4e552e 100644
--- a/third_party/nixpkgs/pkgs/data/misc/nixos-artwork/icons.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/data/soundfonts/generaluser/default.nix b/third_party/nixpkgs/pkgs/data/soundfonts/generaluser/default.nix
index f8dd40cd88..446fa606c1 100644
--- a/third_party/nixpkgs/pkgs/data/soundfonts/generaluser/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/data/soundfonts/ydp-grand/default.nix b/third_party/nixpkgs/pkgs/data/soundfonts/ydp-grand/default.nix
index 34f3542541..79453cfbb4 100644
--- a/third_party/nixpkgs/pkgs/data/soundfonts/ydp-grand/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/data/themes/adementary/default.nix b/third_party/nixpkgs/pkgs/data/themes/adementary/default.nix
index fb3431cc13..4b47f6c2d3 100644
--- a/third_party/nixpkgs/pkgs/data/themes/adementary/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/data/themes/adwaita-qt/default.nix b/third_party/nixpkgs/pkgs/data/themes/adwaita-qt/default.nix
index 5e2f5e2592..7a7f151c38 100644
--- a/third_party/nixpkgs/pkgs/data/themes/adwaita-qt/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/data/themes/alacritty-theme/default.nix b/third_party/nixpkgs/pkgs/data/themes/alacritty-theme/default.nix
index 1fbacb6545..2a866b9e8b 100644
--- a/third_party/nixpkgs/pkgs/data/themes/alacritty-theme/default.nix
+++ b/third_party/nixpkgs/pkgs/data/themes/alacritty-theme/default.nix
@@ -6,13 +6,13 @@
 
 stdenvNoCC.mkDerivation (self: {
   pname = "alacritty-theme";
-  version = "0-unstable-2024-07-16";
+  version = "0-unstable-2024-07-25";
 
   src = fetchFromGitHub {
     owner = "alacritty";
     repo = "alacritty-theme";
-    rev = "cafca9764653f0bd536073a0f882227f04ddc256";
-    hash = "sha256-2MZOZ1nVu9lSBAuvCgebtWjX5uoEqMqd8jcEjOfTTMM=";
+    rev = "bcc5ec1bdecb4a799a6bc8ad3a5b206b3058d6df";
+    hash = "sha256-IRAUY/59InKYLRfMYI78wSKC6+KI/7aOtOhQNUqdjOA=";
   };
 
   dontConfigure = true;
diff --git a/third_party/nixpkgs/pkgs/data/themes/gtk-theme-framework/default.nix b/third_party/nixpkgs/pkgs/data/themes/gtk-theme-framework/default.nix
index d596580d67..9d71e18f03 100644
--- a/third_party/nixpkgs/pkgs/data/themes/gtk-theme-framework/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/data/themes/kde2/default.nix b/third_party/nixpkgs/pkgs/data/themes/kde2/default.nix
index 1404a6ca86..9c883b5134 100644
--- a/third_party/nixpkgs/pkgs/data/themes/kde2/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/data/themes/nixos-bgrt-plymouth/default.nix b/third_party/nixpkgs/pkgs/data/themes/nixos-bgrt-plymouth/default.nix
index be8cb6439a..3a0246247e 100644
--- a/third_party/nixpkgs/pkgs/data/themes/nixos-bgrt-plymouth/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/data/themes/pop-gtk/default.nix b/third_party/nixpkgs/pkgs/data/themes/pop-gtk/default.nix
index de2b92be05..dd4c0281fa 100644
--- a/third_party/nixpkgs/pkgs/data/themes/pop-gtk/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/data/themes/qogir-kde/default.nix b/third_party/nixpkgs/pkgs/data/themes/qogir-kde/default.nix
index 635548c887..8e60dd9094 100644
--- a/third_party/nixpkgs/pkgs/data/themes/qogir-kde/default.nix
+++ b/third_party/nixpkgs/pkgs/data/themes/qogir-kde/default.nix
@@ -9,13 +9,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "qogir-kde";
-  version = "0-unstable-2024-06-28";
+  version = "0-unstable-2024-07-29";
 
   src = fetchFromGitHub {
     owner = "vinceliuice";
     repo = pname;
-    rev = "5224dbdeed76c5ed4b7b5ff6d0b48ebe82547228";
-    hash = "sha256-qS0bVfweSXv2Sox3cXQ8PfcPD+WA6kwrEoS0ijxWZE8=";
+    rev = "5a19a4b4006b7486af12a5f051ca5377104cab1b";
+    hash = "sha256-DHV2iVEYxGY9+21TF9YLEH0OoDWVTvcCJytb7k+nS8M=";
   };
 
   # Propagate sddm theme dependencies to user env otherwise sddm does
diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/apps/deepin-draw/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/apps/deepin-draw/default.nix
index 980c7b3d19..35de0414b4 100644
--- a/third_party/nixpkgs/pkgs/desktops/deepin/apps/deepin-draw/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/desktops/deepin/apps/deepin-screen-recorder/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/apps/deepin-screen-recorder/default.nix
index c035a21717..3b775fb8bc 100644
--- a/third_party/nixpkgs/pkgs/desktops/deepin/apps/deepin-screen-recorder/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/desktops/deepin/apps/deepin-terminal/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/apps/deepin-terminal/default.nix
index b911f74f53..92cbb0eaf7 100644
--- a/third_party/nixpkgs/pkgs/desktops/deepin/apps/deepin-terminal/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/deepin/apps/deepin-terminal/default.nix
@@ -19,13 +19,13 @@
 
 stdenv.mkDerivation rec {
   pname = "deepin-terminal";
-  version = "6.0.12";
+  version = "6.0.13";
 
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
     rev = version;
-    hash = "sha256-VAF6Dn9cGmipQhAKhEOLd7lJyYWySOJ+rehc9L8pfL0=";
+    hash = "sha256-7+NJyqOp+9CHqdpBKx91RQNk1Z8vMQQqZcyKC5RSDjg=";
   };
 
   cmakeFlags = [ "-DVERSION=${version}" ];
diff --git a/third_party/nixpkgs/pkgs/desktops/deepin/artwork/deepin-icon-theme/default.nix b/third_party/nixpkgs/pkgs/desktops/deepin/artwork/deepin-icon-theme/default.nix
index 59d82477b1..0795b194ab 100644
--- a/third_party/nixpkgs/pkgs/desktops/deepin/artwork/deepin-icon-theme/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/deepin/artwork/deepin-icon-theme/default.nix
@@ -8,13 +8,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "deepin-icon-theme";
-  version = "2024.04.16";
+  version = "2024.07.19";
 
   src = fetchFromGitHub {
     owner = "linuxdeepin";
     repo = pname;
     rev = version;
-    hash = "sha256-IUiKGHsFGJawWnwfckS8ZeB2WOxDyDlre4oekJuCKcc=";
+    hash = "sha256-eUL0V9pGYzvAdVZpnrWXDO/YeCBETCOGvcMqDTwTgoU=";
   };
 
   makeFlags = [ "PREFIX=${placeholder "out"}" ];
diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-2/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-2/default.nix
index 76cb60f9f5..3f8d7c6340 100644
--- a/third_party/nixpkgs/pkgs/desktops/gnome-2/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/gnome-2/default.nix
@@ -23,16 +23,6 @@ lib.makeScope pkgs.newScope (self: with self; {
 
   gnome_mime_data = callPackage ./platform/gnome-mime-data { };
 
-  gnome_vfs = callPackage ./platform/gnome-vfs { };
-
-  libgnome = callPackage ./platform/libgnome { };
-
-  libgnomeui = callPackage ./platform/libgnomeui { };
-
-  libbonobo = callPackage ./platform/libbonobo { };
-
-  libbonoboui = callPackage ./platform/libbonoboui { };
-
   gtkglext = callPackage ./platform/gtkglext { };
 
 #### DESKTOP
@@ -65,13 +55,18 @@ lib.makeScope pkgs.newScope (self: with self; {
   gnome_common = gnome-common;
   gnome_python = throw "gnome2.gnome_python has been removed"; # 2023-01-14
   gnome_python_desktop = throw "gnome2.gnome_python_desktop has been removed"; # 2023-01-14
+  gnome_vfs = throw "gnome2.gnome_vfs has been removed"; # 2024-06-27
   gtkhtml = throw "gnome2.gtkhtml has been removed"; # 2023-01-15
   gtkhtml4 = throw "gnome2.gtkhtml4 has been removed"; # 2023-01-15
+  libbonobo = throw "gnome2.libbonobo has been removed"; # 2024-06-27
+  libbonoboui = throw "gnome2.libbonoboui has been removed"; # 2024-06-27
   libglademm = throw "gnome2.libglademm has been removed"; # 2022-01-15
   libgnomecanvasmm = "gnome2.libgnomecanvasmm has been removed"; # 2022-01-15
   libgnomecups = throw "gnome2.libgnomecups has been removed"; # 2023-01-15
   libgnomeprint = throw "gnome2.libgnomeprint has been removed"; # 2023-01-15
   libgnomeprintui = throw "gnome2.libgnomeprintui has been removed"; # 2023-01-15
+  libgnome = throw "gnome2.libgnome has been removed"; # 2024-06-27
+  libgnomeui = throw "gnome2.libgnomeui has been removed"; # 2024-06-27
   libgtkhtml = throw "gnome2.libgtkhtml has been removed"; # 2023-01-15
   python_rsvg = throw "gnome2.python_rsvg has been removed"; # 2023-01-14
 })
diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix
deleted file mode 100644
index 7ce615fb3c..0000000000
--- a/third_party/nixpkgs/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-{ lib, stdenv, fetchurl, fetchpatch, pkg-config, libxml2, bzip2, openssl, dbus-glib
-, glib, gamin, cdparanoia, intltool, GConf, gnome_mime_data, avahi, acl
-, testers
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "gnome-vfs";
-  version = "2.24.4";
-
-  src = let
-    inherit (finalAttrs) pname version;
-  in fetchurl {
-    url = "mirror://gnome/sources/gnome-vfs/${lib.versions.majorMinor version}/${pname}-${version}.tar.bz2";
-    sha256 = "1ajg8jb8k3snxc7rrgczlh8daxkjidmcv3zr9w809sq4p2sn9pk2";
-  };
-
-  outputs = [ "out" "dev" ];
-
-  nativeBuildInputs = [ intltool pkg-config ];
-  buildInputs =
-    [ libxml2 bzip2 openssl dbus-glib gamin cdparanoia
-      gnome_mime_data avahi acl
-    ];
-
-  propagatedBuildInputs = [ GConf glib ];
-
-  # struct SSL is opaque in openssl-1.1; and the SSL_free() man page
-  # says that one should not free members of it manually (in both
-  # the openssl-1.0 and openssl-1.1 man pages).
-  # https://bugs.gentoo.org/592540
-  patches = [ (fetchpatch {
-                name = "gnome-vfs-2.24.4-openssl-1.1.patch";
-                url = "https://bugs.gentoo.org/attachment.cgi?id=535944";
-                sha256 = "1q4icapvmwmd5rjah7rr0bqazzk5cg36znmjlpra20n9y27nz040";
-                extraPrefix = "";
-              })
-            ];
-
-  postPatch = "find . -name Makefile.in | xargs sed 's/-DG_DISABLE_DEPRECATED//g' -i ";
-
-  doCheck = false; # needs dbus daemon
-
-  passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-
-  meta = {
-    pkgConfigModules = [ "gnome-vfs-2.0" "gnome-vfs-module-2.0" ];
-  };
-})
diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-2/platform/libbonobo/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-2/platform/libbonobo/default.nix
deleted file mode 100644
index e928052a47..0000000000
--- a/third_party/nixpkgs/pkgs/desktops/gnome-2/platform/libbonobo/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ lib, stdenv, fetchurl, flex, bison, pkg-config, glib, libxml2, popt
-, intltool, ORBit2, procps }:
-
-stdenv.mkDerivation rec {
-  pname = "libbonobo";
-  version = "2.32.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/libbonobo/${lib.versions.majorMinor version}/libbonobo-${version}.tar.bz2";
-    sha256 = "0swp4kk6x7hy1rvd1f9jba31lvfc6qvafkvbpg9h0r34fzrd8q4i";
-  };
-
-  outputs = [ "out" "dev" ];
-
-  preConfigure = # still using stuff deprecated in new glib versions
-    "sed 's/-DG_DISABLE_DEPRECATED//g' -i configure activation-server/Makefile.in";
-
-  nativeBuildInputs = [ flex bison pkg-config intltool procps ];
-  buildInputs = [ libxml2 ];
-  propagatedBuildInputs = [ popt glib ORBit2 ];
-}
diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-2/platform/libbonoboui/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-2/platform/libbonoboui/default.nix
deleted file mode 100644
index 36ab293f5f..0000000000
--- a/third_party/nixpkgs/pkgs/desktops/gnome-2/platform/libbonoboui/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ lib, stdenv, fetchurl, bison, pkg-config, popt, libxml2, gtk2, libtool
-, intltool, libbonobo, GConf, libgnomecanvas, libgnome, libglade }:
-
-stdenv.mkDerivation rec {
-  pname = "libbonoboui";
-  version = "2.24.5";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/libbonoboui/${lib.versions.majorMinor version}/libbonoboui-${version}.tar.bz2";
-    sha256 = "1kbgqh7bw0fdx4f1a1aqwpff7gp5mwhbaz60c6c98bc4djng5dgs";
-  };
-
-  outputs = [ "out" "dev" ];
-
-  nativeBuildInputs = [ pkg-config intltool ];
-  buildInputs = [ bison popt gtk2 libxml2 GConf libglade libtool ];
-  propagatedBuildInputs = [ libbonobo libgnomecanvas libgnome ];
-}
diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-2/platform/libgnome/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-2/platform/libgnome/default.nix
deleted file mode 100644
index c265b2ea69..0000000000
--- a/third_party/nixpkgs/pkgs/desktops/gnome-2/platform/libgnome/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ lib, stdenv, fetchurl, pkg-config, glib, popt, zlib, libcanberra-gtk2
-, intltool, libbonobo, GConf, gnome_vfs, libtool, libogg
-}:
-
-stdenv.mkDerivation rec {
-  pname = "libgnome";
-  version = "2.32.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/libgnome/${lib.versions.majorMinor version}/libgnome-${version}.tar.bz2";
-    sha256 = "197pnq8y0knqjhm2fg4j6hbqqm3qfzfnd0irhwxpk1b4hqb3kimj";
-  };
-
-  patches = [ ./new-glib.patch ];
-  /* There's a comment containing an invalid utf-8 sequence, breaking glib-mkenums. */
-  postPatch = "sed '/returns the true filename/d' -i libgnome/gnome-config.h";
-
-  outputs = [ "out" "dev" ];
-
-  nativeBuildInputs = [ pkg-config intltool ];
-  buildInputs = [ popt zlib GConf gnome_vfs libcanberra-gtk2 libtool ];
-  propagatedBuildInputs = [ glib libbonobo libogg ];
-  meta.mainProgram = "gnome-open";
-}
diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-2/platform/libgnome/new-glib.patch b/third_party/nixpkgs/pkgs/desktops/gnome-2/platform/libgnome/new-glib.patch
deleted file mode 100644
index ceabfbdd15..0000000000
--- a/third_party/nixpkgs/pkgs/desktops/gnome-2/platform/libgnome/new-glib.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-Porting libgnome to newer glib:
- * remove g_thread_init and g_thread_supported, which are longer needed
-   https://developer.gnome.org/glib/2.36/glib-Deprecated-Thread-APIs.html#g-thread-init
- * replace GStaticRecMutex by GRecMutex
-   https://developer.gnome.org/glib/2.36/glib-Deprecated-Thread-APIs.html#GStaticRecMutex
-
-diff --git a/libgnome/gnome-i18n.c b/libgnome/gnome-i18n.c
-index 531c56c..f13d61e 100644
---- a/libgnome/gnome-i18n.c
-+++ b/libgnome/gnome-i18n.c
-@@ -55,12 +55,14 @@
- const GList *
- gnome_i18n_get_language_list (const gchar *ignored)
- {
--  static GStaticRecMutex lang_list_lock = G_STATIC_REC_MUTEX_INIT;
-+  static GRecMutex lang_list_lock;
-+  g_rec_mutex_init (&lang_list_lock);
-+
-   static GList *list = NULL;
-   const char * const* langs;
-   int i;
- 
--  g_static_rec_mutex_lock (&lang_list_lock);
-+  g_rec_mutex_lock (&lang_list_lock);
- 
-   if (list == NULL) {
-     langs = g_get_language_names ();
-@@ -71,7 +73,7 @@ gnome_i18n_get_language_list (const gchar *ignored)
-     list = g_list_reverse (list);
-   }
- 
--  g_static_rec_mutex_unlock (&lang_list_lock);
-+  g_rec_mutex_unlock (&lang_list_lock);
- 
-   return list;
- }
-diff --git a/libgnome/gnome-init.c b/libgnome/gnome-init.c
-index fe3efd4..c6619af 100644
---- a/libgnome/gnome-init.c
-+++ b/libgnome/gnome-init.c
-@@ -115,9 +115,6 @@ gnome_bonobo_module_info_get (void)
- static void
- bonobo_activation_pre_args_parse (GnomeProgram *program, GnomeModuleInfo *mod_info)
- {
--        if (!g_thread_supported ())
--		g_thread_init (NULL);
--
- 	if (!bonobo_activation_is_initialized ())
- 		bonobo_activation_preinit (program, mod_info);
- }
-diff --git a/libgnome/gnome-program.c b/libgnome/gnome-program.c
-index 739765e..cd14999 100644
---- a/libgnome/gnome-program.c
-+++ b/libgnome/gnome-program.c
-@@ -1878,10 +1878,6 @@ gnome_program_init (const char *app_id, const char *app_version,
-     GnomeProgram *program;
-     va_list args;
- 
--    /* g_thread_init() has to be the first GLib function called ever */
--    if (!g_threads_got_initialized)
--        g_thread_init (NULL);
--
-     g_type_init ();
- 
-     va_start(args, first_property_name);
diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix
deleted file mode 100644
index 29ed44431c..0000000000
--- a/third_party/nixpkgs/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ lib, stdenv, fetchurl, fetchpatch, pkg-config, libxml2, xorg, glib, pango
-, intltool, libgnome, libgnomecanvas, libbonoboui, GConf, libtool
-, gnome_vfs, libgnome-keyring, libglade }:
-
-stdenv.mkDerivation rec {
-  pname = "libgnomeui";
-  version = "2.24.5";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/libgnomeui/${lib.versions.majorMinor version}/libgnomeui-${version}.tar.bz2";
-    sha256 = "03rwbli76crkjl6gp422wrc9lqpl174k56cp9i96b7l8jlj2yddf";
-  };
-
-  outputs = [ "out" "dev" ];
-
-  patches = [
-    (fetchpatch {
-      name = "0001-gnome-scores.h-Convert-to-UTF-8.patch";
-      url = "https://gitlab.gnome.org/Archive/libgnomeui/-/commit/30334c28794ef85d8973f4ed0779b5ceed6594f2.diff";
-      sha256 = "1sn8j8dkam14wfkpw8nga3gk63wniff243mzv3jp0fvv52q8sqhk";
-    })
-  ];
-
-  nativeBuildInputs = [ pkg-config intltool ];
-  buildInputs =
-    [ xorg.libX11 xorg.libSM xorg.libICE libxml2 GConf pango glib libgnome-keyring libglade libtool ];
-
-  propagatedBuildInputs = [ libgnome libbonoboui libgnomecanvas gnome_vfs ];
-}
diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/extensions/pidgin-im-integration/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/pidgin-im-integration/default.nix
index 92e0bfe94d..200ca9a63e 100644
--- a/third_party/nixpkgs/pkgs/desktops/gnome/extensions/pidgin-im-integration/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/desktops/gnome/extensions/sound-output-device-chooser/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/sound-output-device-chooser/default.nix
index 4ec00ee9f1..f3026744ea 100644
--- a/third_party/nixpkgs/pkgs/desktops/gnome/extensions/sound-output-device-chooser/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/desktops/gnome/extensions/systemd-manager/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/systemd-manager/default.nix
index 0b8e52af80..a11186dc0d 100644
--- a/third_party/nixpkgs/pkgs/desktops/gnome/extensions/systemd-manager/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/systemd-manager/default.nix
@@ -18,7 +18,7 @@ assert lib.elem allowPolkitPolicy [
 
 stdenvNoCC.mkDerivation rec {
   pname = "gnome-shell-extension-systemd-manager";
-  version = "16";
+  version = "17";
 
   # Upstream doesn't post new versions in extensions.gnome.org anymore, see also:
   # https://github.com/hardpixel/systemd-manager/issues/19
@@ -26,7 +26,7 @@ stdenvNoCC.mkDerivation rec {
     owner = "hardpixel";
     repo = "systemd-manager";
     rev = "v${version}";
-    hash = "sha256-JecSIRj582jJWdrCQYBWFRkIhosxRhD3BxSAy8/0nVw=";
+    hash = "sha256-3cKjjKXc7lLG7PB8+8ExTRmC23uPRONUI3eEx+jTUVA=";
   };
 
   nativeBuildInputs = [ glib ];
diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/extensions/valent/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/valent/default.nix
index 1aa4799cd8..87fa3accc7 100644
--- a/third_party/nixpkgs/pkgs/desktops/gnome/extensions/valent/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/desktops/gnome/extensions/window-corner-preview/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/extensions/window-corner-preview/default.nix
index 1ac4589b35..48d80545ec 100644
--- a/third_party/nixpkgs/pkgs/desktops/gnome/extensions/window-corner-preview/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/desktops/gnustep/libobjc2/default.nix b/third_party/nixpkgs/pkgs/desktops/gnustep/libobjc2/default.nix
index 2e487fddf4..ce83250fe6 100644
--- a/third_party/nixpkgs/pkgs/desktops/gnustep/libobjc2/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/gnustep/libobjc2/default.nix
@@ -2,21 +2,23 @@
 , stdenv
 , fetchFromGitHub
 , cmake
+, robin-map
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libobjc2";
-  version = "2.1";
+  version = "2.2.1";
 
   src = fetchFromGitHub {
     owner = "gnustep";
     repo = "libobjc2";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-iDOVEDnTAfg9r3/kdHp7hzX2oIjO1ovaqgrlIV7V68M=";
+    hash = "sha256-+NP214bbisk7dCFAHaxnhNOfC/0bZLp8Dd2A9F2vK+s=";
     fetchSubmodules = true;
   };
 
   nativeBuildInputs = [ cmake ];
+  buildInputs = [ robin-map ];
 
   cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" ];
 
diff --git a/third_party/nixpkgs/pkgs/desktops/lomiri/applications/lomiri-system-settings/default.nix b/third_party/nixpkgs/pkgs/desktops/lomiri/applications/lomiri-system-settings/default.nix
index 3025e86f6a..6179fc5a59 100644
--- a/third_party/nixpkgs/pkgs/desktops/lomiri/applications/lomiri-system-settings/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/lomiri/applications/lomiri-system-settings/default.nix
@@ -127,6 +127,7 @@ stdenv.mkDerivation (finalAttrs: {
     glib # glib-compile-schemas
     intltool
     pkg-config
+    qtdeclarative
     validatePkgConfig
   ];
 
diff --git a/third_party/nixpkgs/pkgs/desktops/lomiri/applications/lomiri-system-settings/plugins/lomiri-system-settings-security-privacy.nix b/third_party/nixpkgs/pkgs/desktops/lomiri/applications/lomiri-system-settings/plugins/lomiri-system-settings-security-privacy.nix
index 29a10f12a8..981ad79f86 100644
--- a/third_party/nixpkgs/pkgs/desktops/lomiri/applications/lomiri-system-settings/plugins/lomiri-system-settings-security-privacy.nix
+++ b/third_party/nixpkgs/pkgs/desktops/lomiri/applications/lomiri-system-settings/plugins/lomiri-system-settings-security-privacy.nix
@@ -41,6 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
     cmake
     pkg-config
     python3
+    qtdeclarative
   ];
 
   buildInputs = [
diff --git a/third_party/nixpkgs/pkgs/desktops/lomiri/applications/lomiri/default.nix b/third_party/nixpkgs/pkgs/desktops/lomiri/applications/lomiri/default.nix
index 8d6b3884ad..e34eaf265b 100644
--- a/third_party/nixpkgs/pkgs/desktops/lomiri/applications/lomiri/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/lomiri/applications/lomiri/default.nix
@@ -155,8 +155,6 @@ stdenv.mkDerivation (finalAttrs: {
     patchShebangs tests/whitespace/check_whitespace.py
   '';
 
-  strictDeps = true;
-
   nativeBuildInputs = [
     cmake
     glib # populates GSETTINGS_SCHEMAS_PATH
diff --git a/third_party/nixpkgs/pkgs/desktops/lomiri/data/lomiri-session/default.nix b/third_party/nixpkgs/pkgs/desktops/lomiri/data/lomiri-session/default.nix
index 351aed9de8..3a9d4fb5a1 100644
--- a/third_party/nixpkgs/pkgs/desktops/lomiri/data/lomiri-session/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/lomiri/data/lomiri-session/default.nix
@@ -150,8 +150,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
       --replace-fail '/usr/libexec/Xwayland.lomiri' '${lib.getBin lomiri}/libexec/Xwayland.lomiri'
   '';
 
-  strictDeps = true;
-
   nativeBuildInputs = [
     cmake
     makeWrapper
diff --git a/third_party/nixpkgs/pkgs/desktops/lomiri/development/lomiri-api/default.nix b/third_party/nixpkgs/pkgs/desktops/lomiri/development/lomiri-api/default.nix
index 9f699bbd71..491b95d22a 100644
--- a/third_party/nixpkgs/pkgs/desktops/lomiri/development/lomiri-api/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/lomiri/development/lomiri-api/default.nix
@@ -60,6 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
     doxygen
     graphviz
     pkg-config
+    qtdeclarative
   ];
 
   buildInputs = [
diff --git a/third_party/nixpkgs/pkgs/desktops/lomiri/development/lomiri-app-launch/default.nix b/third_party/nixpkgs/pkgs/desktops/lomiri/development/lomiri-app-launch/default.nix
index ea44e6babb..ab19623356 100644
--- a/third_party/nixpkgs/pkgs/desktops/lomiri/development/lomiri-app-launch/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/lomiri/development/lomiri-app-launch/default.nix
@@ -76,6 +76,7 @@ stdenv.mkDerivation (finalAttrs: {
     cmake
     dpkg # for setting LOMIRI_APP_LAUNCH_ARCH
     gobject-introspection
+    lttng-ust
     pkg-config
     validatePkgConfig
   ] ++ lib.optionals withDocumentation [
diff --git a/third_party/nixpkgs/pkgs/desktops/lomiri/development/qtmir/default.nix b/third_party/nixpkgs/pkgs/desktops/lomiri/development/qtmir/default.nix
index 88ac0b69de..4cc4f3bb1f 100644
--- a/third_party/nixpkgs/pkgs/desktops/lomiri/development/qtmir/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/lomiri/development/qtmir/default.nix
@@ -96,6 +96,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     cmake
     glib # glib-compile-schemas
+    lttng-ust
     pkg-config
     validatePkgConfig
     wrapQtAppsHook
diff --git a/third_party/nixpkgs/pkgs/desktops/lomiri/qml/lomiri-action-api/default.nix b/third_party/nixpkgs/pkgs/desktops/lomiri/qml/lomiri-action-api/default.nix
index d3d23c68f8..35eccd8971 100644
--- a/third_party/nixpkgs/pkgs/desktops/lomiri/qml/lomiri-action-api/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/lomiri/qml/lomiri-action-api/default.nix
@@ -39,6 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     cmake
     pkg-config
+    qtdeclarative
     validatePkgConfig
   ];
 
diff --git a/third_party/nixpkgs/pkgs/desktops/lomiri/qml/lomiri-settings-components/default.nix b/third_party/nixpkgs/pkgs/desktops/lomiri/qml/lomiri-settings-components/default.nix
index 854615512d..8da32d4b15 100644
--- a/third_party/nixpkgs/pkgs/desktops/lomiri/qml/lomiri-settings-components/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/lomiri/qml/lomiri-settings-components/default.nix
@@ -36,6 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     cmake
     pkg-config
+    qtdeclarative
   ];
 
   buildInputs = [
diff --git a/third_party/nixpkgs/pkgs/desktops/lomiri/services/hfd-service/default.nix b/third_party/nixpkgs/pkgs/desktops/lomiri/services/hfd-service/default.nix
index cdffee5eda..ff5f34abc2 100644
--- a/third_party/nixpkgs/pkgs/desktops/lomiri/services/hfd-service/default.nix
+++ b/third_party/nixpkgs/pkgs/desktops/lomiri/services/hfd-service/default.nix
@@ -45,6 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     cmake
     pkg-config
+    qtdeclarative
   ];
 
   buildInputs = [
diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/dynamic-workspaces.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/dynamic-workspaces.nix
index 2e9864cb1d..10133b9bf3 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/dynamic-workspaces.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/parachute.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/parachute.nix
index c50a21f202..63ed7a86fe 100644
--- a/third_party/nixpkgs/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/parachute.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/desktops/surf-display/default.nix b/third_party/nixpkgs/pkgs/desktops/surf-display/default.nix
index 8e06e36db4..1c68d6cf00 100644
--- a/third_party/nixpkgs/pkgs/desktops/surf-display/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py b/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py
deleted file mode 100755
index 5ff56b2bd2..0000000000
--- a/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/generate-sources.py
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/usr/bin/env nix-shell
-#!nix-shell --pure -i python3 -p "python3.withPackages (ps: with ps; [ requests ])"
-
-import json
-import re
-import requests
-import sys
-
-# openjdk15 is only for bootstrapping openjdk
-releases = ("openjdk8", "openjdk11", "openjdk13", "openjdk14", "openjdk15", "openjdk16", "openjdk17")
-oses = ("mac", "linux", "alpine_linux")
-types = ("jre", "jdk")
-impls = ("hotspot", "openj9")
-
-arch_to_nixos = {
-    "x64": ("x86_64",),
-    "aarch64": ("aarch64",),
-    "arm": ("armv6l", "armv7l"),
-    "ppc64le": ("powerpc64le",),
-}
-
-def get_sha256(url):
-    resp = requests.get(url)
-    if resp.status_code != 200:
-        print("error: could not fetch checksum from url {}: code {}".format(url, resp.status_code), file=sys.stderr)
-        sys.exit(1)
-    return resp.text.strip().split(" ")[0]
-
-def generate_sources(release, assets):
-    out = {}
-    for asset in assets:
-        if asset["os"] not in oses: continue
-        if asset["binary_type"] not in types: continue
-        if asset["openjdk_impl"] not in impls: continue
-        if asset["heap_size"] != "normal": continue
-        if asset["architecture"] not in arch_to_nixos: continue
-
-        # examples: 11.0.1+13, 8.0.222+10
-        version, build = asset["version_data"]["semver"].split("+")
-
-        type_map = out.setdefault(asset["os"], {})
-        impl_map = type_map.setdefault(asset["binary_type"], {})
-        arch_map = impl_map.setdefault(asset["openjdk_impl"], {
-            "packageType": asset["binary_type"],
-            "vmType": asset["openjdk_impl"],
-        })
-
-        for nixos_arch in arch_to_nixos[asset["architecture"]]:
-            arch_map[nixos_arch] = {
-                "url": asset["binary_link"],
-                "sha256": get_sha256(asset["checksum_link"]),
-                "version": version,
-                "build": build,
-            }
-
-    return out
-
-out = {}
-for release in releases:
-    resp = requests.get("https://api.adoptopenjdk.net/v2/latestAssets/releases/" + release)
-    if resp.status_code != 200:
-        print("error: could not fetch data for release {} (code {})".format(release, resp.code), file=sys.stderr)
-        sys.exit(1)
-    out[release] = generate_sources(release, resp.json())
-
-with open("sources.json", "w") as f:
-    json.dump(out, f, indent=2, sort_keys=True)
-    f.write('\n')
diff --git a/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix b/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix
deleted file mode 100644
index 68d33b657c..0000000000
--- a/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk-darwin-base.nix
+++ /dev/null
@@ -1,66 +0,0 @@
-{ sourcePerArch, knownVulnerabilities ? [] }:
-
-{ swingSupport ? true # not used for now
-, lib, stdenv
-, fetchurl
-, setJavaClassPath
-}:
-
-assert (stdenv.isDarwin && stdenv.isx86_64);
-
-let cpuName = stdenv.hostPlatform.parsed.cpu.name;
-    result = stdenv.mkDerivation {
-  pname = if sourcePerArch.packageType == "jdk"
-    then "adoptopenjdk-${sourcePerArch.vmType}-bin"
-    else "adoptopenjdk-${sourcePerArch.packageType}-${sourcePerArch.vmType}-bin";
-  version = sourcePerArch.${cpuName}.version or (throw "unsupported CPU ${cpuName}");
-
-  src = fetchurl {
-    inherit (sourcePerArch.${cpuName}) url sha256;
-  };
-
-  # See: https://github.com/NixOS/patchelf/issues/10
-  dontStrip = 1;
-
-  installPhase = ''
-    cd ..
-
-    mv $sourceRoot $out
-
-    # jni.h expects jni_md.h to be in the header search path.
-    ln -s $out/Contents/Home/include/darwin/*_md.h $out/Contents/Home/include/
-
-    rm -rf $out/Home/demo
-
-    # Remove some broken manpages.
-    rm -rf $out/Home/man/ja*
-
-    ln -s $out/Contents/Home/* $out/
-
-    # Propagate the setJavaClassPath setup hook from the JDK so that
-    # any package that depends on the JDK has $CLASSPATH set up
-    # properly.
-    mkdir -p $out/nix-support
-    printWords ${setJavaClassPath} > $out/nix-support/propagated-build-inputs
-
-    # Set JAVA_HOME automatically.
-    cat <<EOF >> $out/nix-support/setup-hook
-    if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi
-    EOF
-  '';
-
-  # FIXME: use multiple outputs or return actual JRE package
-  passthru.jre = result;
-
-  passthru.home = result;
-
-  meta = with lib; {
-    license = licenses.gpl2Classpath;
-    description = "AdoptOpenJDK, prebuilt OpenJDK binary";
-    platforms = [ "x86_64-darwin" ]; # some inherit jre.meta.platforms
-    maintainers = with lib.maintainers; [ taku0 ];
-    inherit knownVulnerabilities;
-    mainProgram = "java";
-  };
-
-}; in result
diff --git a/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix b/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix
deleted file mode 100644
index 712efc2f6e..0000000000
--- a/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk-linux-base.nix
+++ /dev/null
@@ -1,123 +0,0 @@
-{ sourcePerArch, knownVulnerabilities ? [] }:
-
-{ stdenv
-, lib
-, fetchurl
-, autoPatchelfHook
-, makeWrapper
-, setJavaClassPath
-# minimum dependencies
-, alsa-lib
-, fontconfig
-, freetype
-, libffi
-, xorg
-, zlib
-# runtime dependencies
-, cups
-# runtime dependencies for GTK+ Look and Feel
-, gtkSupport ? true
-, cairo
-, glib
-, gtk3
-}:
-
-let
-  cpuName = stdenv.hostPlatform.parsed.cpu.name;
-  runtimeDependencies = [
-    cups
-  ] ++ lib.optionals gtkSupport [
-    cairo glib gtk3
-  ];
-  runtimeLibraryPath = lib.makeLibraryPath runtimeDependencies;
-in
-
-let result = stdenv.mkDerivation rec {
-  pname = if sourcePerArch.packageType == "jdk"
-    then "adoptopenjdk-${sourcePerArch.vmType}-bin"
-    else "adoptopenjdk-${sourcePerArch.packageType}-${sourcePerArch.vmType}-bin";
-
-  version = sourcePerArch.${cpuName}.version or (throw "unsupported CPU ${cpuName}");
-
-  src = fetchurl {
-    inherit (sourcePerArch.${cpuName}) url sha256;
-  };
-
-  buildInputs = [
-    alsa-lib # libasound.so wanted by lib/libjsound.so
-    fontconfig
-    freetype
-    stdenv.cc.cc.lib # libstdc++.so.6
-    xorg.libX11
-    xorg.libXext
-    xorg.libXi
-    xorg.libXrender
-    xorg.libXtst
-    zlib
-  ] ++ lib.optional stdenv.isAarch32 libffi;
-
-  nativeBuildInputs = [ autoPatchelfHook makeWrapper ];
-
-  # See: https://github.com/NixOS/patchelf/issues/10
-  dontStrip = 1;
-
-  installPhase = ''
-    cd ..
-
-    mv $sourceRoot $out
-
-    # jni.h expects jni_md.h to be in the header search path.
-    ln -s $out/include/linux/*_md.h $out/include/
-
-    rm -rf $out/demo
-
-    # Remove some broken manpages.
-    rm -rf $out/man/ja*
-
-    # Remove embedded freetype to avoid problems like
-    # https://github.com/NixOS/nixpkgs/issues/57733
-    find "$out" -name 'libfreetype.so*' -delete
-
-    # Propagate the setJavaClassPath setup hook from the JDK so that
-    # any package that depends on the JDK has $CLASSPATH set up
-    # properly.
-    mkdir -p $out/nix-support
-    printWords ${setJavaClassPath} > $out/nix-support/propagated-build-inputs
-
-    # Set JAVA_HOME automatically.
-    cat <<EOF >> "$out/nix-support/setup-hook"
-    if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi
-    EOF
-
-    # We cannot use -exec since wrapProgram is a function but not a command.
-    #
-    # jspawnhelper is executed from JVM, so it doesn't need to wrap it, and it
-    # breaks building OpenJDK (#114495).
-    for bin in $( find "$out" -executable -type f -not -name jspawnhelper ); do
-      if patchelf --print-interpreter "$bin" &> /dev/null; then
-        wrapProgram "$bin" --prefix LD_LIBRARY_PATH : "${runtimeLibraryPath}"
-      fi
-    done
-  '';
-
-  preFixup = ''
-    find "$out" -name libfontmanager.so -exec \
-      patchelf --add-needed libfontconfig.so {} \;
-  '';
-
-  # FIXME: use multiple outputs or return actual JRE package
-  passthru.jre = result;
-
-  passthru.home = result;
-
-  meta = with lib; {
-    license = licenses.gpl2Classpath;
-    sourceProvenance = with sourceTypes; [ binaryNativeCode binaryBytecode ];
-    description = "AdoptOpenJDK, prebuilt OpenJDK binary";
-    platforms = lib.mapAttrsToList (arch: _: arch + "-linux") sourcePerArch; # some inherit jre.meta.platforms
-    maintainers = with lib.maintainers; [ taku0 ];
-    inherit knownVulnerabilities;
-    mainProgram = "java";
-  };
-
-}; in result
diff --git a/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix b/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix
deleted file mode 100644
index f4f5108df4..0000000000
--- a/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk11-darwin.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ lib }:
-
-let
-  sources = import ./sources.nix;
-in
-{
-  jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk11.mac.jdk.hotspot; };
-  jre-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk11.mac.jre.hotspot; };
-  jdk-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk11.mac.jdk.openj9; };
-  jre-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk11.mac.jre.openj9; };
-}
diff --git a/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk11-linux.nix b/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk11-linux.nix
deleted file mode 100644
index 6d5b1b036e..0000000000
--- a/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk11-linux.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ stdenv, lib }:
-
-let
-  variant = if stdenv.hostPlatform.isMusl then "alpine_linux" else "linux";
-  sources = import ./sources.nix;
-in
-{
-  jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk11.${variant}.jdk.hotspot; };
-  jre-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk11.${variant}.jre.hotspot; };
-  jdk-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk11.${variant}.jdk.openj9; };
-  jre-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk11.${variant}.jre.openj9; };
-}
diff --git a/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk13-darwin.nix b/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk13-darwin.nix
deleted file mode 100644
index 87beaf8dda..0000000000
--- a/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk13-darwin.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ lib }:
-
-let
-  sources = import ./sources.nix;
-in
-{
-  jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk13.mac.jdk.hotspot; knownVulnerabilities = ["Support ended"]; };
-  jre-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk13.mac.jre.hotspot; knownVulnerabilities = ["Support ended"]; };
-  jdk-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk13.mac.jdk.openj9; knownVulnerabilities = ["Support ended"]; };
-  jre-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk13.mac.jre.openj9; knownVulnerabilities = ["Support ended"]; };
-}
diff --git a/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk13-linux.nix b/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk13-linux.nix
deleted file mode 100644
index e6c0002014..0000000000
--- a/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk13-linux.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ stdenv, lib }:
-
-let
-  variant = if stdenv.hostPlatform.isMusl then "alpine_linux" else "linux";
-  sources = import ./sources.nix;
-in
-{
-  jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk13.${variant}.jdk.hotspot; knownVulnerabilities = ["Support ended"]; };
-  jre-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk13.${variant}.jre.hotspot; knownVulnerabilities = ["Support ended"]; };
-  jdk-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk13.${variant}.jdk.openj9; knownVulnerabilities = ["Support ended"]; };
-  jre-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk13.${variant}.jre.openj9; knownVulnerabilities = ["Support ended"]; };
-}
diff --git a/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk14-darwin.nix b/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk14-darwin.nix
deleted file mode 100644
index a4d5b1fc43..0000000000
--- a/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk14-darwin.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ lib }:
-
-let
-  sources = import ./sources.nix;
-in
-{
-  jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk14.mac.jdk.hotspot; knownVulnerabilities = ["Support ended"]; };
-  jre-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk14.mac.jre.hotspot; knownVulnerabilities = ["Support ended"]; };
-  jdk-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk14.mac.jdk.openj9; knownVulnerabilities = ["Support ended"]; };
-  jre-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk14.mac.jre.openj9; knownVulnerabilities = ["Support ended"]; };
-}
diff --git a/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk14-linux.nix b/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk14-linux.nix
deleted file mode 100644
index 4d357969f0..0000000000
--- a/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk14-linux.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ stdenv, lib }:
-
-let
-  variant = if stdenv.hostPlatform.isMusl then "alpine_linux" else "linux";
-  sources = import ./sources.nix;
-in
-{
-  jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk14.${variant}.jdk.hotspot; knownVulnerabilities = ["Support ended"]; };
-  jre-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk14.${variant}.jre.hotspot; knownVulnerabilities = ["Support ended"]; };
-  jdk-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk14.${variant}.jdk.openj9; knownVulnerabilities = ["Support ended"]; };
-  jre-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk14.${variant}.jre.openj9; knownVulnerabilities = ["Support ended"]; };
-}
diff --git a/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk15-darwin.nix b/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk15-darwin.nix
deleted file mode 100644
index 422e5f21e9..0000000000
--- a/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk15-darwin.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ lib }:
-
-let
-  sources = import ./sources.nix;
-in
-{
-  jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk15.mac.jdk.hotspot; knownVulnerabilities = [ "Support ended" ]; };
-  jre-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk15.mac.jre.hotspot; knownVulnerabilities = [ "Support ended" ]; };
-  jdk-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk15.mac.jdk.openj9; knownVulnerabilities = [ "Support ended" ]; };
-  jre-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk15.mac.jre.openj9; knownVulnerabilities = [ "Support ended" ]; };
-}
diff --git a/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk15-linux.nix b/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk15-linux.nix
deleted file mode 100644
index 47bd2a5c9f..0000000000
--- a/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk15-linux.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ stdenv, lib }:
-
-let
-  variant = if stdenv.hostPlatform.isMusl then "alpine_linux" else "linux";
-  sources = import ./sources.nix;
-in
-{
-  jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk15.${variant}.jdk.hotspot; knownVulnerabilities = [ "Support ended" ]; };
-  jre-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk15.${variant}.jre.hotspot; knownVulnerabilities = [ "Support ended" ]; };
-  jdk-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk15.${variant}.jdk.openj9; knownVulnerabilities = [ "Support ended" ]; };
-  jre-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk15.${variant}.jre.openj9; knownVulnerabilities = [ "Support ended" ]; };
-}
diff --git a/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk16-darwin.nix b/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk16-darwin.nix
deleted file mode 100644
index 4eef76cb63..0000000000
--- a/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk16-darwin.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ lib }:
-
-let
-  sources = import ./sources.nix;
-in
-{
-  jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk16.mac.jdk.hotspot; knownVulnerabilities = [ "Support ended" ]; };
-  jre-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk16.mac.jre.hotspot; knownVulnerabilities = [ "Support ended" ]; };
-  jdk-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk16.mac.jdk.openj9; knownVulnerabilities = [ "Support ended" ]; };
-  jre-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk16.mac.jre.openj9; knownVulnerabilities = [ "Support ended" ]; };
-}
diff --git a/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk16-linux.nix b/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk16-linux.nix
deleted file mode 100644
index 873e0ce354..0000000000
--- a/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk16-linux.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ stdenv, lib }:
-
-let
-  variant = if stdenv.hostPlatform.isMusl then "alpine_linux" else "linux";
-  sources = import ./sources.nix;
-in
-{
-  jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk16.${variant}.jdk.hotspot; knownVulnerabilities = [ "Support ended" ]; };
-  jre-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk16.${variant}.jre.hotspot; knownVulnerabilities = [ "Support ended" ]; };
-  jdk-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk16.${variant}.jdk.openj9; knownVulnerabilities = [ "Support ended" ]; };
-  jre-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk16.${variant}.jre.openj9; knownVulnerabilities = [ "Support ended" ]; };
-}
diff --git a/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk17-darwin.nix b/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk17-darwin.nix
deleted file mode 100644
index b79b399022..0000000000
--- a/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk17-darwin.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ lib }:
-
-let
-  sources = import ./sources.nix;
-in
-{
-  jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk17.mac.jdk.hotspot; };
-  jre-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk17.mac.jre.hotspot; };
-}
diff --git a/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk17-linux.nix b/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk17-linux.nix
deleted file mode 100644
index b8bb1cbf2b..0000000000
--- a/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk17-linux.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ stdenv, lib }:
-
-let
-  variant = if stdenv.hostPlatform.isMusl then "alpine_linux" else "linux";
-  sources = import ./sources.nix;
-in
-{
-  jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk17.${variant}.jdk.hotspot; };
-  jre-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk17.${variant}.jre.hotspot; };
-}
diff --git a/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk8-darwin.nix b/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk8-darwin.nix
deleted file mode 100644
index 56028d7f25..0000000000
--- a/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk8-darwin.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ lib }:
-
-let
-  sources = import ./sources.nix;
-in
-{
-  jdk-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk8.mac.jdk.hotspot; };
-  jre-hotspot = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk8.mac.jre.hotspot; };
-  jdk-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk8.mac.jdk.openj9; };
-  jre-openj9 = import ./jdk-darwin-base.nix { sourcePerArch = sources.openjdk8.mac.jre.openj9; };
-}
diff --git a/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk8-linux.nix b/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk8-linux.nix
deleted file mode 100644
index ee8226f690..0000000000
--- a/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/jdk8-linux.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ stdenv, lib }:
-
-let
-  variant = if stdenv.hostPlatform.isMusl then "alpine_linux" else "linux";
-  sources = import ./sources.nix;
-in
-{
-  jdk-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk8.${variant}.jdk.hotspot; };
-  jre-hotspot = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk8.${variant}.jre.hotspot; };
-  jdk-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk8.${variant}.jdk.openj9; };
-  jre-openj9 = import ./jdk-linux-base.nix { sourcePerArch = sources.openjdk8.${variant}.jre.openj9; };
-}
diff --git a/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/sources.json b/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/sources.json
deleted file mode 100644
index 18b8e683bc..0000000000
--- a/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/sources.json
+++ /dev/null
@@ -1,1192 +0,0 @@
-{
-  "openjdk11": {
-    "alpine_linux": {
-      "jdk": {
-        "hotspot": {
-          "packageType": "jdk",
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "7",
-            "sha256": "45f56d75da2f55b29e7307cc790958e379abbe6b5f160a3824dc26e320c718e5",
-            "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jdk_x64_alpine-linux_hotspot_11.0.19_7.tar.gz",
-            "version": "11.0.19"
-          }
-        }
-      },
-      "jre": {
-        "hotspot": {
-          "packageType": "jre",
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "7",
-            "sha256": "b5d71cdf3032040e7d2a577712bf525e32e87686af3430219308a39878b98851",
-            "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jre_x64_alpine-linux_hotspot_11.0.19_7.tar.gz",
-            "version": "11.0.19"
-          }
-        }
-      }
-    },
-    "linux": {
-      "jdk": {
-        "hotspot": {
-          "aarch64": {
-            "build": "7",
-            "sha256": "0c7763a19b4af4ef5fbae831781b5184e988d6f131d264482399eeaf51b6e254",
-            "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jdk_aarch64_linux_hotspot_11.0.19_7.tar.gz",
-            "version": "11.0.19"
-          },
-          "armv6l": {
-            "build": "7",
-            "sha256": "be07af349f0d2e1ffb7e01e1e8bac8bffd76e22f6cc1354e5b627222e3395f41",
-            "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jdk_arm_linux_hotspot_11.0.19_7.tar.gz",
-            "version": "11.0.19"
-          },
-          "armv7l": {
-            "build": "7",
-            "sha256": "be07af349f0d2e1ffb7e01e1e8bac8bffd76e22f6cc1354e5b627222e3395f41",
-            "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jdk_arm_linux_hotspot_11.0.19_7.tar.gz",
-            "version": "11.0.19"
-          },
-          "packageType": "jdk",
-          "powerpc64le": {
-            "build": "7",
-            "sha256": "1e3704c8e155f8f894953c2a6708a52e6f449bbf5a85450be6fbb2ec76581700",
-            "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jdk_ppc64le_linux_hotspot_11.0.19_7.tar.gz",
-            "version": "11.0.19"
-          },
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "7",
-            "sha256": "5f19fb28aea3e28fcc402b73ce72f62b602992d48769502effe81c52ca39a581",
-            "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jdk_x64_linux_hotspot_11.0.19_7.tar.gz",
-            "version": "11.0.19"
-          }
-        },
-        "openj9": {
-          "aarch64": {
-            "build": "9",
-            "sha256": "31242e10bb826679aae3ed303be17ad3ef3c2551afbbd19f031ada87dd73258f",
-            "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jdk_aarch64_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz",
-            "version": "11.0.11-ea"
-          },
-          "packageType": "jdk",
-          "powerpc64le": {
-            "build": "9",
-            "sha256": "691f2b252b5be5e36079177d56ff7b516e3058277f0ba852a16a9a0cd9668224",
-            "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jdk_ppc64le_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz",
-            "version": "11.0.11"
-          },
-          "vmType": "openj9",
-          "x86_64": {
-            "build": "9",
-            "sha256": "a605ab06f76533d44ce0828bd96836cc9c0e71ec3df3f8672052ea98dcbcca22",
-            "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jdk_x64_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz",
-            "version": "11.0.11"
-          }
-        }
-      },
-      "jre": {
-        "hotspot": {
-          "aarch64": {
-            "build": "7",
-            "sha256": "1fe4b20d808f393422610818711c728331992a4455eeeb061d3d05b45412771d",
-            "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jre_aarch64_linux_hotspot_11.0.19_7.tar.gz",
-            "version": "11.0.19"
-          },
-          "armv6l": {
-            "build": "7",
-            "sha256": "cb754b055177381f9f6852b7e5469904a15edddd7f8e136043c28b1e33aee47c",
-            "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jre_arm_linux_hotspot_11.0.19_7.tar.gz",
-            "version": "11.0.19"
-          },
-          "armv7l": {
-            "build": "7",
-            "sha256": "cb754b055177381f9f6852b7e5469904a15edddd7f8e136043c28b1e33aee47c",
-            "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jre_arm_linux_hotspot_11.0.19_7.tar.gz",
-            "version": "11.0.19"
-          },
-          "packageType": "jre",
-          "powerpc64le": {
-            "build": "7",
-            "sha256": "8019d938e5525938ec8e68e2989c4413263b0d9b7b3f20fe0c45f6d967919cfb",
-            "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jre_ppc64le_linux_hotspot_11.0.19_7.tar.gz",
-            "version": "11.0.19"
-          },
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "7",
-            "sha256": "32dcf760664f93531594b72ce9226e9216567de5705a23c9ff5a77c797948054",
-            "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jre_x64_linux_hotspot_11.0.19_7.tar.gz",
-            "version": "11.0.19"
-          }
-        },
-        "openj9": {
-          "aarch64": {
-            "build": "9",
-            "sha256": "434219d233bdb8f1bee024b1ca5accfc3f1f832320b5221ded715eed101e705f",
-            "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jre_aarch64_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz",
-            "version": "11.0.11-ea"
-          },
-          "packageType": "jre",
-          "powerpc64le": {
-            "build": "9",
-            "sha256": "f11ae15da7f2809caeeca70a7cf3b9e7f943848869f498f1b73efc10ef7170f0",
-            "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jre_ppc64le_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz",
-            "version": "11.0.11"
-          },
-          "vmType": "openj9",
-          "x86_64": {
-            "build": "9",
-            "sha256": "152bf992d965ed018e9e1c3c2eb2c1771f92e0b6485b9a1f2c6d84d282117715",
-            "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jre_x64_linux_openj9_11.0.11_9_openj9-0.26.0.tar.gz",
-            "version": "11.0.11"
-          }
-        }
-      }
-    },
-    "mac": {
-      "jdk": {
-        "hotspot": {
-          "aarch64": {
-            "build": "7",
-            "sha256": "f3b416ecccf51f45cc8c986975eb7bd35e7e1ad953656ab0a807125963fcf73b",
-            "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jdk_aarch64_mac_hotspot_11.0.19_7.tar.gz",
-            "version": "11.0.19"
-          },
-          "packageType": "jdk",
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "7",
-            "sha256": "fc34c4f0e590071dcd65a0f93540913466ccac3aa8caa984826713b67afb696d",
-            "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jdk_x64_mac_hotspot_11.0.19_7.tar.gz",
-            "version": "11.0.19"
-          }
-        },
-        "openj9": {
-          "packageType": "jdk",
-          "vmType": "openj9",
-          "x86_64": {
-            "build": "9",
-            "sha256": "797cee6b9f6e18bcc026ee9dcebbce81d62ca897038402d247630b25d41efe15",
-            "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jdk_x64_mac_openj9_11.0.11_9_openj9-0.26.0.tar.gz",
-            "version": "11.0.11"
-          }
-        }
-      },
-      "jre": {
-        "hotspot": {
-          "aarch64": {
-            "build": "7",
-            "sha256": "78a07bd60c278f65bafd0df93890d909ff60259ccbd22ad71a1c3b312906508e",
-            "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jre_aarch64_mac_hotspot_11.0.19_7.tar.gz",
-            "version": "11.0.19"
-          },
-          "packageType": "jre",
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "7",
-            "sha256": "87e439b2193e1a2cf1a8782168bba83b558f54e2708f88ea8296184ea2735c89",
-            "url": "https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.19%2B7/OpenJDK11U-jre_x64_mac_hotspot_11.0.19_7.tar.gz",
-            "version": "11.0.19"
-          }
-        },
-        "openj9": {
-          "packageType": "jre",
-          "vmType": "openj9",
-          "x86_64": {
-            "build": "9",
-            "sha256": "80a0c03f0b603d6008e29c651f884878743fcaa90fc05aef15f3411749da94e7",
-            "url": "https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.11%2B9_openj9-0.26.0/OpenJDK11U-jre_x64_mac_openj9_11.0.11_9_openj9-0.26.0.tar.gz",
-            "version": "11.0.11"
-          }
-        }
-      }
-    }
-  },
-  "openjdk13": {
-    "linux": {
-      "jdk": {
-        "hotspot": {
-          "aarch64": {
-            "build": "8.1",
-            "sha256": "0e6081cb51f8a6f3062bef4f4c45dbe1fccfd3f3b4b5d52522a3edb76581e3af",
-            "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jdk_aarch64_linux_hotspot_13.0.2_8.tar.gz",
-            "version": "13.0.2"
-          },
-          "armv6l": {
-            "build": "8.1",
-            "sha256": "9beec080f2b2a7f6883b024272f4e8d5a0b027325e83647be318215781af1d1a",
-            "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jdk_arm_linux_hotspot_13.0.2_8.tar.gz",
-            "version": "13.0.2"
-          },
-          "armv7l": {
-            "build": "8.1",
-            "sha256": "9beec080f2b2a7f6883b024272f4e8d5a0b027325e83647be318215781af1d1a",
-            "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jdk_arm_linux_hotspot_13.0.2_8.tar.gz",
-            "version": "13.0.2"
-          },
-          "packageType": "jdk",
-          "powerpc64le": {
-            "build": "8.1",
-            "sha256": "fb3362e34aac091a4682394d20dcdc3daea51995d369d62c28424573e0fc04aa",
-            "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jdk_ppc64le_linux_hotspot_13.0.2_8.tar.gz",
-            "version": "13.0.2"
-          },
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "8.1",
-            "sha256": "9ccc063569f19899fd08e41466f8c4cd4e05058abdb5178fa374cb365dcf5998",
-            "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jdk_x64_linux_hotspot_13.0.2_8.tar.gz",
-            "version": "13.0.2"
-          }
-        },
-        "openj9": {
-          "packageType": "jdk",
-          "powerpc64le": {
-            "build": "8.1",
-            "sha256": "f71513e525172dfef695b7c27b25e151f232e05b2281648c2b794650c4970832",
-            "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8_openj9-0.18.0/OpenJDK13U-jdk_ppc64le_linux_openj9_13.0.2_8_openj9-0.18.0.tar.gz",
-            "version": "13.0.2"
-          },
-          "vmType": "openj9",
-          "x86_64": {
-            "build": "8.1",
-            "sha256": "aeecf6d30d0c847db81d07793cf97e5dc44890c29366d7d9f8f9f397f6c52590",
-            "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8_openj9-0.18.0/OpenJDK13U-jdk_x64_linux_openj9_13.0.2_8_openj9-0.18.0.tar.gz",
-            "version": "13.0.2"
-          }
-        }
-      },
-      "jre": {
-        "hotspot": {
-          "aarch64": {
-            "build": "8.1",
-            "sha256": "6c4b69d1609f4c65c576c80d6aa101de80048f8ce5566f890e8fff5349228bae",
-            "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jre_aarch64_linux_hotspot_13.0.2_8.tar.gz",
-            "version": "13.0.2"
-          },
-          "packageType": "jre",
-          "powerpc64le": {
-            "build": "8.1",
-            "sha256": "43d6fb71bdf7b6ad9295087c46dfc9b00bf26db1b5cdcff0c418cbe43b49904a",
-            "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jre_ppc64le_linux_hotspot_13.0.2_8.tar.gz",
-            "version": "13.0.2"
-          },
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "8.1",
-            "sha256": "897f16fe8e056395209e35d2384013bd1ff250e717465769079e3f4793628c34",
-            "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jre_x64_linux_hotspot_13.0.2_8.tar.gz",
-            "version": "13.0.2"
-          }
-        },
-        "openj9": {
-          "packageType": "jre",
-          "powerpc64le": {
-            "build": "8.1",
-            "sha256": "7bf8dc4c3b95e87b154f7bc2f9388a6539413fe76d49b362bba878217ccb7ed7",
-            "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8_openj9-0.18.0/OpenJDK13U-jre_ppc64le_linux_openj9_13.0.2_8_openj9-0.18.0.tar.gz",
-            "version": "13.0.2"
-          },
-          "vmType": "openj9",
-          "x86_64": {
-            "build": "8.1",
-            "sha256": "a0ab38607811e282f64082edc68a2dea3fa6a5113391efb124a6d7d02883110a",
-            "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8_openj9-0.18.0/OpenJDK13U-jre_x64_linux_openj9_13.0.2_8_openj9-0.18.0.tar.gz",
-            "version": "13.0.2"
-          }
-        }
-      }
-    },
-    "mac": {
-      "jdk": {
-        "hotspot": {
-          "packageType": "jdk",
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "8.1",
-            "sha256": "0ddb24efdf5aab541898d19b7667b149a1a64a8bd039b708fc58ee0284fa7e07",
-            "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jdk_x64_mac_hotspot_13.0.2_8.tar.gz",
-            "version": "13.0.2"
-          }
-        },
-        "openj9": {
-          "packageType": "jdk",
-          "vmType": "openj9",
-          "x86_64": {
-            "build": "8.1",
-            "sha256": "dd8d92eec98a3455ec5cd065a0a6672cc1aef280c6a68c507c372ccc1d98fbaa",
-            "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8_openj9-0.18.0/OpenJDK13U-jdk_x64_mac_openj9_13.0.2_8_openj9-0.18.0.tar.gz",
-            "version": "13.0.2"
-          }
-        }
-      },
-      "jre": {
-        "hotspot": {
-          "packageType": "jre",
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "8.1",
-            "sha256": "3149b9ebf0db1eaf2dc152df9efae82003e7971efb1cf550060e6a4798fe8c5c",
-            "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8/OpenJDK13U-jre_x64_mac_hotspot_13.0.2_8.tar.gz",
-            "version": "13.0.2"
-          }
-        },
-        "openj9": {
-          "packageType": "jre",
-          "vmType": "openj9",
-          "x86_64": {
-            "build": "8.1",
-            "sha256": "6a8a636fca4c7e368241e232a37cd73c9867cdec8f0869fd158b1f58c6128cc2",
-            "url": "https://github.com/AdoptOpenJDK/openjdk13-binaries/releases/download/jdk-13.0.2%2B8_openj9-0.18.0/OpenJDK13U-jre_x64_mac_openj9_13.0.2_8_openj9-0.18.0.tar.gz",
-            "version": "13.0.2"
-          }
-        }
-      }
-    }
-  },
-  "openjdk14": {
-    "linux": {
-      "jdk": {
-        "hotspot": {
-          "aarch64": {
-            "build": "12",
-            "sha256": "ee87e9f03b1fbe6f328429b78fe1a9f44900026d220c90dfd747fe0bcd62d904",
-            "url": "https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.2%2B12/OpenJDK14U-jdk_aarch64_linux_hotspot_14.0.2_12.tar.gz",
-            "version": "14.0.2"
-          },
-          "armv6l": {
-            "build": "12",
-            "sha256": "65f193496c6977ba7aed1563edc4b5be091b5ff03e3d790074bb4e389a034b36",
-            "url": "https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.2%2B12/OpenJDK14U-jdk_arm_linux_hotspot_14.0.2_12.tar.gz",
-            "version": "14.0.2"
-          },
-          "armv7l": {
-            "build": "12",
-            "sha256": "65f193496c6977ba7aed1563edc4b5be091b5ff03e3d790074bb4e389a034b36",
-            "url": "https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.2%2B12/OpenJDK14U-jdk_arm_linux_hotspot_14.0.2_12.tar.gz",
-            "version": "14.0.2"
-          },
-          "packageType": "jdk",
-          "powerpc64le": {
-            "build": "12",
-            "sha256": "465a3b8e931896b8d95e452d479615c4bf543535c05b6ea246323ae114e67d7d",
-            "url": "https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.2%2B12/OpenJDK14U-jdk_ppc64le_linux_hotspot_14.0.2_12.tar.gz",
-            "version": "14.0.2"
-          },
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "12",
-            "sha256": "7d5ee7e06909b8a99c0d029f512f67b092597aa5b0e78c109bd59405bbfa74fe",
-            "url": "https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.2%2B12/OpenJDK14U-jdk_x64_linux_hotspot_14.0.2_12.tar.gz",
-            "version": "14.0.2"
-          }
-        },
-        "openj9": {
-          "packageType": "jdk",
-          "powerpc64le": {
-            "build": "12",
-            "sha256": "177fd161ae14df92203d70cd618559daf889ec0c172d6ee615859352f68a2371",
-            "url": "https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.2%2B12_openj9-0.21.0/OpenJDK14U-jdk_ppc64le_linux_openj9_14.0.2_12_openj9-0.21.0.tar.gz",
-            "version": "14.0.2"
-          },
-          "vmType": "openj9",
-          "x86_64": {
-            "build": "12",
-            "sha256": "306f7138cdb65daaf2596ec36cafbde72088144c83b2e964f0193662e6caf3be",
-            "url": "https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.2%2B12_openj9-0.21.0/OpenJDK14U-jdk_x64_linux_openj9_14.0.2_12_openj9-0.21.0.tar.gz",
-            "version": "14.0.2"
-          }
-        }
-      },
-      "jre": {
-        "hotspot": {
-          "aarch64": {
-            "build": "12",
-            "sha256": "2b749ceead19d68dd7e3c28b143dc4f94bb0916378a98b7346e851318ea4da84",
-            "url": "https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.2%2B12/OpenJDK14U-jre_aarch64_linux_hotspot_14.0.2_12.tar.gz",
-            "version": "14.0.2"
-          },
-          "armv6l": {
-            "build": "12",
-            "sha256": "4468ecf74956783ae41a46e8ba023c003c69e4d111622944aad1af764a1bc4af",
-            "url": "https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.2%2B12/OpenJDK14U-jre_arm_linux_hotspot_14.0.2_12.tar.gz",
-            "version": "14.0.2"
-          },
-          "armv7l": {
-            "build": "12",
-            "sha256": "4468ecf74956783ae41a46e8ba023c003c69e4d111622944aad1af764a1bc4af",
-            "url": "https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.2%2B12/OpenJDK14U-jre_arm_linux_hotspot_14.0.2_12.tar.gz",
-            "version": "14.0.2"
-          },
-          "packageType": "jre",
-          "powerpc64le": {
-            "build": "12",
-            "sha256": "0f96998be562cfbe8a4114581349dbd2609d0a23091e538fe142dcd9c83e70cf",
-            "url": "https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.2%2B12/OpenJDK14U-jre_ppc64le_linux_hotspot_14.0.2_12.tar.gz",
-            "version": "14.0.2"
-          },
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "12",
-            "sha256": "1107845947da56e6bdad0da0b79210a079a74ec5c806f815ec5db9d09e1a9236",
-            "url": "https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.2%2B12/OpenJDK14U-jre_x64_linux_hotspot_14.0.2_12.tar.gz",
-            "version": "14.0.2"
-          }
-        },
-        "openj9": {
-          "packageType": "jre",
-          "powerpc64le": {
-            "build": "12",
-            "sha256": "ad7a55a3669878c0c7d7c66faafe7c626d4341374719b6fdd81d2986c6e80945",
-            "url": "https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.2%2B12_openj9-0.21.0/OpenJDK14U-jre_ppc64le_linux_openj9_14.0.2_12_openj9-0.21.0.tar.gz",
-            "version": "14.0.2"
-          },
-          "vmType": "openj9",
-          "x86_64": {
-            "build": "12",
-            "sha256": "3a137146a7b0bd8b029e72beb37c5fbb09dcfb9e33a10125076fff1555227cfd",
-            "url": "https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.2%2B12_openj9-0.21.0/OpenJDK14U-jre_x64_linux_openj9_14.0.2_12_openj9-0.21.0.tar.gz",
-            "version": "14.0.2"
-          }
-        }
-      }
-    },
-    "mac": {
-      "jdk": {
-        "hotspot": {
-          "packageType": "jdk",
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "12",
-            "sha256": "09b7e6ab5d5eb4b73813f4caa793a0b616d33794a17988fa6a6b7c972e8f3dd3",
-            "url": "https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.2%2B12/OpenJDK14U-jdk_x64_mac_hotspot_14.0.2_12.tar.gz",
-            "version": "14.0.2"
-          }
-        },
-        "openj9": {
-          "packageType": "jdk",
-          "vmType": "openj9",
-          "x86_64": {
-            "build": "12",
-            "sha256": "95e6abcc12dde676ccd5ba65ab86f06ddaa22749dde00e31f4c6d3ea95277359",
-            "url": "https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.2%2B12_openj9-0.21.0/OpenJDK14U-jdk_x64_mac_openj9_14.0.2_12_openj9-0.21.0.tar.gz",
-            "version": "14.0.2"
-          }
-        }
-      },
-      "jre": {
-        "hotspot": {
-          "packageType": "jre",
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "12",
-            "sha256": "e8b5196de8ecb2b136a28494c2888784b9d9e22e29d2c38528892fb7d0c95260",
-            "url": "https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.2%2B12/OpenJDK14U-jre_x64_mac_hotspot_14.0.2_12.tar.gz",
-            "version": "14.0.2"
-          }
-        },
-        "openj9": {
-          "packageType": "jre",
-          "vmType": "openj9",
-          "x86_64": {
-            "build": "12",
-            "sha256": "2562a442d7278409358f474071db34df4ba9c555925f28d0270139f97133c8d5",
-            "url": "https://github.com/AdoptOpenJDK/openjdk14-binaries/releases/download/jdk-14.0.2%2B12_openj9-0.21.0/OpenJDK14U-jre_x64_mac_openj9_14.0.2_12_openj9-0.21.0.tar.gz",
-            "version": "14.0.2"
-          }
-        }
-      }
-    }
-  },
-  "openjdk15": {
-    "linux": {
-      "jdk": {
-        "hotspot": {
-          "aarch64": {
-            "build": "7",
-            "sha256": "6e8b6b037148cf20a284b5b257ec7bfdf9cc31ccc87778d0dfd95a2fddf228d4",
-            "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_aarch64_linux_hotspot_15.0.2_7.tar.gz",
-            "version": "15.0.2"
-          },
-          "armv6l": {
-            "build": "7",
-            "sha256": "ff39c0380224e419d940382c4d651cb1e6297a794854e0cc459c1fd4973b3368",
-            "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_arm_linux_hotspot_15.0.2_7.tar.gz",
-            "version": "15.0.2"
-          },
-          "armv7l": {
-            "build": "7",
-            "sha256": "ff39c0380224e419d940382c4d651cb1e6297a794854e0cc459c1fd4973b3368",
-            "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_arm_linux_hotspot_15.0.2_7.tar.gz",
-            "version": "15.0.2"
-          },
-          "packageType": "jdk",
-          "powerpc64le": {
-            "build": "7",
-            "sha256": "486f2aad94c5580c0b27c9007beebadfccd4677c0bd9565a77ca5c34af5319f9",
-            "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_ppc64le_linux_hotspot_15.0.2_7.tar.gz",
-            "version": "15.0.2"
-          },
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "7",
-            "sha256": "94f20ca8ea97773571492e622563883b8869438a015d02df6028180dd9acc24d",
-            "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_x64_linux_hotspot_15.0.2_7.tar.gz",
-            "version": "15.0.2"
-          }
-        },
-        "openj9": {
-          "aarch64": {
-            "build": "7",
-            "sha256": "b69a4bc87ed2e985d252cff02d53f1a11b8d83d39e0800cd4a1cab4521375314",
-            "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7_openj9-0.24.0/OpenJDK15U-jdk_aarch64_linux_openj9_15.0.2_7_openj9-0.24.0.tar.gz",
-            "version": "15.0.2-ea"
-          },
-          "packageType": "jdk",
-          "powerpc64le": {
-            "build": "7",
-            "sha256": "5b2158268de0be247801b7823ee3e7f739254d77718a1879848627181feee2f4",
-            "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7_openj9-0.24.0/OpenJDK15U-jdk_ppc64le_linux_openj9_15.0.2_7_openj9-0.24.0.tar.gz",
-            "version": "15.0.2"
-          },
-          "vmType": "openj9",
-          "x86_64": {
-            "build": "7",
-            "sha256": "5515ccd79b1b5e8d8a615b80d5fe1272f7bb41100e46d94fb78ee611ea014816",
-            "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7_openj9-0.24.0/OpenJDK15U-jdk_x64_linux_openj9_15.0.2_7_openj9-0.24.0.tar.gz",
-            "version": "15.0.2"
-          }
-        }
-      },
-      "jre": {
-        "hotspot": {
-          "aarch64": {
-            "build": "7",
-            "sha256": "1c1fc968d76004b0be0042027712835dcbe3570a6fc3a208157a4ab6adabbef2",
-            "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jre_aarch64_linux_hotspot_15.0.2_7.tar.gz",
-            "version": "15.0.2"
-          },
-          "armv6l": {
-            "build": "7",
-            "sha256": "304be224952dbea7000cda6223b2978b3eefdf2e3749032c3b381a213c8d9c5e",
-            "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jre_arm_linux_hotspot_15.0.2_7.tar.gz",
-            "version": "15.0.2"
-          },
-          "armv7l": {
-            "build": "7",
-            "sha256": "304be224952dbea7000cda6223b2978b3eefdf2e3749032c3b381a213c8d9c5e",
-            "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jre_arm_linux_hotspot_15.0.2_7.tar.gz",
-            "version": "15.0.2"
-          },
-          "packageType": "jre",
-          "powerpc64le": {
-            "build": "7",
-            "sha256": "dc2480948ac3e6b192fb77c9d37227510f44482e52a330002d6e7497a62a7d67",
-            "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jre_ppc64le_linux_hotspot_15.0.2_7.tar.gz",
-            "version": "15.0.2"
-          },
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "7",
-            "sha256": "31af7efdb1cc0ffd001bc145c3d255266889ad6b502133283ae8bf233d11334c",
-            "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jre_x64_linux_hotspot_15.0.2_7.tar.gz",
-            "version": "15.0.2"
-          }
-        },
-        "openj9": {
-          "aarch64": {
-            "build": "7",
-            "sha256": "37492012e75d75021dfb2b25fe5cc73664c03fee85532cec30ce4f5a4e5389c6",
-            "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7_openj9-0.24.0/OpenJDK15U-jre_aarch64_linux_openj9_15.0.2_7_openj9-0.24.0.tar.gz",
-            "version": "15.0.2-ea"
-          },
-          "packageType": "jre",
-          "powerpc64le": {
-            "build": "7",
-            "sha256": "79f657141f1cd0e4a70d041b9215b8b00140d479ce73ed71bc4f3dd015157958",
-            "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7_openj9-0.24.0/OpenJDK15U-jre_ppc64le_linux_openj9_15.0.2_7_openj9-0.24.0.tar.gz",
-            "version": "15.0.2"
-          },
-          "vmType": "openj9",
-          "x86_64": {
-            "build": "7",
-            "sha256": "a4ae1b7275fcfd6d87a3387edacc8e353dc95ee44f00ca5a348ea90331ec2084",
-            "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7_openj9-0.24.0/OpenJDK15U-jre_x64_linux_openj9_15.0.2_7_openj9-0.24.0.tar.gz",
-            "version": "15.0.2"
-          }
-        }
-      }
-    },
-    "mac": {
-      "jdk": {
-        "hotspot": {
-          "packageType": "jdk",
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "7",
-            "sha256": "d358a7ff03905282348c6c80562a4da2e04eb377b60ad2152be4c90f8d580b7f",
-            "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jdk_x64_mac_hotspot_15.0.2_7.tar.gz",
-            "version": "15.0.2"
-          }
-        },
-        "openj9": {
-          "packageType": "jdk",
-          "vmType": "openj9",
-          "x86_64": {
-            "build": "7",
-            "sha256": "1336ae5529af3a0e35ae569e4188944831aeed7080a482f2490fc619380cbe53",
-            "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7_openj9-0.24.0/OpenJDK15U-jdk_x64_mac_openj9_15.0.2_7_openj9-0.24.0.tar.gz",
-            "version": "15.0.2"
-          }
-        }
-      },
-      "jre": {
-        "hotspot": {
-          "packageType": "jre",
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "7",
-            "sha256": "6a7150fa3ca8277394ff5bae6f56a70f61d2144a5dbbea4f008d86a3e5498795",
-            "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7/OpenJDK15U-jre_x64_mac_hotspot_15.0.2_7.tar.gz",
-            "version": "15.0.2"
-          }
-        },
-        "openj9": {
-          "packageType": "jre",
-          "vmType": "openj9",
-          "x86_64": {
-            "build": "7",
-            "sha256": "2c0ba5e66764d660037343db4bf32f1ed75ad27661e54e9a4df23d40cae448b0",
-            "url": "https://github.com/AdoptOpenJDK/openjdk15-binaries/releases/download/jdk-15.0.2%2B7_openj9-0.24.0/OpenJDK15U-jre_x64_mac_openj9_15.0.2_7_openj9-0.24.0.tar.gz",
-            "version": "15.0.2"
-          }
-        }
-      }
-    }
-  },
-  "openjdk16": {
-    "alpine_linux": {
-      "jdk": {
-        "hotspot": {
-          "packageType": "jdk",
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "7",
-            "sha256": "85788b1a1f470ca7ddc576028f29abbc3bc3b08f82dd811a3e24371689d7dc0f",
-            "url": "https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_x64_alpine-linux_hotspot_16.0.2_7.tar.gz",
-            "version": "16.0.2"
-          }
-        }
-      },
-      "jre": {
-        "hotspot": {
-          "packageType": "jre",
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "9",
-            "sha256": "5f10ffc12056b735f5fe505ec6c481fff94de27e80c1d77ea9f9e2830669cc1d",
-            "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jre_x64_alpine-linux_hotspot_16.0.1_9.tar.gz",
-            "version": "16.0.1"
-          }
-        }
-      }
-    },
-    "linux": {
-      "jdk": {
-        "hotspot": {
-          "aarch64": {
-            "build": "7",
-            "sha256": "cb77d9d126f97898dfdc8b5fb694d1e0e5d93d13a0a6cb2aeda76f8635384340",
-            "url": "https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_aarch64_linux_hotspot_16.0.2_7.tar.gz",
-            "version": "16.0.2"
-          },
-          "armv6l": {
-            "build": "7",
-            "sha256": "7721ef81416af8122a28448f3d661eb4bda40a9f78d400e4ecc55b58e627a00c",
-            "url": "https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_arm_linux_hotspot_16.0.2_7.tar.gz",
-            "version": "16.0.2"
-          },
-          "armv7l": {
-            "build": "7",
-            "sha256": "7721ef81416af8122a28448f3d661eb4bda40a9f78d400e4ecc55b58e627a00c",
-            "url": "https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_arm_linux_hotspot_16.0.2_7.tar.gz",
-            "version": "16.0.2"
-          },
-          "packageType": "jdk",
-          "powerpc64le": {
-            "build": "7",
-            "sha256": "36ebe6c72f2fc19b8b17371f731390e15fa3aab08c28b55b9a8b71d0a578adc9",
-            "url": "https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_ppc64le_linux_hotspot_16.0.2_7.tar.gz",
-            "version": "16.0.2"
-          },
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "7",
-            "sha256": "323d6d7474a359a28eff7ddd0df8e65bd61554a8ed12ef42fd9365349e573c2c",
-            "url": "https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_x64_linux_hotspot_16.0.2_7.tar.gz",
-            "version": "16.0.2"
-          }
-        },
-        "openj9": {
-          "aarch64": {
-            "build": "9",
-            "sha256": "abc56cd266b4acc96cc700b166ad016907dac97d7a593bd5c369d54efc4b4acd",
-            "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jdk_aarch64_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz",
-            "version": "16.0.1-ea"
-          },
-          "packageType": "jdk",
-          "powerpc64le": {
-            "build": "9",
-            "sha256": "9200acc9ddb6b0d4facf3ea44b17d3a10035316a379b4b148382b25cacf2bb83",
-            "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jdk_ppc64le_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz",
-            "version": "16.0.1"
-          },
-          "vmType": "openj9",
-          "x86_64": {
-            "build": "9",
-            "sha256": "7395aaa479a7410bbe5bd5efc43d2669718c61ba146b06657315dbd467b98bf1",
-            "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jdk_x64_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz",
-            "version": "16.0.1"
-          }
-        }
-      },
-      "jre": {
-        "hotspot": {
-          "aarch64": {
-            "build": "9",
-            "sha256": "4e47f1cbf46190727be74cd73445ec2b693f5ba4a74542c554d6b3285811cab5",
-            "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jre_aarch64_linux_hotspot_16.0.1_9.tar.gz",
-            "version": "16.0.1"
-          },
-          "armv6l": {
-            "build": "9",
-            "sha256": "c1f88f3ce955cb2e9a4236a916cc6660ef55231d29c4390b1a4398ebbca358b7",
-            "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jre_arm_linux_hotspot_16.0.1_9.tar.gz",
-            "version": "16.0.1"
-          },
-          "armv7l": {
-            "build": "9",
-            "sha256": "c1f88f3ce955cb2e9a4236a916cc6660ef55231d29c4390b1a4398ebbca358b7",
-            "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jre_arm_linux_hotspot_16.0.1_9.tar.gz",
-            "version": "16.0.1"
-          },
-          "packageType": "jre",
-          "powerpc64le": {
-            "build": "9",
-            "sha256": "495805e2e9bcabeac0d8271623b6c92604440608286f4ce411ea48f582854930",
-            "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jre_ppc64le_linux_hotspot_16.0.1_9.tar.gz",
-            "version": "16.0.1"
-          },
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "9",
-            "sha256": "5eca19d406c6d130e9c3a4b932b9cb0a6e9cd45932450668c3e911bded4bcf40",
-            "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jre_x64_linux_hotspot_16.0.1_9.tar.gz",
-            "version": "16.0.1"
-          }
-        },
-        "openj9": {
-          "aarch64": {
-            "build": "9",
-            "sha256": "01d8337d1069b8bfdcdf096b30cc24d1df42ffeede676da99fed77bef2670454",
-            "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jre_aarch64_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz",
-            "version": "16.0.1-ea"
-          },
-          "packageType": "jre",
-          "powerpc64le": {
-            "build": "9",
-            "sha256": "f9734c100f0e85ac63b9f9327b77135221a905e1d743cd9cd4edc0ea0e0fe8d9",
-            "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jre_ppc64le_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz",
-            "version": "16.0.1"
-          },
-          "vmType": "openj9",
-          "x86_64": {
-            "build": "9",
-            "sha256": "fab572dd1a2ef00fd18ad4f5a4c373d0cf140045e61f9104cd5b8dbf6b3a517d",
-            "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jre_x64_linux_openj9_16.0.1_9_openj9-0.26.0.tar.gz",
-            "version": "16.0.1"
-          }
-        }
-      }
-    },
-    "mac": {
-      "jdk": {
-        "hotspot": {
-          "packageType": "jdk",
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "7",
-            "sha256": "27975d9e695cfbb93861540926f9f7bcac973a254ceecbee549706a99cbbdf95",
-            "url": "https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_x64_mac_hotspot_16.0.2_7.tar.gz",
-            "version": "16.0.2"
-          }
-        },
-        "openj9": {
-          "packageType": "jdk",
-          "vmType": "openj9",
-          "x86_64": {
-            "build": "9",
-            "sha256": "6d4241c6ede2167fb71bd57f7a770a74564ee007c06bcae98e1abc3c1de4756f",
-            "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jdk_x64_mac_openj9_16.0.1_9_openj9-0.26.0.tar.gz",
-            "version": "16.0.1"
-          }
-        }
-      },
-      "jre": {
-        "hotspot": {
-          "packageType": "jre",
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "9",
-            "sha256": "33eeccbeea75e70b09610ba12e9591386a0e42248525b8358c9ae683bce82779",
-            "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jre_x64_mac_hotspot_16.0.1_9.tar.gz",
-            "version": "16.0.1"
-          }
-        },
-        "openj9": {
-          "packageType": "jre",
-          "vmType": "openj9",
-          "x86_64": {
-            "build": "9",
-            "sha256": "f57a6f04cf21a8470bb6f9488c57031d89db73c8b24997d74812855372f4e6b8",
-            "url": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9_openj9-0.26.0/OpenJDK16U-jre_x64_mac_openj9_16.0.1_9_openj9-0.26.0.tar.gz",
-            "version": "16.0.1"
-          }
-        }
-      }
-    }
-  },
-  "openjdk17": {
-    "alpine_linux": {
-      "jdk": {
-        "hotspot": {
-          "packageType": "jdk",
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "7",
-            "sha256": "b6edac2fa669876ef16b4895b36b61d01066626e7a69feba2acc19760c8d18cb",
-            "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_x64_alpine-linux_hotspot_17.0.7_7.tar.gz",
-            "version": "17.0.7"
-          }
-        }
-      },
-      "jre": {
-        "hotspot": {
-          "packageType": "jre",
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "7",
-            "sha256": "711f837bacf8222dee9e8cd7f39941a4a0acf869243f03e6038ca3ba189f66ca",
-            "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jre_x64_alpine-linux_hotspot_17.0.7_7.tar.gz",
-            "version": "17.0.7"
-          }
-        }
-      }
-    },
-    "linux": {
-      "jdk": {
-        "hotspot": {
-          "aarch64": {
-            "build": "7",
-            "sha256": "0084272404b89442871e0a1f112779844090532978ad4d4191b8d03fc6adfade",
-            "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_aarch64_linux_hotspot_17.0.7_7.tar.gz",
-            "version": "17.0.7"
-          },
-          "armv6l": {
-            "build": "7",
-            "sha256": "e7a84c3e59704588510d7e6cce1f732f397b54a3b558c521912a18a1b4d0abdc",
-            "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_arm_linux_hotspot_17.0.7_7.tar.gz",
-            "version": "17.0.7"
-          },
-          "armv7l": {
-            "build": "7",
-            "sha256": "e7a84c3e59704588510d7e6cce1f732f397b54a3b558c521912a18a1b4d0abdc",
-            "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_arm_linux_hotspot_17.0.7_7.tar.gz",
-            "version": "17.0.7"
-          },
-          "packageType": "jdk",
-          "powerpc64le": {
-            "build": "7",
-            "sha256": "8f4366ff1eddb548b1744cd82a1a56ceee60abebbcbad446bfb3ead7ac0f0f85",
-            "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_ppc64le_linux_hotspot_17.0.7_7.tar.gz",
-            "version": "17.0.7"
-          },
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "7",
-            "sha256": "e9458b38e97358850902c2936a1bb5f35f6cffc59da9fcd28c63eab8dbbfbc3b",
-            "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_x64_linux_hotspot_17.0.7_7.tar.gz",
-            "version": "17.0.7"
-          }
-        }
-      },
-      "jre": {
-        "hotspot": {
-          "aarch64": {
-            "build": "7",
-            "sha256": "2ff6a4fd1fa354047c93ba8c3179967156162f27bd683aee1f6e52a480bcbe6a",
-            "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jre_aarch64_linux_hotspot_17.0.7_7.tar.gz",
-            "version": "17.0.7"
-          },
-          "armv6l": {
-            "build": "7",
-            "sha256": "5b0401199c7c9163b8395ebf25195ed395fec7b7ef7158c36302420cf993825a",
-            "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jre_arm_linux_hotspot_17.0.7_7.tar.gz",
-            "version": "17.0.7"
-          },
-          "armv7l": {
-            "build": "7",
-            "sha256": "5b0401199c7c9163b8395ebf25195ed395fec7b7ef7158c36302420cf993825a",
-            "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jre_arm_linux_hotspot_17.0.7_7.tar.gz",
-            "version": "17.0.7"
-          },
-          "packageType": "jre",
-          "powerpc64le": {
-            "build": "7",
-            "sha256": "cc25e74c0817cd4d943bba056b256b86e0e9148bf41d7600c5ec2e1eadb2e470",
-            "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jre_ppc64le_linux_hotspot_17.0.7_7.tar.gz",
-            "version": "17.0.7"
-          },
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "7",
-            "sha256": "bb025133b96266f6415d5084bb9b260340a813968007f1d2d14690f20bd021ca",
-            "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jre_x64_linux_hotspot_17.0.7_7.tar.gz",
-            "version": "17.0.7"
-          }
-        }
-      }
-    },
-    "mac": {
-      "jdk": {
-        "hotspot": {
-          "aarch64": {
-            "build": "7",
-            "sha256": "1d6aeb55b47341e8ec33cc1644d58b88dfdcce17aa003a858baa7460550e6ff9",
-            "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_aarch64_mac_hotspot_17.0.7_7.tar.gz",
-            "version": "17.0.7"
-          },
-          "packageType": "jdk",
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "7",
-            "sha256": "50d0e9840113c93916418068ba6c845f1a72ed0dab80a8a1f7977b0e658b65fb",
-            "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jdk_x64_mac_hotspot_17.0.7_7.tar.gz",
-            "version": "17.0.7"
-          }
-        }
-      },
-      "jre": {
-        "hotspot": {
-          "aarch64": {
-            "build": "7",
-            "sha256": "625d070a297a3c856badbaa5c65adaaa1adb3ea3813363fb8335c47709b69140",
-            "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jre_aarch64_mac_hotspot_17.0.7_7.tar.gz",
-            "version": "17.0.7"
-          },
-          "packageType": "jre",
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "7",
-            "sha256": "62559a927a8dbac2ea1d7879f590a62fea87d61bfaa92894e578d2045b8d921b",
-            "url": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.7%2B7/OpenJDK17U-jre_x64_mac_hotspot_17.0.7_7.tar.gz",
-            "version": "17.0.7"
-          }
-        }
-      }
-    }
-  },
-  "openjdk8": {
-    "alpine_linux": {
-      "jdk": {
-        "hotspot": {
-          "packageType": "jdk",
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "7",
-            "sha256": "cfdf8e07c8eeb087b7a2895b90fc0a19986bcff85006f1e2b708e3964909aa8e",
-            "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jdk_x64_alpine-linux_hotspot_8u372b07.tar.gz",
-            "version": "8.0.372"
-          }
-        }
-      },
-      "jre": {
-        "hotspot": {
-          "packageType": "jre",
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "7",
-            "sha256": "95d8cb8b5375ec00a064ed728eb60d925d44c1a79fe92f6ca7385b5863d4f78c",
-            "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jre_x64_alpine-linux_hotspot_8u372b07.tar.gz",
-            "version": "8.0.372"
-          }
-        }
-      }
-    },
-    "linux": {
-      "jdk": {
-        "hotspot": {
-          "aarch64": {
-            "build": "7",
-            "sha256": "195808eb42ab73535c84de05188914a52a47c1ac784e4bf66de95fe1fd315a5a",
-            "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jdk_aarch64_linux_hotspot_8u372b07.tar.gz",
-            "version": "8.0.372"
-          },
-          "armv6l": {
-            "build": "7",
-            "sha256": "3f4848700a4bf856d3c138dc9c2b305b978879c8fbef5aa7df34a7c2fe1b64b8",
-            "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jdk_arm_linux_hotspot_8u372b07.tar.gz",
-            "version": "8.0.372"
-          },
-          "armv7l": {
-            "build": "7",
-            "sha256": "3f4848700a4bf856d3c138dc9c2b305b978879c8fbef5aa7df34a7c2fe1b64b8",
-            "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jdk_arm_linux_hotspot_8u372b07.tar.gz",
-            "version": "8.0.372"
-          },
-          "packageType": "jdk",
-          "powerpc64le": {
-            "build": "7",
-            "sha256": "bb85303848fe402d4f1004f748f80ccb39cb11f356f50a513555d1083c3913b8",
-            "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jdk_ppc64le_linux_hotspot_8u372b07.tar.gz",
-            "version": "8.0.372"
-          },
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "7",
-            "sha256": "78a0b3547d6f3d46227f2ad8c774248425f20f1cd63f399b713f0cdde2cc376c",
-            "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jdk_x64_linux_hotspot_8u372b07.tar.gz",
-            "version": "8.0.372"
-          }
-        },
-        "openj9": {
-          "aarch64": {
-            "build": "10",
-            "sha256": "b168245ddc18b85135c15ed6baea5cbcc06192b49af04dcfa698458373efc061",
-            "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jdk_aarch64_linux_openj9_8u292b10_openj9-0.26.0.tar.gz",
-            "version": "8.0.292-ea"
-          },
-          "packageType": "jdk",
-          "powerpc64le": {
-            "build": "10",
-            "sha256": "bc88be757a884b90a2bb91365b7e922c0e7d0fea991cd69d1f74c59b2257a4b5",
-            "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jdk_ppc64le_linux_openj9_8u292b10_openj9-0.26.0.tar.gz",
-            "version": "8.0.292"
-          },
-          "vmType": "openj9",
-          "x86_64": {
-            "build": "10",
-            "sha256": "06d6c9421778575cf59d50f69b7ac6a7bb237485b3a3c2f89cfb61a056c7b2de",
-            "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jdk_x64_linux_openj9_8u292b10_openj9-0.26.0.tar.gz",
-            "version": "8.0.292"
-          }
-        }
-      },
-      "jre": {
-        "hotspot": {
-          "aarch64": {
-            "build": "7",
-            "sha256": "f8e440273c8feb3fcfaca88ba18fec291deae18a548adde8a37cd1db08107b95",
-            "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jre_aarch64_linux_hotspot_8u372b07.tar.gz",
-            "version": "8.0.372"
-          },
-          "armv6l": {
-            "build": "7",
-            "sha256": "e58e017012838ae4f0db78293e3246cc09958e6ea9a2393c5947ec003bf736dd",
-            "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jre_arm_linux_hotspot_8u372b07.tar.gz",
-            "version": "8.0.372"
-          },
-          "armv7l": {
-            "build": "7",
-            "sha256": "e58e017012838ae4f0db78293e3246cc09958e6ea9a2393c5947ec003bf736dd",
-            "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jre_arm_linux_hotspot_8u372b07.tar.gz",
-            "version": "8.0.372"
-          },
-          "packageType": "jre",
-          "powerpc64le": {
-            "build": "7",
-            "sha256": "ba5f8141a16722e39576bf42b69d2b8ebf95fc2c05441e3200f609af4dd9f1ea",
-            "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jre_ppc64le_linux_hotspot_8u372b07.tar.gz",
-            "version": "8.0.372"
-          },
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "7",
-            "sha256": "b6fdfe32085a884c11b31f66aa67ac62811df7112fb6fb08beea61376a86fbb4",
-            "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jre_x64_linux_hotspot_8u372b07.tar.gz",
-            "version": "8.0.372"
-          }
-        },
-        "openj9": {
-          "aarch64": {
-            "build": "10",
-            "sha256": "f87f90673e25c3ce9e868e96a6059b22665f12d05e389813f75dfbc95d970393",
-            "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jre_aarch64_linux_openj9_8u292b10_openj9-0.26.0.tar.gz",
-            "version": "8.0.292-ea"
-          },
-          "packageType": "jre",
-          "powerpc64le": {
-            "build": "10",
-            "sha256": "b75216f7905cff08432a9200a78a2694a4074279f79d859d27f82a998ca1b1e9",
-            "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jre_ppc64le_linux_openj9_8u292b10_openj9-0.26.0.tar.gz",
-            "version": "8.0.292"
-          },
-          "vmType": "openj9",
-          "x86_64": {
-            "build": "10",
-            "sha256": "6d5b67979e0935febe893895b622647bf8a59df6093ae57074db11d2ac9373ea",
-            "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jre_x64_linux_openj9_8u292b10_openj9-0.26.0.tar.gz",
-            "version": "8.0.292"
-          }
-        }
-      }
-    },
-    "mac": {
-      "jdk": {
-        "hotspot": {
-          "packageType": "jdk",
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "7",
-            "sha256": "9c33db312cc46b6bfe705770fdc5c08edb7d790ba70be4e8b12a98e79da5f4a1",
-            "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jdk_x64_mac_hotspot_8u372b07.tar.gz",
-            "version": "8.0.372"
-          }
-        },
-        "openj9": {
-          "packageType": "jdk",
-          "vmType": "openj9",
-          "x86_64": {
-            "build": "10",
-            "sha256": "d262bc226895e80b7e80d61905e65fe043ca0a3e3b930f7b88ddfacb8835e939",
-            "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jdk_x64_mac_openj9_8u292b10_openj9-0.26.0.tar.gz",
-            "version": "8.0.292"
-          }
-        }
-      },
-      "jre": {
-        "hotspot": {
-          "packageType": "jre",
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "7",
-            "sha256": "6c876ea7bfa778ae78ec5a976e557b2b981a592a3639eb0d3dc3c8d3dda8d321",
-            "url": "https://github.com/adoptium/temurin8-binaries/releases/download/jdk8u372-b07/OpenJDK8U-jre_x64_mac_hotspot_8u372b07.tar.gz",
-            "version": "8.0.372"
-          }
-        },
-        "openj9": {
-          "packageType": "jre",
-          "vmType": "openj9",
-          "x86_64": {
-            "build": "10",
-            "sha256": "50cbc5ef48d0167d649d3ba2c2b8d71553541bffb98914418f4a26e0c5f69aca",
-            "url": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10_openj9-0.26.0/OpenJDK8U-jre_x64_mac_openj9_8u292b10_openj9-0.26.0.tar.gz",
-            "version": "8.0.292"
-          }
-        }
-      }
-    }
-  }
-}
diff --git a/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/sources.nix b/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/sources.nix
deleted file mode 100644
index 0d5dd3c6cd..0000000000
--- a/third_party/nixpkgs/pkgs/development/compilers/adoptopenjdk-bin/sources.nix
+++ /dev/null
@@ -1 +0,0 @@
-builtins.fromJSON (builtins.readFile ./sources.json)
diff --git a/third_party/nixpkgs/pkgs/development/compilers/binaryen/default.nix b/third_party/nixpkgs/pkgs/development/compilers/binaryen/default.nix
index 8542fd52d0..d6c1442a8b 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/binaryen/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/binaryen/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "binaryen";
-  version = "117";
+  version = "118";
 
   src = fetchFromGitHub {
     owner = "WebAssembly";
     repo = "binaryen";
     rev = "version_${version}";
-    hash = "sha256-QYJkrvwcUWbFV5oQdP11JuVmfOTYaFWGQGksboQ1d58=";
+    hash = "sha256-akMW3S2/qUyLK8F77EtnaXPDXvIMpkGfNB2jOD6hQho=";
   };
 
   nativeBuildInputs = [ cmake python3 ];
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/WebAssembly/binaryen";
     description = "Compiler infrastructure and toolchain library for WebAssembly, in C++";
     platforms = platforms.all;
-    maintainers = with maintainers; [ asppsa ];
+    maintainers = with maintainers; [ asppsa willcohen ];
     license = licenses.asl20;
   };
 
diff --git a/third_party/nixpkgs/pkgs/development/compilers/bs-platform/build-bs-platform.nix b/third_party/nixpkgs/pkgs/development/compilers/bs-platform/build-bs-platform.nix
deleted file mode 100644
index 1097e7d3f8..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/bs-platform/default.nix b/third_party/nixpkgs/pkgs/development/compilers/bs-platform/default.nix
deleted file mode 100644
index a1b8ad550a..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/bs-platform/jscomp-release-ninja.patch b/third_party/nixpkgs/pkgs/development/compilers/bs-platform/jscomp-release-ninja.patch
deleted file mode 100644
index 96235f9213..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/bs-platform/ocaml.nix b/third_party/nixpkgs/pkgs/development/compilers/bs-platform/ocaml.nix
deleted file mode 100644
index 206a3aff61..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/c3c/default.nix b/third_party/nixpkgs/pkgs/development/compilers/c3c/default.nix
index 2577f1321d..cbaac08ba6 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/c3c/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/c3c/default.nix
@@ -1,23 +1,24 @@
-{ llvmPackages
-, lib
-, fetchFromGitHub
-, cmake
-, python3
-, curl
-, libxml2
-, libffi
-, xar
-, testers
+{
+  llvmPackages,
+  lib,
+  fetchFromGitHub,
+  cmake,
+  python3,
+  curl,
+  libxml2,
+  libffi,
+  xar,
+  testers,
 }:
 
 llvmPackages.stdenv.mkDerivation (finalAttrs: {
   pname = "c3c";
-  version = "0.5.5";
+  version = "0.6.1";
 
   src = fetchFromGitHub {
     owner = "c3lang";
     repo = "c3c";
-    rev = "refs/tags/${finalAttrs.version}";
+    rev = "refs/tags/v${finalAttrs.version}";
     hash = "sha256-iOljE1BRVc92NJZj+nr1G6KkBTCwJEUOadXHUDNoPGk=";
   };
 
@@ -26,9 +27,7 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
       --replace-fail "\''${LLVM_LIBRARY_DIRS}" "${llvmPackages.lld.lib}/lib ${llvmPackages.llvm.lib}/lib"
   '';
 
-  nativeBuildInputs = [
-    cmake
-  ];
+  nativeBuildInputs = [ cmake ];
 
   buildInputs = [
     llvmPackages.llvm
@@ -36,9 +35,7 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
     curl
     libxml2
     libffi
-  ] ++ lib.optionals llvmPackages.stdenv.isDarwin [
-    xar
-  ];
+  ] ++ lib.optionals llvmPackages.stdenv.isDarwin [ xar ];
 
   nativeCheckInputs = [ python3 ];
 
@@ -52,16 +49,17 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
   '';
 
   passthru.tests = {
-    version = testers.testVersion {
-      package = finalAttrs.finalPackage;
-    };
+    version = testers.testVersion { package = finalAttrs.finalPackage; };
   };
 
   meta = with lib; {
     description = "Compiler for the C3 language";
     homepage = "https://github.com/c3lang/c3c";
     license = licenses.lgpl3Only;
-    maintainers = with maintainers; [ luc65r ];
+    maintainers = with maintainers; [
+      luc65r
+      anas
+    ];
     platforms = platforms.all;
     mainProgram = "c3c";
   };
diff --git a/third_party/nixpkgs/pkgs/development/compilers/chez-racket/shared.nix b/third_party/nixpkgs/pkgs/development/compilers/chez-racket/shared.nix
index 46f5320430..b9368dd4eb 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/chez-racket/shared.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/chez-racket/shared.nix
@@ -1,5 +1,5 @@
 args:
-{ stdenv, lib, fetchFromGitHub, coreutils, darwin
+{ stdenv, lib, fetchFromGitHub, coreutils, cctools, darwin
 , ncurses, libiconv, libX11, zlib, lz4
 }:
 
@@ -23,7 +23,7 @@ stdenv.mkDerivation (args // {
     export LZ4="$(find ${lz4.out}/lib -type f | sort | head -n1)"
   '';
 
-  nativeBuildInputs = lib.optionals stdenv.isDarwin (with darwin; [ cctools autoSignDarwinBinariesHook ]);
+  nativeBuildInputs = lib.optionals stdenv.isDarwin ([ cctools darwin.autoSignDarwinBinariesHook ]);
   buildInputs = [ libiconv libX11 lz4 ncurses zlib ];
 
   enableParallelBuilding = true;
diff --git a/third_party/nixpkgs/pkgs/development/compilers/circt/default.nix b/third_party/nixpkgs/pkgs/development/compilers/circt/default.nix
index aaf560ba4e..2fb6c21fff 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/circt/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/circt/default.nix
@@ -18,12 +18,12 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "circt";
-  version = "1.78.1";
+  version = "1.79";
   src = fetchFromGitHub {
     owner = "llvm";
     repo = "circt";
     rev = "firtool-${version}";
-    hash = "sha256-MV70tU9orK46IXM46HUuxgAuSP4JerXdKpOyPiMfsUE=";
+    hash = "sha256-/PEny7+E/s1Y08NigO22uDnhFfMBtccqaI8hsBOO2fI=";
     fetchSubmodules = true;
   };
 
diff --git a/third_party/nixpkgs/pkgs/development/compilers/dart/default.nix b/third_party/nixpkgs/pkgs/development/compilers/dart/default.nix
index ee10acbdeb..0b21122b03 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/dart/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/dart/default.nix
@@ -3,6 +3,7 @@
 , fetchurl
 , unzip
 , runCommand
+, cctools
 , darwin
 , sources ? import ./sources.nix {inherit fetchurl;}
 , version ? sources.versionUsed
@@ -41,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
 
       testCompile = runCommand "dart-test-compile" {
         nativeBuildInputs = [ finalAttrs.finalPackage ]
-          ++ lib.optionals stdenv.isDarwin [ darwin.cctools darwin.sigtool ];
+          ++ lib.optionals stdenv.isDarwin [ cctools darwin.sigtool ];
       } ''
         HELLO_MESSAGE="Hello, world!"
         echo "void main() => print('$HELLO_MESSAGE');" > hello.dart
diff --git a/third_party/nixpkgs/pkgs/development/compilers/dotnet/sigtool.nix b/third_party/nixpkgs/pkgs/development/compilers/dotnet/sigtool.nix
index 658ee578ae..fe5d1ebc68 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/dotnet/sigtool.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/dotnet/sigtool.nix
@@ -1,11 +1,10 @@
-{ darwin
+{ cctools
+, darwin
 , fetchFromGitHub
 , makeWrapper
 }:
-let
-  cctools = darwin.cctools;
 
-in darwin.sigtool.overrideAttrs (old: {
+darwin.sigtool.overrideAttrs (old: {
   # this is a fork of sigtool that supports -v and --remove-signature, which are
   # used by the dotnet sdk
   src = fetchFromGitHub {
diff --git a/third_party/nixpkgs/pkgs/development/compilers/dotnet/vmr.nix b/third_party/nixpkgs/pkgs/development/compilers/dotnet/vmr.nix
index 306dab376e..197b0e1727 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/dotnet/vmr.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/dotnet/vmr.nix
@@ -41,7 +41,6 @@ let
     isDarwin
     buildPlatform
     targetPlatform;
-  inherit (darwin) cctools-llvm;
   inherit (swiftPackages) apple_sdk swift;
 
   releaseManifest = lib.importJSON releaseManifestFile;
@@ -53,16 +52,6 @@ let
 
   sigtool = callPackage ./sigtool.nix {};
 
-  # we need dwarfdump from cctools, but can't have e.g. 'ar' overriding stdenv
-  dwarfdump = stdenvNoCC.mkDerivation {
-    name = "dwarfdump-wrapper";
-    dontUnpack = true;
-    installPhase = ''
-      mkdir -p "$out/bin"
-      ln -s "${cctools-llvm}/bin/dwarfdump" "$out/bin"
-    '';
-  };
-
   _icu = if isDarwin then darwin.ICU else icu;
 
 in stdenv.mkDerivation rec {
@@ -118,7 +107,6 @@ in stdenv.mkDerivation rec {
       buildInputs = old.buildInputs ++ old.propagatedBuildInputs;
       propagatedBuildInputs = [];
     }))
-    dwarfdump
     sigtool
     Foundation
     CoreFoundation
diff --git a/third_party/nixpkgs/pkgs/development/compilers/elm/packages/elm-json/default.nix b/third_party/nixpkgs/pkgs/development/compilers/elm/packages/elm-json/default.nix
index 16cd7f972c..efb3fbfcc5 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/elm/packages/elm-json/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/elm/packages/elm-json/default.nix
@@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec {
     openssl
   ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
 
-  cargoSha256 = "sha256:8SOpL8nfhYen9vza0LYpB/5fgVmBwG7vGMmFOaJskIc=";
+  cargoHash = "sha256-8SOpL8nfhYen9vza0LYpB/5fgVmBwG7vGMmFOaJskIc=";
 
   # Tests perform networking and therefore can't work in sandbox
   doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/development/compilers/elm/packages/node/node-composition.nix b/third_party/nixpkgs/pkgs/development/compilers/elm/packages/node/node-composition.nix
index 1f86de75e3..1580d1f43f 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/elm/packages/node/node-composition.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/elm/packages/node/node-composition.nix
@@ -8,7 +8,7 @@ let
   nodeEnv = import ../../../../node-packages/node-env.nix {
     inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript;
     inherit pkgs nodejs;
-    libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
+    libtool = if pkgs.stdenv.isDarwin then pkgs.cctools or pkgs.darwin.cctools else null;
   };
 in
 import ./node-packages.nix {
diff --git a/third_party/nixpkgs/pkgs/development/compilers/emscripten/default.nix b/third_party/nixpkgs/pkgs/development/compilers/emscripten/default.nix
index 2919a305e4..2d94880976 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/emscripten/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/emscripten/default.nix
@@ -8,7 +8,7 @@
 
 stdenv.mkDerivation rec {
   pname = "emscripten";
-  version = "3.1.55";
+  version = "3.1.64";
 
   llvmEnv = symlinkJoin {
     name = "emscripten-llvm-${version}";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     name = "emscripten-node-modules-${version}";
     inherit pname version src;
 
-    npmDepsHash = "sha256-7tZEZ7NN1jJBHa9G5sRz/ZpWJvgnTJj4i5EvQMsGQH4=";
+    npmDepsHash = "sha256-2dsIuB6P+Z3wflIsn6QaZvjHeHHGzsFAI3GcP3SfiP4=";
 
     dontBuild = true;
 
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "emscripten-core";
     repo = "emscripten";
-    hash = "sha256-3SqbkXI8xn4Zj3bDLCegxslYH5m/PkF6n/pPfm5z5VA=";
+    hash = "sha256-AbO1b4pxZ7I6n1dRzxhLC7DnXIUnaCK9SbLy96Qxqr0=";
     rev = version;
   };
 
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
   patches = [
     (substituteAll {
       src = ./0001-emulate-clang-sysroot-include-logic.patch;
-      resourceDir = "${llvmEnv}/lib/clang/18/";
+      resourceDir = "${llvmEnv}/lib/clang/${lib.versions.major llvmPackages.llvm.version}/";
     })
   ];
 
@@ -51,9 +51,6 @@ stdenv.mkDerivation rec {
 
     patchShebangs .
 
-    # emscripten 3.1.55 requires LLVM tip-of-tree instead of LLVM 18
-    sed -i -e "s/EXPECTED_LLVM_VERSION = 19/EXPECTED_LLVM_VERSION = 18/g" tools/shared.py
-
     # fixes cmake support
     sed -i -e "s/print \('emcc (Emscript.*\)/sys.stderr.write(\1); sys.stderr.flush()/g" emcc.py
 
diff --git a/third_party/nixpkgs/pkgs/development/compilers/firrtl/default.nix b/third_party/nixpkgs/pkgs/development/compilers/firrtl/default.nix
index e5f10739d6..3f005243d6 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/firrtl/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/gcc/common/builder.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/common/builder.nix
index 25c5646338..9a254ef59c 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/gcc/common/builder.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/common/builder.nix
@@ -7,6 +7,14 @@
 let
   forceLibgccToBuildCrtStuff =
     import ./libgcc-buildstuff.nix { inherit lib stdenv; };
+
+  # todo(@reckenrode) Remove in staging. This is ugly, but it avoid unwanted rebuilds on Darwin and Linux.
+  enableDarwinFixesForStagingNext =
+    version:
+    stdenv.buildPlatform.isDarwin
+    && stdenv.buildPlatform.isx86_64
+    && lib.versionAtLeast version "6"
+    && lib.versionOlder version "10";
 in
 
 originalAttrs: (stdenv.mkDerivation (finalAttrs: originalAttrs // {
@@ -20,9 +28,20 @@ originalAttrs: (stdenv.mkDerivation (finalAttrs: originalAttrs // {
 
     if test "$staticCompiler" = "1"; then
         EXTRA_LDFLAGS="-static"
-    else
-        EXTRA_LDFLAGS="-Wl,-rpath,''${!outputLib}/lib"
-    fi
+    ${
+      if enableDarwinFixesForStagingNext finalAttrs.version then
+        ''
+          elif test "''${NIX_DONT_SET_RPATH-}" != "1"; then
+              EXTRA_LDFLAGS="-Wl,-rpath,''${!outputLib}/lib"
+          else
+              EXTRA_LDFLAGS=""
+        ''
+      else
+        ''
+          else
+              EXTRA_LDFLAGS="-Wl,-rpath,''${!outputLib}/lib"
+        ''
+    }fi
 
     # GCC interprets empty paths as ".", which we don't want.
     if test -z "''${CPATH-}"; then unset CPATH; fi
@@ -56,9 +75,24 @@ originalAttrs: (stdenv.mkDerivation (finalAttrs: originalAttrs // {
                 extraLDFlags=("-L/usr/lib64" "-L/usr/lib")
                 libc_libdir="/usr/lib"
             fi
-            extraLDFlags=("-L$libc_libdir" "-rpath" "$libc_libdir"
-                          "''${extraLDFlags[@]}")
-            for i in "''${extraLDFlags[@]}"; do
+            ${
+              if enableDarwinFixesForStagingNext finalAttrs.version then
+                ''
+                  extraLDFlags=("-L$libc_libdir")
+                          nixDontSetRpathVar=NIX_DONT_SET_RPATH''${post}
+                          if test "''${!nixDontSetRpathVar-}" != "1"; then
+                              extraLDFlags+=("-rpath" "$libc_libdir")
+                          fi
+                          extraLDFlags+=("''${extraLDFlags[@]}")
+                ''
+              else
+                ''
+                  extraLDFlags=("-L$libc_libdir" "-rpath" "$libc_libdir"
+                                        "''${extraLDFlags[@]}")
+                ''
+# The strange indentation with the next line is to ensure the string renders the same when the condition is false,
+# which is necessary to prevent unwanted rebuilds in staging-next.
+}        for i in "''${extraLDFlags[@]}"; do
                 declare -g EXTRA_LDFLAGS''${post}+=" -Wl,$i"
             done
         done
diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/default.nix
index 9746825b23..d69ec08a2a 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/gcc/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/default.nix
@@ -33,6 +33,7 @@
 , nukeReferences
 , callPackage
 , majorMinorVersion
+, cctools
 , darwin
 
 # only for gcc<=6.x
@@ -449,7 +450,7 @@ pipe ((callFile ./common/builder.nix {}) ({
     badPlatforms =
       # avr-gcc8 is maintained for the `qmk` package
       if (is8 && targetPlatform.isAvr) then []
-      else if !(is48 || is49) then [ "aarch64-darwin" ]
+      else if !(is48 || is49 || is6) then [ "aarch64-darwin" ]
       else platforms.darwin;
   } // optionalAttrs is10 {
     badPlatforms = if targetPlatform != hostPlatform then [ "aarch64-darwin" ] else [ ];
@@ -457,7 +458,7 @@ pipe ((callFile ./common/builder.nix {}) ({
 } // optionalAttrs (!atLeast10 && stdenv.targetPlatform.isDarwin) {
   # GCC <10 requires default cctools `strip` instead of `llvm-strip` used by Darwin bintools.
   preBuild = ''
-    makeFlagsArray+=('STRIP=${getBin darwin.cctools-port}/bin/${stdenv.cc.targetPrefix}strip')
+    makeFlagsArray+=('STRIP=${getBin cctools}/bin/${stdenv.cc.targetPrefix}strip')
   '';
 } // optionalAttrs (!atLeast8) {
   doCheck = false; # requires a lot of tools, causes a dependency cycle for stdenv
diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/patches/6/AvailabilityInternal.h-fixincludes.patch b/third_party/nixpkgs/pkgs/development/compilers/gcc/patches/6/AvailabilityInternal.h-fixincludes.patch
new file mode 100644
index 0000000000..a29bb5eba9
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/patches/6/AvailabilityInternal.h-fixincludes.patch
@@ -0,0 +1,105 @@
+diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x
+index 662dc97762c..5140a04f9dd 100644
+--- a/fixincludes/fixincl.x
++++ b/fixincludes/fixincl.x
+@@ -3053,6 +3053,43 @@ static const char* apzDarwin_Stdint_7Patch[] = {
+ #endif",
+     (char*)NULL };
+ 
++/* * * * * * * * * * * * * * * * * * * * * * * * * *
++ *
++ *  Description of Darwin_Nix_Sdk_Availabilityinternal fix
++ */
++tSCC zDarwin_Nix_Sdk_AvailabilityinternalName[] =
++     "darwin_nix_sdk_availabilityinternal";
++
++/*
++ *  File name selection pattern
++ */
++tSCC zDarwin_Nix_Sdk_AvailabilityinternalList[] =
++  "AvailabilityInternal.h\0";
++/*
++ *  Machine/OS name selection pattern
++ */
++tSCC* apzDarwin_Nix_Sdk_AvailabilityinternalMachs[] = {
++        "*-*-darwin*",
++        (const char*)NULL };
++
++/*
++ *  content selection pattern - do fix if pattern found
++ */
++tSCC zDarwin_Nix_Sdk_AvailabilityinternalSelect0[] =
++       "(.*)__has_builtin\\(__is_target_os\\)(.*)";
++
++#define    DARWIN_NIX_SDK_AVAILABILITYINTERNAL_TEST_CT  1
++static tTestDesc aDarwin_Nix_Sdk_AvailabilityinternalTests[] = {
++  { TT_EGREP,    zDarwin_Nix_Sdk_AvailabilityinternalSelect0, (regex_t*)NULL }, };
++
++/*
++ *  Fix Command Arguments for Darwin_Nix_Sdk_Availabilityinternal
++ */
++static const char* apzDarwin_Nix_Sdk_AvailabilityinternalPatch[] = {
++    "format",
++    "%10%2",
++    (char*)NULL };
++
+ /* * * * * * * * * * * * * * * * * * * * * * * * * *
+  *
+  *  Description of Dec_Intern_Asm fix
+@@ -9855,9 +9892,9 @@ static const char* apzX11_SprintfPatch[] = {
+  *
+  *  List of all fixes
+  */
+-#define REGEX_COUNT          277
++#define REGEX_COUNT          278
+ #define MACH_LIST_SIZE_LIMIT 187
+-#define FIX_COUNT            241
++#define FIX_COUNT            242
+ 
+ /*
+  *  Enumerate the fixes
+@@ -9933,6 +9970,7 @@ typedef enum {
+     DARWIN_STDINT_5_FIXIDX,
+     DARWIN_STDINT_6_FIXIDX,
+     DARWIN_STDINT_7_FIXIDX,
++    DARWIN_NIX_SDK_AVAILABILITYINTERNAL_FIXIDX,
+     DEC_INTERN_ASM_FIXIDX,
+     DJGPP_WCHAR_H_FIXIDX,
+     ECD_CURSOR_FIXIDX,
+@@ -10457,6 +10495,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
+      DARWIN_STDINT_7_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+      aDarwin_Stdint_7Tests,   apzDarwin_Stdint_7Patch, 0 },
+ 
++  {  zDarwin_Nix_Sdk_AvailabilityinternalName,    zDarwin_Nix_Sdk_AvailabilityinternalList,
++     apzDarwin_Nix_Sdk_AvailabilityinternalMachs,
++     DARWIN_NIX_SDK_AVAILABILITYINTERNAL_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
++     aDarwin_Nix_Sdk_AvailabilityinternalTests,   apzDarwin_Nix_Sdk_AvailabilityinternalPatch, 0 },
++
+   {  zDec_Intern_AsmName,    zDec_Intern_AsmList,
+      apzDec_Intern_AsmMachs,
+      DEC_INTERN_ASM_TEST_CT, FD_MACH_ONLY,
+diff --git a/fixincludes/inclhack.def b/fixincludes/inclhack.def
+index 98fb5b61649..8aad418dff8 100644
+--- a/fixincludes/inclhack.def
++++ b/fixincludes/inclhack.def
+@@ -1591,6 +1591,20 @@ fix = {
+ 		"#define UINTMAX_C(v) (v ## ULL)";
+ };
+ 
++/*
++ * Newer versions of AvailabilityInternal.h use `__has_builtin`,
++ * which is not implemented in or compatible with GCC.
++ */
++fix = {
++    hackname  = darwin_nix_sdk_availabilityinternal;
++    mach      = "*-*-darwin*";
++    files     = AvailabilityInternal.h;
++    c_fix     = format;
++    c_fix_arg = "%10%2";
++    select    = "(.*)__has_builtin\\(__is_target_os\\)(.*)";
++    test_text = "__has_builtin(__is_target_os)";
++};
++
+ /*
+  *  Fix <c_asm.h> on Digital UNIX V4.0:
+  *  It contains a prototype for a DEC C internal asm() function,
diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/patches/7/AvailabilityInternal.h-fixincludes.patch b/third_party/nixpkgs/pkgs/development/compilers/gcc/patches/7/AvailabilityInternal.h-fixincludes.patch
new file mode 100644
index 0000000000..a8a995d030
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/patches/7/AvailabilityInternal.h-fixincludes.patch
@@ -0,0 +1,105 @@
+diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x
+index d12ba7c3e88..9f31b29c509 100644
+--- a/fixincludes/fixincl.x
++++ b/fixincludes/fixincl.x
+@@ -3468,6 +3468,43 @@ static const char* apzDarwin_Ucred__AtomicPatch[] = {
+ #endif\n",
+     (char*)NULL };
+ 
++/* * * * * * * * * * * * * * * * * * * * * * * * * *
++ *
++ *  Description of Darwin_Nix_Sdk_Availabilityinternal fix
++ */
++tSCC zDarwin_Nix_Sdk_AvailabilityinternalName[] =
++     "darwin_nix_sdk_availabilityinternal";
++
++/*
++ *  File name selection pattern
++ */
++tSCC zDarwin_Nix_Sdk_AvailabilityinternalList[] =
++  "AvailabilityInternal.h\0";
++/*
++ *  Machine/OS name selection pattern
++ */
++tSCC* apzDarwin_Nix_Sdk_AvailabilityinternalMachs[] = {
++        "*-*-darwin*",
++        (const char*)NULL };
++
++/*
++ *  content selection pattern - do fix if pattern found
++ */
++tSCC zDarwin_Nix_Sdk_AvailabilityinternalSelect0[] =
++       "(.*)__has_builtin\\(__is_target_os\\)(.*)";
++
++#define    DARWIN_NIX_SDK_AVAILABILITYINTERNAL_TEST_CT  1
++static tTestDesc aDarwin_Nix_Sdk_AvailabilityinternalTests[] = {
++  { TT_EGREP,    zDarwin_Nix_Sdk_AvailabilityinternalSelect0, (regex_t*)NULL }, };
++
++/*
++ *  Fix Command Arguments for Darwin_Nix_Sdk_Availabilityinternal
++ */
++static const char* apzDarwin_Nix_Sdk_AvailabilityinternalPatch[] = {
++    "format",
++    "%10%2",
++    (char*)NULL };
++
+ /* * * * * * * * * * * * * * * * * * * * * * * * * *
+  *
+  *  Description of Dec_Intern_Asm fix
+@@ -10347,9 +10384,9 @@ static const char* apzX11_SprintfPatch[] = {
+  *
+  *  List of all fixes
+  */
+-#define REGEX_COUNT          291
++#define REGEX_COUNT          292
+ #define MACH_LIST_SIZE_LIMIT 187
+-#define FIX_COUNT            253
++#define FIX_COUNT            254
+ 
+ /*
+  *  Enumerate the fixes
+@@ -10435,6 +10472,7 @@ typedef enum {
+     DARWIN_STDINT_6_FIXIDX,
+     DARWIN_STDINT_7_FIXIDX,
+     DARWIN_UCRED__ATOMIC_FIXIDX,
++    DARWIN_NIX_SDK_AVAILABILITYINTERNAL_FIXIDX,
+     DEC_INTERN_ASM_FIXIDX,
+     DJGPP_WCHAR_H_FIXIDX,
+     ECD_CURSOR_FIXIDX,
+@@ -11011,6 +11049,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
+      DARWIN_UCRED__ATOMIC_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+      aDarwin_Ucred__AtomicTests,   apzDarwin_Ucred__AtomicPatch, 0 },
+ 
++  {  zDarwin_Nix_Sdk_AvailabilityinternalName,    zDarwin_Nix_Sdk_AvailabilityinternalList,
++     apzDarwin_Nix_Sdk_AvailabilityinternalMachs,
++     DARWIN_NIX_SDK_AVAILABILITYINTERNAL_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
++     aDarwin_Nix_Sdk_AvailabilityinternalTests,   apzDarwin_Nix_Sdk_AvailabilityinternalPatch, 0 },
++
+   {  zDec_Intern_AsmName,    zDec_Intern_AsmList,
+      apzDec_Intern_AsmMachs,
+      DEC_INTERN_ASM_TEST_CT, FD_MACH_ONLY,
+diff --git a/fixincludes/inclhack.def b/fixincludes/inclhack.def
+index 179e2f3c98a..70b681f35c8 100644
+--- a/fixincludes/inclhack.def
++++ b/fixincludes/inclhack.def
+@@ -1793,6 +1793,20 @@ fix = {
+     test_text = ""; /* Don't provide this for wrap fixes.  */
+ };
+ 
++/*
++ * Newer versions of AvailabilityInternal.h use `__has_builtin`,
++ * which is not implemented in or compatible with GCC.
++ */
++fix = {
++    hackname  = darwin_nix_sdk_availabilityinternal;
++    mach      = "*-*-darwin*";
++    files     = AvailabilityInternal.h;
++    c_fix     = format;
++    c_fix_arg = "%10%2";
++    select    = "(.*)__has_builtin\\(__is_target_os\\)(.*)";
++    test_text = "__has_builtin(__is_target_os)";
++};
++
+ /*
+  *  Fix <c_asm.h> on Digital UNIX V4.0:
+  *  It contains a prototype for a DEC C internal asm() function,
diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/patches/8/AvailabilityInternal.h-fixincludes.patch b/third_party/nixpkgs/pkgs/development/compilers/gcc/patches/8/AvailabilityInternal.h-fixincludes.patch
new file mode 100644
index 0000000000..0a4f46bce0
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/patches/8/AvailabilityInternal.h-fixincludes.patch
@@ -0,0 +1,105 @@
+diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x
+index 9578c99ab7b..e0ae73496c6 100644
+--- a/fixincludes/fixincl.x
++++ b/fixincludes/fixincl.x
+@@ -3428,6 +3428,43 @@ static const char* apzDarwin_Ucred__AtomicPatch[] = {
+ #endif\n",
+     (char*)NULL };
+ 
++/* * * * * * * * * * * * * * * * * * * * * * * * * *
++ *
++ *  Description of Darwin_Nix_Sdk_Availabilityinternal fix
++ */
++tSCC zDarwin_Nix_Sdk_AvailabilityinternalName[] =
++     "darwin_nix_sdk_availabilityinternal";
++
++/*
++ *  File name selection pattern
++ */
++tSCC zDarwin_Nix_Sdk_AvailabilityinternalList[] =
++  "AvailabilityInternal.h\0";
++/*
++ *  Machine/OS name selection pattern
++ */
++tSCC* apzDarwin_Nix_Sdk_AvailabilityinternalMachs[] = {
++        "*-*-darwin*",
++        (const char*)NULL };
++
++/*
++ *  content selection pattern - do fix if pattern found
++ */
++tSCC zDarwin_Nix_Sdk_AvailabilityinternalSelect0[] =
++       "(.*)__has_builtin\\(__is_target_os\\)(.*)";
++
++#define    DARWIN_NIX_SDK_AVAILABILITYINTERNAL_TEST_CT  1
++static tTestDesc aDarwin_Nix_Sdk_AvailabilityinternalTests[] = {
++  { TT_EGREP,    zDarwin_Nix_Sdk_AvailabilityinternalSelect0, (regex_t*)NULL }, };
++
++/*
++ *  Fix Command Arguments for Darwin_Nix_Sdk_Availabilityinternal
++ */
++static const char* apzDarwin_Nix_Sdk_AvailabilityinternalPatch[] = {
++    "format",
++    "%10%2",
++    (char*)NULL };
++
+ /* * * * * * * * * * * * * * * * * * * * * * * * * *
+  *
+  *  Description of Dec_Intern_Asm fix
+@@ -10356,9 +10393,9 @@ static const char* apzX11_SprintfPatch[] = {
+  *
+  *  List of all fixes
+  */
+-#define REGEX_COUNT          294
++#define REGEX_COUNT          295
+ #define MACH_LIST_SIZE_LIMIT 187
+-#define FIX_COUNT            255
++#define FIX_COUNT            256
+ 
+ /*
+  *  Enumerate the fixes
+@@ -10445,6 +10482,7 @@ typedef enum {
+     DARWIN_STDINT_6_FIXIDX,
+     DARWIN_STDINT_7_FIXIDX,
+     DARWIN_UCRED__ATOMIC_FIXIDX,
++    DARWIN_NIX_SDK_AVAILABILITYINTERNAL_FIXIDX,
+     DEC_INTERN_ASM_FIXIDX,
+     DJGPP_WCHAR_H_FIXIDX,
+     ECD_CURSOR_FIXIDX,
+@@ -11027,6 +11065,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
+      DARWIN_UCRED__ATOMIC_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+      aDarwin_Ucred__AtomicTests,   apzDarwin_Ucred__AtomicPatch, 0 },
+ 
++  {  zDarwin_Nix_Sdk_AvailabilityinternalName,    zDarwin_Nix_Sdk_AvailabilityinternalList,
++     apzDarwin_Nix_Sdk_AvailabilityinternalMachs,
++     DARWIN_NIX_SDK_AVAILABILITYINTERNAL_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
++     aDarwin_Nix_Sdk_AvailabilityinternalTests,   apzDarwin_Nix_Sdk_AvailabilityinternalPatch, 0 },
++
+   {  zDec_Intern_AsmName,    zDec_Intern_AsmList,
+      apzDec_Intern_AsmMachs,
+      DEC_INTERN_ASM_TEST_CT, FD_MACH_ONLY,
+diff --git a/fixincludes/inclhack.def b/fixincludes/inclhack.def
+index 948ea1d9183..5eb403ac841 100644
+--- a/fixincludes/inclhack.def
++++ b/fixincludes/inclhack.def
+@@ -1697,6 +1697,20 @@ fix = {
+     test_text = ""; /* Don't provide this for wrap fixes.  */
+ };
+ 
++/*
++ * Newer versions of AvailabilityInternal.h use `__has_builtin`,
++ * which is not implemented in or compatible with GCC.
++ */
++fix = {
++    hackname  = darwin_nix_sdk_availabilityinternal;
++    mach      = "*-*-darwin*";
++    files     = AvailabilityInternal.h;
++    c_fix     = format;
++    c_fix_arg = "%10%2";
++    select    = "(.*)__has_builtin\\(__is_target_os\\)(.*)";
++    test_text = "__has_builtin(__is_target_os)";
++};
++
+ /*
+  *  Fix <c_asm.h> on Digital UNIX V4.0:
+  *  It contains a prototype for a DEC C internal asm() function,
diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/patches/9/AvailabilityInternal.h-fixincludes.patch b/third_party/nixpkgs/pkgs/development/compilers/gcc/patches/9/AvailabilityInternal.h-fixincludes.patch
new file mode 100644
index 0000000000..8575f71912
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/patches/9/AvailabilityInternal.h-fixincludes.patch
@@ -0,0 +1,105 @@
+diff --git a/fixincludes/fixincl.x b/fixincludes/fixincl.x
+index 47a3578f017..6cf22d19b2a 100644
+--- a/fixincludes/fixincl.x
++++ b/fixincludes/fixincl.x
+@@ -3480,6 +3480,43 @@ static const char* apzDarwin_Ucred__AtomicPatch[] = {
+ #endif\n",
+     (char*)NULL };
+ 
++/* * * * * * * * * * * * * * * * * * * * * * * * * *
++ *
++ *  Description of Darwin_Nix_Sdk_Availabilityinternal fix
++ */
++tSCC zDarwin_Nix_Sdk_AvailabilityinternalName[] =
++     "darwin_nix_sdk_availabilityinternal";
++
++/*
++ *  File name selection pattern
++ */
++tSCC zDarwin_Nix_Sdk_AvailabilityinternalList[] =
++  "AvailabilityInternal.h\0";
++/*
++ *  Machine/OS name selection pattern
++ */
++tSCC* apzDarwin_Nix_Sdk_AvailabilityinternalMachs[] = {
++        "*-*-darwin*",
++        (const char*)NULL };
++
++/*
++ *  content selection pattern - do fix if pattern found
++ */
++tSCC zDarwin_Nix_Sdk_AvailabilityinternalSelect0[] =
++       "(.*)__has_builtin\\(__is_target_os\\)(.*)";
++
++#define    DARWIN_NIX_SDK_AVAILABILITYINTERNAL_TEST_CT  1
++static tTestDesc aDarwin_Nix_Sdk_AvailabilityinternalTests[] = {
++  { TT_EGREP,    zDarwin_Nix_Sdk_AvailabilityinternalSelect0, (regex_t*)NULL }, };
++
++/*
++ *  Fix Command Arguments for Darwin_Nix_Sdk_Availabilityinternal
++ */
++static const char* apzDarwin_Nix_Sdk_AvailabilityinternalPatch[] = {
++    "format",
++    "%10%2",
++    (char*)NULL };
++
+ /* * * * * * * * * * * * * * * * * * * * * * * * * *
+  *
+  *  Description of Dec_Intern_Asm fix
+@@ -10445,9 +10482,9 @@ static const char* apzX11_SprintfPatch[] = {
+  *
+  *  List of all fixes
+  */
+-#define REGEX_COUNT          296
++#define REGEX_COUNT          297
+ #define MACH_LIST_SIZE_LIMIT 187
+-#define FIX_COUNT            257
++#define FIX_COUNT            258
+ 
+ /*
+  *  Enumerate the fixes
+@@ -10535,6 +10572,7 @@ typedef enum {
+     DARWIN_STDINT_6_FIXIDX,
+     DARWIN_STDINT_7_FIXIDX,
+     DARWIN_UCRED__ATOMIC_FIXIDX,
++    DARWIN_NIX_SDK_AVAILABILITYINTERNAL_FIXIDX,
+     DEC_INTERN_ASM_FIXIDX,
+     DJGPP_WCHAR_H_FIXIDX,
+     ECD_CURSOR_FIXIDX,
+@@ -11123,6 +11161,11 @@ tFixDesc fixDescList[ FIX_COUNT ] = {
+      DARWIN_UCRED__ATOMIC_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
+      aDarwin_Ucred__AtomicTests,   apzDarwin_Ucred__AtomicPatch, 0 },
+ 
++  {  zDarwin_Nix_Sdk_AvailabilityinternalName,    zDarwin_Nix_Sdk_AvailabilityinternalList,
++     apzDarwin_Nix_Sdk_AvailabilityinternalMachs,
++     DARWIN_NIX_SDK_AVAILABILITYINTERNAL_TEST_CT, FD_MACH_ONLY | FD_SUBROUTINE,
++     aDarwin_Nix_Sdk_AvailabilityinternalTests,   apzDarwin_Nix_Sdk_AvailabilityinternalPatch, 0 },
++
+   {  zDec_Intern_AsmName,    zDec_Intern_AsmList,
+      apzDec_Intern_AsmMachs,
+      DEC_INTERN_ASM_TEST_CT, FD_MACH_ONLY,
+diff --git a/fixincludes/inclhack.def b/fixincludes/inclhack.def
+index bf136fdaa20..89bceb46c26 100644
+--- a/fixincludes/inclhack.def
++++ b/fixincludes/inclhack.def
+@@ -1727,6 +1727,20 @@ fix = {
+     test_text = ""; /* Don't provide this for wrap fixes.  */
+ };
+ 
++/*
++ * Newer versions of AvailabilityInternal.h use `__has_builtin`,
++ * which is not implemented in or compatible with GCC.
++ */
++fix = {
++    hackname  = darwin_nix_sdk_availabilityinternal;
++    mach      = "*-*-darwin*";
++    files     = AvailabilityInternal.h;
++    c_fix     = format;
++    c_fix_arg = "%10%2";
++    select    = "(.*)__has_builtin\\(__is_target_os\\)(.*)";
++    test_text = "__has_builtin(__is_target_os)";
++};
++
+ /*
+  *  Fix <c_asm.h> on Digital UNIX V4.0:
+  *  It contains a prototype for a DEC C internal asm() function,
diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/patches/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gcc/patches/default.nix
index 2a9d987e1c..7e16ac0003 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/gcc/patches/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/patches/default.nix
@@ -173,6 +173,14 @@ in
   }) ];
 }.${majorVersion} or [])
 
+# Work around newer AvailabilityInternal.h when building older versions of GCC.
+++ optionals (stdenv.isDarwin) ({
+  "9" = [ ../patches/9/AvailabilityInternal.h-fixincludes.patch ];
+  "8" = [ ../patches/8/AvailabilityInternal.h-fixincludes.patch ];
+  "7" = [ ../patches/7/AvailabilityInternal.h-fixincludes.patch ];
+  "6" = [ ../patches/6/AvailabilityInternal.h-fixincludes.patch ];
+}.${majorVersion} or [])
+
 
 ## Windows
 
@@ -279,9 +287,9 @@ in
   ./6/gnat-glibc234.patch
 ]
 
-# The clang-based assembler used in darwin.cctools-llvm (LLVM >11) does not support piping input.
+# The clang-based assembler used in darwin.binutils (LLVM >11) does not support piping input.
 # Fortunately, it does not exhibit the problem GCC has with the cctools assembler.
-# This patch can be dropped should darwin.cctools-llvm ever implement support.
+# This patch can be dropped should darwin.binutils ever implement support.
 ++ optional (!atLeast7 && hostPlatform.isDarwin && lib.versionAtLeast (lib.getVersion stdenv.cc) "12") ./4.9/darwin-clang-as.patch
 
 # Building libstdc++ with flat namespaces results in trying to link CoreFoundation, which
diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghc/8.10.7-binary.nix b/third_party/nixpkgs/pkgs/development/compilers/ghc/8.10.7-binary.nix
index c29b3c89f4..a4602c9a64 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/ghc/8.10.7-binary.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/ghc/8.10.7-binary.nix
@@ -4,6 +4,7 @@
 , ncurses6, gmp, libiconv, numactl
 , llvmPackages
 , coreutils
+, rcodesign
 , targetPackages
 
   # minimal = true; will remove files that aren't strictly necessary for
@@ -190,7 +191,15 @@ stdenv.mkDerivation rec {
   #           https://gitlab.haskell.org/ghc/ghc/-/issues/20059
   #       and update this comment accordingly.
 
-  nativeBuildInputs = [ perl ];
+  nativeBuildInputs = [ perl ]
+    # Upstream binaries may not be linker-signed, which invalidates their signatures
+    # because `install_name_tool` will only replace a signature if it is both
+    # an ad hoc signature and the signature is flagged as linker-signed.
+    #
+    # rcodesign is used to replace the signature instead of sigtool because it
+    # supports setting the linker-signed flag, which will ensure future processing
+    # of the binaries does not invalidate their signatures.
+    ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ rcodesign ];
 
   # Set LD_LIBRARY_PATH or equivalent so that the programs running as part
   # of the bindist installer can find the libraries they expect.
@@ -236,15 +245,20 @@ stdenv.mkDerivation rec {
         ])
     # GHC has dtrace probes, which causes ld to try to open /usr/lib/libdtrace.dylib
     # during linking
-    + lib.optionalString stdenv.isDarwin ''
+    + lib.optionalString stdenv.isDarwin (''
       export NIX_LDFLAGS+=" -no_dtrace_dof"
       # not enough room in the object files for the full path to libiconv :(
       for exe in $(find . -type f -executable); do
         isScript $exe && continue
         ln -fs ${libiconv}/lib/libiconv.dylib $(dirname $exe)/libiconv.dylib
         install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib -change /usr/local/lib/gcc/6/libgcc_s.1.dylib ${gcc.cc.lib}/lib/libgcc_s.1.dylib $exe
+    '' + lib.optionalString stdenv.isAarch64 ''
+        # Resign the binary and set the linker-signed flag. Ignore failures when the file is an object file.
+        # Object files don’t have signatures, so ignoring the failures is harmless.
+        rcodesign sign --code-signature-flags linker-signed $exe || true
+    '' + ''
       done
-    '' +
+    '') +
 
     # Some scripts used during the build need to have their shebangs patched
     ''
diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghc/8.10.7.nix b/third_party/nixpkgs/pkgs/development/compilers/ghc/8.10.7.nix
index a0ba35619a..a6694e2e99 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/ghc/8.10.7.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/ghc/8.10.7.nix
@@ -157,18 +157,16 @@ let
 
         otool = cc.bintools.bintools;
 
-        # GHC needs install_name_tool on all darwin platforms. On aarch64-darwin it is
-        # part of the bintools wrapper (due to codesigning requirements), but not on
-        # x86_64-darwin. We decide based on target platform to have consistent tools
-        # across all GHC stages.
-        install_name_tool =
-          if stdenv.targetPlatform.isAarch64
-          then cc.bintools
-          else cc.bintools.bintools;
-        # Same goes for strip.
+        # GHC needs install_name_tool on all darwin platforms. The same one can
+        # be used on both platforms. It is safe to use with linker-generated
+        # signatures because it will update the signatures automatically after
+        # modifying the target binary.
+        install_name_tool = cc.bintools.bintools;
+
+        # strip on darwin is wrapped to enable deterministic mode.
         strip =
           # TODO(@sternenseemann): also use wrapper if linker == "bfd" or "gold"
-          if stdenv.targetPlatform.isAarch64 && stdenv.targetPlatform.isDarwin
+          if stdenv.targetPlatform.isDarwin
           then cc.bintools
           else cc.bintools.bintools;
       }.${name};
diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghc/9.6.3-binary.nix b/third_party/nixpkgs/pkgs/development/compilers/ghc/9.6.3-binary.nix
index 65ed655e57..d67e9f47ac 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/ghc/9.6.3-binary.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/ghc/common-hadrian.nix b/third_party/nixpkgs/pkgs/development/compilers/ghc/common-hadrian.nix
index 5a9be57e61..b6d4d7236f 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/ghc/common-hadrian.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/ghc/common-hadrian.nix
@@ -288,18 +288,16 @@ let
 
         otool = cc.bintools.bintools;
 
-        # GHC needs install_name_tool on all darwin platforms. On aarch64-darwin it is
-        # part of the bintools wrapper (due to codesigning requirements), but not on
-        # x86_64-darwin. We decide based on target platform to have consistent tools
-        # across all GHC stages.
-        install_name_tool =
-          if stdenv.targetPlatform.isAarch64
-          then cc.bintools
-          else cc.bintools.bintools;
-        # Same goes for strip.
+        # GHC needs install_name_tool on all darwin platforms. The same one can
+        # be used on both platforms. It is safe to use with linker-generated
+        # signatures because it will update the signatures automatically after
+        # modifying the target binary.
+        install_name_tool = cc.bintools.bintools;
+
+        # strip on darwin is wrapped to enable deterministic mode.
         strip =
           # TODO(@sternenseemann): also use wrapper if linker == "bfd" or "gold"
-          if stdenv.targetPlatform.isAarch64 && stdenv.targetPlatform.isDarwin
+          if stdenv.targetPlatform.isDarwin
           then cc.bintools
           else cc.bintools.bintools;
       }.${name};
diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghc/common-make-native-bignum.nix b/third_party/nixpkgs/pkgs/development/compilers/ghc/common-make-native-bignum.nix
index 79fced444f..2b23cd75a0 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/ghc/common-make-native-bignum.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/ghc/common-make-native-bignum.nix
@@ -157,18 +157,16 @@ let
 
         otool = cc.bintools.bintools;
 
-        # GHC needs install_name_tool on all darwin platforms. On aarch64-darwin it is
-        # part of the bintools wrapper (due to codesigning requirements), but not on
-        # x86_64-darwin. We decide based on target platform to have consistent tools
-        # across all GHC stages.
-        install_name_tool =
-          if stdenv.targetPlatform.isAarch64
-          then cc.bintools
-          else cc.bintools.bintools;
-        # Same goes for strip.
+        # GHC needs install_name_tool on all darwin platforms. The same one can
+        # be used on both platforms. It is safe to use with linker-generated
+        # signatures because it will update the signatures automatically after
+        # modifying the target binary.
+        install_name_tool = cc.bintools.bintools;
+
+        # strip on darwin is wrapped to enable deterministic mode.
         strip =
           # TODO(@sternenseemann): also use wrapper if linker == "bfd" or "gold"
-          if stdenv.targetPlatform.isAarch64 && stdenv.targetPlatform.isDarwin
+          if stdenv.targetPlatform.isDarwin
           then cc.bintools
           else cc.bintools.bintools;
       }.${name};
diff --git a/third_party/nixpkgs/pkgs/development/compilers/glslang/default.nix b/third_party/nixpkgs/pkgs/development/compilers/glslang/default.nix
index 91dfb29631..5fe11e35a4 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/glslang/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/glslang/default.nix
@@ -9,13 +9,13 @@
 }:
 stdenv.mkDerivation rec {
   pname = "glslang";
-  version = "14.2.0";
+  version = "14.3.0";
 
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "glslang";
     rev = version;
-    hash = "sha256-B6jVCeoFjd2H6+7tIses+Kj8DgHS6E2dkVzQAIzDHEc=";
+    hash = "sha256-slKBFq6NyWHQmJq/YR3LmbGnHyZgRg0hej90tZDOGzA=";
   };
 
   # These get set at all-packages, keep onto them for child drvs
diff --git a/third_party/nixpkgs/pkgs/development/compilers/gnu-cobol/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gnu-cobol/default.nix
index 5b01856786..f086f22cc1 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/gnu-cobol/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/go/1.21.nix b/third_party/nixpkgs/pkgs/development/compilers/go/1.21.nix
index 1e83bf9a2c..ef969cb671 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/go/1.21.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/go/1.21.nix
@@ -17,8 +17,7 @@
 }:
 
 let
-  useGccGoBootstrap = stdenv.buildPlatform.isMusl;
-  goBootstrap = if useGccGoBootstrap then buildPackages.gccgo12 else buildPackages.callPackage ./bootstrap121.nix { };
+  goBootstrap = buildPackages.callPackage ./bootstrap121.nix { };
 
   skopeoTest = skopeo.override { buildGoModule = buildGo121Module; };
 
@@ -115,7 +114,7 @@ stdenv.mkDerivation (finalAttrs: {
   GO386 = "softfloat"; # from Arch: don't assume sse2 on i686
   CGO_ENABLED = 1;
 
-  GOROOT_BOOTSTRAP = if useGccGoBootstrap then goBootstrap else "${goBootstrap}/share/go";
+  GOROOT_BOOTSTRAP = "${goBootstrap}/share/go";
 
   buildPhase = ''
     runHook preBuild
diff --git a/third_party/nixpkgs/pkgs/development/compilers/go/1.22.nix b/third_party/nixpkgs/pkgs/development/compilers/go/1.22.nix
index fcbd87f25c..447b9815fb 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/go/1.22.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/go/1.22.nix
@@ -17,8 +17,7 @@
 }:
 
 let
-  useGccGoBootstrap = stdenv.buildPlatform.isMusl;
-  goBootstrap = if useGccGoBootstrap then buildPackages.gccgo12 else buildPackages.callPackage ./bootstrap121.nix { };
+  goBootstrap = buildPackages.callPackage ./bootstrap121.nix { };
 
   skopeoTest = skopeo.override { buildGoModule = buildGo122Module; };
 
@@ -117,7 +116,7 @@ stdenv.mkDerivation (finalAttrs: {
   # Wasi does not support CGO
   CGO_ENABLED = if stdenv.targetPlatform.isWasi then 0 else 1;
 
-  GOROOT_BOOTSTRAP = if useGccGoBootstrap then goBootstrap else "${goBootstrap}/share/go";
+  GOROOT_BOOTSTRAP = "${goBootstrap}/share/go";
 
   buildPhase = ''
     runHook preBuild
diff --git a/third_party/nixpkgs/pkgs/development/compilers/go/1.23.nix b/third_party/nixpkgs/pkgs/development/compilers/go/1.23.nix
index fb83a95dd4..63df35a72d 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/go/1.23.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/go/1.23.nix
@@ -17,8 +17,7 @@
 }:
 
 let
-  useGccGoBootstrap = stdenv.buildPlatform.isMusl;
-  goBootstrap = if useGccGoBootstrap then buildPackages.gccgo12 else buildPackages.callPackage ./bootstrap121.nix { };
+  goBootstrap = buildPackages.callPackage ./bootstrap121.nix { };
 
   skopeoTest = skopeo.override { buildGoModule = buildGo123Module; };
 
@@ -117,7 +116,7 @@ stdenv.mkDerivation (finalAttrs: {
   # Wasi does not support CGO
   CGO_ENABLED = if stdenv.targetPlatform.isWasi then 0 else 1;
 
-  GOROOT_BOOTSTRAP = if useGccGoBootstrap then goBootstrap else "${goBootstrap}/share/go";
+  GOROOT_BOOTSTRAP = "${goBootstrap}/share/go";
 
   buildPhase = ''
     runHook preBuild
diff --git a/third_party/nixpkgs/pkgs/development/compilers/go/binary.nix b/third_party/nixpkgs/pkgs/development/compilers/go/binary.nix
index 3b4e8010d2..cd2e429e70 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/go/binary.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/go/binary.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, version, hashes, autoPatchelfHook }:
+{ lib, stdenv, fetchurl, version, hashes }:
 let
   toGoKernel = platform:
     if platform.isDarwin then "darwin"
@@ -26,8 +26,6 @@ stdenv.mkDerivation rec {
     sha256 = hashes.${platform} or (throw "Missing Go bootstrap hash for platform ${platform}");
   };
 
-  nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ];
-
   # We must preserve the signature on Darwin
   dontStrip = stdenv.hostPlatform.isDarwin;
 
diff --git a/third_party/nixpkgs/pkgs/development/compilers/intel-graphics-compiler/default.nix b/third_party/nixpkgs/pkgs/development/compilers/intel-graphics-compiler/default.nix
index 02bc670f26..27cd6acc3f 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/intel-graphics-compiler/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/intel-graphics-compiler/default.nix
@@ -31,13 +31,13 @@ in
 
 stdenv.mkDerivation rec {
   pname = "intel-graphics-compiler";
-  version = "1.0.16695.4";
+  version = "1.0.17193.4";
 
   src = fetchFromGitHub {
     owner = "intel";
     repo = "intel-graphics-compiler";
     rev = "igc-${version}";
-    hash = "sha256-XgQ2Gk3HDKBpsfomlpRUt8WybEIoHfKlyuWJCwCnmDA=";
+    hash = "sha256-OOKj3kfl+0/dgeICFtbiOVE0nsYYvI4v97BLjcExAmc=";
   };
 
   nativeBuildInputs = [ bison cmake flex (python3.withPackages (ps : with ps; [ mako ])) ];
diff --git a/third_party/nixpkgs/pkgs/development/compilers/juniper/default.nix b/third_party/nixpkgs/pkgs/development/compilers/juniper/default.nix
index edf3e4b637..09a7f9b286 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/juniper/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/llvm/12/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/default.nix
index 43f940a846..4e2754def4 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/llvm/common/compiler-rt/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/common/compiler-rt/default.nix
index 67f9661cf7..769c362738 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/llvm/common/compiler-rt/default.nix
+++ b/third_party/nixpkgs/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,7 +50,7 @@ let
       cp -r ${monorepoSrc}/${baseName} "$out"
     '' else src;
 
-  preConfigure = lib.optionalString (useLLVM && !haveLibc) ''
+  preConfigure = lib.optionalString (!haveLibc) ''
     cmakeFlagsArray+=(-DCMAKE_C_FLAGS="-nodefaultlibs -ffreestanding")
   '';
 in
@@ -82,23 +86,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 +146,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 +198,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/third_party/nixpkgs/pkgs/development/compilers/llvm/common/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/common/default.nix
index b84fcab17f..0c7602e4f2 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/llvm/common/default.nix
+++ b/third_party/nixpkgs/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
@@ -225,7 +233,24 @@ let
                   stripLen = 1;
                   hash = "sha256-e8YKrMy2rGcSJGC6er2V66cOnAnI+u1/yImkvsRsmg8=";
                 }
-              );
+              )
+          ++ lib.optionals (lib.versions.major metadata.release_version == "18") [
+            # Reorgs one test so the next patch applies
+            (fetchpatch {
+              name = "osabi-test-reorg.patch";
+              url = "https://github.com/llvm/llvm-project/commit/06cecdc60ec9ebfdd4d8cdb2586d201272bdf6bd.patch";
+              stripLen = 1;
+              hash = "sha256-s9GZTNgzLS511Pzh6Wb1hEV68lxhmLWXjlybHBDMhvM=";
+            })
+            # Sets the OSABI for OpenBSD, needed for an LLD patch for OpenBSD.
+            # https://github.com/llvm/llvm-project/pull/98553
+            (fetchpatch {
+              name = "mc-set-openbsd-osabi.patch";
+              url = "https://github.com/llvm/llvm-project/commit/b64c1de714c50bec7493530446ebf5e540d5f96a.patch";
+              stripLen = 1;
+              hash = "sha256-fqw5gTSEOGs3kAguR4tINFG7Xja1RAje+q67HJt2nGg=";
+            })
+          ];
         pollyPatches =
           [ (metadata.getVersionFile "llvm/gnu-install-dirs-polly.patch") ]
           ++ lib.optional (lib.versionAtLeast metadata.release_version "15")
@@ -327,7 +352,16 @@ let
           )
           ++ lib.optional (
             lib.versionAtLeast metadata.release_version "16" && lib.versionOlder metadata.release_version "18"
-          ) (metadata.getVersionFile "lld/add-table-base.patch");
+          ) (metadata.getVersionFile "lld/add-table-base.patch")
+          ++ lib.optional (lib.versions.major metadata.release_version == "18") (
+            # https://github.com/llvm/llvm-project/pull/97122
+            fetchpatch {
+              name = "more-openbsd-program-headers.patch";
+              url = "https://github.com/llvm/llvm-project/commit/d7fd8b19e560fbb613159625acd8046d0df75115.patch";
+              stripLen = 1;
+              hash = "sha256-7wTy7XDTx0+fhWQpW1KEuz7xJvpl42qMTUfd20KGOfA=";
+            }
+          );
       };
 
       lldb = callPackage ./lldb.nix (
@@ -443,25 +477,76 @@ let
         }
       );
 
-      clangNoLibcxx = wrapCCWith (
+      clangWithLibcAndBasicRtAndLibcxx = wrapCCWith (
         rec {
           cc = tools.clang-unwrapped;
-          libcxx = null;
+          libcxx = targetLlvmLibraries.libcxx;
           bintools = bintools';
-          extraPackages = [ targetLlvmLibraries.compiler-rt ];
+          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" >> $out/nix-support/cc-cflags
-              echo "-B${targetLlvmLibraries.compiler-rt}/lib" >> $out/nix-support/cc-cflags
-              echo "-nostdlib++" >> $out/nix-support/cc-cflags
-            ''
-            + mkExtraBuildCommands cc;
+            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"
-              "-B${targetLlvmLibraries.compiler-rt}/lib"
+              "-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-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-no-libc}/lib" >> $out/nix-support/cc-cflags
+              echo "-nostdlib++" >> $out/nix-support/cc-cflags
+            ''
+            + mkExtraBuildCommandsBasicRt cc;
+        }
+        // lib.optionalAttrs (lib.versionAtLeast metadata.release_version "14") {
+          nixSupport.cc-cflags =
+            [
+              "-rtlib=compiler-rt"
+              "-B${targetLlvmLibraries.compiler-rt-no-libc}/lib"
               "-nostdlib++"
             ]
             ++ lib.optional (
@@ -470,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
@@ -495,7 +580,7 @@ let
         }
       );
 
-      clangNoCompilerRt = wrapCCWith (
+      clangNoLibcNoRt = wrapCCWith (
         rec {
           cc = tools.clang-unwrapped;
           libcxx = null;
@@ -516,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;
@@ -527,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'
@@ -601,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;
 
@@ -698,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.
@@ -710,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/third_party/nixpkgs/pkgs/development/compilers/llvm/common/llvm/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/common/llvm/default.nix
index 5a8346875f..9f9f91ee2d 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/llvm/common/llvm/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/common/llvm/default.nix
@@ -102,6 +102,10 @@ stdenv.mkDerivation (rec {
 
   outputs = [ "out" "lib" "dev" "python" ];
 
+  hardeningDisable = [
+    "trivialautovarinit"
+  ];
+
   nativeBuildInputs = [ cmake ]
     ++ (lib.optional (lib.versionAtLeast release_version "15") ninja)
     ++ [ python ]
@@ -537,6 +541,4 @@ stdenv.mkDerivation (rec {
     check_version minor ${minor}
     check_version patch ${patch}
   '';
-} // lib.optionalAttrs (lib.versionOlder release_version "17" || lib.versionAtLeast release_version "18") {
-  hardeningDisable = [ "trivialautovarinit" ];
 })
diff --git a/third_party/nixpkgs/pkgs/development/compilers/openjdk/11.nix b/third_party/nixpkgs/pkgs/development/compilers/openjdk/11.nix
index 04df2d28a4..089e841121 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/openjdk/11.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/openjdk/11.nix
@@ -5,7 +5,7 @@
 , setJavaClassPath
 , headless ? false
 , enableJavaFX ? false, openjfx
-, enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf
+, enableGtk ? true, gtk3, glib
 }:
 
 let
@@ -33,8 +33,8 @@ let
       cpio file which zip perl zlib cups freetype harfbuzz alsa-lib libjpeg giflib
       libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
       libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap
-    ] ++ lib.optionals (!headless && enableGnome2) [
-      gtk3 gnome_vfs GConf glib
+    ] ++ lib.optionals (!headless && enableGtk) [
+      gtk3 glib
     ];
 
     patches = [
@@ -51,7 +51,7 @@ let
         url = "https://github.com/openjdk/jdk/commit/9341d135b855cc208d48e47d30cd90aafa354c36.patch";
         hash = "sha256-Qcm3ZmGCOYLZcskNjj7DYR85R4v07vYvvavrVOYL8vg=";
       })
-    ] ++ lib.optionals (!headless && enableGnome2) [
+    ] ++ lib.optionals (!headless && enableGtk) [
       ./swing-use-gtk-jdk10.patch
     ];
 
@@ -74,9 +74,19 @@ let
       "--with-lcms=system"
       "--with-stdc++lib=dynamic"
       "--disable-warnings-as-errors"
-    ] ++ lib.optional stdenv.isx86_64 "--with-jvm-features=zgc"
-      ++ lib.optional headless "--enable-headless-only"
-      ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}";
+    ]
+    # Cannot be built by recent versions of Clang, as far as I can tell (see
+    # https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=260319). Known to
+    # compile with LLVM 12.
+    ++ lib.optionals stdenv.cc.isClang [
+      "--with-toolchain-type=clang"
+      # Explicitly tell Clang to compile C++ files as C++, see
+      # https://github.com/NixOS/nixpkgs/issues/150655#issuecomment-1935304859
+      "--with-extra-cxxflags=-xc++"
+    ]
+    ++ lib.optional stdenv.isx86_64 "--with-jvm-features=zgc"
+    ++ lib.optional headless "--enable-headless-only"
+    ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}";
 
     separateDebugInfo = true;
 
@@ -87,8 +97,8 @@ let
 
     NIX_LDFLAGS = toString (lib.optionals (!headless) [
       "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
-    ] ++ lib.optionals (!headless && enableGnome2) [
-      "-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2"
+    ] ++ lib.optionals (!headless && enableGtk) [
+      "-lgtk-3" "-lgio-2.0"
     ]);
 
     # -j flag is explicitly rejected by the build system:
diff --git a/third_party/nixpkgs/pkgs/development/compilers/openjdk/12.nix b/third_party/nixpkgs/pkgs/development/compilers/openjdk/12.nix
deleted file mode 100644
index ab0696e172..0000000000
--- a/third_party/nixpkgs/pkgs/development/compilers/openjdk/12.nix
+++ /dev/null
@@ -1,172 +0,0 @@
-{ stdenv, lib, fetchurl, bash, pkg-config, autoconf, cpio, file, which, unzip
-, zip, perl, cups, freetype, alsa-lib, libjpeg, giflib, libpng, zlib, lcms2
-, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama
-, libXcursor, libXrandr, fontconfig, openjdk11-bootstrap, fetchpatch
-, setJavaClassPath
-, headless ? false
-, enableJavaFX ? false, openjfx
-, enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf
-}:
-
-let
-  major = "12";
-  update = ".0.2";
-  build = "ga";
-
-  # when building a headless jdk, also bootstrap it with a headless jdk
-  openjdk-bootstrap = openjdk11-bootstrap.override { gtkSupport = !headless; };
-
-  openjdk = stdenv.mkDerivation rec {
-    pname = "openjdk" + lib.optionalString headless "-headless";
-    version = "${major}${update}-${build}";
-
-    src = fetchurl {
-      url = "http://hg.openjdk.java.net/jdk-updates/jdk${major}u/archive/jdk-${version}.tar.gz";
-      sha256 = "1ndlxmikyy298z7lqpr1bd0zxq7yx6xidj8y3c8mw9m9fy64h9c7";
-    };
-
-    nativeBuildInputs = [ pkg-config autoconf unzip ];
-    buildInputs = [
-      cpio file which zip perl zlib cups freetype alsa-lib libjpeg giflib
-      libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
-      libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap
-    ] ++ lib.optionals (!headless && enableGnome2) [
-      gtk3 gnome_vfs GConf glib
-    ];
-
-    patches = [
-      ./fix-java-home-jdk10.patch
-      ./read-truststore-from-env-jdk10.patch
-      ./currency-date-range-jdk10.patch
-      ./increase-javadoc-heap.patch
-      # -Wformat etc. are stricter in newer gccs, per
-      # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79677
-      # so grab the work-around from
-      # https://src.fedoraproject.org/rpms/java-openjdk/pull-request/24
-      (fetchurl {
-        url = "https://src.fedoraproject.org/rpms/java-openjdk/raw/06c001c7d87f2e9fe4fedeef2d993bcd5d7afa2a/f/rh1673833-remove_removal_of_wformat_during_test_compilation.patch";
-        sha256 = "082lmc30x64x583vqq00c8y0wqih3y4r0mp1c4bqq36l22qv6b6r";
-      })
-      # Fix gnumake 4.3 incompatibility
-      (fetchpatch {
-        url = "https://github.com/openjdk/panama-foreign/commit/af5c725b8109ce83fc04ef0f8bf6aaf0b50c0441.patch";
-        sha256 = "0ja84kih5wkjn58pml53s59qnavb1z92dc88cbgw7vcyqwc1gs0h";
-      })
-    ] ++ lib.optionals (!headless && enableGnome2) [
-      ./swing-use-gtk-jdk10.patch
-    ];
-
-    prePatch = ''
-      chmod +x configure
-      patchShebangs --build configure
-    '';
-
-    configureFlags = [
-      "--with-boot-jdk=${openjdk-bootstrap.home}"
-      "--with-version-pre="
-      "--enable-unlimited-crypto"
-      "--with-native-debug-symbols=internal"
-      "--with-freetype=system"
-      "--with-libjpeg=system"
-      "--with-giflib=system"
-      "--with-libpng=system"
-      "--with-zlib=system"
-      "--with-lcms=system"
-      "--with-stdc++lib=dynamic"
-    ] ++ lib.optional stdenv.isx86_64 "--with-jvm-features=zgc"
-      ++ lib.optional headless "--enable-headless-only"
-      ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}";
-
-    separateDebugInfo = true;
-
-    env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error" ];
-
-    NIX_LDFLAGS = lib.optionals (!headless) [
-      "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
-    ] ++ lib.optionals (!headless && enableGnome2) [
-      "-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2"
-    ];
-
-    # -j flag is explicitly rejected by the build system:
-    #     Error: 'make -jN' is not supported, use 'make JOBS=N'
-    # Note: it does not make build sequential. Build system
-    # still runs in parallel.
-    enableParallelBuilding = false;
-
-    buildFlags = [ "all" ];
-
-    postBuild = ''
-      cd build/linux*
-      make images
-      cd -
-    '';
-
-    installPhase = ''
-      mkdir -p $out/lib
-
-      mv build/*/images/jdk $out/lib/openjdk
-
-      # Remove some broken manpages.
-      rm -rf $out/lib/openjdk/man/ja*
-
-      # Mirror some stuff in top-level.
-      mkdir -p $out/share
-      ln -s $out/lib/openjdk/include $out/include
-      ln -s $out/lib/openjdk/man $out/share/man
-
-      # jni.h expects jni_md.h to be in the header search path.
-      ln -s $out/include/linux/*_md.h $out/include/
-
-      # Remove crap from the installation.
-      rm -rf $out/lib/openjdk/demo
-      ${lib.optionalString headless ''
-        rm $out/lib/openjdk/lib/{libjsound,libfontmanager}.so
-      ''}
-
-      ln -s $out/lib/openjdk/bin $out/bin
-    '';
-
-    preFixup = ''
-      # Propagate the setJavaClassPath setup hook so that any package
-      # that depends on the JDK has $CLASSPATH set up properly.
-      mkdir -p $out/nix-support
-      #TODO or printWords?  cf https://github.com/NixOS/nixpkgs/pull/27427#issuecomment-317293040
-      echo -n "${setJavaClassPath}" > $out/nix-support/propagated-build-inputs
-
-      # Set JAVA_HOME automatically.
-      mkdir -p $out/nix-support
-      cat <<EOF > $out/nix-support/setup-hook
-      if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out/lib/openjdk; fi
-      EOF
-    '';
-
-    postFixup = ''
-      # Build the set of output library directories to rpath against
-      LIBDIRS=""
-      for output in $(getAllOutputNames); do
-        if [ "$output" = debug ]; then continue; fi
-        LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort | uniq | tr '\n' ':'):$LIBDIRS"
-      done
-      # Add the local library paths to remove dependencies on the bootstrap
-      for output in $(getAllOutputNames); do
-        if [ "$output" = debug ]; then continue; fi
-        OUTPUTDIR=$(eval echo \$$output)
-        BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*)
-        echo "$BINLIBS" | while read i; do
-          patchelf --set-rpath "$LIBDIRS:$(patchelf --print-rpath "$i")" "$i" || true
-          patchelf --shrink-rpath "$i" || true
-        done
-      done
-    '';
-
-    disallowedReferences = [ openjdk-bootstrap ];
-
-    meta = import ./meta.nix lib version;
-
-    passthru = {
-      architecture = "";
-      home = "${openjdk}/lib/openjdk";
-      inherit gtk3;
-    };
-  };
-in openjdk
diff --git a/third_party/nixpkgs/pkgs/development/compilers/openjdk/13.nix b/third_party/nixpkgs/pkgs/development/compilers/openjdk/13.nix
deleted file mode 100644
index 5d5d9f7747..0000000000
--- a/third_party/nixpkgs/pkgs/development/compilers/openjdk/13.nix
+++ /dev/null
@@ -1,177 +0,0 @@
-{ stdenv, lib, fetchurl, bash, pkg-config, autoconf, cpio, file, which, unzip
-, zip, perl, cups, freetype, alsa-lib, libjpeg, giflib, libpng, zlib, lcms2
-, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama
-, libXcursor, libXrandr, fontconfig, openjdk13-bootstrap, fetchpatch
-, setJavaClassPath
-, headless ? false
-, enableJavaFX ? false, openjfx
-, enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf
-}:
-
-let
-  major = "13";
-  update = ".0.2";
-  build = "-ga";
-
-  # when building a headless jdk, also bootstrap it with a headless jdk
-  openjdk-bootstrap = openjdk13-bootstrap.override { gtkSupport = !headless; };
-
-  openjdk = stdenv.mkDerivation rec {
-    pname = "openjdk" + lib.optionalString headless "-headless";
-    version = "${major}${update}${build}";
-
-    src = fetchurl {
-      url = "http://hg.openjdk.java.net/jdk-updates/jdk${major}u/archive/jdk-${version}.tar.gz";
-      sha256 = "1871ziss7ny19rw8f7bay5vznmhpqbfi4ihn3yygs06wyxhm0zmv";
-    };
-
-    nativeBuildInputs = [ pkg-config autoconf unzip ];
-    buildInputs = [
-      cpio file which zip perl zlib cups freetype alsa-lib libjpeg giflib
-      libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
-      libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap
-    ] ++ lib.optionals (!headless && enableGnome2) [
-      gtk3 gnome_vfs GConf glib
-    ];
-
-    patches = [
-      ./fix-java-home-jdk10.patch
-      ./read-truststore-from-env-jdk10.patch
-      ./currency-date-range-jdk10.patch
-      ./increase-javadoc-heap-jdk13.patch
-      # -Wformat etc. are stricter in newer gccs, per
-      # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79677
-      # so grab the work-around from
-      # https://src.fedoraproject.org/rpms/java-openjdk/pull-request/24
-      (fetchurl {
-        url = "https://src.fedoraproject.org/rpms/java-openjdk/raw/06c001c7d87f2e9fe4fedeef2d993bcd5d7afa2a/f/rh1673833-remove_removal_of_wformat_during_test_compilation.patch";
-        sha256 = "082lmc30x64x583vqq00c8y0wqih3y4r0mp1c4bqq36l22qv6b6r";
-      })
-      # Fix gnumake 4.3 incompatibility
-      (fetchpatch {
-        url = "https://github.com/openjdk/panama-foreign/commit/af5c725b8109ce83fc04ef0f8bf6aaf0b50c0441.patch";
-        sha256 = "0ja84kih5wkjn58pml53s59qnavb1z92dc88cbgw7vcyqwc1gs0h";
-      })
-    ] ++ lib.optionals (!headless && enableGnome2) [
-      ./swing-use-gtk-jdk13.patch
-    ];
-
-    prePatch = ''
-      chmod +x configure
-      patchShebangs --build configure
-    '';
-
-    # JDK's build system attempts to specifically detect
-    # and special-case WSL, and we don't want it to do that,
-    # so pass the correct platform names explicitly
-    configurePlatforms = ["build" "host"];
-
-    configureFlags = [
-      "--with-boot-jdk=${openjdk-bootstrap.home}"
-      "--with-version-pre="
-      "--enable-unlimited-crypto"
-      "--with-native-debug-symbols=internal"
-      "--with-freetype=system"
-      "--with-libjpeg=system"
-      "--with-giflib=system"
-      "--with-libpng=system"
-      "--with-zlib=system"
-      "--with-lcms=system"
-      "--with-stdc++lib=dynamic"
-    ] ++ lib.optional stdenv.isx86_64 "--with-jvm-features=zgc"
-      ++ lib.optional headless "--enable-headless-only"
-      ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}";
-
-    separateDebugInfo = true;
-
-    env.NIX_CFLAGS_COMPILE = "-Wno-error";
-
-    NIX_LDFLAGS = toString (lib.optionals (!headless) [
-      "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
-    ] ++ lib.optionals (!headless && enableGnome2) [
-      "-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2"
-    ]);
-
-    # -j flag is explicitly rejected by the build system:
-    #     Error: 'make -jN' is not supported, use 'make JOBS=N'
-    # Note: it does not make build sequential. Build system
-    # still runs in parallel.
-    enableParallelBuilding = false;
-
-    buildFlags = [ "all" ];
-
-    postBuild = ''
-      cd build/linux*
-      make images
-      cd -
-    '';
-
-    installPhase = ''
-      mkdir -p $out/lib
-
-      mv build/*/images/jdk $out/lib/openjdk
-
-      # Remove some broken manpages.
-      rm -rf $out/lib/openjdk/man/ja*
-
-      # Mirror some stuff in top-level.
-      mkdir -p $out/share
-      ln -s $out/lib/openjdk/include $out/include
-      ln -s $out/lib/openjdk/man $out/share/man
-
-      # jni.h expects jni_md.h to be in the header search path.
-      ln -s $out/include/linux/*_md.h $out/include/
-
-      # Remove crap from the installation.
-      rm -rf $out/lib/openjdk/demo
-      ${lib.optionalString headless ''
-        rm $out/lib/openjdk/lib/{libjsound,libfontmanager}.so
-      ''}
-
-      ln -s $out/lib/openjdk/bin $out/bin
-    '';
-
-    preFixup = ''
-      # Propagate the setJavaClassPath setup hook so that any package
-      # that depends on the JDK has $CLASSPATH set up properly.
-      mkdir -p $out/nix-support
-      #TODO or printWords?  cf https://github.com/NixOS/nixpkgs/pull/27427#issuecomment-317293040
-      echo -n "${setJavaClassPath}" > $out/nix-support/propagated-build-inputs
-
-      # Set JAVA_HOME automatically.
-      mkdir -p $out/nix-support
-      cat <<EOF > $out/nix-support/setup-hook
-      if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out/lib/openjdk; fi
-      EOF
-    '';
-
-    postFixup = ''
-      # Build the set of output library directories to rpath against
-      LIBDIRS=""
-      for output in $(getAllOutputNames); do
-        if [ "$output" = debug ]; then continue; fi
-        LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort | uniq | tr '\n' ':'):$LIBDIRS"
-      done
-      # Add the local library paths to remove dependencies on the bootstrap
-      for output in $(getAllOutputNames); do
-        if [ "$output" = debug ]; then continue; fi
-        OUTPUTDIR=$(eval echo \$$output)
-        BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*)
-        echo "$BINLIBS" | while read i; do
-          patchelf --set-rpath "$LIBDIRS:$(patchelf --print-rpath "$i")" "$i" || true
-          patchelf --shrink-rpath "$i" || true
-        done
-      done
-    '';
-
-    disallowedReferences = [ openjdk-bootstrap ];
-
-    meta = (import ./meta.nix lib version) // { broken = true; };
-
-    passthru = {
-      architecture = "";
-      home = "${openjdk}/lib/openjdk";
-      inherit gtk3;
-    };
-  };
-in openjdk
diff --git a/third_party/nixpkgs/pkgs/development/compilers/openjdk/14.nix b/third_party/nixpkgs/pkgs/development/compilers/openjdk/14.nix
deleted file mode 100644
index 348fd3996c..0000000000
--- a/third_party/nixpkgs/pkgs/development/compilers/openjdk/14.nix
+++ /dev/null
@@ -1,173 +0,0 @@
-{ stdenv, lib, fetchurl, bash, pkg-config, autoconf, cpio, file, which, unzip
-, zip, perl, cups, freetype, alsa-lib, libjpeg, giflib, libpng, zlib, lcms2
-, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama
-, libXcursor, libXrandr, fontconfig, openjdk14-bootstrap
-, setJavaClassPath
-, headless ? false
-, enableJavaFX ? false, openjfx
-, enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf
-}:
-
-let
-  major = "14";
-  update = ".0.2";
-  build = "-ga";
-
-  # when building a headless jdk, also bootstrap it with a headless jdk
-  openjdk-bootstrap = openjdk14-bootstrap.override { gtkSupport = !headless; };
-
-  openjdk = stdenv.mkDerivation rec {
-    pname = "openjdk" + lib.optionalString headless "-headless";
-    version = "${major}${update}${build}";
-
-    src = fetchurl {
-      url = "https://hg.openjdk.java.net/jdk-updates/jdk${major}u/archive/jdk-${version}.tar.gz";
-      sha256 = "1s1pc6ihzf0awp4hbaqfxmbica0hnrg8nr7s0yd2hfn7nan8xmf3";
-    };
-
-    nativeBuildInputs = [ pkg-config autoconf unzip ];
-    buildInputs = [
-      cpio file which zip perl zlib cups freetype alsa-lib libjpeg giflib
-      libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
-      libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap
-    ] ++ lib.optionals (!headless && enableGnome2) [
-      gtk3 gnome_vfs GConf glib
-    ];
-
-    patches = [
-      ./fix-java-home-jdk10.patch
-      ./read-truststore-from-env-jdk10.patch
-      ./currency-date-range-jdk10.patch
-      ./increase-javadoc-heap-jdk13.patch
-      # -Wformat etc. are stricter in newer gccs, per
-      # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79677
-      # so grab the work-around from
-      # https://src.fedoraproject.org/rpms/java-openjdk/pull-request/24
-      (fetchurl {
-        url = "https://src.fedoraproject.org/rpms/java-openjdk/raw/06c001c7d87f2e9fe4fedeef2d993bcd5d7afa2a/f/rh1673833-remove_removal_of_wformat_during_test_compilation.patch";
-        sha256 = "082lmc30x64x583vqq00c8y0wqih3y4r0mp1c4bqq36l22qv6b6r";
-      })
-    ] ++ lib.optionals (!headless && enableGnome2) [
-      ./swing-use-gtk-jdk13.patch
-    ];
-
-    prePatch = ''
-      chmod +x configure
-      patchShebangs --build configure
-    '';
-
-    # JDK's build system attempts to specifically detect
-    # and special-case WSL, and we don't want it to do that,
-    # so pass the correct platform names explicitly
-    configurePlatforms = ["build" "host"];
-
-    configureFlags = [
-      "--with-boot-jdk=${openjdk-bootstrap.home}"
-      "--with-version-pre="
-      "--enable-unlimited-crypto"
-      "--with-native-debug-symbols=internal"
-      "--with-freetype=system"
-      "--with-libjpeg=system"
-      "--with-giflib=system"
-      "--with-libpng=system"
-      "--with-zlib=system"
-      "--with-lcms=system"
-      "--with-stdc++lib=dynamic"
-    ] ++ lib.optional stdenv.isx86_64 "--with-jvm-features=zgc"
-      ++ lib.optional headless "--enable-headless-only"
-      ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}";
-
-    separateDebugInfo = true;
-
-    env.NIX_CFLAGS_COMPILE = "-Wno-error";
-
-    NIX_LDFLAGS = toString (lib.optionals (!headless) [
-      "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
-    ] ++ lib.optionals (!headless && enableGnome2) [
-      "-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2"
-    ]);
-
-    # -j flag is explicitly rejected by the build system:
-    #     Error: 'make -jN' is not supported, use 'make JOBS=N'
-    # Note: it does not make build sequential. Build system
-    # still runs in parallel.
-    enableParallelBuilding = false;
-
-    buildFlags = [ "all" ];
-
-    postBuild = ''
-      cd build/linux*
-      make images
-      cd -
-    '';
-
-    installPhase = ''
-      mkdir -p $out/lib
-
-      mv build/*/images/jdk $out/lib/openjdk
-
-      # Remove some broken manpages.
-      rm -rf $out/lib/openjdk/man/ja*
-
-      # Mirror some stuff in top-level.
-      mkdir -p $out/share
-      ln -s $out/lib/openjdk/include $out/include
-      ln -s $out/lib/openjdk/man $out/share/man
-      ln -s $out/lib/openjdk/lib/src.zip $out/lib/src.zip
-
-      # jni.h expects jni_md.h to be in the header search path.
-      ln -s $out/include/linux/*_md.h $out/include/
-
-      # Remove crap from the installation.
-      rm -rf $out/lib/openjdk/demo
-      ${lib.optionalString headless ''
-        rm $out/lib/openjdk/lib/{libjsound,libfontmanager}.so
-      ''}
-
-      ln -s $out/lib/openjdk/bin $out/bin
-    '';
-
-    preFixup = ''
-      # Propagate the setJavaClassPath setup hook so that any package
-      # that depends on the JDK has $CLASSPATH set up properly.
-      mkdir -p $out/nix-support
-      #TODO or printWords?  cf https://github.com/NixOS/nixpkgs/pull/27427#issuecomment-317293040
-      echo -n "${setJavaClassPath}" > $out/nix-support/propagated-build-inputs
-
-      # Set JAVA_HOME automatically.
-      mkdir -p $out/nix-support
-      cat <<EOF > $out/nix-support/setup-hook
-      if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out/lib/openjdk; fi
-      EOF
-    '';
-
-    postFixup = ''
-      # Build the set of output library directories to rpath against
-      LIBDIRS=""
-      for output in $(getAllOutputNames); do
-        if [ "$output" = debug ]; then continue; fi
-        LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort | uniq | tr '\n' ':'):$LIBDIRS"
-      done
-      # Add the local library paths to remove dependencies on the bootstrap
-      for output in $(getAllOutputNames); do
-        if [ "$output" = debug ]; then continue; fi
-        OUTPUTDIR=$(eval echo \$$output)
-        BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*)
-        echo "$BINLIBS" | while read i; do
-          patchelf --set-rpath "$LIBDIRS:$(patchelf --print-rpath "$i")" "$i" || true
-          patchelf --shrink-rpath "$i" || true
-        done
-      done
-    '';
-
-    disallowedReferences = [ openjdk-bootstrap ];
-
-    meta = (import ./meta.nix lib version) // { broken = true; };
-
-    passthru = {
-      architecture = "";
-      home = "${openjdk}/lib/openjdk";
-      inherit gtk3;
-    };
-  };
-in openjdk
diff --git a/third_party/nixpkgs/pkgs/development/compilers/openjdk/15.nix b/third_party/nixpkgs/pkgs/development/compilers/openjdk/15.nix
deleted file mode 100644
index 2447b0783c..0000000000
--- a/third_party/nixpkgs/pkgs/development/compilers/openjdk/15.nix
+++ /dev/null
@@ -1,176 +0,0 @@
-{ stdenv, lib, fetchurl, bash, pkg-config, autoconf, cpio, file, which, unzip
-, zip, perl, cups, freetype, alsa-lib, libjpeg, giflib, libpng, zlib, lcms2
-, libX11, libICE, libXrender, libXext, libXt, libXtst, libXi, libXinerama
-, libXcursor, libXrandr, fontconfig, openjdk15-bootstrap
-, setJavaClassPath
-, headless ? false
-, enableJavaFX ? false, openjfx
-, enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf
-}:
-
-let
-  version = {
-    major = "15";
-    update = ".0.1";
-    build = "-ga";
-    __toString = self: "${self.major}${self.update}${self.build}";
-  };
-
-  # when building a headless jdk, also bootstrap it with a headless jdk
-  openjdk-bootstrap = openjdk15-bootstrap.override { gtkSupport = !headless; };
-
-  openjdk = stdenv.mkDerivation {
-    pname = "openjdk" + lib.optionalString headless "-headless";
-    inherit version;
-
-    src = fetchurl {
-      url = "https://hg.openjdk.java.net/jdk-updates/jdk${version.major}u/archive/jdk-${version}.tar.gz";
-      sha256 = "1h8n5figc9q0k9p8b0qggyhvqagvxanfih1lj5j492c74cd1mx1l";
-    };
-
-    nativeBuildInputs = [ pkg-config autoconf unzip zip file which ];
-    buildInputs = [
-      cpio perl zlib cups freetype alsa-lib libjpeg giflib
-      libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
-      libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap
-    ] ++ lib.optionals (!headless && enableGnome2) [
-      gtk3 gnome_vfs GConf glib
-    ];
-
-    patches = [
-      ./fix-java-home-jdk10.patch
-      ./read-truststore-from-env-jdk10.patch
-      ./currency-date-range-jdk10.patch
-      ./increase-javadoc-heap-jdk13.patch
-      # -Wformat etc. are stricter in newer gccs, per
-      # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79677
-      # so grab the work-around from
-      # https://src.fedoraproject.org/rpms/java-openjdk/pull-request/24
-      (fetchurl {
-        url = "https://src.fedoraproject.org/rpms/java-openjdk/raw/06c001c7d87f2e9fe4fedeef2d993bcd5d7afa2a/f/rh1673833-remove_removal_of_wformat_during_test_compilation.patch";
-        sha256 = "082lmc30x64x583vqq00c8y0wqih3y4r0mp1c4bqq36l22qv6b6r";
-      })
-    ] ++ lib.optionals (!headless && enableGnome2) [
-      ./swing-use-gtk-jdk13.patch
-    ];
-
-    prePatch = ''
-      chmod +x configure
-      patchShebangs --build configure
-    '';
-
-    # JDK's build system attempts to specifically detect
-    # and special-case WSL, and we don't want it to do that,
-    # so pass the correct platform names explicitly
-    configurePlatforms = ["build" "host"];
-
-    configureFlags = [
-      "--with-boot-jdk=${openjdk-bootstrap.home}"
-      "--with-version-pre="
-      "--enable-unlimited-crypto"
-      "--with-native-debug-symbols=internal"
-      "--with-freetype=system"
-      "--with-libjpeg=system"
-      "--with-giflib=system"
-      "--with-libpng=system"
-      "--with-zlib=system"
-      "--with-lcms=system"
-      "--with-stdc++lib=dynamic"
-    ] ++ lib.optional headless "--enable-headless-only"
-      ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}";
-
-    separateDebugInfo = true;
-
-    env.NIX_CFLAGS_COMPILE = "-Wno-error";
-
-    NIX_LDFLAGS = toString (lib.optionals (!headless) [
-      "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
-    ] ++ lib.optionals (!headless && enableGnome2) [
-      "-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2"
-    ]);
-
-    # -j flag is explicitly rejected by the build system:
-    #     Error: 'make -jN' is not supported, use 'make JOBS=N'
-    # Note: it does not make build sequential. Build system
-    # still runs in parallel.
-    enableParallelBuilding = false;
-
-    buildFlags = [ "all" ];
-
-    postBuild = ''
-      cd build/linux*
-      make images
-      cd -
-    '';
-
-    installPhase = ''
-      mkdir -p $out/lib
-
-      mv build/*/images/jdk $out/lib/openjdk
-
-      # Remove some broken manpages.
-      rm -rf $out/lib/openjdk/man/ja*
-
-      # Mirror some stuff in top-level.
-      mkdir -p $out/share
-      ln -s $out/lib/openjdk/include $out/include
-      ln -s $out/lib/openjdk/man $out/share/man
-      ln -s $out/lib/openjdk/lib/src.zip $out/lib/src.zip
-
-      # jni.h expects jni_md.h to be in the header search path.
-      ln -s $out/include/linux/*_md.h $out/include/
-
-      # Remove crap from the installation.
-      rm -rf $out/lib/openjdk/demo
-      ${lib.optionalString headless ''
-        rm $out/lib/openjdk/lib/{libjsound,libfontmanager}.so
-      ''}
-
-      ln -s $out/lib/openjdk/bin $out/bin
-    '';
-
-    preFixup = ''
-      # Propagate the setJavaClassPath setup hook so that any package
-      # that depends on the JDK has $CLASSPATH set up properly.
-      mkdir -p $out/nix-support
-      #TODO or printWords?  cf https://github.com/NixOS/nixpkgs/pull/27427#issuecomment-317293040
-      echo -n "${setJavaClassPath}" > $out/nix-support/propagated-build-inputs
-
-      # Set JAVA_HOME automatically.
-      mkdir -p $out/nix-support
-      cat <<EOF > $out/nix-support/setup-hook
-      if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out/lib/openjdk; fi
-      EOF
-    '';
-
-    postFixup = ''
-      # Build the set of output library directories to rpath against
-      LIBDIRS=""
-      for output in $(getAllOutputNames); do
-        if [ "$output" = debug ]; then continue; fi
-        LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort | uniq | tr '\n' ':'):$LIBDIRS"
-      done
-      # Add the local library paths to remove dependencies on the bootstrap
-      for output in $(getAllOutputNames); do
-        if [ "$output" = debug ]; then continue; fi
-        OUTPUTDIR=$(eval echo \$$output)
-        BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*)
-        echo "$BINLIBS" | while read i; do
-          patchelf --set-rpath "$LIBDIRS:$(patchelf --print-rpath "$i")" "$i" || true
-          patchelf --shrink-rpath "$i" || true
-        done
-      done
-    '';
-
-    disallowedReferences = [ openjdk-bootstrap ];
-
-    pos = builtins.unsafeGetAttrPos "major" version;
-    meta = import ./meta.nix lib version.major;
-
-    passthru = {
-      architecture = "";
-      home = "${openjdk}/lib/openjdk";
-      inherit gtk3;
-    };
-  };
-in openjdk
diff --git a/third_party/nixpkgs/pkgs/development/compilers/openjdk/16.nix b/third_party/nixpkgs/pkgs/development/compilers/openjdk/16.nix
deleted file mode 100644
index 12ba5c9c16..0000000000
--- a/third_party/nixpkgs/pkgs/development/compilers/openjdk/16.nix
+++ /dev/null
@@ -1,181 +0,0 @@
-{ stdenv, lib, fetchurl, fetchFromGitHub, bash, pkg-config, autoconf, cpio
-, file, which, unzip, zip, perl, cups, freetype, alsa-lib, libjpeg, giflib
-, libpng, zlib, lcms2, libX11, libICE, libXrender, libXext, libXt, libXtst
-, libXi, libXinerama, libXcursor, libXrandr, fontconfig, openjdk16-bootstrap
-, setJavaClassPath
-, headless ? false
-, enableJavaFX ? false, openjfx
-, enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf
-}:
-
-let
-  version = {
-    feature = "16";
-    interim = ".0.2-ga";
-    build = "1";
-  };
-
-  # when building a headless jdk, also bootstrap it with a headless jdk
-  openjdk-bootstrap = openjdk16-bootstrap.override { gtkSupport = !headless; };
-
-  openjdk = stdenv.mkDerivation {
-    pname = "openjdk" + lib.optionalString headless "-headless";
-    version = "${version.feature}${version.interim}+${version.build}";
-
-    src = fetchFromGitHub {
-      owner = "openjdk";
-      repo = "jdk${version.feature}u";
-      rev = "jdk-${version.feature}${version.interim}";
-      # rev = "jdk-${version.feature}${version.interim}+${version.build}";
-      sha256 = "sha256-/8XHNrf9joCCXMCyPncT54JhqlF+KBL7eAf8hUW/BxU=";
-    };
-
-    nativeBuildInputs = [ pkg-config autoconf unzip ];
-    buildInputs = [
-      cpio file which zip perl zlib cups freetype alsa-lib libjpeg giflib
-      libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
-      libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap
-    ] ++ lib.optionals (!headless && enableGnome2) [
-      gtk3 gnome_vfs GConf glib
-    ];
-
-    patches = [
-      ./fix-java-home-jdk10.patch
-      ./read-truststore-from-env-jdk10.patch
-      ./currency-date-range-jdk10.patch
-      ./increase-javadoc-heap-jdk13.patch
-      # -Wformat etc. are stricter in newer gccs, per
-      # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79677
-      # so grab the work-around from
-      # https://src.fedoraproject.org/rpms/java-openjdk/pull-request/24
-      (fetchurl {
-        url = "https://src.fedoraproject.org/rpms/java-openjdk/raw/06c001c7d87f2e9fe4fedeef2d993bcd5d7afa2a/f/rh1673833-remove_removal_of_wformat_during_test_compilation.patch";
-        sha256 = "082lmc30x64x583vqq00c8y0wqih3y4r0mp1c4bqq36l22qv6b6r";
-      })
-      ./fix-glibc-2.34.patch
-    ] ++ lib.optionals (!headless && enableGnome2) [
-      ./swing-use-gtk-jdk13.patch
-    ];
-
-    prePatch = ''
-      chmod +x configure
-      patchShebangs --build configure
-    '';
-
-    # JDK's build system attempts to specifically detect
-    # and special-case WSL, and we don't want it to do that,
-    # so pass the correct platform names explicitly
-    configurePlatforms = ["build" "host"];
-
-    configureFlags = [
-      "--with-boot-jdk=${openjdk-bootstrap.home}"
-      "--with-version-build=${version.build}"
-      "--with-version-opt=nixos"
-      "--with-version-pre="
-      "--enable-unlimited-crypto"
-      "--with-native-debug-symbols=internal"
-      "--with-freetype=system"
-      "--with-libjpeg=system"
-      "--with-giflib=system"
-      "--with-libpng=system"
-      "--with-zlib=system"
-      "--with-lcms=system"
-      "--with-stdc++lib=dynamic"
-    ] ++ lib.optional headless "--enable-headless-only"
-      ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}";
-
-    separateDebugInfo = true;
-
-    env.NIX_CFLAGS_COMPILE = "-Wno-error";
-
-    NIX_LDFLAGS = toString (lib.optionals (!headless) [
-      "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
-    ] ++ lib.optionals (!headless && enableGnome2) [
-      "-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2"
-    ]);
-
-    # -j flag is explicitly rejected by the build system:
-    #     Error: 'make -jN' is not supported, use 'make JOBS=N'
-    # Note: it does not make build sequential. Build system
-    # still runs in parallel.
-    enableParallelBuilding = false;
-
-    buildFlags = [ "all" ];
-
-    postBuild = ''
-      cd build/linux*
-      make images
-      cd -
-    '';
-
-    installPhase = ''
-      mkdir -p $out/lib
-
-      mv build/*/images/jdk $out/lib/openjdk
-
-      # Remove some broken manpages.
-      rm -rf $out/lib/openjdk/man/ja*
-
-      # Mirror some stuff in top-level.
-      mkdir -p $out/share
-      ln -s $out/lib/openjdk/include $out/include
-      ln -s $out/lib/openjdk/man $out/share/man
-      ln -s $out/lib/openjdk/lib/src.zip $out/lib/src.zip
-
-      # jni.h expects jni_md.h to be in the header search path.
-      ln -s $out/include/linux/*_md.h $out/include/
-
-      # Remove crap from the installation.
-      rm -rf $out/lib/openjdk/demo
-      ${lib.optionalString headless ''
-        rm $out/lib/openjdk/lib/{libjsound,libfontmanager}.so
-      ''}
-
-      ln -s $out/lib/openjdk/bin $out/bin
-    '';
-
-    preFixup = ''
-      # Propagate the setJavaClassPath setup hook so that any package
-      # that depends on the JDK has $CLASSPATH set up properly.
-      mkdir -p $out/nix-support
-      #TODO or printWords?  cf https://github.com/NixOS/nixpkgs/pull/27427#issuecomment-317293040
-      echo -n "${setJavaClassPath}" > $out/nix-support/propagated-build-inputs
-
-      # Set JAVA_HOME automatically.
-      mkdir -p $out/nix-support
-      cat <<EOF > $out/nix-support/setup-hook
-      if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out/lib/openjdk; fi
-      EOF
-    '';
-
-    postFixup = ''
-      # Build the set of output library directories to rpath against
-      LIBDIRS=""
-      for output in $(getAllOutputNames); do
-        if [ "$output" = debug ]; then continue; fi
-        LIBDIRS="$(find $(eval echo \$$output) -name \*.so\* -exec dirname {} \+ | sort | uniq | tr '\n' ':'):$LIBDIRS"
-      done
-      # Add the local library paths to remove dependencies on the bootstrap
-      for output in $(getAllOutputNames); do
-        if [ "$output" = debug ]; then continue; fi
-        OUTPUTDIR=$(eval echo \$$output)
-        BINLIBS=$(find $OUTPUTDIR/bin/ -type f; find $OUTPUTDIR -name \*.so\*)
-        echo "$BINLIBS" | while read i; do
-          patchelf --set-rpath "$LIBDIRS:$(patchelf --print-rpath "$i")" "$i" || true
-          patchelf --shrink-rpath "$i" || true
-        done
-      done
-    '';
-
-    disallowedReferences = [ openjdk-bootstrap ];
-
-    pos = builtins.unsafeGetAttrPos "feature" version;
-    meta = import ./meta.nix lib version.feature;
-
-    passthru = {
-      architecture = "";
-      home = "${openjdk}/lib/openjdk";
-      inherit gtk3;
-    };
-  };
-in openjdk
diff --git a/third_party/nixpkgs/pkgs/development/compilers/openjdk/17.nix b/third_party/nixpkgs/pkgs/development/compilers/openjdk/17.nix
index 1c9aee9af5..d0c954d1b0 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/openjdk/17.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/openjdk/17.nix
@@ -5,7 +5,7 @@
 , setJavaClassPath
 , headless ? false
 , enableJavaFX ? false, openjfx
-, enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf
+, enableGtk ? true, gtk3, glib
 }:
 
 let
@@ -34,8 +34,8 @@ let
       cpio file which zip perl zlib cups freetype harfbuzz alsa-lib libjpeg giflib
       libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
       libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap
-    ] ++ lib.optionals (!headless && enableGnome2) [
-      gtk3 gnome_vfs GConf glib
+    ] ++ lib.optionals (!headless && enableGtk) [
+      gtk3 glib
     ];
 
     patches = [
@@ -69,7 +69,15 @@ let
         url = "https://github.com/openjdk/jdk/commit/9341d135b855cc208d48e47d30cd90aafa354c36.patch";
         hash = "sha256-Qcm3ZmGCOYLZcskNjj7DYR85R4v07vYvvavrVOYL8vg=";
       })
-    ] ++ lib.optionals (!headless && enableGnome2) [
+
+      # Backport fixes for musl 1.2.4 which are already applied in jdk21+
+      # Fetching patch from chimera because they already went through the effort of rebasing it onto jdk17
+      (fetchurl {
+        name = "lfs64.patch";
+        url = "https://raw.githubusercontent.com/chimera-linux/cports/4614075d19e9c9636f3f7e476687247f63330a35/contrib/openjdk17/patches/lfs64.patch";
+        hash = "sha256-t2mRbdEiumBAbIAC0zsJNwCn59WYWHsnRtuOSL6bWB4=";
+      })
+    ] ++ lib.optionals (!headless && enableGtk) [
       ./swing-use-gtk-jdk13.patch
     ];
 
@@ -98,8 +106,15 @@ let
       "--with-zlib=system"
       "--with-lcms=system"
       "--with-stdc++lib=dynamic"
-    ] ++ lib.optional headless "--enable-headless-only"
-      ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}";
+    ]
+    ++ lib.optionals stdenv.cc.isClang [
+      "--with-toolchain-type=clang"
+      # Explicitly tell Clang to compile C++ files as C++, see
+      # https://github.com/NixOS/nixpkgs/issues/150655#issuecomment-1935304859
+      "--with-extra-cxxflags=-xc++"
+    ]
+    ++ lib.optional headless "--enable-headless-only"
+    ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}";
 
     separateDebugInfo = true;
 
@@ -107,8 +122,8 @@ let
 
     NIX_LDFLAGS = toString (lib.optionals (!headless) [
       "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
-    ] ++ lib.optionals (!headless && enableGnome2) [
-      "-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2"
+    ] ++ lib.optionals (!headless && enableGtk) [
+      "-lgtk-3" "-lgio-2.0"
     ]);
 
     # -j flag is explicitly rejected by the build system:
diff --git a/third_party/nixpkgs/pkgs/development/compilers/openjdk/18.nix b/third_party/nixpkgs/pkgs/development/compilers/openjdk/18.nix
index 5ce4ff8f54..e798317f8a 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/openjdk/18.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/openjdk/18.nix
@@ -5,7 +5,7 @@
 , setJavaClassPath
 , headless ? false
 , enableJavaFX ? false, openjfx
-, enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf
+, enableGtk ? true, gtk3, glib
 }:
 
 let
@@ -34,8 +34,8 @@ let
       cpio file which zip perl zlib cups freetype harfbuzz alsa-lib libjpeg giflib
       libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
       libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap
-    ] ++ lib.optionals (!headless && enableGnome2) [
-      gtk3 gnome_vfs GConf glib
+    ] ++ lib.optionals (!headless && enableGtk) [
+      gtk3 glib
     ];
 
     patches = [
@@ -60,7 +60,7 @@ let
         url = "https://git.alpinelinux.org/aports/plain/testing/openjdk18/FixNullPtrCast.patch?id=b93d1fc37fcf106144958d957bb97c7db67bd41f";
         hash = "sha256-nvO8RcmKwMcPdzq28mZ4If1XJ6FQ76CYWqRIozPCk5U=";
       })
-    ] ++ lib.optionals (!headless && enableGnome2) [
+    ] ++ lib.optionals (!headless && enableGtk) [
       ./swing-use-gtk-jdk13.patch
     ];
 
@@ -98,8 +98,8 @@ let
 
     NIX_LDFLAGS = toString (lib.optionals (!headless) [
       "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
-    ] ++ lib.optionals (!headless && enableGnome2) [
-      "-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2"
+    ] ++ lib.optionals (!headless && enableGtk) [
+      "-lgtk-3" "-lgio-2.0"
     ]);
 
     # -j flag is explicitly rejected by the build system:
diff --git a/third_party/nixpkgs/pkgs/development/compilers/openjdk/19.nix b/third_party/nixpkgs/pkgs/development/compilers/openjdk/19.nix
index 187d724b57..8a28a6851a 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/openjdk/19.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/openjdk/19.nix
@@ -8,7 +8,7 @@
 # which should be fixable, this is a no-rebuild workaround for GHC.
 , headless ? stdenv.targetPlatform.isGhcjs
 , enableJavaFX ? false, openjfx
-, enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf
+, enableGtk ? true, gtk3, glib
 }:
 
 let
@@ -39,8 +39,8 @@ let
       cpio file which zip perl zlib cups freetype alsa-lib libjpeg giflib
       libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
       libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap
-    ] ++ lib.optionals (!headless && enableGnome2) [
-      gtk3 gnome_vfs GConf glib
+    ] ++ lib.optionals (!headless && enableGtk) [
+      gtk3 glib
     ];
 
     patches = [
@@ -73,7 +73,7 @@ let
         url = "https://github.com/openjdk/jdk/commit/9341d135b855cc208d48e47d30cd90aafa354c36.patch";
         hash = "sha256-Qcm3ZmGCOYLZcskNjj7DYR85R4v07vYvvavrVOYL8vg=";
       })
-    ] ++ lib.optionals (!headless && enableGnome2) [
+    ] ++ lib.optionals (!headless && enableGtk) [
       ./swing-use-gtk-jdk13.patch
     ];
 
@@ -100,8 +100,15 @@ let
       "--with-zlib=system"
       "--with-lcms=system"
       "--with-stdc++lib=dynamic"
-    ] ++ lib.optional headless "--enable-headless-only"
-      ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}";
+    ]
+    ++ lib.optionals stdenv.cc.isClang [
+      "--with-toolchain-type=clang"
+      # Explicitly tell Clang to compile C++ files as C++, see
+      # https://github.com/NixOS/nixpkgs/issues/150655#issuecomment-1935304859
+      "--with-extra-cxxflags=-xc++"
+    ]
+    ++ lib.optional headless "--enable-headless-only"
+    ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}";
 
     separateDebugInfo = true;
 
@@ -109,8 +116,8 @@ let
 
     NIX_LDFLAGS = toString (lib.optionals (!headless) [
       "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
-    ] ++ lib.optionals (!headless && enableGnome2) [
-      "-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2"
+    ] ++ lib.optionals (!headless && enableGtk) [
+      "-lgtk-3" "-lgio-2.0"
     ]);
 
     # -j flag is explicitly rejected by the build system:
diff --git a/third_party/nixpkgs/pkgs/development/compilers/openjdk/20.nix b/third_party/nixpkgs/pkgs/development/compilers/openjdk/20.nix
index bdb7d057f2..1f2216b1a2 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/openjdk/20.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/openjdk/20.nix
@@ -8,7 +8,7 @@
 # which should be fixable, this is a no-rebuild workaround for GHC.
 , headless ? stdenv.targetPlatform.isGhcjs
 , enableJavaFX ? false, openjfx
-, enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf
+, enableGtk ? true, gtk3, glib
 }:
 
 let
@@ -37,8 +37,8 @@ let
       cpio file which zip perl zlib cups freetype alsa-lib libjpeg giflib
       libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
       libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap
-    ] ++ lib.optionals (!headless && enableGnome2) [
-      gtk3 gnome_vfs GConf glib
+    ] ++ lib.optionals (!headless && enableGtk) [
+      gtk3 glib
     ];
 
     patches = [
@@ -71,7 +71,7 @@ let
         url = "https://github.com/openjdk/jdk/commit/9341d135b855cc208d48e47d30cd90aafa354c36.patch";
         hash = "sha256-Qcm3ZmGCOYLZcskNjj7DYR85R4v07vYvvavrVOYL8vg=";
       })
-    ] ++ lib.optionals (!headless && enableGnome2) [
+    ] ++ lib.optionals (!headless && enableGtk) [
       ./swing-use-gtk-jdk13.patch
     ];
 
@@ -98,8 +98,15 @@ let
       "--with-zlib=system"
       "--with-lcms=system"
       "--with-stdc++lib=dynamic"
-    ] ++ lib.optional headless "--enable-headless-only"
-      ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}";
+    ]
+    ++ lib.optionals stdenv.cc.isClang [
+      "--with-toolchain-type=clang"
+      # Explicitly tell Clang to compile C++ files as C++, see
+      # https://github.com/NixOS/nixpkgs/issues/150655#issuecomment-1935304859
+      "--with-extra-cxxflags=-xc++"
+    ]
+    ++ lib.optional headless "--enable-headless-only"
+    ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}";
 
     separateDebugInfo = true;
 
@@ -107,8 +114,8 @@ let
 
     NIX_LDFLAGS = toString (lib.optionals (!headless) [
       "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
-    ] ++ lib.optionals (!headless && enableGnome2) [
-      "-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2"
+    ] ++ lib.optionals (!headless && enableGtk) [
+      "-lgtk-3" "-lgio-2.0"
     ]);
 
     # -j flag is explicitly rejected by the build system:
diff --git a/third_party/nixpkgs/pkgs/development/compilers/openjdk/21.nix b/third_party/nixpkgs/pkgs/development/compilers/openjdk/21.nix
index 160b3da4c8..9c403fb275 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/openjdk/21.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/openjdk/21.nix
@@ -8,7 +8,7 @@
 # which should be fixable, this is a no-rebuild workaround for GHC.
 , headless ? stdenv.targetPlatform.isGhcjs
 , enableJavaFX ? false, openjfx
-, enableGnome2 ? true, gtk3, gnome_vfs, glib, GConf
+, enableGtk ? true, gtk3, glib
 }:
 
 let
@@ -37,8 +37,8 @@ let
       cpio file which zip perl zlib cups freetype alsa-lib libjpeg giflib
       libpng zlib lcms2 libX11 libICE libXrender libXext libXtst libXt libXtst
       libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap
-    ] ++ lib.optionals (!headless && enableGnome2) [
-      gtk3 gnome_vfs GConf glib
+    ] ++ lib.optionals (!headless && enableGtk) [
+      gtk3 glib
     ];
 
     patches = [
@@ -64,7 +64,7 @@ let
         url = "https://github.com/openjdk/jdk/commit/9341d135b855cc208d48e47d30cd90aafa354c36.patch";
         hash = "sha256-Qcm3ZmGCOYLZcskNjj7DYR85R4v07vYvvavrVOYL8vg=";
       })
-    ] ++ lib.optionals (!headless && enableGnome2) [
+    ] ++ lib.optionals (!headless && enableGtk) [
       ./swing-use-gtk-jdk13.patch
     ];
 
@@ -91,9 +91,16 @@ let
       "--with-zlib=system"
       "--with-lcms=system"
       "--with-stdc++lib=dynamic"
-    ] ++ lib.optional stdenv.isx86_64 "--with-jvm-features=zgc"
-      ++ lib.optional headless "--enable-headless-only"
-      ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}";
+    ]
+    ++ lib.optionals stdenv.cc.isClang [
+      "--with-toolchain-type=clang"
+      # Explicitly tell Clang to compile C++ files as C++, see
+      # https://github.com/NixOS/nixpkgs/issues/150655#issuecomment-1935304859
+      "--with-extra-cxxflags=-xc++"
+    ]
+    ++ lib.optional stdenv.isx86_64 "--with-jvm-features=zgc"
+    ++ lib.optional headless "--enable-headless-only"
+    ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}";
 
     separateDebugInfo = true;
 
@@ -101,8 +108,8 @@ let
 
     NIX_LDFLAGS = toString (lib.optionals (!headless) [
       "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
-    ] ++ lib.optionals (!headless && enableGnome2) [
-      "-lgtk-3" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2"
+    ] ++ lib.optionals (!headless && enableGtk) [
+      "-lgtk-3" "-lgio-2.0"
     ]);
 
     # -j flag is explicitly rejected by the build system:
diff --git a/third_party/nixpkgs/pkgs/development/compilers/openjdk/22.nix b/third_party/nixpkgs/pkgs/development/compilers/openjdk/22.nix
index 97d1a3b3b4..18ab52f089 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/openjdk/22.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/openjdk/22.nix
@@ -38,11 +38,9 @@
 , headless ? stdenv.targetPlatform.isGhcjs
 , enableJavaFX ? false
 , openjfx
-, enableGnome2 ? true
+, enableGtk ? true
 , gtk3
-, gnome_vfs
 , glib
-, GConf
 , writeShellScript
 }:
 
@@ -101,10 +99,8 @@ stdenv.mkDerivation (finalAttrs: {
     libXrandr
     fontconfig
     openjdk-bootstrap
-  ] ++ lib.optionals (!headless && enableGnome2) [
+  ] ++ lib.optionals (!headless && enableGtk) [
     gtk3
-    gnome_vfs
-    GConf
     glib
   ];
 
@@ -131,7 +127,7 @@ stdenv.mkDerivation (finalAttrs: {
       url = "https://github.com/openjdk/jdk/commit/9341d135b855cc208d48e47d30cd90aafa354c36.patch";
       hash = "sha256-Qcm3ZmGCOYLZcskNjj7DYR85R4v07vYvvavrVOYL8vg=";
     })
-  ] ++ lib.optionals (!headless && enableGnome2) [
+  ] ++ lib.optionals (!headless && enableGtk) [
     ./swing-use-gtk-jdk13.patch
   ];
 
@@ -160,6 +156,12 @@ stdenv.mkDerivation (finalAttrs: {
     "--with-lcms=system"
     "--with-stdc++lib=dynamic"
   ]
+  ++ lib.optionals stdenv.cc.isClang [
+    "--with-toolchain-type=clang"
+    # Explicitly tell Clang to compile C++ files as C++, see
+    # https://github.com/NixOS/nixpkgs/issues/150655#issuecomment-1935304859
+    "--with-extra-cxxflags=-xc++"
+  ]
   ++ lib.optional headless "--enable-headless-only"
   ++ lib.optional (!headless && enableJavaFX) "--with-import-modules=${openjfx}";
 
@@ -173,11 +175,9 @@ stdenv.mkDerivation (finalAttrs: {
     "-lXinerama"
     "-lXrandr"
     "-lmagic"
-  ] ++ lib.optionals (!headless && enableGnome2) [
+  ] ++ lib.optionals (!headless && enableGtk) [
     "-lgtk-3"
     "-lgio-2.0"
-    "-lgnomevfs-2"
-    "-lgconf-2"
   ]);
 
   # -j flag is explicitly rejected by the build system:
diff --git a/third_party/nixpkgs/pkgs/development/compilers/openjdk/8.nix b/third_party/nixpkgs/pkgs/development/compilers/openjdk/8.nix
index 0dc0188f0d..b77b058e2c 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/openjdk/8.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/openjdk/8.nix
@@ -5,7 +5,7 @@
 , openjdk8-bootstrap
 , setJavaClassPath
 , headless ? false
-, enableGnome2 ? true, gtk2, gnome_vfs, glib, GConf
+, enableGtk ? true, gtk2, glib
 }:
 
 let
@@ -43,8 +43,8 @@ let
       cpio file which zip perl zlib cups freetype alsa-lib
       libjpeg giflib libX11 libICE libXext libXrender libXtst libXt libXtst
       libXi libXinerama libXcursor libXrandr fontconfig openjdk-bootstrap
-    ] ++ lib.optionals (!headless && enableGnome2) [
-      gtk2 gnome_vfs GConf glib
+    ] ++ lib.optionals (!headless && enableGtk) [
+      gtk2 glib
     ];
 
     patches = [
@@ -52,7 +52,7 @@ let
       ./read-truststore-from-env-jdk8.patch
       ./currency-date-range-jdk8.patch
       ./fix-library-path-jdk8.patch
-    ] ++ lib.optionals (!headless && enableGnome2) [
+    ] ++ lib.optionals (!headless && enableGtk) [
       ./swing-use-gtk-jdk8.patch
     ];
 
@@ -96,8 +96,8 @@ let
 
     NIX_LDFLAGS= toString (lib.optionals (!headless) [
       "-lfontconfig" "-lcups" "-lXinerama" "-lXrandr" "-lmagic"
-    ] ++ lib.optionals (!headless && enableGnome2) [
-      "-lgtk-x11-2.0" "-lgio-2.0" "-lgnomevfs-2" "-lgconf-2"
+    ] ++ lib.optionals (!headless && enableGtk) [
+      "-lgtk-x11-2.0" "-lgio-2.0"
     ]);
 
     # -j flag is explicitly rejected by the build system:
diff --git a/third_party/nixpkgs/pkgs/development/compilers/orc/default.nix b/third_party/nixpkgs/pkgs/development/compilers/orc/default.nix
index 0b66e0d21a..18b99d5ba6 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/orc/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/orc/default.nix
@@ -18,11 +18,11 @@
   inherit (lib) optional optionals;
 in stdenv.mkDerivation rec {
   pname = "orc";
-  version = "0.4.38";
+  version = "0.4.39";
 
   src = fetchurl {
     url = "https://gstreamer.freedesktop.org/src/orc/${pname}-${version}.tar.xz";
-    sha256 = "sha256-pVqY1HclZ6o/rtj7hNVAw9t36roW0+LhCwRPvJIoZo0=";
+    sha256 = "sha256-M+0jh/Sbgl+hucOwBy4F8lkUG4lUdK0IWuURQ9MEDMA=";
   };
 
   postPatch = lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) ''
@@ -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/third_party/nixpkgs/pkgs/development/compilers/p4c/default.nix b/third_party/nixpkgs/pkgs/development/compilers/p4c/default.nix
index 54d2875d1b..060e298098 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/p4c/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/p4c/default.nix
@@ -76,6 +76,8 @@ stdenv.mkDerivation (finalAttrs: {
     bison
     flex
     cmake
+    protobuf
+    python3
   ]
   ++ lib.optionals enableDocumentation [ doxygen graphviz ]
   ++ lib.optionals enableBPF [ libllvm libbpf ];
@@ -86,7 +88,6 @@ stdenv.mkDerivation (finalAttrs: {
     boehmgc
     gmp
     flex
-    python3
   ];
 
   meta = {
diff --git a/third_party/nixpkgs/pkgs/development/compilers/picat/default.nix b/third_party/nixpkgs/pkgs/development/compilers/picat/default.nix
index a723e314b3..04c8088467 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/picat/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/picat/default.nix
@@ -11,11 +11,11 @@ let
 in
 stdenv.mkDerivation {
   pname = "picat";
-  version = "3.6";
+  version = "3.6#8";
 
   src = fetchurl {
-    url = "http://picat-lang.org/download/picat36_src.tar.gz";
-    hash = "sha256-DjP1cjKxRLxMjiHmYX42+kaG5//09IrPIc1O75gLA6k=";
+    url = "http://picat-lang.org/download/picat368_src.tar.gz";
+    hash = "sha256-eJxF5atvJq3fhFltcQCGTP/sgUmfsfCohUgm3x2U1n0=";
   };
 
   buildInputs = [ zlib ];
@@ -37,7 +37,7 @@ stdenv.mkDerivation {
   '';
 
   meta = with lib; {
-    description = "Logic-based programming langage";
+    description = "Logic-based programming language";
     mainProgram = "picat";
     homepage    = "http://picat-lang.org/";
     license     = licenses.mpl20;
@@ -51,4 +51,3 @@ stdenv.mkDerivation {
     maintainers = with maintainers; [ earldouglas thoughtpolice ];
   };
 }
-
diff --git a/third_party/nixpkgs/pkgs/development/compilers/ponyc/default.nix b/third_party/nixpkgs/pkgs/development/compilers/ponyc/default.nix
index c7008ec22a..b10739ca33 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/ponyc/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/ponyc/default.nix
@@ -4,7 +4,7 @@
 , cmake
 , coreutils
 , libxml2
-, lto ? !stdenv.isDarwin
+, lto ? true
 , makeWrapper
 , openssl
 , pcre2
@@ -13,6 +13,7 @@
 , substituteAll
 , which
 , z3
+, cctools
 , darwin
 }:
 
@@ -36,7 +37,7 @@ stdenv.mkDerivation (rec {
   };
 
   nativeBuildInputs = [ cmake makeWrapper which python3 ]
-    ++ lib.optionals (stdenv.isDarwin) [ darwin.cctools ];
+    ++ lib.optionals (stdenv.isDarwin) [ cctools ];
   buildInputs = [ libxml2 z3 ];
 
   # Sandbox disallows network access, so disabling problematic networking tests
diff --git a/third_party/nixpkgs/pkgs/development/compilers/purescript/psc-package/default.nix b/third_party/nixpkgs/pkgs/development/compilers/purescript/psc-package/default.nix
index 425281ef38..f0664df84d 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/purescript/psc-package/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/reason/default.nix b/third_party/nixpkgs/pkgs/development/compilers/reason/default.nix
index 954c58718c..d66d2c7532 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/reason/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/rgbds/default.nix b/third_party/nixpkgs/pkgs/development/compilers/rgbds/default.nix
index 4f6f0df262..872dcae2e1 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/rgbds/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/rgbds/default.nix
@@ -14,7 +14,6 @@ stdenv.mkDerivation rec {
   postPatch = ''
     patchShebangs --host src/bison.sh
   '';
-  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-fno-lto";
   installFlags = [ "PREFIX=${placeholder "out"}" ];
 
   meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/development/compilers/rust/1_78.nix b/third_party/nixpkgs/pkgs/development/compilers/rust/1_79.nix
similarity index 55%
rename from third_party/nixpkgs/pkgs/development/compilers/rust/1_78.nix
rename to third_party/nixpkgs/pkgs/development/compilers/rust/1_79.nix
index d81e964fb7..a749e58c16 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/rust/1_78.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/rust/1_79.nix
@@ -19,8 +19,8 @@
 } @ args:
 
 import ./default.nix {
-  rustcVersion = "1.78.0";
-  rustcSha256 = "/1RII6XLJ/JzgShXfx5+AO6PTIPyo0h4GuT8NV6R1ak=";
+  rustcVersion = "1.79.0";
+  rustcSha256 = "sha256-Fy7PPH0fnZ+xbNKmKIaXgmcEFt7QEp5SSoZ1H5YUSMA=";
 
   llvmSharedForBuild = pkgsBuildBuild.llvmPackages_18.libllvm.override { enableSharedLibraries = true; };
   llvmSharedForHost = pkgsBuildHost.llvmPackages_18.libllvm.override { enableSharedLibraries = true; };
@@ -34,25 +34,25 @@ import ./default.nix {
 
   # Note: the version MUST be one version prior to the version we're
   # building
-  bootstrapVersion = "1.77.2";
+  bootstrapVersion = "1.78.0";
 
   # fetch hashes by running `print-hashes.sh ${bootstrapVersion}`
   bootstrapHashes = {
-    i686-unknown-linux-gnu = "168e653fbc30b3a80801bc7735a79ff644651618434234959925f669bf77d1a2";
-    x86_64-unknown-linux-gnu = "b7d12b1b162c36c1fd5234b4b16856aa7eafca91d17c49787f6487cb26f4062d";
-    x86_64-unknown-linux-musl = "2e08fe23c4837a780a40ebfac601760cd6297581d21eae2f88cb59060243a375";
-    arm-unknown-linux-gnueabihf = "9f14a31dbef0153c0a7463a79cf8f9e8295b355354de41aa054953027beb70d7";
-    armv7-unknown-linux-gnueabihf = "b37649399081228244b3ff3acc6047f6c138e602c721cd500efe43715d043c5e";
-    aarch64-unknown-linux-gnu = "297c6201edd42e580f242fcd75b521b0392f6f3be02cf03ca76690fece4a74da";
-    aarch64-unknown-linux-musl = "fdd9c485f93c73a085c113b4f0fbad0989f79153079d394ec4bbac2b3804f71b";
-    x86_64-apple-darwin = "16bbbfcf0c982b35271d8904977d80fda1bb7caa7f898abceed3569a867d9cea";
-    aarch64-apple-darwin = "415bb2bc198feb0f2d8329e33c57d0890bbd57977d1ae48b17f6c7e1f632eaa7";
-    powerpc64le-unknown-linux-gnu = "79582acb339bd2d79fef095b977049049ffa04616011f1af1793fb8e98194b19";
-    riscv64gc-unknown-linux-gnu = "300fe4861e2d1f6e4c4f5e36ae7997beca8a979343a7f661237ab78a37a54648";
-    x86_64-unknown-freebsd = "72f49040fc2ed4492cddfaef3b4a9cb28d008f9f5ce5cac50802a5fca910f58c";
+    i686-unknown-linux-gnu = "8f3f5d2ab7b609ab30d584cfb5cecc3d8b16d2620fffb7643383c8a0a3881e21";
+    x86_64-unknown-linux-gnu = "1307747915e8bd925f4d5396ab2ae3d8d9c7fad564afbc358c081683d0f22e87";
+    x86_64-unknown-linux-musl = "c11ab908cbffbe98097d99ed62f5db00aa98496520b1e09583a151d36df7fca4";
+    arm-unknown-linux-gnueabihf = "2a2b1cf93b31e429624380e5b0d2bcce327274f8593b63657b863e38831f6421";
+    armv7-unknown-linux-gnueabihf = "fcce5ddb4f55bbdc9a1359a4cb6e65f2ff790d59ad228102cd472112ea65d3fe";
+    aarch64-unknown-linux-gnu = "131eda738cd977fff2c912e5838e8e9b9c260ecddc1247c0fe5473bf09c594af";
+    aarch64-unknown-linux-musl = "f328bcf109bf3eae01559b53939a9afbdb70ef30429f95109f7ea21030d60dfa";
+    x86_64-apple-darwin = "6c91ed3bd90253961fcb4a2991b8b22e042e2aaa9aba9f389f1e17008171d898";
+    aarch64-apple-darwin = "3be74c31ee8dc4f1d49e2f2888228de374138eaeca1876d0c1b1a61df6023b3b";
+    powerpc64le-unknown-linux-gnu = "c5aedb12c552daa18072e386697205fb7b91cef1e8791fe6fb74834723851388";
+    riscv64gc-unknown-linux-gnu = "847a925ace172d4c0a8d3da8d755b8678071ef73e659886128a3103bb896dcd9";
+    x86_64-unknown-freebsd = "b9cc84c60deb8da08a6c876426f8721758f4c7e7c553b4554385752ad37c63df";
   };
 
-  selectRustPackage = pkgs: pkgs.rust_1_78;
+  selectRustPackage = pkgs: pkgs.rust_1_79;
 
   rustcPatches = [ ];
 }
diff --git a/third_party/nixpkgs/pkgs/development/compilers/rust/rustc.nix b/third_party/nixpkgs/pkgs/development/compilers/rust/rustc.nix
index a68e117658..487de452b0 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/rust/rustc.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/rust/rustc.nix
@@ -35,6 +35,12 @@ in stdenv.mkDerivation (finalAttrs: {
     passthru.isReleaseTarball = true;
   };
 
+  hardeningDisable = optionals stdenv.cc.isClang [
+    # remove once https://github.com/NixOS/nixpkgs/issues/318674 is
+    # addressed properly
+    "zerocallusedregs"
+  ];
+
   __darwinAllowLocalNetworking = true;
 
   # rustc complains about modified source files otherwise
@@ -303,10 +309,4 @@ in stdenv.mkDerivation (finalAttrs: {
       "i686-windows" "x86_64-windows"
     ];
   };
-} // lib.optionalAttrs stdenv.cc.isClang { # FIXME: move inside again when rebuilds are OK
-  hardeningDisable = optionals stdenv.cc.isClang [
-    # remove once https://github.com/NixOS/nixpkgs/issues/318674 is
-    # addressed properly
-    "zerocallusedregs"
-  ];
 })
diff --git a/third_party/nixpkgs/pkgs/development/compilers/sbcl/default.nix b/third_party/nixpkgs/pkgs/development/compilers/sbcl/default.nix
index 6676a7ce6c..f523939616 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/sbcl/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/sbcl/default.nix
@@ -10,12 +10,12 @@
 
 let
   versionMap = {
-    "2.4.5" = {
-      sha256 = "sha256-TfaOkMkDGAdkK0t2GYjetb9qG9FSxHI0goNO+nNae9E=";
-    };
     "2.4.6" = {
       sha256 = "sha256-pImQeELa4JoXJtYphb96VmcKrqLz7KH7cCO8pnw/MJE=";
     };
+    "2.4.7" = {
+      sha256 = "sha256-aFRNJQNjWs0BXVNMzJsq6faJltQptakGP9Iv8JJQEdI=";
+    };
   };
   # Collection of pre-built SBCL binaries for platforms that need them for
   # bootstrapping. Ideally these are to be avoided.  If ECL (or any other
diff --git a/third_party/nixpkgs/pkgs/development/compilers/scryer-prolog/default.nix b/third_party/nixpkgs/pkgs/development/compilers/scryer-prolog/default.nix
index 49818fee3e..7a63db530f 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/scryer-prolog/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/scryer-prolog/default.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-0c0MsjrHRitg+5VEHB9/iSuiqcPztF+2inDZa9fQpwU=";
   };
 
-  cargoSha256 = "sha256-q8s6HAJhKnMhsgZk5plR+ar3CpLKNqjrD14roDWLwfo=";
+  cargoHash = "sha256-q8s6HAJhKnMhsgZk5plR+ar3CpLKNqjrD14roDWLwfo=";
 
   nativeBuildInputs = [ pkg-config ];
 
diff --git a/third_party/nixpkgs/pkgs/development/compilers/serpent/default.nix b/third_party/nixpkgs/pkgs/development/compilers/serpent/default.nix
index 31f6b0709d..670986b3ff 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/serpent/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/compilers/spirv-llvm-translator/default.nix b/third_party/nixpkgs/pkgs/development/compilers/spirv-llvm-translator/default.nix
index 3e2ef4532c..6321b6940e 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/spirv-llvm-translator/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/spirv-llvm-translator/default.nix
@@ -32,9 +32,9 @@ let
       rev = "v${version}";
       hash = "sha256-OsDohXRxovtEXaWiRGp8gJ0dXmoALyO+ZimeSO8aPVI=";
     } else if llvmMajor == "14" then {
-      version = "14.0.0+unstable-2024-02-14";
-      rev = "2221771c28dc224d5d560faf6a2cd73f8ecf713d";
-      hash = "sha256-J4qOgDdcsPRU1AXXXWN+qe4c47uMCrjmtM8MSrl9NjE=";
+      version = "14.0.0+unstable-2024-05-27";
+      rev = "62f5b09b11b1da42274371b1f7535f6f2ab11485";
+      hash = "sha256-lEOdWHyq9hEyBZPz9z1LxUAZqNub+mZFHHWMlzh3HaI=";
     } else if llvmMajor == "11" then {
       version = "11.0.0+unstable-2022-05-04";
       rev = "4ef524240833abfeee1c5b9fff6b1bd53f4806b3"; # 267 commits ahead of v11.0.0
diff --git a/third_party/nixpkgs/pkgs/development/compilers/swift/default.nix b/third_party/nixpkgs/pkgs/development/compilers/swift/default.nix
index fede34c8b0..e55465e952 100644
--- a/third_party/nixpkgs/pkgs/development/compilers/swift/default.nix
+++ b/third_party/nixpkgs/pkgs/development/compilers/swift/default.nix
@@ -58,7 +58,7 @@ let
     xcbuild = xcodebuild;
 
     swift-unwrapped = callPackage ./compiler {
-      inherit (darwin) DarwinTools cctools sigtool;
+      inherit (darwin) DarwinTools sigtool;
       inherit (apple_sdk) MacOSX-SDK CLTools_Executables;
       inherit (apple_sdk.frameworks) CoreServices Foundation Combine;
     };
@@ -85,7 +85,7 @@ let
     };
 
     swiftpm = callPackage ./swiftpm {
-      inherit (darwin) DarwinTools cctools;
+      inherit (darwin) DarwinTools;
       inherit (apple_sdk.frameworks) CryptoKit LocalAuthentication;
       swift = swiftNoSwiftDriver;
     };
diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/high-school-geometry/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/high-school-geometry/default.nix
new file mode 100644
index 0000000000..2f478978bd
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/coq-modules/high-school-geometry/default.nix
@@ -0,0 +1,27 @@
+{ lib, mkCoqDerivation, coq, version ? null }:
+
+mkCoqDerivation {
+  pname = "high-school-geometry";
+  inherit version;
+  repo = "HighSchoolGeometry";
+  defaultVersion = with lib.versions; lib.switch coq.coq-version [
+    { case = range "8.16" "8.20"; out = "8.16"; }
+    { case = range "8.12" "8.16"; out = "8.13"; }
+    { case = "8.12"; out = "8.12"; }
+    { case = "8.11"; out = "8.11"; }
+  ] null;
+
+  release = {
+    "8.16".sha256 = "sha256-HvUrZ6l7wCshuKUZs8rvfMkTEv+oXuogI5LICcD8Bn8=";
+    "8.13".sha256 = "sha256-5F/6155v0bWi5t7n4qU/GuR6jENngvWIIqJGPURzIeQ=";
+    "8.12".sha256 = "sha256-OF7sahU+5Ormkcrd8t6p2Kp/B2/Q/6zYTV3/XBvlGHc=";
+    "8.11".sha256 = "sha256-sVGeBBAJ7a7f+EJU1aSUvIVe9ip9PakY4379XWvvoqw=";
+  };
+  releaseRev = v: "v${v}";
+
+  meta = with lib; {
+    description = "Geometry in Coq for French high school";
+    maintainers = with maintainers; [ definfo ];
+    license = licenses.lgpl21Plus;
+  };
+}
diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/metacoq/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/metacoq/default.nix
index 5accb47a31..8534f098fa 100644
--- a/third_party/nixpkgs/pkgs/development/coq-modules/metacoq/default.nix
+++ b/third_party/nixpkgs/pkgs/development/coq-modules/metacoq/default.nix
@@ -15,7 +15,7 @@ let
       { case = "8.16"; out = "1.1-8.16"; }
       { case = "8.17"; out = "1.3.1-8.17"; }
       { case = "8.18"; out = "1.3.1-8.18"; }
-      { case = "8.19"; out = "1.3.1-8.19"; }
+      { case = "8.19"; out = "1.3.2-8.19"; }
     ] null;
   release = {
     "1.0-beta2-8.11".sha256 = "sha256-I9YNk5Di6Udvq5/xpLSNflfjRyRH8fMnRzbo3uhpXNs=";
@@ -32,6 +32,7 @@ let
     "1.3.1-8.17".sha256 = "sha256-l0/QLC7V3zSk/FsaE2eL6tXy2BzbcI5MAk/c+FESwnc=";
     "1.3.1-8.18".sha256 = "sha256-L6Ym4Auwqaxv5tRmJLSVC812dxCqdUU5aN8+t5HVYzY=";
     "1.3.1-8.19".sha256 = "sha256-fZED/Uel1jt5XF83dR6HfyhSkfBdLkET8C/ArDgsm64=";
+    "1.3.2-8.19".sha256 = "sha256-e5Pm1AhaQrO6JoZylSXYWmeXY033QflQuCBZhxGH8MA=";
   };
   releaseRev = v: "v${v}";
 
diff --git a/third_party/nixpkgs/pkgs/development/cuda-modules/cuda-library-samples/generic.nix b/third_party/nixpkgs/pkgs/development/cuda-modules/cuda-library-samples/generic.nix
index 64131ab59b..f5d1c250cf 100644
--- a/third_party/nixpkgs/pkgs/development/cuda-modules/cuda-library-samples/generic.nix
+++ b/third_party/nixpkgs/pkgs/development/cuda-modules/cuda-library-samples/generic.nix
@@ -3,7 +3,7 @@
   backendStdenv,
   fetchFromGitHub,
   cmake,
-  addOpenGLRunpath,
+  addDriverRunpath,
   cudatoolkit,
   cutensor,
 }:
@@ -20,12 +20,12 @@ let
     version = lib.strings.substring 0 7 rev + "-" + lib.versions.majorMinor cudatoolkit.version;
     nativeBuildInputs = [
       cmake
-      addOpenGLRunpath
+      addDriverRunpath
     ];
     buildInputs = [ cudatoolkit ];
     postFixup = ''
       for exe in $out/bin/*; do
-        addOpenGLRunpath $exe
+        addDriverRunpath $exe
       done
     '';
     meta = {
diff --git a/third_party/nixpkgs/pkgs/development/cuda-modules/cudatoolkit/default.nix b/third_party/nixpkgs/pkgs/development/cuda-modules/cudatoolkit/default.nix
index d2f8e2ce3f..f7be0aa9f4 100644
--- a/third_party/nixpkgs/pkgs/development/cuda-modules/cudatoolkit/default.nix
+++ b/third_party/nixpkgs/pkgs/development/cuda-modules/cudatoolkit/default.nix
@@ -3,7 +3,7 @@
   runPatches ? [ ],
   autoPatchelfHook,
   autoAddDriverRunpath,
-  addOpenGLRunpath,
+  addDriverRunpath,
   alsa-lib,
   curlMinimal,
   expat,
@@ -74,7 +74,7 @@ backendStdenv.mkDerivation rec {
       perl
       makeWrapper
       rsync
-      addOpenGLRunpath
+      addDriverRunpath
       autoPatchelfHook
       autoAddDriverRunpath
       markForCudatoolkitRootHook
diff --git a/third_party/nixpkgs/pkgs/development/embedded/arduino/arduino-cli/default.nix b/third_party/nixpkgs/pkgs/development/embedded/arduino/arduino-cli/default.nix
deleted file mode 100644
index 9e1325a434..0000000000
--- a/third_party/nixpkgs/pkgs/development/embedded/arduino/arduino-cli/default.nix
+++ /dev/null
@@ -1,99 +0,0 @@
-{ lib, stdenv, buildGoModule, fetchFromGitHub, buildFHSEnv, installShellFiles, go-task }:
-
-let
-
-  pkg = buildGoModule rec {
-    pname = "arduino-cli";
-    version = "1.0.2";
-
-    src = fetchFromGitHub {
-      owner = "arduino";
-      repo = pname;
-      rev = "v${version}";
-      hash = "sha256-lRCkUF0BBX0nej/HxfV9u8NIuA5W0aBKP2xPR8C61NY=";
-    };
-
-    nativeBuildInputs = [
-      installShellFiles
-    ];
-
-    nativeCheckInputs = [
-      go-task
-    ];
-
-    subPackages = [ "." ];
-
-    vendorHash = "sha256-lB/PfUZFL5+YBcAhrMMV2ckAHPhtW2SL3/zM3L4XGVc=";
-
-    postPatch = let
-      skipTests = [
-        # tries to "go install"
-        "TestDummyMonitor"
-        # try to Get "https://downloads.arduino.cc/libraries/library_index.tar.bz2"
-        "TestDownloadAndChecksums"
-        "TestParseArgs"
-        "TestParseReferenceCores"
-        "TestPlatformSearch"
-        "TestPlatformSearchSorting"
-      ];
-    in ''
-      substituteInPlace Taskfile.yml \
-        --replace-fail "go test" "go test -p $NIX_BUILD_CORES -skip '(${lib.concatStringsSep "|" skipTests})'"
-    '';
-
-    doCheck = stdenv.isLinux;
-
-    checkPhase = ''
-      runHook preCheck
-      task go:test
-      runHook postCheck
-    '';
-
-    ldflags = [
-      "-s" "-w" "-X github.com/arduino/arduino-cli/version.versionString=${version}" "-X github.com/arduino/arduino-cli/version.commit=unknown"
-    ] ++ lib.optionals stdenv.isLinux [ "-extldflags '-static'" ];
-
-    postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
-      export HOME="$(mktemp -d)"
-      installShellCompletion --cmd arduino-cli \
-        --bash <($out/bin/arduino-cli completion bash) \
-        --zsh <($out/bin/arduino-cli completion zsh) \
-        --fish <($out/bin/arduino-cli completion fish)
-      unset HOME
-    '';
-
-    meta = with lib; {
-      inherit (src.meta) homepage;
-      description = "Arduino from the command line";
-      mainProgram = "arduino-cli";
-      changelog = "https://github.com/arduino/arduino-cli/releases/tag/${version}";
-      license = [ licenses.gpl3Only licenses.asl20 ];
-      maintainers = with maintainers; [ ryantm sfrijters ];
-    };
-
-  };
-
-in
-if stdenv.isLinux then
-# buildFHSEnv is needed because the arduino-cli downloads compiler
-# toolchains from the internet that have their interpreters pointed at
-# /lib64/ld-linux-x86-64.so.2
-  buildFHSEnv
-  {
-    inherit (pkg) name meta;
-
-    runScript = "${pkg.outPath}/bin/arduino-cli";
-
-    extraInstallCommands = ''
-      mv $out/bin/$name $out/bin/arduino-cli
-    '' + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
-      cp -r ${pkg.outPath}/share $out/share
-    '';
-    passthru.pureGoPkg = pkg;
-
-    targetPkgs = pkgs: with pkgs; [
-      zlib
-    ];
-  }
-else
-  pkg
diff --git a/third_party/nixpkgs/pkgs/development/embedded/fpga/openfpgaloader/default.nix b/third_party/nixpkgs/pkgs/development/embedded/fpga/openfpgaloader/default.nix
index 5309093f17..2a84bfdc8c 100644
--- a/third_party/nixpkgs/pkgs/development/embedded/fpga/openfpgaloader/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/embedded/fpga/tinyprog/default.nix b/third_party/nixpkgs/pkgs/development/embedded/fpga/tinyprog/default.nix
index b5a9937ad2..0e962d2f2a 100644
--- a/third_party/nixpkgs/pkgs/development/embedded/fpga/tinyprog/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix
index a48be42dd0..13ed878128 100644
--- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix
+++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix
@@ -3100,6 +3100,11 @@ self: super: {
     hash = "sha256-JxraFWzErJT4EhELa3PWBGHaLT9OLgEPNSnxwpdpHd0=";
   }) (doJailbreak super.argon2); # Unmaintained
 
+  safe-exceptions = overrideCabal (drv: {
+    # Fix strictDeps build error "could not execute: hspec-discover"
+    testToolDepends = drv.testToolDepends or [] ++ [ self.hspec-discover ];
+  }) super.safe-exceptions;
+
   # Apply patch to use v.4.0.2
   push-notify-apn = appendPatch (
     fetchpatch {
diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/generic-builder.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/generic-builder.nix
index 6c60efe1bc..f3439e19bd 100644
--- a/third_party/nixpkgs/pkgs/development/haskell-modules/generic-builder.nix
+++ b/third_party/nixpkgs/pkgs/development/haskell-modules/generic-builder.nix
@@ -150,6 +150,35 @@ assert stdenv.hostPlatform.isWasm -> enableStaticLibraries == false;
 
 let
 
+  # This is a workaround for the 2024-07-20 staging-next cycle to avoid causing mass rebuilds.
+  # todo(@reckenrode) Remove this workaround and remove `NIX_COREFOUNDATION_RPATH`, the related hooks, and ld-wrapper support.
+  nixCoreFoundationRpathWorkaround = stdenv.mkDerivation {
+    name = "nix-corefoundation-rpath-workaround";
+    buildCommand = ''
+      mkdir -p "$out/nix-support"
+      cat <<-EOF > "$out/nix-support/setup-hook"
+      removeUseSystemCoreFoundationFrameworkHook() {
+        unset NIX_COREFOUNDATION_RPATH
+        local _hook
+        for _hook in envBuildBuildHooks envBuildHostHooks envBuildTargetHooks envHostHostHooks envHostTargetHooks envTargetTargetHooks; do
+          local _index=0
+          local _var="\$_hook[@]"
+          for _var in "\''${!_var}"; do
+            if [ "\$_var" = "useSystemCoreFoundationFramework" ]; then
+              unset "\$_hook[\$_index]"
+            fi
+            ((++_index))
+          done
+          unset _index
+          unset _var
+        done
+        unset _hook
+      }
+      addEnvHooks "\$hostOffset" removeUseSystemCoreFoundationFrameworkHook
+      EOF
+    '';
+  };
+
   inherit (lib) optional optionals optionalString versionAtLeast
                        concatStringsSep enableFeature optionalAttrs;
 
@@ -430,7 +459,8 @@ stdenv.mkDerivation ({
   inherit depsBuildBuild nativeBuildInputs;
   buildInputs = otherBuildInputs ++ optionals (!isLibrary) propagatedBuildInputs
     # For patchShebangsAuto in fixupPhase
-    ++ optionals stdenv.hostPlatform.isGhcjs [ nodejs ];
+    ++ optionals stdenv.hostPlatform.isGhcjs [ nodejs ]
+    ++ optionals (stdenv.isDarwin && stdenv.isx86_64) [ nixCoreFoundationRpathWorkaround ];
   propagatedBuildInputs = optionals isLibrary propagatedBuildInputs;
 
   LANG = "en_US.UTF-8";         # GHC needs the locale configured during the Haddock phase.
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/cyclone/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/cyclone/default.nix
index d5a31c7aeb..643ee3a632 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/cyclone/default.nix
+++ b/third_party/nixpkgs/pkgs/development/interpreters/cyclone/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, libck, darwin }:
+{ lib, stdenv, fetchFromGitHub, libck, cctools }:
 
 let
   version = "0.34.0";
@@ -15,7 +15,7 @@ let
 
     enableParallelBuilding = true;
 
-    nativeBuildInputs = lib.optionals stdenv.isDarwin [ darwin.cctools ];
+    nativeBuildInputs = lib.optionals stdenv.isDarwin [ cctools ];
 
     buildInputs = [ libck ];
 
@@ -36,7 +36,7 @@ stdenv.mkDerivation {
   enableParallelBuilding = true;
 
   nativeBuildInputs = [ bootstrap ]
-    ++ lib.optionals stdenv.isDarwin [ darwin.cctools ];
+    ++ lib.optionals stdenv.isDarwin [ cctools ];
 
   buildInputs = [ libck ];
 
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/emilua/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/emilua/default.nix
index 396164b14a..4ef35441d3 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/emilua/default.nix
+++ b/third_party/nixpkgs/pkgs/development/interpreters/emilua/default.nix
@@ -71,13 +71,6 @@ stdenv.mkDerivation rec {
 
   dontUseCmakeConfigure = true;
 
-  # Meson is no longer able to pick up Boost automatically.
-  # https://github.com/NixOS/nixpkgs/issues/86131
-  env = {
-    BOOST_INCLUDEDIR = "${lib.getDev boost182}/include";
-    BOOST_LIBRARYDIR = "${lib.getLib boost182}/lib";
-  };
-
   mesonFlags = [
     (lib.mesonBool "enable_file_io" true)
     (lib.mesonBool "enable_io_uring" true)
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/guile/3.0.nix b/third_party/nixpkgs/pkgs/development/interpreters/guile/3.0.nix
index 7eb0f1abc4..f7797a7c8a 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/guile/3.0.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/interpreters/lua-5/build-luarocks-package.nix b/third_party/nixpkgs/pkgs/development/interpreters/lua-5/build-luarocks-package.nix
index 55bd577e46..263cd11dd5 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/lua-5/build-luarocks-package.nix
+++ b/third_party/nixpkgs/pkgs/development/interpreters/lua-5/build-luarocks-package.nix
@@ -134,12 +134,15 @@ let
       externalDeps = lib.unique (self.externalDeps ++ externalDepsGenerated);
       local_cache = "";
 
+      # To prevent collisions when creating environments, we install the rock
+      # files into per-package subdirectories
+      rocks_subdir = self.rocksSubdir;
+
       # Filter out the lua derivation itself from the Lua module dependency
       # closure, as it doesn't have a rock tree :)
       # luaLib.hasLuaModule
       requiredLuaRocks = lib.filter luaLib.hasLuaModule
         (lua.pkgs.requiredLuaModules (self.nativeBuildInputs ++ self.propagatedBuildInputs));
-      inherit (self) rocksSubdir;
     };
 
     luarocksConfig' = lib.recursiveUpdate luarocksConfig
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/3.13/0001-Fix-build-with-_PY_SHORT_FLOAT_REPR-0.patch b/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/3.13/0001-Fix-build-with-_PY_SHORT_FLOAT_REPR-0.patch
deleted file mode 100644
index 1c9f8b1c43..0000000000
--- a/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/3.13/0001-Fix-build-with-_PY_SHORT_FLOAT_REPR-0.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 94d8a9efe6ec86a6e5b4806dbfb82ac926286456 Mon Sep 17 00:00:00 2001
-From: Yureka <yuka@yuka.dev>
-Date: Sun, 30 Jun 2024 09:45:58 +0200
-Subject: [PATCH] Fix build with _PY_SHORT_FLOAT_REPR == 0
-
----
- Include/internal/pycore_dtoa.h | 10 +++-------
- 1 file changed, 3 insertions(+), 7 deletions(-)
-
-diff --git a/Include/internal/pycore_dtoa.h b/Include/internal/pycore_dtoa.h
-index c5cfdf4ce8..e4222c5267 100644
---- a/Include/internal/pycore_dtoa.h
-+++ b/Include/internal/pycore_dtoa.h
-@@ -11,8 +11,6 @@ extern "C" {
- #include "pycore_pymath.h"        // _PY_SHORT_FLOAT_REPR
- 
- 
--#if _PY_SHORT_FLOAT_REPR == 1
--
- typedef uint32_t ULong;
- 
- struct
-@@ -22,15 +20,15 @@ Bigint {
-     ULong x[1];
- };
- 
--#ifdef Py_USING_MEMORY_DEBUGGER
-+#if defined(Py_USING_MEMORY_DEBUGGER) || _PY_SHORT_FLOAT_REPR == 0
- 
- struct _dtoa_state {
-     int _not_used;
- };
--#define _dtoa_interp_state_INIT(INTERP) \
-+#define _dtoa_state_INIT(INTERP) \
-     {0}
- 
--#else  // !Py_USING_MEMORY_DEBUGGER
-+#else  // !Py_USING_MEMORY_DEBUGGER && _PY_SHORT_FLOAT_REPR != 0
- 
- /* The size of the Bigint freelist */
- #define Bigint_Kmax 7
-@@ -66,8 +64,6 @@ extern char* _Py_dg_dtoa(double d, int mode, int ndigits,
-                          int *decpt, int *sign, char **rve);
- extern void _Py_dg_freedtoa(char *s);
- 
--#endif // _PY_SHORT_FLOAT_REPR == 1
--
- 
- extern PyStatus _PyDtoa_Init(PyInterpreterState *interp);
- extern void _PyDtoa_Fini(PyInterpreterState *interp);
--- 
-2.45.1
-
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix
index 5a11727861..dd569db153 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix
+++ b/third_party/nixpkgs/pkgs/development/interpreters/python/cpython/default.nix
@@ -70,8 +70,7 @@
 , enableNoSemanticInterposition ? true
 
 # enabling LTO on 32bit arch causes downstream packages to fail when linking
-# enabling LTO on *-darwin causes python3 to fail when linking.
-, enableLTO ? stdenv.is64bit && stdenv.isLinux
+, enableLTO ? stdenv.isDarwin || (stdenv.is64bit && stdenv.isLinux)
 
 # enable asserts to ensure the build remains reproducible
 , reproducibleBuild ? false
@@ -367,17 +366,10 @@ in with passthru; stdenv.mkDerivation (finalAttrs: {
     };
   in [
     "${mingw-patch}/*.patch"
-  ]) ++ optionals (pythonAtLeast "3.12" && (stdenv.hostPlatform != stdenv.buildPlatform) && (
-    stdenv.hostPlatform.isAarch32 || stdenv.hostPlatform.isAarch64 || stdenv.hostPlatform.isRiscV
-  )) [
-    # backport fix for various platforms; armv7l, riscv64
+  ]) ++ optionals isPy312 [
+    # backport fix for various platforms; armv7l, riscv64, s390
     # https://github.com/python/cpython/pull/121178
-    (
-      if (pythonAtLeast "3.13") then
-        ./3.13/0001-Fix-build-with-_PY_SHORT_FLOAT_REPR-0.patch
-      else
-        ./3.12/0001-Fix-build-with-_PY_SHORT_FLOAT_REPR-0.patch
-    )
+    ./3.12/0001-Fix-build-with-_PY_SHORT_FLOAT_REPR-0.patch
   ];
 
   postPatch = optionalString (!stdenv.hostPlatform.isWindows) ''
@@ -408,9 +400,6 @@ in with passthru; stdenv.mkDerivation (finalAttrs: {
   configureFlags = [
     "--without-ensurepip"
     "--with-system-expat"
-  ] ++ optionals (!(stdenv.isDarwin && pythonAtLeast "3.12")) [
-    #  ./Modules/_decimal/_decimal.c:4673:6: error: "No valid combination of CONFIG_64, CONFIG_32 and _PyHASH_BITS"
-    # https://hydra.nixos.org/build/248410479/nixlog/2/tail
     "--with-system-libmpdec"
   ] ++ optionals (openssl != null) [
     "--with-openssl=${openssl.dev}"
@@ -482,6 +471,10 @@ in with passthru; stdenv.mkDerivation (finalAttrs: {
     export PYTHON_DECIMAL_WITH_MACHINE=${if stdenv.isAarch64 then "uint128" else "x64"}
     # Ensure that modern platform features are enabled on Darwin in spite of having no version suffix.
     sed -E -i -e 's|Darwin/\[12\]\[0-9\]\.\*|Darwin/*|' configure
+  '' + optionalString (pythonAtLeast "3.11") ''
+    # Also override the auto-detection in `configure`.
+    substituteInPlace configure \
+      --replace-fail 'libmpdec_machine=universal' 'libmpdec_machine=${if stdenv.isAarch64 then "uint128" else "x64"}'
   '' + optionalString (stdenv.isDarwin && x11Support && pythonAtLeast "3.11") ''
     export TCLTK_LIBS="-L${tcl}/lib -L${tk}/lib -l${tcl.libPrefix} -l${tk.libPrefix}"
     export TCLTK_CFLAGS="-I${tcl}/include -I${tk}/include"
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/python/hooks/python-relax-deps-hook.sh b/third_party/nixpkgs/pkgs/development/interpreters/python/hooks/python-relax-deps-hook.sh
index 16df000139..7fd1b52a04 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/python/hooks/python-relax-deps-hook.sh
+++ b/third_party/nixpkgs/pkgs/development/interpreters/python/hooks/python-relax-deps-hook.sh
@@ -4,12 +4,10 @@
 #
 # Example usage in a derivation:
 #
-#   { …, pythonPackages, … }:
+#   { …, python3Packages, … }:
 #
-#   pythonPackages.buildPythonPackage {
+#   python3Packages.buildPythonPackage {
 #     …
-#     nativeBuildInputs = [ pythonPackages.pythonRelaxDepsHook ];
-#
 #     # This will relax the dependency restrictions
 #     # e.g.: abc>1,<=2 -> abc
 #     pythonRelaxDeps = [ "abc" ];
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/racket/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/racket/default.nix
index e2dfabfa97..738e3a8e97 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/racket/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/interpreters/racket/racket_7_9.nix b/third_party/nixpkgs/pkgs/development/interpreters/racket/racket_7_9.nix
index 49901e40f1..91f7654fca 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/racket/racket_7_9.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/interpreters/ruby/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/ruby/default.nix
index b7f765c213..2ee6ff9b13 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/ruby/default.nix
+++ b/third_party/nixpkgs/pkgs/development/interpreters/ruby/default.nix
@@ -6,6 +6,7 @@
 , makeBinaryWrapper, buildRubyGem, defaultGemConfig, removeReferencesTo
 , openssl
 , linuxPackages, libsystemtap
+, gitUpdater
 } @ args:
 
 let
@@ -13,7 +14,7 @@ let
   ops = lib.optionals;
   opString = lib.optionalString;
   config = import ./config.nix { inherit fetchFromSavannah; };
-  rubygems = import ./rubygems { inherit stdenv lib fetchurl; };
+  rubygems = import ./rubygems { inherit stdenv lib fetchurl gitUpdater; };
 
   # Contains the ruby version heuristics
   rubyVersion = import ./ruby-version.nix { inherit lib; };
@@ -57,6 +58,7 @@ let
           rubygemsSupport = false;
         }
       , useBaseRuby ? stdenv.hostPlatform != stdenv.buildPlatform
+      , gitUpdater
       }:
       stdenv.mkDerivation ( finalAttrs: {
         pname = "ruby";
@@ -171,6 +173,14 @@ let
           export HOME=$TMPDIR
         '';
 
+        # Work around useSystemCoreFoundationFramework hook causing issues with the ld64 upgrade.
+        # This will be fixed on staging in https://github.com/NixOS/nixpkgs/pull/329529
+        preBuild =
+          if lib.versionAtLeast ver.majMin "3.3" && stdenv.isDarwin && stdenv.isx86_64 then
+            "unset NIX_COREFOUNDATION_RPATH"
+          else
+            null;
+
         # fails with "16993 tests, 2229489 assertions, 105 failures, 14 errors, 89 skips"
         # mostly TZ- and patch-related tests
         # TZ- failures are caused by nix sandboxing, I didn't investigate others
@@ -269,6 +279,7 @@ let
           license     = licenses.ruby;
           maintainers = with maintainers; [ manveru ];
           platforms   = platforms.all;
+          mainProgram = "ruby";
           knownVulnerabilities = op (lib.versionOlder ver.majMin "3.0") "This Ruby release has reached its end of life. See https://www.ruby-lang.org/en/downloads/branches/.";
         };
 
@@ -299,8 +310,8 @@ in {
   mkRuby = generic;
 
   ruby_3_1 = generic {
-    version = rubyVersion "3" "1" "5" "";
-    hash = "sha256-NoXFHu7hNSwx6gOXBtcZdvU9AKttdzEt5qoauvXNosU=";
+    version = rubyVersion "3" "1" "6" "";
+    hash = "sha256-DQ2vuFnnZ2NDJXGjEJ0VN9l2JmvjCDRFZR3Gje7SXCI=";
   };
 
   ruby_3_2 = generic {
@@ -310,8 +321,8 @@ in {
   };
 
   ruby_3_3 = generic {
-    version = rubyVersion "3" "3" "2" "";
-    hash = "sha256-O+HRAOvyoM5gws2NIs2dtNZLPgShlDvixP97Ug8ry1s=";
+    version = rubyVersion "3" "3" "4" "";
+    hash = "sha256-/mow+X1U4Cl2jy3fSSNpnEFs28Om6W2z4tVxbH25ajQ=";
     cargoHash = "sha256-GeelTMRFIyvz1QS2L+Q3KAnyQy7jc0ejhx3TdEFVEbk=";
   };
 
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/ruby/rubygems/0004-delete-binstub-lock-file.patch b/third_party/nixpkgs/pkgs/development/interpreters/ruby/rubygems/0004-delete-binstub-lock-file.patch
new file mode 100644
index 0000000000..91f221e196
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/interpreters/ruby/rubygems/0004-delete-binstub-lock-file.patch
@@ -0,0 +1,36 @@
+A change introduced in PR https://github.com/rubygems/rubygems/pull/7797
+does not delete the binstub lock files after the binstub file is created.
+
+This change was introduced in rubygems 3.5.15,
+and this version causes Hydra builds to fail, in particular mastodon.
+
+A resolution is delete these binstub lock files after the binstub file is created
+to prevent lock files from ending up in the bin folders of the various derivations
+which will cause the build to fail.
+
+---
+diff --git a/bundler/lib/bundler/rubygems_ext.rb b/bundler/lib/bundler/rubygems_ext.rb
+index 503959bba7..603b30e277 100644
+--- a/bundler/lib/bundler/rubygems_ext.rb
++++ b/bundler/lib/bundler/rubygems_ext.rb
+@@ -47,6 +47,8 @@ def self.open_file_with_flock(path, &block)
+         else
+           File.open(path, flags, &block)
+         end
++      ensure
++        FileUtils.rm_f(path) if File.exist?(path)
+       end
+     end
+   end
+diff --git a/lib/rubygems.rb b/lib/rubygems.rb
+index 569041f3d7..bcc95ae85c 100644
+--- a/lib/rubygems.rb
++++ b/lib/rubygems.rb
+@@ -796,6 +796,8 @@ def self.open_file_with_flock(path, &block)
+       else
+         open_file(path, flags, &block)
+       end
++    ensure
++      FileUtils.rm_f(path) if File.exist?(path)
+     end
+   end
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/ruby/rubygems/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/ruby/rubygems/default.nix
index 9ad7a04eab..9fbfdb59fb 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/ruby/rubygems/default.nix
+++ b/third_party/nixpkgs/pkgs/development/interpreters/ruby/rubygems/default.nix
@@ -1,18 +1,24 @@
-{ stdenv, lib, fetchurl }:
+{
+  fetchurl,
+  gitUpdater,
+  lib,
+  stdenv,
+}:
 
 stdenv.mkDerivation rec {
   pname = "rubygems";
-  version = "3.5.11";
+  version = "3.5.16";
 
   src = fetchurl {
     url = "https://rubygems.org/rubygems/rubygems-${version}.tgz";
-    hash = "sha256-RSG1L4Q2IKn8XKdBRSa3RjsJiVZMOugLJraPvRMEyBg=";
+    hash = "sha256-f9EN6eXpMzIbYrjxGUJWrmRwO6JUHKuR7DEkSgGNkBI=";
   };
 
   patches = [
     ./0001-add-post-extract-hook.patch
     ./0002-binaries-with-env-shebang.patch
     ./0003-gem-install-default-to-user.patch
+    ./0004-delete-binstub-lock-file.patch
   ];
 
   installPhase = ''
@@ -21,6 +27,12 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
+  passthru.updateScript = gitUpdater {
+    url = "https://github.com/rubygems/rubygems.git";
+    rev-prefix = "v";
+    ignoredVersions = "(pre|alpha|beta|rc|bundler).*";
+  };
+
   meta = with lib; {
     description = "Package management framework for Ruby";
     changelog = "https://github.com/rubygems/rubygems/blob/v${version}/CHANGELOG.md";
diff --git a/third_party/nixpkgs/pkgs/development/interpreters/supercollider/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/supercollider/default.nix
index b69658ff03..7eb0de6f68 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/supercollider/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/interpreters/supercollider/plugins/sc3-plugins.nix b/third_party/nixpkgs/pkgs/development/interpreters/supercollider/plugins/sc3-plugins.nix
index 492033c52c..8a2d9a371d 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/supercollider/plugins/sc3-plugins.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/interpreters/unicon-lang/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/unicon-lang/default.nix
index 421958100c..f0a45495d7 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/unicon-lang/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/interpreters/yex-lang/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/yex-lang/default.nix
index 772a2b5acf..ba00c0ec0c 100644
--- a/third_party/nixpkgs/pkgs/development/interpreters/yex-lang/default.nix
+++ b/third_party/nixpkgs/pkgs/development/interpreters/yex-lang/default.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-sxzkZ2Rhn3HvZIfjnJ6Z2au/l/jV5705ecs/X3Iah6k=";
   };
 
-  cargoSha256 = "sha256-nX5FoPAk50wt0CXskyg7jQeHvD5YtBNnCe0CVOGXTMI=";
+  cargoHash = "sha256-nX5FoPAk50wt0CXskyg7jQeHvD5YtBNnCe0CVOGXTMI=";
 
   meta = with lib; {
     homepage = "https://github.com/nonamescm/yex-lang";
diff --git a/third_party/nixpkgs/pkgs/development/libraries/adns/default.nix b/third_party/nixpkgs/pkgs/development/libraries/adns/default.nix
index 42edfc190c..60de8957d0 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/adns/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/adns/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, lib, fetchurl, gnum4 }:
+{ stdenv, lib, fetchurl, gnum4, gitUpdater }:
 
 stdenv.mkDerivation rec {
   pname = "adns";
-  version = "1.6.0";
+  version = "1.6.1";
 
   src = fetchurl {
     urls = [
       "https://www.chiark.greenend.org.uk/~ian/adns/ftp/adns-${version}.tar.gz"
       "mirror://gnu/adns/adns-${version}.tar.gz"
     ];
-    sha256 = "1pi0xl07pav4zm2jrbrfpv43s1r1q1y12awgak8k7q41m5jp4hpv";
+    hash = "sha256-cTizeJt1Br1oP0UdT32FMHepGAO3s12G7GZ/D5zUAc0=";
   };
 
   nativeBuildInputs = [ gnum4 ];
@@ -41,6 +41,11 @@ stdenv.mkDerivation rec {
     done
   '';
 
+  passthru.updateScript = gitUpdater {
+    url = "https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/githttp/adns.git";
+    rev-prefix = "adns-";
+  };
+
   meta = with lib; {
     homepage = "http://www.chiark.greenend.org.uk/~ian/adns/";
     description = "Asynchronous DNS Resolver Library";
diff --git a/third_party/nixpkgs/pkgs/development/libraries/aemu/LFS64.patch b/third_party/nixpkgs/pkgs/development/libraries/aemu/LFS64.patch
new file mode 100644
index 0000000000..e1d06d8073
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/aemu/default.nix b/third_party/nixpkgs/pkgs/development/libraries/aemu/default.nix
index e2ea8e5b1c..0a2f6fa8b8 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/aemu/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/agda/standard-library/default.nix b/third_party/nixpkgs/pkgs/development/libraries/agda/standard-library/default.nix
index 9779277b5e..cbf3100347 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/agda/standard-library/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/agda/standard-library/default.nix
@@ -2,13 +2,13 @@
 
 mkDerivation rec {
   pname = "standard-library";
-  version = "2.0";
+  version = "2.1";
 
   src = fetchFromGitHub {
     repo = "agda-stdlib";
     owner = "agda";
     rev = "v${version}";
-    hash = "sha256-TjGvY3eqpF+DDwatT7A78flyPcTkcLHQ1xcg+MKgCoE=";
+    hash = "sha256-tv/Fj8ZJgSvieNLlXBjyIR7MSmDp0e2QbN1d/0xBpFg=";
   };
 
   nativeBuildInputs = [ (ghcWithPackages (self : [ self.filemanip ])) ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/appstream/default.nix b/third_party/nixpkgs/pkgs/development/libraries/appstream/default.nix
index b2b1e40576..6f2f3def2b 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/appstream/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/appstream/default.nix
@@ -4,6 +4,7 @@
 , fetchFromGitHub
 , meson
 , mesonEmulatorHook
+, appstream
 , ninja
 , pkg-config
 , cmake
@@ -36,7 +37,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "appstream";
-  version = "1.0.2";
+  version = "1.0.3";
 
   outputs = [ "out" "dev" "installedTests" ];
 
@@ -44,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "ximion";
     repo = "appstream";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-0NzZku6TQyyaTOAMWZD459RayhsH8cotlOaSKkVY/EQ=";
+    sha256 = "sha256-pniZq+rR9wW86QqfRw4WZiBo1F16aSAb1J2RjI4aqE0=";
   };
 
   patches = [
@@ -80,6 +81,7 @@ stdenv.mkDerivation (finalAttrs: {
     gperf
   ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
     mesonEmulatorHook
+    appstream
   ];
 
   buildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/libraries/appstream/qt.nix b/third_party/nixpkgs/pkgs/development/libraries/appstream/qt.nix
index 1916774b8c..4699c7ce93 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/appstream/qt.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/appstream/qt.nix
@@ -24,9 +24,13 @@ stdenv.mkDerivation {
 
   dontWrapQtApps = true;
 
+  # AppStreamQt tries to be relocatable, in hacky cmake ways that generally fail
+  # horribly on NixOS. Just hardcode the paths.
   postFixup = ''
     sed -i "$dev/lib/cmake/AppStreamQt${qtSuffix}/AppStreamQt${qtSuffix}Config.cmake" \
       -e "/INTERFACE_INCLUDE_DIRECTORIES/ s@\''${PACKAGE_PREFIX_DIR}@$dev@"
+    sed -i "$dev/lib/cmake/AppStreamQt${qtSuffix}/AppStreamQt${qtSuffix}Config.cmake" \
+      -e "/IMPORTED_LOCATION/ s@\''${PACKAGE_PREFIX_DIR}@$out@"
   '';
 
   passthru = appstream.passthru // {
diff --git a/third_party/nixpkgs/pkgs/development/libraries/argparse/default.nix b/third_party/nixpkgs/pkgs/development/libraries/argparse/default.nix
index 16a4f3b7a2..3b10b70e20 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/argparse/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/argparse/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "argparse";
-  version = "3.0";
+  version = "3.1";
 
   src = fetchFromGitHub {
     owner = "p-ranav";
     repo = "argparse";
     rev = "v${version}";
-    sha256 = "sha256-0fgMy7Q9BiQ/C1tmhuNpQgad8yzaLYxh5f6Ps38f2mk=";
+    sha256 = "sha256-JH9t/e/6RaSz+3LjmuNBYOy5gJT3zA+Vz4CxuwEXlvA=";
   };
 
   postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/development/libraries/audio/libmysofa/default.nix b/third_party/nixpkgs/pkgs/development/libraries/audio/libmysofa/default.nix
index 3b5224c97f..5125d4c76e 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/audio/libmysofa/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/audio/mbelib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/audio/mbelib/default.nix
index d67e18476a..d2c9d28f20 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/audio/mbelib/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/ayatana-ido/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ayatana-ido/default.nix
index 7e15b74ebe..af3476ce1a 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/ayatana-ido/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/ayatana-ido/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ayatana-ido";
-  version = "0.10.2";
+  version = "0.10.3";
 
   src = fetchFromGitHub {
     owner = "AyatanaIndicators";
     repo = pname;
     rev = version;
-    sha256 = "sha256-Y+5fHUe1HAjU/cy7jWKE7zVQUezJNFg4q9tn7H1+NuA=";
+    sha256 = "sha256-WEPW9BstDv2k/5dTEDQza3eOQ9bd6CEVvmd817sEPAs=";
   };
 
   nativeBuildInputs = [ pkg-config cmake ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/backward-cpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/backward-cpp/default.nix
index 15556a4108..1cea807902 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/backward-cpp/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/blst/default.nix b/third_party/nixpkgs/pkgs/development/libraries/blst/default.nix
index e5eb5b64aa..1283184808 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/blst/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/blst/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation ( finalAttrs: {
   pname = "blst";
-  version = "0.3.12";
+  version = "0.3.13";
 
   src = fetchFromGitHub {
     owner = "supranational";
     repo = "blst";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-z/xnttMuAOfoKn/yCBwdYbgcd6cDLD6tZxInAWn8XIk=";
+    hash = "sha256-+Ae2cCVVEXnV/ftVOApxDcXM3COf/4DXXd1AOuGS5uc=";
   };
 
   buildPhase = ''
diff --git a/third_party/nixpkgs/pkgs/development/libraries/boost/generic.nix b/third_party/nixpkgs/pkgs/development/libraries/boost/generic.nix
index 3db9b77bf0..5efcb49510 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/boost/generic.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/boost/generic.nix
@@ -1,4 +1,6 @@
 { lib, stdenv, icu, expat, zlib, bzip2, zstd, xz, python ? null, fixDarwinDylibNames, libiconv, libxcrypt
+, makePkgconfigItem
+, copyPkgconfigItems
 , boost-build
 , fetchpatch
 , which
@@ -70,7 +72,7 @@ let
     "address-model=${toString stdenv.hostPlatform.parsed.cpu.bits}"
     "architecture=${if stdenv.hostPlatform.isMips64
                     then if lib.versionOlder version "1.78" then "mips1" else "mips"
-                    else if stdenv.hostPlatform.parsed.cpu.name == "s390x" then "s390x"
+                    else if stdenv.hostPlatform.isS390 then "s390x"
                     else toString stdenv.hostPlatform.parsed.cpu.family}"
     # env in host triplet for Mach-O is "macho", but boost binary format for Mach-O is "mach-o"
     "binary-format=${if stdenv.hostPlatform.isMacho then "mach-o"
@@ -210,12 +212,28 @@ stdenv.mkDerivation {
     EOF
   '';
 
-  NIX_CFLAGS_LINK = lib.optionalString stdenv.isDarwin
-                      "-headerpad_max_install_names";
+  env = {
+    NIX_CFLAGS_LINK = lib.optionalString stdenv.isDarwin "-headerpad_max_install_names";
+    # copyPkgconfigItems will substitute these in the pkg-config file
+    includedir = "${placeholder "dev"}/include";
+    libdir = "${placeholder "out"}/lib";
+  };
+
+  pkgconfigItems = [
+    (makePkgconfigItem {
+      name = "boost";
+      inherit version;
+      # Exclude other variables not needed by meson
+      variables = {
+        includedir = "@includedir@";
+        libdir = "@libdir@";
+      };
+    })
+  ];
 
   enableParallelBuilding = true;
 
-  nativeBuildInputs = [ which boost-build ]
+  nativeBuildInputs = [ which boost-build copyPkgconfigItems ]
     ++ lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
   buildInputs = [ expat zlib bzip2 libiconv ]
     ++ lib.optional (lib.versionAtLeast version "1.69") zstd
diff --git a/third_party/nixpkgs/pkgs/development/libraries/cairomm/1.16.nix b/third_party/nixpkgs/pkgs/development/libraries/cairomm/1.16.nix
index 9da00741c3..83428f0fef 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/cairomm/1.16.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/cairomm/1.16.nix
@@ -44,11 +44,6 @@ stdenv.mkDerivation rec {
     "-Dbuild-tests=true"
   ];
 
-  # Meson is no longer able to pick up Boost automatically.
-  # https://github.com/NixOS/nixpkgs/issues/86131
-  BOOST_INCLUDEDIR = "${lib.getDev boost}/include";
-  BOOST_LIBRARYDIR = "${lib.getLib boost}/lib";
-
   # Tests fail on Darwin, possibly because of sandboxing.
   doCheck = !stdenv.isDarwin;
 
diff --git a/third_party/nixpkgs/pkgs/development/libraries/cairomm/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cairomm/default.nix
index d8d908cbc4..957cfa26ac 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/cairomm/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/cairomm/default.nix
@@ -44,11 +44,6 @@ stdenv.mkDerivation rec {
     "-Dbuild-tests=true"
   ];
 
-  # Meson is no longer able to pick up Boost automatically.
-  # https://github.com/NixOS/nixpkgs/issues/86131
-  BOOST_INCLUDEDIR = "${lib.getDev boost}/include";
-  BOOST_LIBRARYDIR = "${lib.getLib boost}/lib";
-
   doCheck = !stdenv.isDarwin;
 
   meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/development/libraries/capnproto/default.nix b/third_party/nixpkgs/pkgs/development/libraries/capnproto/default.nix
index 669e2c7d18..4e96d6a6b9 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/capnproto/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/catboost/default.nix b/third_party/nixpkgs/pkgs/development/libraries/catboost/default.nix
index b4fa78a125..3824cf046b 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/catboost/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/catboost/default.nix
@@ -2,7 +2,7 @@
 , config
 , fetchFromGitHub
 , cmake
-, darwin
+, cctools
 , libiconv
 , llvmPackages
 , ninja
@@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
     ragel
     yasm
   ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    darwin.cctools
+    cctools
   ] ++ lib.optionals cudaSupport (with cudaPackages; [
     cuda_nvcc
   ]);
diff --git a/third_party/nixpkgs/pkgs/development/libraries/clanlib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/clanlib/default.nix
index ee9ee04aa6..6369128d5a 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/clanlib/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/clanlib/default.nix
@@ -1,16 +1,17 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, autoreconfHook
-, libGL
-, libpng
-, pkg-config
-, xorg
-, file
-, freetype
-, fontconfig
-, alsa-lib
-, libXrender
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  fetchpatch,
+  autoreconfHook,
+  libGL,
+  libpng,
+  pkg-config,
+  xorg,
+  freetype,
+  fontconfig,
+  alsa-lib,
+  libXrender,
 }:
 
 stdenv.mkDerivation rec {
@@ -24,10 +25,19 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-SVsLWcTP+PCIGDWLkadMpJPj4coLK9dJrW4sc2+HotE=";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "clanlib-add-support-for-riscv.patch";
+      url = "https://github.com/sphair/ClanLib/commit/f5f694205054b66dc800135c9b01673f69a7a671.patch";
+      hash = "sha256-/1XLFaTZDQAlT2mG9P6SJzXtTg7IWYGQ18Sx0e9zh0s=";
+    })
+  ];
+
   nativeBuildInputs = [
     pkg-config
     autoreconfHook
   ];
+
   buildInputs = [
     libGL
     libpng
@@ -38,11 +48,11 @@ stdenv.mkDerivation rec {
     libXrender
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/sphair/ClanLib";
     description = "Cross platform toolkit library with a primary focus on game creation";
-    license = licenses.mit;
-    maintainers = with maintainers; [ nixinator ];
-    platforms = [ "x86_64-linux" ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ nixinator ];
+    platforms = with lib.platforms; lib.intersectLists linux (x86 ++ arm ++ aarch64 ++ riscv);
   };
 }
diff --git a/third_party/nixpkgs/pkgs/development/libraries/clutter-gst/default.nix b/third_party/nixpkgs/pkgs/development/libraries/clutter-gst/default.nix
index 4d21cd10f8..e741893168 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/clutter-gst/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/clutter-gtk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/clutter-gtk/default.nix
index 31743a8f68..7800e82ff2 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/clutter-gtk/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/clutter/default.nix b/third_party/nixpkgs/pkgs/development/libraries/clutter/default.nix
index 804aa13ed9..d6720eb181 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/clutter/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/coin3d/default.nix b/third_party/nixpkgs/pkgs/development/libraries/coin3d/default.nix
index e1a5db9c0f..f4ea863383 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/coin3d/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/coin3d/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "High-level, retained-mode toolkit for effective 3D graphics development";
     mainProgram = "coin-config";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ gebner viric ];
+    maintainers = with maintainers; [ gebner ];
     platforms = platforms.linux ++ platforms.darwin;
   };
 })
diff --git a/third_party/nixpkgs/pkgs/development/libraries/cppcms/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cppcms/default.nix
index 718c73fd3f..86aa687aaa 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/cppcms/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/cppcms/default.nix
@@ -9,8 +9,8 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-aXAxx9FB/dIVxr5QkLZuIQamO7PlLwnugSDo78bAiiE=";
   };
 
-  nativeBuildInputs = [ cmake ];
-  buildInputs = [ pcre zlib python3 openssl ];
+  nativeBuildInputs = [ cmake python3 ];
+  buildInputs = [ pcre zlib openssl ];
 
   strictDeps = true;
 
diff --git a/third_party/nixpkgs/pkgs/development/libraries/cracklib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cracklib/default.nix
index 44c615b38a..2ccb298830 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/cracklib/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/cracklib/default.nix
@@ -1,8 +1,8 @@
-let version = "2.9.11"; in
-{ stdenv, lib, buildPackages, fetchurl, zlib, gettext
+let version = "2.10.0"; in
+{ stdenv, lib, buildPackages, fetchurl, zlib, gettext, fetchpatch2
 , lists ? [ (fetchurl {
   url = "https://github.com/cracklib/cracklib/releases/download/v${version}/cracklib-words-${version}.gz";
-  hash = "sha256-popxGjE1c517Z+nzYLM/DU7M+b1/rE0XwNXkVqkcUXo=";
+  hash = "sha256-JDLo/bSLIijC2DUl+8Q704i2zgw5cxL6t68wvuivPpY=";
 }) ]
 }:
 
@@ -12,9 +12,19 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2";
-    hash = "sha256-yosEmjwtOyIloejRXWE3mOvHSOOVA4jtomlN5Qe6YCA=";
+    hash = "sha256-cAw5YMplCx6vAhfWmskZuBHyB1o4dGd7hMceOG3V51Y=";
   };
 
+  patches = lib.optionals stdenv.isDarwin [
+    # Fixes build failure on Darwin due to missing byte order functions.
+    # https://github.com/cracklib/cracklib/pull/96
+    (fetchpatch2 {
+      url = "https://github.com/cracklib/cracklib/commit/dff319e543272c1fb958261cf9ee8bb82960bc40.patch";
+      hash = "sha256-QaWpEVV6l1kl4OIkJAqkXPVThbo040Rv9X2dY/+syqs=";
+      stripLen = 1;
+    })
+  ];
+
   nativeBuildInputs = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) buildPackages.cracklib;
   buildInputs = [ zlib gettext ];
 
diff --git a/third_party/nixpkgs/pkgs/development/libraries/crocoddyl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/crocoddyl/default.nix
index 8b5c057b8b..046a6a014d 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/crocoddyl/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/crocoddyl/default.nix
@@ -23,6 +23,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [
     cmake
+  ] ++ lib.optionals pythonSupport [
+    python3Packages.python
   ];
 
   propagatedBuildInputs = lib.optionals (!pythonSupport) [
diff --git a/third_party/nixpkgs/pkgs/development/libraries/crossguid/default.nix b/third_party/nixpkgs/pkgs/development/libraries/crossguid/default.nix
index b26e630f1e..c4c015d924 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/crossguid/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/ctypes_sh/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ctypes_sh/default.nix
index f3c78567ef..44f7198206 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/ctypes_sh/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/dav1d/default.nix b/third_party/nixpkgs/pkgs/development/libraries/dav1d/default.nix
index 96d560b187..d0b77e2477 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/dav1d/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/dav1d/default.nix
@@ -26,13 +26,13 @@ assert useVulkan -> withExamples;
 
 stdenv.mkDerivation rec {
   pname = "dav1d";
-  version = "1.4.1";
+  version = "1.4.3";
 
   src = fetchFromGitHub {
     owner = "videolan";
     repo = pname;
     rev = version;
-    hash = "sha256-PBFQrGGP7hKNMuwkl7q/7/C7v41xqdOYW+pJ70fI4Uo=";
+    hash = "sha256-uudtA9ZpGIpw1yfCzbywFyH7EWYHuXfE6pBb2eksx1g=";
   };
 
   outputs = [ "out" "dev" ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/dbxml/default.nix b/third_party/nixpkgs/pkgs/development/libraries/dbxml/default.nix
index f50b53d47e..207904b96c 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/dbxml/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/discord-rpc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/discord-rpc/default.nix
index 4fa74b5740..f0c60e9506 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/discord-rpc/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/dqlite/default.nix b/third_party/nixpkgs/pkgs/development/libraries/dqlite/default.nix
index d0a8bdbafb..0821488c16 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/dqlite/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/dqlite/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   pname = "dqlite";
-  version = "1.16.5";
+  version = "1.16.6";
 
   src = fetchFromGitHub {
     owner = "canonical";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-dk4OEQuADPMfdfAmrgA36Bdzo6qm5Ak4/Rw/L9C75a0=";
+    hash = "sha256-NtBEhtK6PysRqCUNcbFvPMBEmDR9WWJkWdFdzTOKt/8=";
   };
 
   nativeBuildInputs = [ autoreconfHook file pkg-config ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/enet/default.nix b/third_party/nixpkgs/pkgs/development/libraries/enet/default.nix
index cb57f5a2f0..f9583a097a 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/enet/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/ethash/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ethash/default.nix
index 9100ccad3b..adc9649b4d 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/ethash/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/fbjni/default.nix b/third_party/nixpkgs/pkgs/development/libraries/fbjni/default.nix
index eec0756abf..aaab456ab6 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/fbjni/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/5.1.4-CVE-2023-49502.patch b/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/5.1.4-CVE-2023-49502.patch
deleted file mode 100644
index ca8b8b4d15..0000000000
--- a/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/5.1.4-CVE-2023-49502.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Based on upstream 737ede405b11a37fdd61d19cf25df296a0cb0b75, with cuda and
-vulkan implementations removed, bwdif adjusted to apply to 5.1.4
-
-diff --git a/libavfilter/vf_bwdif.c b/libavfilter/vf_bwdif.c
-index 65c617ebb3..35c864f71e 100644
---- a/libavfilter/vf_bwdif.c
-+++ b/libavfilter/vf_bwdif.c
-@@ -333,13 +333,14 @@ static int config_props(AVFilterLink *link)
-     if(yadif->mode&1)
-         link->frame_rate = av_mul_q(link->src->inputs[0]->frame_rate, (AVRational){2,1});
- 
--    if (link->w < 3 || link->h < 4) {
--        av_log(ctx, AV_LOG_ERROR, "Video of less than 3 columns or 4 lines is not supported\n");
-+    yadif->csp = av_pix_fmt_desc_get(link->format);
-+    yadif->filter = filter;
-+
-+    if (AV_CEIL_RSHIFT(link->w, yadif->csp->log2_chroma_w) < 3 || AV_CEIL_RSHIFT(link->h, yadif->csp->log2_chroma_h) < 4) {
-+        av_log(ctx, AV_LOG_ERROR, "Video with planes less than 3 columns or 4 lines is not supported\n");
-         return AVERROR(EINVAL);
-     }
- 
--    yadif->csp = av_pix_fmt_desc_get(link->format);
--    yadif->filter = filter;
-     if (yadif->csp->comp[0].depth > 8) {
-         s->filter_intra = filter_intra_16bit;
-         s->filter_line  = filter_line_c_16bit;
diff --git a/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/default.nix
index 88b5564ecb..a4869184bd 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/default.nix
@@ -22,11 +22,6 @@ let
     hash = "sha256-Q8bkuF/1uJfqttJJoObnnLX3BEduv+qxsvOrVhMvRjA=";
   };
 
-  v5 = {
-    version = "5.1.4";
-    hash = "sha256-2jUL1/xGUf7aMooST2DW41KE7bC+BtgChXmj0sAJZ90=";
-  };
-
   v6 = {
     version = "6.1.1";
     hash = "sha256-Q0c95hbCVUHQWPoh5uC8uzMylmB4BnWg+VhXEgSouzo=";
@@ -43,10 +38,6 @@ rec {
   ffmpeg_4-headless = mkFFmpeg v4 "headless";
   ffmpeg_4-full = mkFFmpeg v4 "full";
 
-  ffmpeg_5 = mkFFmpeg v5 "small";
-  ffmpeg_5-headless = mkFFmpeg v5 "headless";
-  ffmpeg_5-full = mkFFmpeg v5 "full";
-
   ffmpeg_6 = mkFFmpeg v6 "small";
   ffmpeg_6-headless = mkFFmpeg v6 "headless";
   ffmpeg_6-full = mkFFmpeg v6 "full";
diff --git a/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix b/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix
index 17ee1776e7..32e9b9d895 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/ffmpeg/generic.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, buildPackages, removeReferencesTo, addOpenGLRunpath, pkg-config, perl, texinfo, yasm
+{ lib, stdenv, buildPackages, removeReferencesTo, addDriverRunpath, pkg-config, perl, texinfo, texinfo6, yasm
 
   # You can fetch any upstream version using this derivation by specifying version and hash
   # NOTICE: Always use this argument to override the version. Do not use overrideAttrs.
@@ -72,6 +72,7 @@
 , withJack ? withFullDeps && !stdenv.isDarwin # Jack audio
 , withJxl ? withFullDeps && lib.versionAtLeast version "5" # JPEG XL de/encoding
 , withLadspa ? withFullDeps # LADSPA audio filtering
+, withLcms2 ? withFullDeps # ICC profile support via lcms2
 , withLzma ? withHeadlessDeps # xz-utils
 , withMetal ? false # Unfree and requires manual downloading of files
 , withMfx ? withFullDeps && (with stdenv.hostPlatform; isLinux && !isAarch) # Hardware acceleration via intel-media-sdk/libmfx
@@ -237,6 +238,7 @@
 , intel-media-sdk
 , ladspaH
 , lame
+, lcms2
 , libaom
 , libaribcaption
 , libass
@@ -425,43 +427,10 @@ stdenv.mkDerivation (finalAttrs: {
             --replace 'const AVInputFormat *const ' 'const AVInputFormat *'
         '';
       })
-    ]
-    ++ optionals (lib.versionAtLeast version "5" && lib.versionOlder version "6") [
       (fetchpatch2 {
-        name = "fix_build_failure_due_to_libjxl_version_to_new";
-        url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/75b1a555a70c178a9166629e43ec2f6250219eb2";
-        hash = "sha256-+2kzfPJf5piim+DqEgDuVEEX5HLwRsxq0dWONJ4ACrU=";
-      })
-      (fetchpatch2 {
-        name = "5.x-CVE-2024-31585.patch";
-        url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/8711cea3841fc385cccb1e7255176479e865cd4d";
-        hash = "sha256-WT+ly/l04yM/tRVbhkESA3sDDjwvtd/Cg2y8tQo4ApI=";
-      })
-      (fetchpatch2 {
-        name = "CVE-2024-31582.patch";
-        url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/99debe5f823f45a482e1dc08de35879aa9c74bd2";
-        hash = "sha256-+CQ9FXR6Vr/AmsbXFiCUXZcxKj1s8nInEdke/Oc/kUA=";
-      })
-      (fetchpatch2 {
-        name = "CVE-2024-31578.patch";
-        url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/3bb00c0a420c3ce83c6fafee30270d69622ccad7";
-        hash = "sha256-oZMZysBA+/gwaGEM1yvI+8wCadXWE7qLRL6Emap3b8Q=";
-      })
-      ./5.1.4-CVE-2023-49502.patch
-      (fetchpatch2 {
-        name = "CVE-2023-50008.patch";
-        url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/5f87a68cf70dafeab2fb89b42e41a4c29053b89b";
-        hash = "sha256-sqUUSOPTPLwu2h8GbAw4SfEf+0oWioz52BcpW1n4v3Y=";
-      })
-      (fetchpatch2 {
-        name = "CVE-2023-51793.patch";
-        url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/8b8b4bdef311f88c0075a06a25320187aff00bf2";
-        hash = "sha256-e7oGyOfUXuA8XK3vfygNtFlHpHl92O2KSLAo50sNJ5o=";
-      })
-      (fetchpatch2 {
-        name = "CVE-2023-51796.patch";
-        url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/e01a55c5283b82667dad347331816a5e20869ce9";
-        hash = "sha256-m4rq+UFG3nXdgOJ3S6XcruMZ+CPw+twmy2HFv3cnvJc=";
+        name = "CVE-2023-51794.patch";
+        url = "https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/50f0f8c53c818f73fe2d752708e2fa9d2a2d8a07";
+        hash = "sha256-5G9lmKjMEa0+vqbA8EEiNIr6QG+PeEoIL+uZP4Hlo28=";
       })
     ]
     ++ optionals (lib.versionAtLeast version "6.1" && lib.versionOlder version "6.2") [
@@ -648,6 +617,9 @@ stdenv.mkDerivation (finalAttrs: {
     (enableFeature withJxl "libjxl")
   ] ++ [
     (enableFeature withLadspa "ladspa")
+  ] ++ optionals (versionAtLeast version "5.1") [
+    (enableFeature withLcms2 "lcms2")
+  ] ++ [
     (enableFeature withLzma "lzma")
   ] ++ optionals (versionAtLeast version "5.0") [
     (enableFeature withMetal "metal")
@@ -755,7 +727,9 @@ stdenv.mkDerivation (finalAttrs: {
 
   strictDeps = true;
 
-  nativeBuildInputs = [ removeReferencesTo addOpenGLRunpath perl pkg-config texinfo yasm ]
+  nativeBuildInputs = [ removeReferencesTo addDriverRunpath perl pkg-config yasm ]
+  # Texinfo version 7.1 introduced breaking changes, which older versions of ffmpeg do not handle.
+  ++ (if versionOlder version "5" then [ texinfo6 ] else [ texinfo ])
   ++ optionals withCudaLLVM [ clang ];
 
   buildInputs = []
@@ -795,6 +769,7 @@ stdenv.mkDerivation (finalAttrs: {
   ++ optionals withJack [ libjack2 ]
   ++ optionals withJxl [ libjxl ]
   ++ optionals withLadspa [ ladspaH ]
+  ++ optionals withLcms2 [ lcms2 ]
   ++ optionals withLzma [ xz ]
   ++ optionals withMfx [ intel-media-sdk ]
   ++ optionals withModplug [ libmodplug ]
@@ -888,10 +863,10 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   # Set RUNPATH so that libnvcuvid and libcuda in /run/opengl-driver(-32)/lib can be found.
-  # See the explanation in addOpenGLRunpath.
+  # See the explanation in addDriverRunpath.
   postFixup = optionalString (stdenv.isLinux && withLib) ''
-    addOpenGLRunpath ${placeholder "lib"}/lib/libavcodec.so
-    addOpenGLRunpath ${placeholder "lib"}/lib/libavutil.so
+    addDriverRunpath ${placeholder "lib"}/lib/libavcodec.so
+    addDriverRunpath ${placeholder "lib"}/lib/libavutil.so
   ''
   # https://trac.ffmpeg.org/ticket/10809
   + optionalString (versionAtLeast version "5.0" && withVulkan && !stdenv.hostPlatform.isMinGW) ''
diff --git a/third_party/nixpkgs/pkgs/development/libraries/ffms/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ffms/default.nix
index 54ffad6fc3..6d5db4cdac 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/ffms/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/filter-audio/default.nix b/third_party/nixpkgs/pkgs/development/libraries/filter-audio/default.nix
index a412f70704..8b76c151b4 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/filter-audio/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/flann/default.nix b/third_party/nixpkgs/pkgs/development/libraries/flann/default.nix
index eeac7d1456..52d64f18e8 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/flann/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/flann/default.nix
@@ -73,7 +73,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/flann-lib/flann";
     license = lib.licenses.bsd3;
     description = "Fast approximate nearest neighbor searches in high dimensional spaces";
-    maintainers = with lib.maintainers; [viric];
+    maintainers = [ ];
     platforms = with lib.platforms; linux ++ darwin;
   };
 }
diff --git a/third_party/nixpkgs/pkgs/development/libraries/flatbuffers/23.nix b/third_party/nixpkgs/pkgs/development/libraries/flatbuffers/23.nix
new file mode 100644
index 0000000000..5263694b05
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/libraries/flatbuffers/23.nix
@@ -0,0 +1,47 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  python3,
+}:
+
+stdenv.mkDerivation rec {
+  pname = "flatbuffers";
+  version = "23.5.26";
+
+  src = fetchFromGitHub {
+    owner = "google";
+    repo = "flatbuffers";
+    rev = "v${version}";
+    hash = "sha256-e+dNPNbCHYDXUS/W+hMqf/37fhVgEGzId6rhP3cToTE=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    python3
+  ];
+
+  cmakeFlags = [
+    "-DFLATBUFFERS_BUILD_TESTS=${if doCheck then "ON" else "OFF"}"
+    "-DFLATBUFFERS_OSX_BUILD_UNIVERSAL=OFF"
+  ];
+
+  doCheck = stdenv.hostPlatform == stdenv.buildPlatform;
+  checkTarget = "test";
+
+  meta = with lib; {
+    description = "Memory Efficient Serialization Library";
+    longDescription = ''
+      FlatBuffers is an efficient cross platform serialization library for
+      games and other memory constrained apps. It allows you to directly
+      access serialized data without unpacking/parsing it first, while still
+      having great forwards/backwards compatibility.
+    '';
+    homepage = "https://google.github.io/flatbuffers/";
+    license = licenses.asl20;
+    maintainers = [ maintainers.teh ];
+    mainProgram = "flatc";
+    platforms = platforms.unix;
+  };
+}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/flatbuffers/default.nix b/third_party/nixpkgs/pkgs/development/libraries/flatbuffers/default.nix
index 747a976f4c..00bb9cc8d1 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/flatbuffers/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/flatbuffers/default.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "flatbuffers";
-  version = "23.5.26";
+  version = "24.3.25";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "flatbuffers";
     rev = "v${version}";
-    hash = "sha256-e+dNPNbCHYDXUS/W+hMqf/37fhVgEGzId6rhP3cToTE=";
+    hash = "sha256-uE9CQnhzVgOweYLhWPn2hvzXHyBbFiFVESJ1AEM3BmA=";
   };
 
   nativeBuildInputs = [ cmake python3 ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/flatcc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/flatcc/default.nix
index ff78f863a4..888fd9f612 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/flatcc/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/flatcc/default.nix
@@ -1,5 +1,6 @@
 { lib, stdenv
 , fetchFromGitHub
+, fetchpatch
 , cmake
 }:
 
@@ -14,17 +15,21 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-0/IZ7eX6b4PTnlSSdoOH0FsORGK9hrLr1zlr/IHsJFQ=";
   };
 
+  patches = [
+    # Fix builds on clang15. Remove post-0.6.1.
+    (fetchpatch {
+      name = "clang15fixes.patch";
+      url = "https://github.com/dvidelabs/flatcc/commit/5885e50f88248bc7ed398880c887ab23db89f05a.patch";
+      hash = "sha256-z2HSxNXerDFKtMGu6/vnzGRlqfz476bFMjg4DVfbObQ";
+    })
+  ];
+
   nativeBuildInputs = [ cmake ];
 
   cmakeFlags = [
     "-DFLATCC_INSTALL=on"
   ];
 
-  env.NIX_CFLAGS_COMPILE = toString [
-    "-Wno-error=misleading-indentation"
-    "-Wno-error=stringop-overflow"
-  ];
-
   meta = with lib; {
     description = "FlatBuffers Compiler and Library in C for C";
     mainProgram = "flatcc";
diff --git a/third_party/nixpkgs/pkgs/development/libraries/fox/default.nix b/third_party/nixpkgs/pkgs/development/libraries/fox/default.nix
index 6286155d8e..68a9806cf4 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/fox/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/fox/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
     '';
     homepage = "http://fox-toolkit.org";
     license = licenses.lgpl3Plus;
-    maintainers = [];
+    maintainers = [ ];
     platforms = platforms.all;
   };
 }
diff --git a/third_party/nixpkgs/pkgs/development/libraries/fox/fox-1.6.nix b/third_party/nixpkgs/pkgs/development/libraries/fox/fox-1.6.nix
index 0ab874fd76..775340af30 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/fox/fox-1.6.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/fox/fox-1.6.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
       '';
     homepage = "http://fox-toolkit.org";
     license = lib.licenses.lgpl3;
-    maintainers = [];
+    maintainers = [ ];
     platforms = lib.platforms.mesaPlatforms;
   };
 }
diff --git a/third_party/nixpkgs/pkgs/development/libraries/freeglut/default.nix b/third_party/nixpkgs/pkgs/development/libraries/freeglut/default.nix
index 8e79b3e57d..c3a0fdb797 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/freeglut/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/freeglut/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "freeglut";
-  version = "3.4.0";
+  version = "3.6.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/freeglut/freeglut-${finalAttrs.version}.tar.gz";
-    sha256 = "sha256-PAvLkV2bGAqX7a69ARt6HeVFg6g4ZE3NQrsOoMbz6uw=";
+    sha256 = "sha256-nD1NZRb7+gKA7ck8d2mPtzA+RDwaqvN9Jp4yiKbD6lI=";
   };
 
   outputs = [ "out" "dev" ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/freeimage/default.nix b/third_party/nixpkgs/pkgs/development/libraries/freeimage/default.nix
index 245ea93f63..20ced14ace 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/freeimage/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/freeimage/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchsvn, darwin, libtiff
+{ lib, stdenv, fetchsvn, cctools, libtiff
 , libpng, zlib, libwebp, libraw, openexr, openjpeg
 , libjpeg, jxrlib, pkg-config
 , fixDarwinDylibNames, autoSignDarwinBinariesHook }:
@@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     pkg-config
   ] ++ lib.optionals stdenv.isDarwin [
-    darwin.cctools
+    cctools
     fixDarwinDylibNames
   ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [
     autoSignDarwinBinariesHook
@@ -86,7 +86,7 @@ stdenv.mkDerivation (finalAttrs: {
       "CVE-2023-47995"
       "CVE-2023-47996"
     ];
-    maintainers = with lib.maintainers; [viric l-as];
+    maintainers = with lib.maintainers; [ l-as ];
     platforms = with lib.platforms; unix;
   };
 })
diff --git a/third_party/nixpkgs/pkgs/development/libraries/freetds/default.nix b/third_party/nixpkgs/pkgs/development/libraries/freetds/default.nix
index bcc5e8dacf..fa86bc4a18 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/freetds/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/freetds/default.nix
@@ -8,11 +8,11 @@ assert odbcSupport -> unixODBC != null;
 
 stdenv.mkDerivation rec {
   pname = "freetds";
-  version = "1.4.19";
+  version = "1.4.22";
 
   src = fetchurl {
     url    = "https://www.freetds.org/files/stable/${pname}-${version}.tar.bz2";
-    hash   = "sha256-kK65g8NLMT+dxJTaAFviJNToS9EZ/rKlsey3OpQon5U=";
+    hash   = "sha256-qafyTwp6hxYX526MxuZVaueIBC8cAGGVZlUFSZsjNLE=";
   };
 
   buildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/libraries/frei0r/default.nix b/third_party/nixpkgs/pkgs/development/libraries/frei0r/default.nix
index 50e5ba87da..d05d8ddd5f 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/frei0r/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/frei0r/default.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   pname = "frei0r-plugins";
-  version = "2.3.2";
+  version = "2.3.3";
 
   src = fetchFromGitHub {
     owner = "dyne";
     repo = "frei0r";
     rev = "v${version}";
-    hash = "sha256-shPCCKcmacSB/mqwLU6BPR1p+/9Myg759MMehj9yijI=";
+    hash = "sha256-uKYCJD88TnrJTTnzCCietNt01QPeFW+hhnjcBNKUWsY=";
   };
 
   nativeBuildInputs = [ cmake pkg-config ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/functionalplus/default.nix b/third_party/nixpkgs/pkgs/development/libraries/functionalplus/default.nix
index e4eef8dfe5..7f0c809b9e 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/functionalplus/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/functionalplus/default.nix
@@ -18,6 +18,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/Dobiasd/FunctionalPlus";
     license = licenses.boost;
     platforms = platforms.all;
-    maintainers = [];
+    maintainers = [ ];
   };
 }
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gbenchmark/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gbenchmark/default.nix
index fd7c22a674..d8666d92cf 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/gbenchmark/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/gbenchmark/default.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   pname = "gbenchmark";
-  version = "1.8.3";
+  version = "1.8.4";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "benchmark";
     rev = "v${version}";
-    sha256 = "sha256-gztnxui9Fe/FTieMjdvfJjWHjkImtlsHn6fM1FruyME=";
+    sha256 = "sha256-O+1ZHaNHSkKz3PlKDyI94LqiLtjyrKxjOIi8Q236/MI=";
   };
 
   nativeBuildInputs = [ cmake ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gd/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gd/default.nix
index bf59bdd1f6..0a74d6122e 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/gd/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/gdal/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gdal/default.nix
index 611b547b10..812eb86637 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/gdal/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/gdal/default.nix
@@ -168,7 +168,7 @@ stdenv.mkDerivation (finalAttrs: {
       json_c
       lerc
       xz
-      libxml2
+      (libxml2.override { enableHttp = true; })
       lz4
       openjpeg
       openssl
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gdcm/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gdcm/default.nix
index bdfa576f23..cacfb778c7 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/gdcm/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/gdcm/default.nix
@@ -72,7 +72,7 @@ stdenv.mkDerivation rec {
     "TestFind"
     "gdcmscu-echo-dicomserver"
     "gdcmscu-find-dicomserver"
-    # seemingly ought to be be disabled when the test data submodule is not present:
+    # seemingly ought to be disabled when the test data submodule is not present:
     "TestvtkGDCMImageReader2_3"
     "TestSCUValidation"
     # errors because 3 classes not wrapped:
diff --git a/third_party/nixpkgs/pkgs/development/libraries/giflib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/giflib/default.nix
index 67677e8a85..cc5ef6f643 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/giflib/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/git2-cpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/git2-cpp/default.nix
index bf12d2c489..45750d0b24 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/git2-cpp/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/gl3w/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gl3w/default.nix
index 541fb7c14e..c12ab1f22a 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/gl3w/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/glib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/glib/default.nix
index 47ca3f35b2..4057d46188 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/glib/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/glib/default.nix
@@ -61,11 +61,11 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "glib";
-  version = "2.80.3";
+  version = "2.80.4";
 
   src = fetchurl {
     url = "mirror://gnome/sources/glib/${lib.versions.majorMinor finalAttrs.version}/glib-${finalAttrs.version}.tar.xz";
-    hash = "sha256-OUeg6t3Q82E9AjC7JG0MaeRhQsGQIvXEsbLjy6I21Bc=";
+    hash = "sha256-JOApxd/JtE5Fc2l63zMHipgnxIk4VVAEs7kJb6TqA08=";
   };
 
   patches = lib.optionals stdenv.isDarwin [
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gloox/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gloox/default.nix
index 4ecae5fe48..ed5e4ec9b0 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/gloox/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/gmime/2.nix b/third_party/nixpkgs/pkgs/development/libraries/gmime/2.nix
index 6f48f6ed3a..e004437a77 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/gmime/2.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/gmime/3.nix b/third_party/nixpkgs/pkgs/development/libraries/gmime/3.nix
index 1fea5408ef..0d1997cf1a 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/gmime/3.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/gnu-efi/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gnu-efi/default.nix
index 31b6f7c7d2..7eb508f27a 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/gnu-efi/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/gnutls/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gnutls/default.nix
index 48e027f524..33b35446d7 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/gnutls/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/gnutls/default.nix
@@ -60,11 +60,11 @@ in
 
 stdenv.mkDerivation rec {
   pname = "gnutls";
-  version = "3.8.5";
+  version = "3.8.6";
 
   src = fetchurl {
     url = "mirror://gnupg/gnutls/v${lib.versions.majorMinor version}/gnutls-${version}.tar.xz";
-    hash = "sha256-ZiaaLP4OHC2r7Ie9u9irZW85bt2aQN0AaXjgA8+lK/w=";
+    hash = "sha256-LhWIquU8sy1Dk38fTsoo/r2cDHqhc0/F3WGn6B4OvN0=";
   };
 
   outputs = [ "bin" "dev" "out" ]
@@ -85,16 +85,6 @@ stdenv.mkDerivation rec {
       revert = true;
       hash = "sha256-r/+Gmwqy0Yc1LHL/PdPLXlErUBC5JxquLzCBAN3LuRM=";
     })
-    # Makes the system-wide configuration for RSAES-PKCS1-v1_5 actually apply
-    # and makes it enabled by default when the config file is missing
-    # Without this an error 113 is thrown when using some RSA certificates
-    # see https://gitlab.com/gnutls/gnutls/-/issues/1540
-    # "This is pretty sever[e], since it breaks on letsencrypt-issued RSA keys." (comment from above issue)
-    (fetchpatch2 {
-      name = "fix-rsaes-pkcs1-v1_5-system-wide-configuration.patch";
-      url = "https://gitlab.com/gnutls/gnutls/-/commit/2d73d945c4b1dfcf8d2328c4d23187d62ffaab2d.diff";
-      hash = "sha256-2aWcLff9jzJnY+XSqCIaK/zdwSLwkNlfDeMlWyRShN8=";
-    })
   ];
 
   # Skip some tests:
diff --git a/third_party/nixpkgs/pkgs/development/libraries/goocanvas/2.x.nix b/third_party/nixpkgs/pkgs/development/libraries/goocanvas/2.x.nix
index 46c7b188c9..2066b1b72e 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/goocanvas/2.x.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/goocanvasmm/default.nix b/third_party/nixpkgs/pkgs/development/libraries/goocanvasmm/default.nix
index ccee4831dc..ca6951c30e 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/goocanvasmm/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/gpgme/LFS64.patch b/third_party/nixpkgs/pkgs/development/libraries/gpgme/LFS64.patch
new file mode 100644
index 0000000000..8aaed815d3
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/libraries/gpgme/LFS64.patch
@@ -0,0 +1,34 @@
+From 1726e0a0a3b9765a4ddf99c506178d3939a46ccd Mon Sep 17 00:00:00 2001
+From: Alyssa Ross <hi@alyssa.is>
+Date: Fri, 3 May 2024 13:39:26 +0200
+Subject: [PATCH] posix: don't use LFS64 types in struct linux_dirent64
+
+The *64_t types are transitional APIs for applications that do not yet
+fully support large files on 32-bit platforms.  They have been removed
+in musl 1.2.5, which caused gpgme to fail to build.  Since this is for
+a raw syscall anyway, it doesn't make sense to use libc-specific types
+here anyway, so I've changed this to match the definition of the
+struct used in the kernel (except there the kernel-specific u64 and
+s64 typedefs are used instead).
+---
+ src/posix-io.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/posix-io.c b/src/posix-io.c
+index a422d8f6..c943f75c 100644
+--- a/src/posix-io.c
++++ b/src/posix-io.c
+@@ -74,8 +74,8 @@
+  * define it ourselves.  */
+ struct linux_dirent64
+ {
+-  ino64_t d_ino;
+-  off64_t d_off;
++  uint64_t d_ino;
++  int64_t d_off;
+   unsigned short d_reclen;
+   unsigned char d_type;
+   char d_name[];
+-- 
+2.44.0
+
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gpgme/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gpgme/default.nix
index c712b5195d..395ccfde06 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/gpgme/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/gpgme/default.nix
@@ -40,6 +40,9 @@ stdenv.mkDerivation rec {
     ./python-310-312-remove-distutils.patch
     # Fix a test after disallowing compressed signatures in gpg (PR #180336)
     ./test_t-verify_double-plaintext.patch
+    # Don't use deprecated LFS64 APIs (removed in musl 1.2.4)
+    # https://dev.gnupg.org/D600
+    ./LFS64.patch
   ];
 
   postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gsignond/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gsignond/default.nix
index 863ac7ba4b..6c1ee550f7 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/gsignond/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/gsignond/plugins/lastfm.nix b/third_party/nixpkgs/pkgs/development/libraries/gsignond/plugins/lastfm.nix
index 6141528a9f..7f58b4d11c 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/gsignond/plugins/lastfm.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/gsignond/plugins/mail.nix b/third_party/nixpkgs/pkgs/development/libraries/gsignond/plugins/mail.nix
index 977bc14894..d9012a3aa7 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/gsignond/plugins/mail.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/gsignond/plugins/oauth.nix b/third_party/nixpkgs/pkgs/development/libraries/gsignond/plugins/oauth.nix
index bc496e8ac2..06999b225d 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/gsignond/plugins/oauth.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/gsignond/plugins/sasl.nix b/third_party/nixpkgs/pkgs/development/libraries/gsignond/plugins/sasl.nix
index bd87d4f72b..3154f92b59 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/gsignond/plugins/sasl.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/gss/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gss/default.nix
index 883d68d42c..ffa4ca77e2 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/gss/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/gss/default.nix
@@ -13,6 +13,10 @@ stdenv.mkDerivation rec {
     url = "mirror://gnu/gss/gss-${version}.tar.gz";
     hash = "sha256-7M6r3vTK4/znIYsuy4PrQifbpEtTthuMKy6IrgJBnHM=";
   };
+  # This test crashes now.  Most likely triggered by expiration on 20240711.
+  postPatch = ''
+    rm tests/krb5context.c
+  '';
 
   buildInputs = lib.optional withShishi shishi;
 
@@ -25,7 +29,9 @@ stdenv.mkDerivation rec {
     "--${if withShishi then "enable" else "disable"}-kerberos5"
   ];
 
-  doCheck = true;
+  # krb5context test uses certificates that expired on 2024-07-11.
+  # Reported to bug-gss@gnu.org with Message-ID: <87cyngavtt.fsf@alyssa.is>.
+  doCheck = !withShishi;
 
   # Fixup .la files
   postInstall = lib.optionalString withShishi ''
@@ -37,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/third_party/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix
index b203eab089..03e7637944 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/bad/default.nix
@@ -59,6 +59,7 @@
 , neon
 , openal
 , openexr_3
+, openh264Support ? lib.meta.availableOn stdenv.hostPlatform openh264
 , openh264
 , libopenmpt
 , pango
@@ -81,7 +82,7 @@
 , mjpegtools
 , libGLU
 , libGL
-, addOpenGLRunpath
+, addDriverRunpath
 , gtk3
 , libintl
 , game-music-emu
@@ -125,7 +126,7 @@ stdenv.mkDerivation rec {
     # Add fallback paths for nvidia userspace libraries
     (substituteAll {
       src = ./fix-paths.patch;
-      inherit (addOpenGLRunpath) driverLink;
+      inherit (addDriverRunpath) driverLink;
     })
   ];
 
@@ -175,7 +176,6 @@ stdenv.mkDerivation rec {
     neon
     openal
     openexr_3
-    openh264
     rtmpdump
     pango
     soundtouch
@@ -211,6 +211,8 @@ stdenv.mkDerivation rec {
     bluez
   ] ++ lib.optionals microdnsSupport [
     libmicrodns
+  ] ++ lib.optionals openh264Support [
+    openh264
   ] ++ lib.optionals (gst-plugins-base.waylandEnabled && stdenv.isLinux) [
     libva # vaapi requires libva -> libdrm -> libpciaccess, which is Linux-only in nixpkgs
     wayland
@@ -300,6 +302,7 @@ stdenv.mkDerivation rec {
     "-Daja=disabled" # should pass libajantv2 via aja-sdk-dir instead
     "-Dmicrodns=${if microdnsSupport then "enabled" else "disabled"}"
     "-Dbluez=${if bluezSupport then "enabled" else "disabled"}"
+    (lib.mesonEnable "openh264" openh264Support)
     (lib.mesonEnable "doc" enableDocumentation)
   ]
   ++ lib.optionals (!stdenv.isLinux) [
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/base/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/base/default.nix
index 930cdd79b7..e03b223f12 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/base/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/base/default.nix
@@ -50,6 +50,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   outputs = [ "out" "dev" ];
 
+  separateDebugInfo = true;
+
   src = let
     inherit (finalAttrs) pname version;
   in fetchurl {
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/core/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/core/default.nix
index a6f0cee7d7..40d40d7424 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/core/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/core/default.nix
@@ -33,6 +33,8 @@ stdenv.mkDerivation (finalAttrs: {
     "dev"
   ];
 
+  separateDebugInfo = true;
+
   src = let
     inherit (finalAttrs) pname version;
   in fetchurl {
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/devtools/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/devtools/default.nix
index 41e3e1cba9..1232224faa 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/devtools/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/gstreamer/ges/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/ges/default.nix
index cf15a4c406..89830f3aed 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/ges/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/gstreamer/icamerasrc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/icamerasrc/default.nix
index da74ec243c..68485f7e74 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/icamerasrc/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/gstreamer/libav/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/libav/default.nix
index e3065437f5..92156dec54 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/libav/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/gstreamer/rs/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/rs/default.nix
index 4c0d8bffb3..9e8d95b77a 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/rs/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/rs/default.nix
@@ -11,6 +11,7 @@
 , rustc
 , cargo
 , cargo-c
+, lld
 , nasm
 , gstreamer
 , gst-plugins-base
@@ -199,10 +200,14 @@ stdenv.mkDerivation (finalAttrs: {
     cargo
     cargo-c'
     nasm
+  ] ++ lib.optionals stdenv.isDarwin [
+    lld
   ] ++ lib.optionals enableDocumentation [
     hotdoc
   ];
 
+  env = lib.optionalAttrs stdenv.isDarwin { NIX_CFLAGS_LINK = "-fuse-ld=lld"; };
+
   buildInputs = [
     gstreamer
     gst-plugins-base
@@ -258,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/third_party/nixpkgs/pkgs/development/libraries/gstreamer/vaapi/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gstreamer/vaapi/default.nix
index 62f11a580c..a341f4df4e 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/gstreamer/vaapi/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/gthree/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gthree/default.nix
index f8e50f3845..3657f62f92 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/gthree/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/gtk/2.x.nix b/third_party/nixpkgs/pkgs/development/libraries/gtk/2.x.nix
index 9d9b855c9d..ed0900ee1a 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/gtk/2.x.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/gtk/2.x.nix
@@ -2,6 +2,7 @@
 , lib
 , stdenv
 , fetchurl
+, fetchpatch
 , atk
 , buildPackages
 , cairo
@@ -63,6 +64,12 @@ stdenv.mkDerivation (finalAttrs: {
   patches = [
     ./patches/2.0-immodules.cache.patch
     ./patches/gtk2-theme-paths.patch
+    (fetchpatch {
+      # https://gitlab.gnome.org/GNOME/gtk/-/issues/6786
+      name = "CVE-2024-6655.patch";
+      url = "https://gitlab.gnome.org/GNOME/gtk/-/commit/3bbf0b6176d42836d23c36a6ac410e807ec0a7a7.patch";
+      hash = "sha256-mstOPk9NNpUwScrdEbvGhmAv8jlds3SBdj53T0q33vM=";
+    })
   ] ++ lib.optionals stdenv.isDarwin [
     ./patches/2.0-gnome_bugzilla_557780_306776_freeciv_darwin.patch
     ./patches/2.0-darwin-x11.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtk/3.x.nix b/third_party/nixpkgs/pkgs/development/libraries/gtk/3.x.nix
index f194dee9c9..5473f02f35 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/gtk/3.x.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/gtk/3.x.nix
@@ -64,7 +64,7 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gtk+3";
-  version = "3.24.42";
+  version = "3.24.43";
 
   outputs = [ "out" "dev" ] ++ lib.optional withIntrospection "devdoc";
   outputBin = "dev";
@@ -78,7 +78,7 @@ stdenv.mkDerivation (finalAttrs: {
     inherit (finalAttrs) version;
   in fetchurl {
     url = "mirror://gnome/sources/gtk+/${lib.versions.majorMinor version}/gtk+-${version}.tar.xz";
-    sha256 = "sha256-UPifYVCS1N0Bu9dZcZ+L04Dl8Un2/XipRyXi3hEjd+I=";
+    hash = "sha256-fgTwZIUVA0uAa3SuXXdNh8/7GiqWxGjLW+R21Rvy88c=";
   };
 
   patches = [
diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtkspell/3.nix b/third_party/nixpkgs/pkgs/development/libraries/gtkspell/3.nix
index 3c7a6a3b3b..7e75108b1a 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/gtkspell/3.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/gts/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gts/default.nix
index 5aa8aca6ff..9586c3be7b 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/gts/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/gts/default.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
       3D surfaces meshed with interconnected triangles.
     '';
 
-    maintainers = [ lib.maintainers.viric ];
+    maintainers = [ ];
     platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };
 }
diff --git a/third_party/nixpkgs/pkgs/development/libraries/harfbuzz/default.nix b/third_party/nixpkgs/pkgs/development/libraries/harfbuzz/default.nix
index 657ea82f0b..3c0e466878 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/harfbuzz/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/harfbuzz/default.nix
@@ -33,11 +33,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "harfbuzz${lib.optionalString withIcu "-icu"}";
-  version = "8.4.0";
+  version = "9.0.0";
 
   src = fetchurl {
     url = "https://github.com/harfbuzz/harfbuzz/releases/download/${finalAttrs.version}/harfbuzz-${finalAttrs.version}.tar.xz";
-    hash = "sha256-r06nPiWrdIyMBjt4wviOSIM9ubKsNp4pvRFXAueJdV4=";
+    hash = "sha256-pBsnLO65IMVyY+yFFgRULZ7IXuMDBQbZRmIGfHtquJ4=";
   };
 
   postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/development/libraries/hpp-fcl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/hpp-fcl/default.nix
index ea8c89f53e..0359abec9b 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/hpp-fcl/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/hpp-fcl/default.nix
@@ -14,14 +14,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "hpp-fcl";
-  version = "2.4.4";
+  version = "2.4.5";
 
   src = fetchFromGitHub {
     owner = "humanoid-path-planner";
     repo = "hpp-fcl";
     rev = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-BwS9RSirdlD6Cqwp7KD59dkh2WsJVwdlH9LzM2AFjI4=";
+    hash = "sha256-0OORdtT7vMpvK3BPJvtvuLcz0+bfu1+nVvzs3y+LyQw=";
   };
 
   strictDeps = true;
@@ -29,6 +29,8 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     cmake
     doxygen
+  ] ++ lib.optionals pythonSupport [
+    python3Packages.numpy
   ];
 
   propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/libraries/hunspell/default.nix b/third_party/nixpkgs/pkgs/development/libraries/hunspell/default.nix
index 2f48bd668d..4e704a4859 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/hunspell/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/imlib2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/imlib2/default.nix
index 0c48ad94ec..edd9c8a79e 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/imlib2/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/ip2location-c/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ip2location-c/default.nix
index 0e74478982..bc1c3736f7 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/ip2location-c/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/ipu6-camera-hal/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ipu6-camera-hal/default.nix
index ff490414da..9c6cc585f9 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/ipu6-camera-hal/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/itk/generic.nix b/third_party/nixpkgs/pkgs/development/libraries/itk/generic.nix
index 54f725683a..1db337611d 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/itk/generic.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/itk/generic.nix
@@ -112,6 +112,6 @@ stdenv.mkDerivation {
     mainProgram = "itkTestDriver";
     homepage = "https://www.itk.org";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [viric];
+    maintainers = [ ];
   };
 }
diff --git a/third_party/nixpkgs/pkgs/development/libraries/jansson/default.nix b/third_party/nixpkgs/pkgs/development/libraries/jansson/default.nix
deleted file mode 100644
index e868324209..0000000000
--- a/third_party/nixpkgs/pkgs/development/libraries/jansson/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, cmake }:
-
-stdenv.mkDerivation rec {
-  pname = "jansson";
-  version = "2.14";
-
-  src = fetchFromGitHub {
-    owner = "akheron";
-    repo = "jansson";
-    rev = "v${version}";
-    sha256 = "sha256-FQgy2+g3AyRVJeniqPQj0KNeHgPdza2pmEIXqSyYry4=";
-  };
-
-  nativeBuildInputs = [ cmake ];
-
-  cmakeFlags = [
-    # networkmanager relies on libjansson.so:
-    #   https://github.com/NixOS/nixpkgs/pull/176302#issuecomment-1150239453
-    "-DJANSSON_BUILD_SHARED_LIBS=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}"
-  ];
-
-  meta = with lib; {
-    homepage = "https://github.com/akheron/jansson";
-    description = "C library for encoding, decoding and manipulating JSON data";
-    changelog = "https://github.com/akheron/jansson/raw/v${version}/CHANGES";
-    license = licenses.mit;
-    platforms = platforms.all;
-    maintainers = [ ];
-  };
-}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/jose/default.nix b/third_party/nixpkgs/pkgs/development/libraries/jose/default.nix
index 39e10e2dbe..362a084d03 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/jose/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/kcp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/kcp/default.nix
index 2468ba22d3..b473419bfd 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/kcp/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kimageformats.nix b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kimageformats.nix
index 5954d56e6c..d516081da2 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kimageformats.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/kde-frameworks/kimageformats.nix
@@ -1,7 +1,7 @@
 {
   mkDerivation, lib,
   extra-cmake-modules,
-  ilmbase, karchive, openexr, libavif, libheif, libjxl, libraw, qtbase
+  ilmbase, karchive, openexr, dav1d, libaom, libavif, libheif, libjxl, libraw, libyuv, qtbase
 }:
 
 let inherit (lib) getDev; in
@@ -10,7 +10,7 @@ mkDerivation {
   pname = "kimageformats";
 
   nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ karchive openexr libavif libheif libjxl libraw qtbase ];
+  buildInputs = [ karchive openexr libaom libavif dav1d libheif libjxl libraw libyuv qtbase ];
   outputs = [ "out" ]; # plugins only
   CXXFLAGS = "-I${getDev ilmbase}/include/OpenEXR";
   cmakeFlags = [
diff --git a/third_party/nixpkgs/pkgs/development/libraries/kerberos/krb5.nix b/third_party/nixpkgs/pkgs/development/libraries/kerberos/krb5.nix
index 8dd68af4fd..7a51d454cf 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/kerberos/krb5.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/kerberos/krb5.nix
@@ -31,11 +31,11 @@ assert withLdap -> !libOnly;
 
 stdenv.mkDerivation rec {
   pname = "${type}krb5";
-  version = "1.21.2";
+  version = "1.21.3";
 
   src = fetchurl {
     url = "https://kerberos.org/dist/krb5/${lib.versions.majorMinor version}/krb5-${version}.tar.gz";
-    hash = "sha256-lWCUGp2EPAJDpxsXp6xv4xx867W845g9t55Srn6FBJE=";
+    hash = "sha256-t6TNXq1n+wi5gLIavRUP9yF+heoyDJ7QxtrdMEhArTU=";
   };
 
   outputs = [ "out" "dev" ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/kmsxx/default.nix b/third_party/nixpkgs/pkgs/development/libraries/kmsxx/default.nix
index 78fd58f151..0347339205 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/kmsxx/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/ktextaddons/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ktextaddons/default.nix
index b648109d15..15286ff162 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/ktextaddons/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/ktextaddons/default.nix
@@ -15,6 +15,6 @@ mkDerivation rec {
     description = "Various text handling addons for KDE applications";
     homepage = "https://invent.kde.org/libraries/ktextaddons/";
     license = licenses.gpl2Plus;
-    maintainers = [];
+    maintainers = [ ];
   };
 }
diff --git a/third_party/nixpkgs/pkgs/development/libraries/l-smash/default.nix b/third_party/nixpkgs/pkgs/development/libraries/l-smash/default.nix
index fe3a88dc71..1439c1046f 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/l-smash/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/ldacbt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ldacbt/default.nix
index a467eb8e0d..b11da8cb59 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/ldacbt/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/ldb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ldb/default.nix
index 7e5f987e0e..80a3f725f9 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/ldb/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/ldb/default.nix
@@ -19,11 +19,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ldb";
-  version = "2.9.0";
+  version = "2.9.1";
 
   src = fetchurl {
     url = "mirror://samba/ldb/ldb-${finalAttrs.version}.tar.gz";
-    hash = "sha256-EFqv9xrYgaf661gv1BauKCIbb94zj/+CgoBlBiwlB6U=";
+    hash = "sha256-yV5Nwy3qiGS3mJnuNAyf3yi0hvRku8OLqZFRoItJP5s=";
   };
 
   outputs = [ "out" "dev" ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/level-zero/default.nix b/third_party/nixpkgs/pkgs/development/libraries/level-zero/default.nix
index 298f330e3b..e3b55c457f 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/level-zero/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/level-zero/default.nix
@@ -1,5 +1,5 @@
 { lib
-, addOpenGLRunpath
+, addDriverRunpath
 , cmake
 , fetchFromGitHub
 , intel-compute-runtime
@@ -18,10 +18,10 @@ stdenv.mkDerivation rec {
     hash = "sha256-WfnoYLBBXzYQ35Og6UgGFv6ebLMBos49JvJcZANRhd8=";
   };
 
-  nativeBuildInputs = [ cmake addOpenGLRunpath ];
+  nativeBuildInputs = [ cmake addDriverRunpath ];
 
   postFixup = ''
-    addOpenGLRunpath $out/lib/libze_loader.so
+    addDriverRunpath $out/lib/libze_loader.so
   '';
 
   passthru.tests = {
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libabigail/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libabigail/default.nix
index 4ca2eb75b4..c6723b5879 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libabigail/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/libabw/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libabw/default.nix
index 3da65787e0..5476b3c740 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libabw/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libabw/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, boost, doxygen, gperf, pkg-config, librevenge, libxml2, perl }:
+{ lib, stdenv, fetchurl, boost, doxygen, gperf, pkg-config, librevenge, libxml2, perl, zlib }:
 
 stdenv.mkDerivation rec {
   pname = "libabw";
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   '';
 
   nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ boost doxygen gperf librevenge libxml2 perl ];
+  buildInputs = [ boost doxygen gperf librevenge libxml2 perl zlib ];
 
   meta = with lib; {
     homepage = "https://wiki.documentfoundation.org/DLP/Libraries/libabw";
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libajantv2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libajantv2/default.nix
index 278752b187..ed5a57ed73 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libajantv2/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/libao/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libao/default.nix
index 63cb0401aa..b920fe9c3b 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libao/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/libaom/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libaom/default.nix
index 16a9e872aa..8f4afbf5a3 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libaom/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libaom/default.nix
@@ -13,11 +13,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "libaom";
-  version = "3.9.0";
+  version = "3.9.1";
 
   src = fetchzip {
     url = "https://aomedia.googlesource.com/aom/+archive/v${version}.tar.gz";
-    hash = "sha256-ON/BWCO2k7fADW3ZANKjnRE8SrQZpjdyUF1N0fD/xnc=";
+    hash = "sha256-XQ1sekNZDUAiYP/HriYRj4+40PAvE/OiyG9bbrdg63I=";
     stripRoot = false;
   };
 
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libarchive/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libarchive/default.nix
index 5e37255d23..09a96e829e 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libarchive/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libarchive/default.nix
@@ -23,6 +23,9 @@
 , cmake
 , nix
 , samba
+
+# for passthru.lore
+, binlore
 }:
 
 assert xarSupport -> libxml2 != null;
@@ -125,4 +128,11 @@ stdenv.mkDerivation (finalAttrs: {
   passthru.tests = {
     inherit cmake nix samba;
   };
+
+  # bsdtar is detected as "cannot" because its exec is internal to
+  # calls it makes into libarchive itself. If binlore gains support
+  # for detecting another layer down into libraries, this can be cut.
+  passthru.binlore.out = binlore.synthesize finalAttrs.finalPackage ''
+    execer can bin/bsdtar
+  '';
 })
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libargs/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libargs/default.nix
index 0ad0a264f0..227afc0eb1 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libargs/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/libass/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libass/default.nix
index cf8f4c85e0..3c3fa3ee70 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libass/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libass/default.nix
@@ -11,11 +11,11 @@ assert fontconfigSupport -> fontconfig != null;
 
 stdenv.mkDerivation rec {
   pname = "libass";
-  version = "0.17.2";
+  version = "0.17.3";
 
   src = fetchurl {
     url = "https://github.com/libass/libass/releases/download/${version}/${pname}-${version}.tar.xz";
-    sha256 = "sha256-6CYbUdZrqTP+mSSMb92HZ+2WxaflNjyDmSxzWiwvv3Q=";
+    hash = "sha256-6uQl2lDwAVwh97OpxyYqkQ8CGK9GniLikxRi/tPFCVk=";
   };
 
   outputs = [ "out" "dev" ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libavif/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libavif/default.nix
index 6df341d68e..ec2c22a247 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libavif/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libavif/default.nix
@@ -19,13 +19,13 @@ in
 
 stdenv.mkDerivation rec {
   pname = "libavif";
-  version = "1.0.4";
+  version = "1.1.0";
 
   src = fetchFromGitHub {
     owner = "AOMediaCodec";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-9YP4Zq6dehIJanNkpAJK1aYwSOAueqonF8k2t/3B4kw=";
+    hash = "sha256-yNJiMTWgOKR1c2pxTkLY/uPWGIY4xgH+Ee0r15oroDU=";
   };
 
   # reco: encode libaom slowest but best, decode dav1d fastest
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libbsd/darwin-enable-strtonum.patch b/third_party/nixpkgs/pkgs/development/libraries/libbsd/darwin-enable-strtonum.patch
new file mode 100644
index 0000000000..b2123c78be
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/libraries/libbsd/darwin-enable-strtonum.patch
@@ -0,0 +1,13 @@
+diff --git a/configure.ac b/configure.ac
+index 2a15d720f9...186ab24978 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -254,7 +254,7 @@
+     abi_strl=no
+     abi_strmode=no
+     abi_strnstr=no
+-    abi_strtonum=no
++    abi_strtonum=yes
+     abi_strtox=yes
+     abi_timeconv=no
+     # On libmd.
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libbsd/darwin-fix-libbsd.sym.patch b/third_party/nixpkgs/pkgs/development/libraries/libbsd/darwin-fix-libbsd.sym.patch
deleted file mode 100644
index de40da9816..0000000000
--- a/third_party/nixpkgs/pkgs/development/libraries/libbsd/darwin-fix-libbsd.sym.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 9d22b00..c6848fc 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -198,7 +198,9 @@ libbsd_ctor_a_SOURCES = \
- # Generate a simple libtool symbol export list to be used as a fallback if
- # there is no version script support.
- libbsd.sym: libbsd.map
--	$(AM_V_GEN) $(SED) -ne 's/^[[:space:]]\{1,\}\([A-Za-z0-9_]\{1,\}\);/\1/p' libbsd.map > $@
-+	$(AM_V_GEN) $(SED) -ne 's/^[[:space:]]\{1,\}\([A-Za-z0-9_]\{1,\}\);/\1/p' libbsd.map \
-+	  | grep -Ev '(group_from_gid|user_from_uid|nlist|__fdnlist|bsd_getopt)' \
-+	  > $@
- 
- if NEED_TRANSPARENT_LIBMD
- TRANSPARENT_LIBMD_DEPENDS = format.ld
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libbsd/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libbsd/default.nix
index fa8b6b6595..90a92f50f4 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libbsd/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libbsd/default.nix
@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation rec {
   pname = "libbsd";
-  version = "0.11.8";
+  version = "0.12.2";
 
   src = fetchurl {
     url = "https://libbsd.freedesktop.org/releases/${pname}-${version}.tar.xz";
-    hash = "sha256-Vf36Jpb7TVWlkvqa0Uqd+JfHsACN2zswxBmRSEH4XzM=";
+    hash = "sha256-uIzJFj0MZSqvOamZkdl03bocOpcR248bWDivKhRzEBQ=";
   };
 
   outputs = [ "out" "dev" "man" ];
@@ -24,10 +24,10 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ autoreconfHook ];
   propagatedBuildInputs = [ libmd ];
 
-  patches = lib.optionals stdenv.isDarwin [
-    # Temporary build system hack from upstream maintainer
-    # https://gitlab.freedesktop.org/libbsd/libbsd/-/issues/19#note_2017684
-    ./darwin-fix-libbsd.sym.patch
+  patches = [
+    # `strtonum(3)` is not available on our default SDK version.
+    # https://gitlab.freedesktop.org/libbsd/libbsd/-/issues/30
+    ./darwin-enable-strtonum.patch
   ];
 
   passthru.updateScript = gitUpdater {
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libcacard/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libcacard/default.nix
index b4b558945f..5f987943d8 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libcacard/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/libcanberra/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libcanberra/default.nix
index 6bfb780d31..0a9aabf731 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libcanberra/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libcanberra/default.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, fetchurl, fetchpatch, pkg-config, libtool
 , gtk2-x11, gtk3-x11 , gtkSupport ? null
-, libpulseaudio, gst_all_1, libvorbis, libcap
+, libpulseaudio, gst_all_1, libvorbis, libcap, systemd
 , Carbon, CoreServices, AppKit
 , withAlsa ? stdenv.isLinux, alsa-lib }:
 
@@ -24,10 +24,11 @@ stdenv.mkDerivation rec {
     ++ lib.optional (gtkSupport == "gtk2") gtk2-x11
     ++ lib.optional (gtkSupport == "gtk3") gtk3-x11
     ++ lib.optionals stdenv.isDarwin [ Carbon CoreServices AppKit ]
-    ++ lib.optional stdenv.isLinux libcap
+    ++ lib.optionals stdenv.isLinux [ libcap systemd ]
     ++ lib.optional withAlsa alsa-lib;
 
-  configureFlags = [ "--disable-oss" ];
+  configureFlags = [ "--disable-oss" ]
+    ++ lib.optional stdenv.isLinux "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system";
 
   patches = [
     (fetchpatch {
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libcbor/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libcbor/default.nix
index 4cd36f4401..673885b096 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libcbor/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/libchop/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libchop/default.nix
index ce113106ce..aa9f50917b 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libchop/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/libcutl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libcutl/default.nix
index db04b5f59b..f514d3c00a 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libcutl/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/libdatrie/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libdatrie/default.nix
index 765efe573a..be3717d2cb 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libdatrie/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/libdbi-drivers/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libdbi-drivers/default.nix
index f1352cd47b..bbd9e3898d 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libdbi-drivers/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/libdc1394/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libdc1394/default.nix
index afd53588a3..0163eb9015 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libdc1394/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libdc1394/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     description = "Capture and control API for IIDC compliant cameras";
     homepage = "https://sourceforge.net/projects/libdc1394/";
     license = licenses.lgpl21Plus;
-    maintainers = [ maintainers.viric ];
+    maintainers = [ ];
     mainProgram = "dc1394_reset_bus";
     platforms = platforms.unix;
   };
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libdevil/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libdevil/default.nix
index 63ca4877da..409df07cb2 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libdevil/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/libdrm/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libdrm/default.nix
index 31e36be121..f4d5472232 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libdrm/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libdrm/default.nix
@@ -7,11 +7,11 @@
 
 stdenv.mkDerivation rec {
   pname = "libdrm";
-  version = "2.4.121";
+  version = "2.4.122";
 
   src = fetchurl {
     url = "https://dri.freedesktop.org/${pname}/${pname}-${version}.tar.xz";
-    hash = "sha256-kJCEpQXXY4iH9ZC3B5Gzu9kGnHEMlI9dHxzm0IDN/Ks=";
+    hash = "sha256-2fUHm3d9/8qTAMzFaxCpNYjN+8nd4vrhEZQN+2KS8lE=";
   };
 
   outputs = [ "out" "dev" "bin" ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libebml/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libebml/default.nix
index 3478217d7f..34a45e398b 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libebml/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/libelfin/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libelfin/default.nix
index 7d5a928aa2..8ff7d8c952 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libelfin/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/libevdev/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libevdev/default.nix
index 34af29955a..abd8185eae 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libevdev/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libevdev/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "libevdev";
-  version = "1.13.1";
+  version = "1.13.2";
 
   src = fetchurl {
     url = "https://www.freedesktop.org/software/${pname}/${pname}-${version}.tar.xz";
-    sha256 = "sha256-Bqd78qxcmTMFiCvBZBAX9b7BWS1tG2R4e61JKrNPLzY=";
+    sha256 = "sha256-PsqGps5VuB1bzpEGN/xFHIu+NzsflpjzdcfxrQ3jrEg=";
   };
 
   nativeBuildInputs = [ python3 ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libexecinfo/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libexecinfo/default.nix
index b2ce5b0b2c..24fc1e6dc7 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libexecinfo/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/libfido2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libfido2/default.nix
index 9511d26310..04bfadeef9 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libfido2/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libfido2/default.nix
@@ -14,12 +14,12 @@
 
 stdenv.mkDerivation rec {
   pname = "libfido2";
-  version = "1.14.0";
+  version = "1.15.0";
 
   # releases on https://developers.yubico.com/libfido2/Releases/ are signed
   src = fetchurl {
     url = "https://developers.yubico.com/${pname}/Releases/${pname}-${version}.tar.gz";
-    sha256 = "sha256-NgF5LjIAMtQoACxMzoSZpMe4AzGQUaJaDJ8fE4/+5Fo=";
+    hash = "sha256-q6qxMY0h0mLs5Bb7inEy+pN0vaifb6UrhqmKL1cSth4=";
   };
 
   nativeBuildInputs = [ cmake pkg-config ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgcrypt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libgcrypt/default.nix
index ac8323ceb2..ffe9f42326 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libgcrypt/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libgcrypt/default.nix
@@ -22,8 +22,7 @@ stdenv.mkDerivation rec {
     hash = "sha256-iwhwiXrFrGfe1Wjc+t9Flpz6imvrD9YK8qnq3Coycqo=";
   };
 
-  outputs = [ "out" "dev" "info" ];
-  outputBin = "dev";
+  outputs = [ "bin" "lib" "dev" "info" "out" ];
 
   # The CPU Jitter random number generator must not be compiled with
   # optimizations and the optimize -O0 pragma only works for gcc.
@@ -58,15 +57,22 @@ stdenv.mkDerivation rec {
   # Also make sure includes are fixed for callers who don't use libgpgcrypt-config
   postFixup = ''
     sed -i 's,#include <gpg-error.h>,#include "${libgpg-error.dev}/include/gpg-error.h",g' "$dev/include/gcrypt.h"
+  ''
+  # The `libgcrypt-config` script references $dev and in the $dev output, the
+  # stdenv automagically puts the $bin output into propagatedBuildInputs. This
+  # would cause a cycle. This is a weird tool anyways, so let's stuff it in $dev
+  # instead.
+  + ''
+    moveToOutput bin/libgcrypt-config $dev
   '' + lib.optionalString enableCapabilities ''
-    sed -i 's,\(-lcap\),-L${libcap.lib}/lib \1,' $out/lib/libgcrypt.la
+    sed -i 's,\(-lcap\),-L${libcap.lib}/lib \1,' $lib/lib/libgcrypt.la
   '';
 
   # TODO: figure out why this is even necessary and why the missing dylib only crashes
   # random instead of every test
   preCheck = lib.optionalString stdenv.isDarwin ''
-    mkdir -p $out/lib
-    cp src/.libs/libgcrypt.20.dylib $out/lib
+    mkdir -p $lib/lib
+    cp src/.libs/libgcrypt.20.dylib $lib/lib
   '';
 
   doCheck = true;
@@ -82,6 +88,6 @@ stdenv.mkDerivation rec {
     description = "General-purpose cryptographic library";
     license = licenses.lgpl2Plus;
     platforms = platforms.all;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libglvnd/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libglvnd/default.nix
index 9a9c3b861d..d3e85c012c 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libglvnd/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libglvnd/default.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, fetchFromGitLab
 , fetchpatch
-, autoreconfHook, pkg-config, python3, addOpenGLRunpath
+, autoreconfHook, pkg-config, python3, addDriverRunpath
 , libX11, libXext, xorgproto
 }:
 
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  nativeBuildInputs = [ autoreconfHook pkg-config python3 addOpenGLRunpath ];
+  nativeBuildInputs = [ autoreconfHook pkg-config python3 addDriverRunpath ];
   buildInputs = [ libX11 libXext xorgproto ];
 
   postPatch = lib.optionalString stdenv.isDarwin ''
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
   env.NIX_CFLAGS_COMPILE = toString ([
     "-UDEFAULT_EGL_VENDOR_CONFIG_DIRS"
     # FHS paths are added so that non-NixOS applications can find vendor files.
-    "-DDEFAULT_EGL_VENDOR_CONFIG_DIRS=\"${addOpenGLRunpath.driverLink}/share/glvnd/egl_vendor.d:/etc/glvnd/egl_vendor.d:/usr/share/glvnd/egl_vendor.d\""
+    "-DDEFAULT_EGL_VENDOR_CONFIG_DIRS=\"${addDriverRunpath.driverLink}/share/glvnd/egl_vendor.d:/etc/glvnd/egl_vendor.d:/usr/share/glvnd/egl_vendor.d\""
 
     "-Wno-error=array-bounds"
   ] ++ lib.optionals stdenv.cc.isClang [
@@ -61,10 +61,10 @@ stdenv.mkDerivation rec {
   # Note that libEGL does not need it because it uses driver config files which should
   # contain absolute paths to libraries.
   postFixup = ''
-    addOpenGLRunpath $out/lib/libGLX.so
+    addDriverRunpath $out/lib/libGLX.so
   '';
 
-  passthru = { inherit (addOpenGLRunpath) driverLink; };
+  passthru = { inherit (addDriverRunpath) driverLink; };
 
   meta = with lib; {
     description = "GL Vendor-Neutral Dispatch library";
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgnurl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libgnurl/default.nix
index 011e86f067..b3db03d024 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libgnurl/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/libgpg-error/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libgpg-error/default.nix
index cf0c289300..9920a54e04 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libgpg-error/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libgpg-error/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildPackages, fetchurl, gettext
+{ stdenv, lib, buildPackages, fetchurl, fetchpatch, gettext
 , genPosixLockObjOnly ? false
 }: let
   genPosixLockObjOnlyAttrs = lib.optionalAttrs genPosixLockObjOnly {
@@ -17,13 +17,21 @@
   };
 in stdenv.mkDerivation (rec {
   pname = "libgpg-error";
-  version = "1.49";
+  version = "1.50";
 
   src = fetchurl {
     url = "mirror://gnupg/${pname}/${pname}-${version}.tar.bz2";
-    sha256 = "sha256-i3nVRjnb9KvAi1QG+y835mmi3sCR3QJPuH3TZxMcY6k=";
+    hash = "sha256-aUBTSeCmM+REooxbNc6PFEhGhFGKUI3EigiZkv6T4go=";
   };
 
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/macports/macports-ports/raw/cc17f22f4056d84967bd94cf41458e3d3150f9e1/devel/libgpg-error/files/patch-src-spawn-posix.c.diff";
+      extraPrefix = "";
+      hash = "sha256-nIS9oKcgHdHtRTlaSx7mgwQPXq855t+SNujplQKKhzQ=";
+    })
+  ];
+
   postPatch = ''
     sed '/BUILD_TIMESTAMP=/s/=.*/=1970-01-01T00:01+0000/' -i ./configure
   '';
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgsf/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libgsf/default.nix
index bd3ece4235..dcb460272d 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libgsf/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libgsf/default.nix
@@ -2,6 +2,7 @@
 , lib
 , stdenv
 , autoreconfHook
+, fetchpatch2
 , gtk-doc
 , pkg-config
 , intltool
@@ -31,6 +32,14 @@ stdenv.mkDerivation rec {
     hash = "sha256-uSi2/pZiST07YutU8SHNoY2LifEQhohQeyaH9spyG2s=";
   };
 
+  patches = [
+    # Fixes building when nanohttp is not enabled in libxml2, which is the default since libxml2 2.13.
+    (fetchpatch2 {
+      url = "https://gitlab.gnome.org/GNOME/libgsf/-/commit/5d4bb55095d3d6ef793c1908a88504183e28644c.diff";
+      hash = "sha256-2TF1KDUxJtSMTDze2/dOJQRkW8S1GA9OyFpYzYeKpjQ=";
+    })
+  ];
+
   postPatch = ''
     # Fix cross-compilation
     substituteInPlace configure.ac \
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libhandy/0.x.nix b/third_party/nixpkgs/pkgs/development/libraries/libhandy/0.x.nix
index e2b4ce381b..d25335c891 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libhandy/0.x.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/libheif/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libheif/default.nix
index cdff03fc09..b3f22bb2b5 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libheif/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libheif/default.nix
@@ -17,12 +17,13 @@
 , imagemagick
 , imlib2Full
 , imv
+, python3Packages
 , vips
 }:
 
 stdenv.mkDerivation rec {
   pname = "libheif";
-  version = "1.17.6";
+  version = "1.18.0";
 
   outputs = [ "bin" "out" "dev" "man" ];
 
@@ -30,7 +31,7 @@ stdenv.mkDerivation rec {
     owner = "strukturag";
     repo = "libheif";
     rev = "v${version}";
-    sha256 = "sha256-pp+PjV/pfExLqzFE61mxliOtVAYOePh1+i1pwZxDLAM=";
+    sha256 = "sha256-3au6xCJd1kP6qJI6TBeWJ2ittCqE0QvmSYxWYcgPOcw=";
   };
 
   nativeBuildInputs = [
@@ -60,6 +61,7 @@ stdenv.mkDerivation rec {
 
   passthru.tests = {
     inherit gimp imagemagick imlib2Full imv vips;
+    inherit (python3Packages) pillow-heif;
   };
 
   meta = {
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libhsts/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libhsts/default.nix
index 967ffe5631..124b1fc549 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libhsts/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/libimagequant/Cargo.lock b/third_party/nixpkgs/pkgs/development/libraries/libimagequant/Cargo.lock
index 8e542f3586..4925fc1a9e 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libimagequant/Cargo.lock
+++ b/third_party/nixpkgs/pkgs/development/libraries/libimagequant/Cargo.lock
@@ -10,9 +10,9 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
 
 [[package]]
 name = "ahash"
-version = "0.8.7"
+version = "0.8.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01"
+checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -28,15 +28,15 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
 
 [[package]]
 name = "bitflags"
-version = "2.4.2"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
 
 [[package]]
 name = "bytemuck"
-version = "1.14.0"
+version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6"
+checksum = "78834c15cb5d5efe3452d58b1e8ba890dd62d21907f867f383358198e56ebca5"
 
 [[package]]
 name = "c_test"
@@ -48,12 +48,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.0.83"
+version = "1.0.97"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
-dependencies = [
- "libc",
-]
+checksum = "099a5357d84c4c61eb35fc8eafa9a79a902c2f76911e5747ced4e032edd8d9b4"
 
 [[package]]
 name = "cfg-if"
@@ -63,9 +60,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
 [[package]]
 name = "crc32fast"
-version = "1.3.2"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
+checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa"
 dependencies = [
  "cfg-if",
 ]
@@ -97,9 +94,9 @@ checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345"
 
 [[package]]
 name = "either"
-version = "1.9.0"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
+checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2"
 
 [[package]]
 name = "fallible_collections"
@@ -112,9 +109,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",
@@ -131,7 +128,7 @@ dependencies = [
 
 [[package]]
 name = "imagequant"
-version = "4.3.0"
+version = "4.3.1"
 dependencies = [
  "arrayvec",
  "lodepng",
@@ -152,9 +149,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.152"
+version = "0.2.154"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7"
+checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346"
 
 [[package]]
 name = "lodepng"
@@ -171,9 +168,9 @@ dependencies = [
 
 [[package]]
 name = "miniz_oxide"
-version = "0.7.1"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
+checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7"
 dependencies = [
  "adler",
 ]
@@ -186,27 +183,27 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.78"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
 
 [[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",
 ]
 
 [[package]]
 name = "rayon"
-version = "1.8.1"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa7237101a77a10773db45d62004a272517633fbcc3df19d96455ede1122e051"
+checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
 dependencies = [
  "either",
  "rayon-core",
@@ -233,9 +230,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.48"
+version = "2.0.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
+checksum = "7ad3dee41f36859875573074334c200d1add8e4a87bb37113ebd31d926b7b11f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -244,9 +241,9 @@ dependencies = [
 
 [[package]]
 name = "thread_local"
-version = "1.1.7"
+version = "1.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152"
+checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -266,18 +263,18 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "zerocopy"
-version = "0.7.32"
+version = "0.7.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be"
+checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.32"
+version = "0.7.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
+checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libimagequant/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libimagequant/default.nix
index e4d3f4d0fe..f4e3512bdb 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libimagequant/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libimagequant/default.nix
@@ -14,16 +14,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "libimagequant";
-  version = "4.3.0";
+  version = "4.3.1";
 
   src = fetchFromGitHub {
     owner = "ImageOptim";
     repo = "libimagequant";
     rev = version;
-    hash = "sha256-/gHe3LQaBWOQImBesKvHK46T42TtRld988wgxbut4i0=";
+    hash = "sha256-dau+oGwcyN7AA1jEBtCgYV/cmrx5Wo3koKXbloYagrw=";
   };
 
   cargoLock = {
+    # created it by running `cargo update` in the source tree.
     lockFile = ./Cargo.lock;
   };
 
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libinotify-kqueue/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libinotify-kqueue/default.nix
index 2ac160a9b7..3d73ace3c9 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libinotify-kqueue/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/libinput/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libinput/default.nix
index 4f7e652e9b..1628cb679d 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libinput/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libinput/default.nix
@@ -45,7 +45,7 @@ in
 
 stdenv.mkDerivation rec {
   pname = "libinput";
-  version = "1.26.0";
+  version = "1.26.1";
 
   outputs = [ "bin" "out" "dev" ];
 
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
     owner = "libinput";
     repo = "libinput";
     rev = version;
-    hash = "sha256-mlxw4OUjaAdgRLFfPKMZDMOWosW9yKAkzDccwuLGCwQ=";
+    hash = "sha256-3iWKqg9HSicocDAyp1Lk87nBbj+Slg1/e1VKEOIQkyQ=";
   };
 
   patches = [
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libivykis/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libivykis/default.nix
index c5e0c55854..fbf4f4b648 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libivykis/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libivykis/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
       notification facilities
     '';
     license = licenses.zlib;
-    maintainers = [];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libjcat/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libjcat/default.nix
index 33fb21237e..79a419451d 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libjcat/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/libjxl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libjxl/default.nix
index 1b0888348c..4ae2657de9 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libjxl/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libjxl/default.nix
@@ -27,7 +27,7 @@ in
 
 stdenv.mkDerivation rec {
   pname = "libjxl";
-  version = "0.10.2";
+  version = "0.10.3";
 
   outputs = [ "out" "dev" ];
 
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
     owner = "libjxl";
     repo = "libjxl";
     rev = "v${version}";
-    hash = "sha256-Ip/5fbzt6OfIrHJajnxEe14ppvX1hJ1FSJUBEE/h5YQ=";
+    hash = "sha256-zk/fI1C26K5WC9QBfzS6MqPT9PiR4wmWURjOOIiNsg4=";
     # There are various submodules in `third_party/`.
     fetchSubmodules = true;
   };
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libksba/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libksba/default.nix
index d33de73e40..fdebb9d9dc 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libksba/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/liblc3/default.nix b/third_party/nixpkgs/pkgs/development/libraries/liblc3/default.nix
index 3e1be4ba27..ff04d23cb0 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/liblc3/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/liblc3/default.nix
@@ -27,9 +27,6 @@ stdenv.mkDerivation {
     ninja
   ];
 
-  # LTO does not work on Darwin: https://github.com/NixOS/nixpkgs/issues/19098
-  mesonFlags = lib.optionals stdenv.isDarwin [ "-Db_lto=false" ];
-
   meta = with lib; {
     description = "LC3 (Low Complexity Communication Codec) is an efficient low latency audio codec";
     homepage = "https://github.com/google/liblc3";
diff --git a/third_party/nixpkgs/pkgs/development/libraries/liblcf/default.nix b/third_party/nixpkgs/pkgs/development/libraries/liblcf/default.nix
index 3ccfffa1af..07f24f4d5a 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/liblcf/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/liblinphone/default.nix b/third_party/nixpkgs/pkgs/development/libraries/liblinphone/default.nix
index c4b792e673..a4a1e03e93 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/liblinphone/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/liblinphone/default.nix
@@ -59,7 +59,6 @@ stdenv.mkDerivation rec {
 
     jsoncpp
     libxml2
-    (python3.withPackages (ps: [ ps.pystache ps.six ]))
     sqlite
     xercesc
     zxing-cpp
@@ -68,6 +67,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     cmake
     doxygen
+    (python3.withPackages (ps: [ ps.pystache ps.six ]))
   ];
 
   strictDeps = true;
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmatroska/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libmatroska/default.nix
index 8bbd6d9d9d..7eb02d3ddd 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libmatroska/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/libmaxminddb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libmaxminddb/default.nix
index 1651d36710..9a944abbb1 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libmaxminddb/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libmaxminddb/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "libmaxminddb";
-  version = "1.9.1";
+  version = "1.10.0";
 
   src = fetchurl {
     url = meta.homepage + "/releases/download/${version}/${pname}-${version}.tar.gz";
-    sha256 = "sha256-qAaCqJ2RX99gs10xYjL7BOvzb/8n/am9Of6KONPNPxI=";
+    sha256 = "sha256-Xm23LfQjriJb/oiXBp9t70D6qJMfRWuZ15uLTWZMZnE=";
   };
 
   meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmcrypt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libmcrypt/default.nix
index 672ba730be..6a4b0adfef 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libmcrypt/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libmcrypt/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, darwin, disablePosixThreads ? false }:
+{ lib, stdenv, fetchurl, cctools, disablePosixThreads ? false }:
 
 stdenv.mkDerivation rec {
   pname = "libmcrypt";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "0gipgb939vy9m66d3k8il98rvvwczyaw2ixr8yn6icds9c3nrsz4";
   };
 
-  buildInputs = lib.optional stdenv.isDarwin darwin.cctools;
+  buildInputs = lib.optional stdenv.isDarwin cctools;
 
   configureFlags = lib.optionals disablePosixThreads [ "--disable-posix-threads" ]
     ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmicrohttpd/1.0.nix b/third_party/nixpkgs/pkgs/development/libraries/libmicrohttpd/1.0.nix
new file mode 100644
index 0000000000..16a4f2ed88
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/libraries/libmicrohttpd/1.0.nix
@@ -0,0 +1,10 @@
+{ callPackage, fetchurl }:
+
+callPackage ./generic.nix (rec {
+  version = "1.0.1";
+
+  src = fetchurl {
+    url = "mirror://gnu/libmicrohttpd/libmicrohttpd-${version}.tar.gz";
+    hash = "sha256-qJ4J/JtN403eGfT8tPqqHOECmbmQjbETK7+h3keIK5Q=";
+  };
+})
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmicrohttpd/generic.nix b/third_party/nixpkgs/pkgs/development/libraries/libmicrohttpd/generic.nix
index 58fadfdca5..9427febbb6 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libmicrohttpd/generic.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libmicrohttpd/generic.nix
@@ -1,10 +1,6 @@
 { lib, stdenv, libgcrypt, curl, gnutls, pkg-config, libiconv, libintl, version, src, meta ? {} }:
 
-let
-  meta_ = meta;
-in
-
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "libmicrohttpd";
   inherit version src;
 
@@ -34,5 +30,5 @@ stdenv.mkDerivation rec {
 
     maintainers = with maintainers; [ eelco fpletz ];
     platforms = platforms.unix;
-  } // meta_;
-}
+  } // meta;
+})
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmodulemd/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libmodulemd/default.nix
index 7011f30bcf..0769cf4b1c 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libmodulemd/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/libmpeg2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libmpeg2/default.nix
index 289d5beac8..baada92d43 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libmpeg2/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/libmrss/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libmrss/default.nix
index 43d829b983..daa66847b4 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libmrss/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libmrss/default.nix
@@ -18,6 +18,6 @@ stdenv.mkDerivation rec {
     license = lib.licenses.lgpl2;
 
     platforms = lib.platforms.all;
-    maintainers = [ lib.maintainers.viric ];
+    maintainers = [ ];
   };
 }
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmx/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libmx/default.nix
index c178e152d2..de825b3b9d 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libmx/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/libnftnl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libnftnl/default.nix
index 3fb02abfb5..1da5bf5a6d 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libnftnl/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libnftnl/default.nix
@@ -1,12 +1,12 @@
-{ lib, stdenv, fetchurl, pkg-config, libmnl }:
+{ lib, stdenv, fetchurl, pkg-config, libmnl, gitUpdater }:
 
 stdenv.mkDerivation rec {
-  version = "1.2.6";
+  version = "1.2.7";
   pname = "libnftnl";
 
   src = fetchurl {
     url = "https://netfilter.org/projects/${pname}/files/${pname}-${version}.tar.xz";
-    hash = "sha256-zurqLNkhR9oZ8To1p/GkvCdn/4l+g45LR5z1S1nHd/Q=";
+    hash = "sha256-kSJ3T5aAk9XAus3dZ95IDzH6QHNAWn/AWKNLDzh67LM=";
   };
 
   configureFlags = lib.optional (stdenv.cc.bintools.isLLVM && lib.versionAtLeast stdenv.cc.bintools.version "17") "LDFLAGS=-Wl,--undefined-version";
@@ -14,6 +14,13 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ libmnl ];
 
+  enableParallelBuilding = true;
+
+  passthru.updateScript = gitUpdater {
+    url = "https://git.netfilter.org/libnftnl";
+    rev-prefix = "libnftnl-";
+  };
+
   meta = with lib; {
     description = "Userspace library providing a low-level netlink API to the in-kernel nf_tables subsystem";
     homepage = "https://netfilter.org/projects/libnftnl/";
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libnxml/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libnxml/default.nix
index 6a0c52c9e9..69ff6a6ebd 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libnxml/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libnxml/default.nix
@@ -17,6 +17,6 @@ stdenv.mkDerivation rec {
     license = lib.licenses.lgpl2;
 
     platforms = lib.platforms.all;
-    maintainers = [ lib.maintainers.viric ];
+    maintainers = [ ];
   };
 }
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libplacebo/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libplacebo/default.nix
index c8f678ccbb..b9bcd3cd08 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libplacebo/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libplacebo/default.nix
@@ -20,14 +20,14 @@
 
 stdenv.mkDerivation rec {
   pname = "libplacebo";
-  version = "6.338.2";
+  version = "7.349.0";
 
   src = fetchFromGitLab {
     domain = "code.videolan.org";
     owner = "videolan";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-gE6yKnFvsOFh8bFYc7b+bS+zmdDU7jucr0HwhdDeFzU=";
+    hash = "sha256-mIjQvc7SRjE1Orb2BkHK+K1TcRQvzj2oUOCUT4DzIuA=";
   };
 
   nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libplist/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libplist/default.nix
index 9a69af13d2..eeabf62e1c 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libplist/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libplist/default.nix
@@ -10,7 +10,7 @@
 
 stdenv.mkDerivation rec {
   pname = "libplist";
-  version = "2.4.0";
+  version = "2.6.0";
 
   outputs = [ "bin" "dev" "out" ] ++ lib.optional enablePython "py";
 
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     owner = "libimobiledevice";
     repo = pname;
     rev = version;
-    hash = "sha256-bH40HSp76w56tlxO5M1INAW4wRR7O27AY4H/CyEcp+Y=";
+    hash = "sha256-hitRcOjbF+L9Og9/qajqFqOhKfRn9+iWLoCKmS9dT80=";
   };
 
   nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libqofono/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libqofono/default.nix
index ff72711c8a..4b241ee278 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libqofono/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/librdf/raptor2.nix b/third_party/nixpkgs/pkgs/development/libraries/librdf/raptor2.nix
index 424022b7ab..a747ad8eb8 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/librdf/raptor2.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/librdf/raptor2.nix
@@ -1,6 +1,7 @@
 { lib
 , stdenv
 , libxml2
+, curl
 , libxslt
 , pkg-config
 , cmake
@@ -45,7 +46,11 @@ stdenv.mkDerivation rec {
   ];
 
   nativeBuildInputs = [ pkg-config cmake perl bison flex ];
-  buildInputs = [ libxml2 libxslt ];
+  buildInputs = [
+    curl
+    libxml2
+    libxslt
+  ];
 
   meta = {
     description = "RDF Parser Toolkit";
diff --git a/third_party/nixpkgs/pkgs/development/libraries/librsvg/default.nix b/third_party/nixpkgs/pkgs/development/libraries/librsvg/default.nix
index e9a9eb977d..e8426b97ce 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/librsvg/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/librsvg/default.nix
@@ -42,7 +42,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "librsvg";
-  version = "2.58.1";
+  version = "2.58.2";
 
   outputs = [ "out" "dev" ] ++ lib.optionals withIntrospection [
     "devdoc"
@@ -50,13 +50,13 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/librsvg/${lib.versions.majorMinor finalAttrs.version}/librsvg-${finalAttrs.version}.tar.xz";
-    hash = "sha256-NyhZYpCoV20wXQbsiv30c1Fv7unf8i4DI16sQz1Wgk4=";
+    hash = "sha256-GOnXDAjPJfUNYQ1tWvVxVh1nz0F5+WLgQmZHXfbi4iQ=";
   };
 
   cargoDeps = rustPlatform.fetchCargoTarball {
     inherit (finalAttrs) src;
     name = "librsvg-deps-${finalAttrs.version}";
-    hash = "sha256-FIW92Cr83YkGTOe/xjyZGZvHYSrG70GBpHc9l0sMjLg=";
+    hash = "sha256-E0bXSxWI0MkJmNvl8gxklXHgy4zlkiee59+s0h4Gw5s=";
     # TODO: move this to fetchCargoTarball
     dontConfigure = true;
   };
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libsignon-glib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libsignon-glib/default.nix
index bdb6df0e52..95541c97eb 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libsignon-glib/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/libsixel/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libsixel/default.nix
index 852f19da78..dc773c3de4 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libsixel/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/libspatialite/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libspatialite/default.nix
index b8d1fe45e4..98d184ae70 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libspatialite/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libspatialite/default.nix
@@ -11,6 +11,7 @@
 , proj
 , sqlite
 , libiconv
+, zlib
 }:
 
 stdenv.mkDerivation rec {
@@ -34,10 +35,11 @@ stdenv.mkDerivation rec {
     freexl
     geos
     librttopo
-    libxml2
+    (libxml2.override { enableHttp = true; })
     minizip
     proj
     sqlite
+    zlib
   ] ++ lib.optionals stdenv.isDarwin [
     libiconv
   ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libstatgrab/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libstatgrab/default.nix
index e5a17b68e0..abda8137f5 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libstatgrab/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/libtheora/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libtheora/default.nix
index 45b7e4caaf..d529c22c9f 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libtheora/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/libtomcrypt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libtomcrypt/default.nix
index 1457030f87..2a32900040 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libtomcrypt/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/libtsm/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libtsm/default.nix
index c8e00cf4a9..bcf9270a71 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libtsm/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/libuchardet/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libuchardet/default.nix
index 642c39e597..1b54ea948d 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libuchardet/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/libunistring/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libunistring/default.nix
index e865873c28..13ffffe6aa 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libunistring/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libunistring/default.nix
@@ -1,42 +1,56 @@
-{ fetchurl, lib, stdenv, libiconv, updateAutotoolsGnuConfigScriptsHook }:
+{
+  fetchurl,
+  lib,
+  stdenv,
+  libiconv,
+  updateAutotoolsGnuConfigScriptsHook,
+  darwin
+}:
 
 # Note: this package is used for bootstrapping fetchurl, and thus
 # cannot use fetchpatch! All mutable patches (generated by GitHub or
 # cgit) that are needed here should be included directly in Nixpkgs as
 # files.
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "libunistring";
-  version = "1.1";
+  version = "1.2";
 
   src = fetchurl {
-    url = "mirror://gnu/libunistring/${pname}-${version}.tar.gz";
-    sha256 = "sha256-oiUr7uyDCsREufaNazitiD2xmRnbNbUiIs+CfDhb22o=";
+    url = "mirror://gnu/libunistring/libunistring-${finalAttrs.version}.tar.gz";
+    hash = "sha256-/W1WYvpwZIfEg0mnWLV7wUnOlOxsMGJOyf3Ec86rvI4=";
   };
 
-  outputs = [ "out" "dev" "info" "doc" ];
+  outputs = [
+    "out"
+    "dev"
+    "info"
+    "doc"
+  ];
 
   strictDeps = true;
   propagatedBuildInputs = lib.optional (!stdenv.isLinux) libiconv;
+  buildInputs = lib.optionals stdenv.isDarwin [
+    darwin.apple_sdk.frameworks.CoreServices
+  ];
   nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ];
 
-  configureFlags = [
-    "--with-libiconv-prefix=${libiconv}"
-  ];
+  configureFlags = [ "--with-libiconv-prefix=${libiconv}" ];
 
   doCheck = false;
 
-  /* This seems to cause several random failures like these, which I assume
-     is because of bad or missing target dependencies in their build system:
+  /*
+    This seems to cause several random failures like these, which I assume
+    is because of bad or missing target dependencies in their build system:
 
-        ./unistdio/test-u16-vasnprintf2.sh: line 16: ./test-u16-vasnprintf1: No such file or directory
-        FAIL unistdio/test-u16-vasnprintf2.sh (exit status: 1)
+      ./unistdio/test-u16-vasnprintf2.sh: line 16: ./test-u16-vasnprintf1: No such file or directory
+      FAIL unistdio/test-u16-vasnprintf2.sh (exit status: 1)
 
-        FAIL: unistdio/test-u16-vasnprintf3.sh
-        ======================================
+      FAIL: unistdio/test-u16-vasnprintf3.sh
+      ======================================
 
-        ./unistdio/test-u16-vasnprintf3.sh: line 16: ./test-u16-vasnprintf1: No such file or directory
-        FAIL unistdio/test-u16-vasnprintf3.sh (exit status: 1)
+      ./unistdio/test-u16-vasnprintf3.sh: line 16: ./test-u16-vasnprintf1: No such file or directory
+      FAIL unistdio/test-u16-vasnprintf3.sh (exit status: 1)
   */
   enableParallelChecking = false;
   enableParallelBuilding = true;
@@ -72,4 +86,4 @@ stdenv.mkDerivation rec {
     maintainers = [ ];
     platforms = lib.platforms.all;
   };
-}
+})
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libunity/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libunity/default.nix
index 066f23cf54..5905798ee8 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libunity/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/libusbgx/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libusbgx/default.nix
index 1f6e8f1697..84dcdff974 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libusbgx/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/libuv/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libuv/default.nix
index 82a37d0434..a4254921e1 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libuv/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/libva/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libva/default.nix
index aad42d7e51..c4decf850c 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libva/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libva/default.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libva" + lib.optionalString minimal "-minimal";
-  version = "2.21.0";
+  version = "2.22.0";
 
   src = fetchFromGitHub {
     owner  = "intel";
     repo   = "libva";
     rev    = finalAttrs.version;
-    sha256 = "sha256-X9H5nxbYFSMfxZMxs3iWwCgdrJ2FTVWW7tlgQek3WIg=";
+    sha256 = "sha256-0eOYxyMt2M2lkhoWOhoUQgP/1LYY3QQqSF5TdRUuCbs=";
   };
 
   outputs = [ "dev" "out" ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libvmi/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libvmi/default.nix
index 265e19a1ae..9aded47d23 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libvmi/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/libxl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libxl/default.nix
index 0263b25f3b..3a6c0ca18e 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libxl/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/libxml2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libxml2/default.nix
index 79fe8c9f52..be57d05910 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libxml2/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libxml2/default.nix
@@ -1,7 +1,7 @@
 { stdenv
 , lib
 , fetchurl
-, zlib
+, fetchpatch
 , pkg-config
 , autoreconfHook
 , libintl
@@ -20,26 +20,41 @@
 , enableStatic ? !enableShared
 , gnome
 , testers
+, enableHttp ? false
 }:
 
-stdenv.mkDerivation (finalAttrs: rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "libxml2";
-  version = "2.12.7";
+  version = "2.13.2";
 
-  outputs = [ "bin" "dev" "out" "doc" ]
+  outputs = [ "bin" "dev" "out" "devdoc" ]
     ++ lib.optional pythonSupport "py"
     ++ lib.optional (enableStatic && enableShared) "static";
   outputMan = "bin";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/libxml2/${lib.versions.majorMinor version}/libxml2-${version}.tar.xz";
-    hash = "sha256-JK54/xNjqXPm2L66lBp5RdoqwFbhm1OVautpJ/1s+1Y=";
+    url = "mirror://gnome/sources/libxml2/${lib.versions.majorMinor finalAttrs.version}/libxml2-${finalAttrs.version}.tar.xz";
+    hash = "sha256-58j14LVUIVng3cQJwiyRZDBLWB6qmTBlOnb7hFsWkmM=";
   };
 
-  # https://gitlab.gnome.org/GNOME/libxml2/-/issues/725
-  postPatch = if stdenv.hostPlatform.isFreeBSD then ''
-    substituteInPlace ./configure.ac --replace-fail pthread_join pthread_create
-  '' else null;
+  patches = [
+    # Fix XInclude failing too aggresively.
+    # https://gitlab.gnome.org/GNOME/libxml2/-/issues/772
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/libxml2/-/commit/a0330b53c8034bb79220e403e8d4ad8c23ef088f.patch";
+      hash = "sha256-iVAgX8qNF0fw8GYUKsWduudjEuRMEOTAENAIFTjyRjU=";
+    })
+    # Fix error handling
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/libxml2/-/commit/ed8b4264f65b1ced1e3b13967dd1cf90102cfa40.patch";
+      hash = "sha256-EvxoUcr+VXBbYvK1PBV+KWcWTDk9rMWf+GXCYvXWDMI=";
+    })
+    # Fix more error handling
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/libxml2/-/commit/e30cb632e734394ddbd7bd62b57cee3586424352.patch";
+      hash = "sha256-C0ef17wTRC9rH0dKua/LJwwqTRI5W8sKWmvL7JxzT4o=";
+    })
+  ];
 
   strictDeps = true;
 
@@ -59,7 +74,6 @@ stdenv.mkDerivation (finalAttrs: rec {
   ];
 
   propagatedBuildInputs = [
-    zlib
     findXMLCatalogs
   ] ++ lib.optionals stdenv.isDarwin [
     libiconv
@@ -74,7 +88,7 @@ stdenv.mkDerivation (finalAttrs: rec {
     (lib.withFeature icuSupport "icu")
     (lib.withFeature pythonSupport "python")
     (lib.optionalString pythonSupport "PYTHON=${python.pythonOnBuildForHost.interpreter}")
-  ];
+  ] ++ lib.optional enableHttp "--with-http";
 
   installFlags = lib.optionals pythonSupport [
     "pythondir=\"${placeholder "py"}/${python.sitePackages}\""
@@ -95,7 +109,7 @@ stdenv.mkDerivation (finalAttrs: rec {
   '';
 
   preInstall = lib.optionalString pythonSupport ''
-    substituteInPlace python/libxml2mod.la --replace "$dev/${python.sitePackages}" "$py/${python.sitePackages}"
+    substituteInPlace python/libxml2mod.la --replace-fail "$dev/${python.sitePackages}" "$py/${python.sitePackages}"
   '';
 
   postFixup = ''
@@ -106,11 +120,10 @@ stdenv.mkDerivation (finalAttrs: rec {
   '';
 
   passthru = {
-    inherit version;
-    pythonSupport = pythonSupport;
+    inherit pythonSupport;
 
     updateScript = gnome.updateScript {
-      packageName = pname;
+      packageName = "libxml2";
       versionPolicy = "none";
     };
     tests = {
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libxmlb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libxmlb/default.nix
index 4cc4e2b15c..a90ae30fec 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libxmlb/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/libxmlxx/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libxmlxx/default.nix
index 9ec4090f60..5d55e242f0 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libxmlxx/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/libxslt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libxslt/default.nix
index df04c749d0..10ee52a027 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libxslt/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/libxslt/default.nix
@@ -17,14 +17,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libxslt";
-  version = "1.1.41";
+  version = "1.1.42";
 
   outputs = [ "bin" "dev" "out" "doc" "devdoc" ] ++ lib.optional pythonSupport "py";
   outputMan = "bin";
 
   src = fetchurl {
     url = "mirror://gnome/sources/libxslt/${lib.versions.majorMinor finalAttrs.version}/libxslt-${finalAttrs.version}.tar.xz";
-    hash = "sha256-OtOSr5ERW3dA97UNIozBxfwTr8HafxbLAhORejf3G9o=";
+    hash = "sha256-hcpiysDUH8d9P2Az2p32/XPSDqL8GLCjYJ/7QRDhuus=";
   };
 
   strictDeps = true;
diff --git a/third_party/nixpkgs/pkgs/development/libraries/libykclient/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libykclient/default.nix
index 9113b5b6a1..0f99c86f93 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/libykclient/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/linenoise-ng/default.nix b/third_party/nixpkgs/pkgs/development/libraries/linenoise-ng/default.nix
index 0832ef5c6c..c52b708579 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/linenoise-ng/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/luabridge/default.nix b/third_party/nixpkgs/pkgs/development/libraries/luabridge/default.nix
index b2f4db56f6..16f8841f89 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/luabridge/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/mac/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mac/default.nix
index 8bb245342c..ca58c20eab 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/mac/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/mailcore2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mailcore2/default.nix
index dddd224ca6..ed7406cc52 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/mailcore2/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/mapnik/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mapnik/default.nix
index 0428dd585c..cd13cc850a 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/mapnik/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/mapnik/default.nix
@@ -84,7 +84,7 @@ stdenv.mkDerivation rec {
     python3
     sqlite
     zlib
-    libxml2
+    (libxml2.override { enableHttp = true; })
     postgresql
     protozero
     sparsehash
diff --git a/third_party/nixpkgs/pkgs/development/libraries/mdk-sdk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mdk-sdk/default.nix
index b8d63560ef..c172fbf313 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/mdk-sdk/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/mdk-sdk/default.nix
@@ -1,6 +1,6 @@
 { lib, stdenv, fetchurl, autoPatchelfHook
 , alsa-lib, gcc-unwrapped, libX11, libcxx, libdrm, libglvnd, libpulseaudio, libxcb, mesa, wayland, xz, zlib
-, libva, libvdpau, addOpenGLRunpath
+, libva, libvdpau, addDriverRunpath
 }:
 
 stdenv.mkDerivation rec {
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   ];
 
   appendRunpaths = lib.makeLibraryPath [
-    libva libvdpau addOpenGLRunpath.driverLink
+    libva libvdpau addDriverRunpath.driverLink
   ];
 
   installPhase = ''
diff --git a/third_party/nixpkgs/pkgs/development/libraries/mesa/common.nix b/third_party/nixpkgs/pkgs/development/libraries/mesa/common.nix
index b42403d10a..1a60c136be 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/mesa/common.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/mesa/common.nix
@@ -1,14 +1,18 @@
 { lib, fetchurl }:
+# When updating this package, please verify at least these build (assuming x86_64-linux):
+# nix build .#mesa .#pkgsi686Linux.mesa .#pkgsCross.aarch64-multiplatform.mesa .#pkgsMusl.mesa
+# Ideally also verify:
+# nix build .#legacyPackages.x86_64-darwin.mesa .#legacyPackages.aarch64-darwin.mesa
 rec {
   pname = "mesa";
-  version = "24.1.2";
+  version = "24.1.4";
 
   src = fetchurl {
     urls = [
       "https://archive.mesa3d.org/mesa-${version}.tar.xz"
       "https://mesa.freedesktop.org/archive/mesa-${version}.tar.xz"
     ];
-    hash = "sha256-osWEyNV9O9i6EXkKbprjcT+IId+WwFm3ivsp3Zdcn0U=";
+    hash = "sha256-fPfG9mUmOtASKInB1LB2ZUwe7ep6LzjGnIxRV5k3reE=";
   };
 
   meta = {
diff --git a/third_party/nixpkgs/pkgs/development/libraries/mesa/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mesa/default.nix
index 43aa880341..2266716bd9 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/mesa/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/mesa/default.nix
@@ -6,6 +6,7 @@
 , expat
 , fetchCrate
 , fetchurl
+, fetchpatch
 , file
 , flex
 , glslang
@@ -93,9 +94,6 @@
 , makeSetupHook
 }:
 
-# When updating this package, please verify at least these build (assuming x86_64-linux):
-# nix build .#mesa .#pkgsi686Linux.mesa .#pkgsCross.aarch64-multiplatform.mesa .#pkgsMusl.mesa
-
 let
   rustDeps = [
     {
@@ -140,6 +138,13 @@ in stdenv.mkDerivation {
 
   patches = [
     ./opencl.patch
+
+    # https://gitlab.freedesktop.org/mesa/mesa/-/issues/11533
+    (fetchpatch {
+      name = "ffmpeg.patch";
+      url = "https://gitlab.freedesktop.org/mesa/mesa/-/commit/241f70e5a13bb9c13a168282446ad074e16c3d74.patch";
+      hash = "sha256-Cx7OL8iXGAOuDbCQReCCxSrWYvfZVrGoP0txIKSLTvs=";
+    })
   ];
 
   postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/development/libraries/mitama-cpp-result/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mitama-cpp-result/default.nix
index 7700483529..69d910e3bd 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/mitama-cpp-result/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/msgpack-c/default.nix b/third_party/nixpkgs/pkgs/development/libraries/msgpack-c/default.nix
index 63a712b088..3d8cae18ac 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/msgpack-c/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/msgpack-c/default.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "msgpack-c";
-  version = "6.0.1";
+  version = "6.0.2";
 
   src = fetchFromGitHub {
     owner = "msgpack";
     repo = "msgpack-c";
     rev = "refs/tags/c-${finalAttrs.version}";
-    hash = "sha256-BXnK7xNRdZvbSz7tERf/PDJkmxbqAC6trH+h36O/v6k=";
+    hash = "sha256-Tjgn9ayyPK1mKA4OBr7/VogSzJwh5RZR5BrMNadfqak=";
   };
 
   strictDeps = true;
diff --git a/third_party/nixpkgs/pkgs/development/libraries/ncurses/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ncurses/default.nix
index 85bf4bee63..95b427a7ba 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/ncurses/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/ncurses/default.nix
@@ -11,6 +11,7 @@
 , mouseSupport ? false, gpm
 , unicodeSupport ? true
 , testers
+, binlore
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -180,6 +181,17 @@ stdenv.mkDerivation (finalAttrs: {
     rm "$out"/lib/*.a
   '';
 
+  # I'm not very familiar with ncurses, but it looks like most of the
+  # exec here will run hard-coded executables. There's one that is
+  # dynamic, but it looks like it only comes from executing a terminfo
+  # file, so I think it isn't going to be under user control via CLI?
+  # Happy to have someone help nail this down in either direction!
+  # The "capability" is 'iprog', and I could only find 1 real example:
+  # https://invisible-island.net/ncurses/terminfo.ti.html#tic-linux-s
+  passthru.binlore.out = binlore.synthesize ncurses ''
+    execer cannot bin/{reset,tput,tset}
+  '';
+
   meta = with lib; {
     homepage = "https://www.gnu.org/software/ncurses/";
     description = "Free software emulation of curses in SVR4 and more";
diff --git a/third_party/nixpkgs/pkgs/development/libraries/neardal/default.nix b/third_party/nixpkgs/pkgs/development/libraries/neardal/default.nix
index 485c803d4c..04f429aa89 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/neardal/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/newt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/newt/default.nix
index 1e6f8de2d5..15a8347098 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/newt/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/newt/default.nix
@@ -56,6 +56,6 @@ stdenv.mkDerivation rec {
     changelog = "https://pagure.io/newt/blob/master/f/CHANGES";
     license = licenses.lgpl2;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ viric ];
+    maintainers = [ ];
   };
 }
diff --git a/third_party/nixpkgs/pkgs/development/libraries/nghttp2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/nghttp2/default.nix
index 0fe8f1d88d..fbe3e2a92f 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/nghttp2/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/nghttp2/default.nix
@@ -32,11 +32,11 @@ assert enableJemalloc -> enableApp;
 
 stdenv.mkDerivation rec {
   pname = "nghttp2";
-  version = "1.61.0";
+  version = "1.62.1";
 
   src = fetchurl {
     url = "https://github.com/${pname}/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2";
-    sha256 = "sha256-Toz37DLUxaQwlmJC1yA10lXNlHCodm1h7tegGQ3VRP0=";
+    sha256 = "sha256-OWbsgv2n/DgFBtNyomDY2bbpRr5N6u8f7MGnS0gJrj0=";
   };
 
   outputs = [ "out" "dev" "lib" "doc" "man" ];
@@ -60,6 +60,10 @@ stdenv.mkDerivation rec {
     (lib.enableFeature enableHttp3 "http3")
   ];
 
+  env.NIX_CFLAGS_COMPILE = toString (lib.optionals (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13") [
+    "-faligned-allocation"
+  ]);
+
   # Unit tests require CUnit and setting TZDIR environment variable
   doCheck = enableTests;
   nativeCheckInputs = lib.optionals (enableTests) [ cunit tzdata ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/nss/esr.nix b/third_party/nixpkgs/pkgs/development/libraries/nss/esr.nix
index 95c9aa0e19..2473ee1dd4 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/nss/esr.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/nss/esr.nix
@@ -1,4 +1,4 @@
 import ./generic.nix {
-  version = "3.90.2";
-  hash = "sha256-4r/LhKilkSeEhw/rl2IRAn5xMJ74W5ACg7fX0e4GQxA=";
+  version = "3.101.1";
+  hash = "sha256-KcRiOUbdFnH618MFM6uxmRn+/Jn4QMHtv1BELXrCAX4=";
 }
diff --git a/third_party/nixpkgs/pkgs/development/libraries/nss/generic.nix b/third_party/nixpkgs/pkgs/development/libraries/nss/generic.nix
index b0a633869a..7ef488cca4 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/nss/generic.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/nss/generic.nix
@@ -7,7 +7,7 @@
 , zlib
 , sqlite
 , ninja
-, darwin
+, cctools
 , fixDarwinDylibNames
 , buildPackages
 , useP11kit ? true
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
   depsBuildBuild = [ buildPackages.stdenv.cc ];
 
   nativeBuildInputs = [ perl ninja (buildPackages.python3.withPackages (ps: with ps; [ gyp ])) ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.cctools fixDarwinDylibNames ];
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [ cctools fixDarwinDylibNames ];
 
   buildInputs = [ zlib sqlite ];
 
@@ -46,10 +46,6 @@ stdenv.mkDerivation rec {
     # Based on http://patch-tracker.debian.org/patch/series/dl/nss/2:3.15.4-1/85_security_load.patch
     ./85_security_load_3.85+.patch
     ./fix-cross-compilation.patch
-  ] ++ lib.optionals (lib.versionOlder version "3.91") [
-    # https://bugzilla.mozilla.org/show_bug.cgi?id=1836925
-    # https://phabricator.services.mozilla.com/D180068
-    ./remove-c25519-support.patch
   ];
 
   postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/development/libraries/nss/remove-c25519-support.patch b/third_party/nixpkgs/pkgs/development/libraries/nss/remove-c25519-support.patch
deleted file mode 100644
index d5dba01627..0000000000
--- a/third_party/nixpkgs/pkgs/development/libraries/nss/remove-c25519-support.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-diff --git a/nss/lib/freebl/Makefile b/nss/lib/freebl/Makefile
-index 74e8e65..aa9dd95 100644
---- nss/lib/freebl/Makefile
-+++ nss/lib/freebl/Makefile
-@@ -568,7 +568,6 @@ ifneq ($(shell $(CC) -? 2>&1 >/dev/null </dev/null | sed -e 's/:.*//;1q'),lcc)
-             HAVE_INT128_SUPPORT = 1
-             DEFINES += -DHAVE_INT128_SUPPORT
-     else ifeq (1,$(CC_IS_GCC))
--        SUPPORTS_VALE_CURVE25519 = 1
-         ifneq (,$(filter 4.6 4.7 4.8 4.9,$(word 1,$(GCC_VERSION)).$(word 2,$(GCC_VERSION))))
-             HAVE_INT128_SUPPORT = 1
-             DEFINES += -DHAVE_INT128_SUPPORT
-@@ -593,11 +592,6 @@ ifndef HAVE_INT128_SUPPORT
-     DEFINES += -DKRML_VERIFIED_UINT128
- endif
- 
--ifdef SUPPORTS_VALE_CURVE25519
--    VERIFIED_SRCS += Hacl_Curve25519_64.c
--    DEFINES += -DHACL_CAN_COMPILE_INLINE_ASM
--endif
--
- ifndef NSS_DISABLE_CHACHAPOLY
-     ifeq ($(CPU_ARCH),x86_64)
-         ifndef NSS_DISABLE_AVX2
-diff --git a/nss/lib/freebl/freebl.gyp b/nss/lib/freebl/freebl.gyp
-index 65f9a80..23940ef 100644
---- nss/lib/freebl/freebl.gyp
-+++ nss/lib/freebl/freebl.gyp
-@@ -866,12 +866,6 @@
-           }],
-         ],
-       }],
--      [ 'supports_vale_curve25519==1', {
--        'defines': [
--          # The Makefile does version-tests on GCC, but we're not doing that here.
--          'HACL_CAN_COMPILE_INLINE_ASM',
--        ],
--      }],
-       [ 'OS=="linux" or OS=="android"', {
-         'conditions': [
-           [ 'target_arch=="x64"', {
-@@ -934,11 +928,6 @@
-   'variables': {
-     'module': 'nss',
-     'conditions': [
--      [ 'target_arch=="x64" and cc_is_gcc==1', {
--        'supports_vale_curve25519%': 1,
--      }, {
--        'supports_vale_curve25519%': 0,
--      }],
-       [ 'target_arch=="x64" or target_arch=="arm64" or target_arch=="aarch64"', {
-         'have_int128_support%': 1,
-       }, {
-diff --git a/nss/lib/freebl/freebl_base.gypi b/nss/lib/freebl/freebl_base.gypi
-index d198c44..34b6b3c 100644
---- nss/lib/freebl/freebl_base.gypi
-+++ nss/lib/freebl/freebl_base.gypi
-@@ -151,11 +151,6 @@
-         'ecl/curve25519_32.c',
-       ],
-     }],
--    ['supports_vale_curve25519==1', {
--      'sources': [
--        'verified/Hacl_Curve25519_64.c',
--      ],
--    }],
-     ['(target_arch!="ppc64" and target_arch!="ppc64le") or disable_altivec==1', {
-       'sources': [
-         # Gyp does not support per-file cflags, so working around like this.
diff --git a/third_party/nixpkgs/pkgs/development/libraries/nvidia-vaapi-driver/default.nix b/third_party/nixpkgs/pkgs/development/libraries/nvidia-vaapi-driver/default.nix
index 92f447a324..786a11f482 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/nvidia-vaapi-driver/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/nvidia-vaapi-driver/default.nix
@@ -9,7 +9,7 @@
 , gst_all_1
 , nv-codec-headers-11
 , libva
-, addOpenGLRunpath
+, addDriverRunpath
 }:
 
 stdenv.mkDerivation rec {
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
     meson
     ninja
     pkg-config
-    addOpenGLRunpath
+    addDriverRunpath
   ];
 
   buildInputs = [
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
   ];
 
   postFixup = ''
-    addOpenGLRunpath "$out/lib/dri/nvidia_drv_video.so"
+    addDriverRunpath "$out/lib/dri/nvidia_drv_video.so"
   '';
 
   meta = with lib;{
diff --git a/third_party/nixpkgs/pkgs/development/libraries/ocl-icd/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ocl-icd/default.nix
index 0930b8904b..f5cdc9f484 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/ocl-icd/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/ocl-icd/default.nix
@@ -3,7 +3,7 @@
 , fetchFromGitHub
 , ruby
 , opencl-headers
-, addOpenGLRunpath
+, addDriverRunpath
 , autoreconfHook
 , windows
 }:
diff --git a/third_party/nixpkgs/pkgs/development/libraries/onnxruntime/default.nix b/third_party/nixpkgs/pkgs/development/libraries/onnxruntime/default.nix
index 6297488d49..4eef69d925 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/onnxruntime/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/onnxruntime/default.nix
@@ -2,13 +2,12 @@
 , stdenv
 , lib
 , fetchFromGitHub
-, fetchpatch
 , Foundation
 , abseil-cpp
 , cmake
 , cpuinfo
 , eigen
-, flatbuffers
+, flatbuffers_23
 , gbenchmark
 , glibcLocales
 , gtest
@@ -184,7 +183,7 @@ effectiveStdenv.mkDerivation rec {
     "-DFETCHCONTENT_QUIET=OFF"
     "-DFETCHCONTENT_SOURCE_DIR_ABSEIL_CPP=${abseil-cpp.src}"
     "-DFETCHCONTENT_SOURCE_DIR_DATE=${howard-hinnant-date}"
-    "-DFETCHCONTENT_SOURCE_DIR_FLATBUFFERS=${flatbuffers.src}"
+    "-DFETCHCONTENT_SOURCE_DIR_FLATBUFFERS=${flatbuffers_23.src}"
     "-DFETCHCONTENT_SOURCE_DIR_GOOGLETEST=${gtest.src}"
     "-DFETCHCONTENT_SOURCE_DIR_GOOGLE_NSYNC=${nsync.src}"
     "-DFETCHCONTENT_SOURCE_DIR_MP11=${mp11}"
diff --git a/third_party/nixpkgs/pkgs/development/libraries/opencl-clang/default.nix b/third_party/nixpkgs/pkgs/development/libraries/opencl-clang/default.nix
index 1c90cc3867..22478d7220 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/opencl-clang/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/opencl-clang/default.nix
@@ -54,26 +54,20 @@ let
     };
   };
 
-  version = "unstable-2023-06-12";
+  version = "unstable-2024-06-06";
   src = applyPatches {
     src = fetchFromGitHub {
       owner = "intel";
       repo = "opencl-clang";
       # https://github.com/intel/opencl-clang/compare/ocl-open-140
-      rev = "cf95b338d14685e4f3402ab1828bef31d48f1fd6";
-      hash = "sha256-To1RlQX9IJ+1zAwEXaW7ua3VNfjK9mu7pgsRPsfa8g8=";
+      rev = "66a54cbef6726c4e791986779a60d7a45b09c9c9";
+      hash = "sha256-vM2IlF/e3b2GIXMaHYre+iQn4WKsFIU3x90Ee5KVHtI=";
     };
 
     patches = [
       # Build script tries to find Clang OpenCL headers under ${llvm}
       # Work around it by specifying that directory manually.
       ./opencl-headers-dir.patch
-
-      # fix CMake throwing errors
-      (fetchpatch {
-        url = "https://github.com/intel/opencl-clang/commit/321e3b99c1a8d54c8475f5ae998452069cc5eb71.patch";
-        hash = "sha256-cATbH+AMVtcabhl3EkzAH7w3wGreUV53hQYHVUUEP4g=";
-      })
     ];
 
     postPatch = ''
@@ -111,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/third_party/nixpkgs/pkgs/development/libraries/opencv/default.nix b/third_party/nixpkgs/pkgs/development/libraries/opencv/default.nix
index 91201cb576..d59e6a6342 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/opencv/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/openldap/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openldap/default.nix
index 266b690093..e25f0a8c17 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/openldap/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/openldap/default.nix
@@ -17,11 +17,11 @@
 
 stdenv.mkDerivation rec {
   pname = "openldap";
-  version = "2.6.7";
+  version = "2.6.8";
 
   src = fetchurl {
     url = "https://www.openldap.org/software/download/OpenLDAP/openldap-release/${pname}-${version}.tgz";
-    hash = "sha256-zXdfYlyUTteKPaGKA7A7CO6nPIqryXtBuzNumhCVSTA=";
+    hash = "sha256-SJaTI+lOO+OwPGoTKULcun741UXyrTVAFwkBn2lsPE4=";
   };
 
   # TODO: separate "out" and "bin"
diff --git a/third_party/nixpkgs/pkgs/development/libraries/openpam/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openpam/default.nix
deleted file mode 100644
index 9f7f1b7bf4..0000000000
--- a/third_party/nixpkgs/pkgs/development/libraries/openpam/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ stdenv, fetchurl, lib }:
-
-stdenv.mkDerivation rec {
-  pname = "openpam";
-  version = "20170430";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/openpam/openpam/Resedacea/${pname}-${version}.tar.gz";
-    sha256 = "0pz8kf9mxj0k8yp8jgmhahddz58zv2b7gnyjwng75xgsx4i55xi2";
-  };
-
-  meta = with lib; {
-    homepage = "https://www.openpam.org";
-    description = "Open source PAM library that focuses on simplicity, correctness, and cleanliness";
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ matthewbauer ];
-    license = licenses.bsd3;
-  };
-}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/openssl/3.3/CVE-2024-5535.patch b/third_party/nixpkgs/pkgs/development/libraries/openssl/3.3/CVE-2024-5535.patch
new file mode 100644
index 0000000000..2d0f822b25
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/libraries/openssl/3.3/CVE-2024-5535.patch
@@ -0,0 +1,108 @@
+From e86ac436f0bd54d4517745483e2315650fae7b2c Mon Sep 17 00:00:00 2001
+From: Matt Caswell <matt@openssl.org>
+Date: Fri, 31 May 2024 11:14:33 +0100
+Subject: [PATCH] Fix SSL_select_next_proto
+
+Ensure that the provided client list is non-NULL and starts with a valid
+entry. When called from the ALPN callback the client list should already
+have been validated by OpenSSL so this should not cause a problem. When
+called from the NPN callback the client list is locally configured and
+will not have already been validated. Therefore SSL_select_next_proto
+should not assume that it is correctly formatted.
+
+We implement stricter checking of the client protocol list. We also do the
+same for the server list while we are about it.
+
+CVE-2024-5535
+
+Reviewed-by: Tomas Mraz <tomas@openssl.org>
+Reviewed-by: Neil Horman <nhorman@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/24716)
+
+(cherry picked from commit 2ebbe2d7ca8551c4cb5fbb391ab9af411708090e)
+---
+ ssl/ssl_lib.c | 63 ++++++++++++++++++++++++++++++++-------------------
+ 1 file changed, 40 insertions(+), 23 deletions(-)
+
+diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
+index 5ec6ac4b63dc5..4c20ac4bf1fe7 100644
+--- a/ssl/ssl_lib.c
++++ b/ssl/ssl_lib.c
+@@ -3530,37 +3530,54 @@ int SSL_select_next_proto(unsigned char **out, unsigned char *outlen,
+                           unsigned int server_len,
+                           const unsigned char *client, unsigned int client_len)
+ {
+-    unsigned int i, j;
+-    const unsigned char *result;
+-    int status = OPENSSL_NPN_UNSUPPORTED;
++    PACKET cpkt, csubpkt, spkt, ssubpkt;
++
++    if (!PACKET_buf_init(&cpkt, client, client_len)
++            || !PACKET_get_length_prefixed_1(&cpkt, &csubpkt)
++            || PACKET_remaining(&csubpkt) == 0) {
++        *out = NULL;
++        *outlen = 0;
++        return OPENSSL_NPN_NO_OVERLAP;
++    }
++
++    /*
++     * Set the default opportunistic protocol. Will be overwritten if we find
++     * a match.
++     */
++    *out = (unsigned char *)PACKET_data(&csubpkt);
++    *outlen = (unsigned char)PACKET_remaining(&csubpkt);
+ 
+     /*
+      * For each protocol in server preference order, see if we support it.
+      */
+-    for (i = 0; i < server_len;) {
+-        for (j = 0; j < client_len;) {
+-            if (server[i] == client[j] &&
+-                memcmp(&server[i + 1], &client[j + 1], server[i]) == 0) {
+-                /* We found a match */
+-                result = &server[i];
+-                status = OPENSSL_NPN_NEGOTIATED;
+-                goto found;
++    if (PACKET_buf_init(&spkt, server, server_len)) {
++        while (PACKET_get_length_prefixed_1(&spkt, &ssubpkt)) {
++            if (PACKET_remaining(&ssubpkt) == 0)
++                continue; /* Invalid - ignore it */
++            if (PACKET_buf_init(&cpkt, client, client_len)) {
++                while (PACKET_get_length_prefixed_1(&cpkt, &csubpkt)) {
++                    if (PACKET_equal(&csubpkt, PACKET_data(&ssubpkt),
++                                     PACKET_remaining(&ssubpkt))) {
++                        /* We found a match */
++                        *out = (unsigned char *)PACKET_data(&ssubpkt);
++                        *outlen = (unsigned char)PACKET_remaining(&ssubpkt);
++                        return OPENSSL_NPN_NEGOTIATED;
++                    }
++                }
++                /* Ignore spurious trailing bytes in the client list */
++            } else {
++                /* This should never happen */
++                return OPENSSL_NPN_NO_OVERLAP;
+             }
+-            j += client[j];
+-            j++;
+         }
+-        i += server[i];
+-        i++;
++        /* Ignore spurious trailing bytes in the server list */
+     }
+ 
+-    /* There's no overlap between our protocols and the server's list. */
+-    result = client;
+-    status = OPENSSL_NPN_NO_OVERLAP;
+-
+- found:
+-    *out = (unsigned char *)result + 1;
+-    *outlen = result[0];
+-    return status;
++    /*
++     * There's no overlap between our protocols and the server's list. We use
++     * the default opportunistic protocol selected earlier
++     */
++    return OPENSSL_NPN_NO_OVERLAP;
+ }
+ 
+ #ifndef OPENSSL_NO_NEXTPROTONEG
diff --git a/third_party/nixpkgs/pkgs/development/libraries/openssl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openssl/default.nix
index 3662ae9cc3..94934c489e 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/openssl/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/openssl/default.nix
@@ -286,6 +286,8 @@ in {
       # This patch disables build-time detection.
       ./3.0/openssl-disable-kernel-detection.patch
 
+      ./3.3/CVE-2024-5535.patch
+
       (if stdenv.hostPlatform.isDarwin
        then ./use-etc-ssl-certs-darwin.patch
        else ./use-etc-ssl-certs.patch)
@@ -309,6 +311,8 @@ in {
       # This patch disables build-time detection.
       ./3.0/openssl-disable-kernel-detection.patch
 
+      ./3.3/CVE-2024-5535.patch
+
       (if stdenv.hostPlatform.isDarwin
        then ./3.2/use-etc-ssl-certs-darwin.patch
        else ./3.2/use-etc-ssl-certs.patch)
@@ -332,6 +336,8 @@ in {
       # This patch disables build-time detection.
       ./3.0/openssl-disable-kernel-detection.patch
 
+      ./3.3/CVE-2024-5535.patch
+
       (if stdenv.hostPlatform.isDarwin
        then ./3.2/use-etc-ssl-certs-darwin.patch
        else ./3.2/use-etc-ssl-certs.patch)
diff --git a/third_party/nixpkgs/pkgs/development/libraries/openvino/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openvino/default.nix
index 14ad6c166e..a1f3027715 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/openvino/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/openvino/default.nix
@@ -6,7 +6,7 @@
 
 # build
 , scons
-, addOpenGLRunpath
+, addDriverRunpath
 , autoPatchelfHook
 , cmake
 , git
@@ -38,7 +38,7 @@ let
   stdenv = gcc12Stdenv;
 
   # prevent scons from leaking in the default python version
-  scons' = scons.override { python3 = python3Packages.python; };
+  scons' = scons.override { inherit python3Packages; };
 
   tbbbind_version = "2_5";
   tbbbind = fetchurl {
@@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
   ];
 
   nativeBuildInputs = [
-    addOpenGLRunpath
+    addDriverRunpath
     autoPatchelfHook
     cmake
     git
@@ -161,7 +161,7 @@ stdenv.mkDerivation rec {
   postFixup = ''
     # Link to OpenCL
     find $out -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do
-      addOpenGLRunpath "$lib"
+      addDriverRunpath "$lib"
     done
   '';
 
diff --git a/third_party/nixpkgs/pkgs/development/libraries/openzwave/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openzwave/default.nix
index f45eacfd15..4cde03bdf5 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/openzwave/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/p11-kit/default.nix b/third_party/nixpkgs/pkgs/development/libraries/p11-kit/default.nix
index 32ee1dced3..b520c7087b 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/p11-kit/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/p11-kit/default.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation rec {
   pname = "p11-kit";
-  version = "0.25.3";
+  version = "0.25.5";
 
   src = fetchFromGitHub {
     owner = "p11-glue";
     repo = pname;
     rev = version;
-    hash = "sha256-zIbkw0pwt4TdyjncnSDeTN6Gsx7cc+x7Un4rnagZxQk=";
+    hash = "sha256-2xDUvXGsF8x42uezgnvOXLVUdNNHcaE042HDDEJeplc=";
     fetchSubmodules = true;
   };
 
diff --git a/third_party/nixpkgs/pkgs/development/libraries/partio/default.nix b/third_party/nixpkgs/pkgs/development/libraries/partio/default.nix
index a567612fae..05c8abfafb 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/partio/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/partio/default.nix
@@ -31,6 +31,7 @@ stdenv.mkDerivation rec {
     unzip
     cmake
     doxygen
+    python3
   ];
 
   buildInputs = [
@@ -38,7 +39,6 @@ stdenv.mkDerivation rec {
     swig
     xorg.libXi
     xorg.libXmu
-    python3
   ] ++ lib.optionals stdenv.isDarwin [
     darwin.apple_sdk.frameworks.Cocoa
     darwin.apple_sdk.frameworks.GLUT
diff --git a/third_party/nixpkgs/pkgs/development/libraries/pcl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pcl/default.nix
index 624ca4aa66..36e54f873c 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/pcl/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/pcl/default.nix
@@ -72,7 +72,7 @@ stdenv.mkDerivation rec {
     homepage = "https://pointclouds.org/";
     description = "Open project for 2D/3D image and point cloud processing";
     license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [ viric ];
+    maintainers = [ ];
     platforms = with lib.platforms; linux ++ darwin;
   };
 }
diff --git a/third_party/nixpkgs/pkgs/development/libraries/pcre/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pcre/default.nix
index 52a4ba3231..5b86dc2230 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/pcre/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/pdal/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pdal/default.nix
index 38ee448925..a6a5948837 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/pdal/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/pdal/default.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
     laszip
     libgeotiff
     libtiff
-    libxml2
+    (libxml2.override { enableHttp = true; })
     openscenegraph
     postgresql
     proj
diff --git a/third_party/nixpkgs/pkgs/development/libraries/pico-sdk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pico-sdk/default.nix
index 46a9a2348e..0e70251082 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/pico-sdk/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/pico-sdk/default.nix
@@ -1,4 +1,16 @@
-{ lib, stdenv, fetchFromGitHub, cmake }:
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+
+  # Options
+
+  # The submodules in the pico-sdk contain important additional functionality
+  # such as tinyusb, but not all these libraries might be bsd3.
+  # Off by default.
+  withSubmodules ? false,
+}:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pico-sdk";
@@ -8,7 +20,11 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "raspberrypi";
     repo = "pico-sdk";
     rev = finalAttrs.version;
-    hash = "sha256-JNcxd86XNNiPkvipVFR3X255boMmq+YcuJXUP4JwInU=";
+    fetchSubmodules = withSubmodules;
+    hash = if (withSubmodules) then
+      "sha256-GY5jjJzaENL3ftuU5KpEZAmEZgyFRtLwGVg3W1e/4Ho="
+    else
+      "sha256-JNcxd86XNNiPkvipVFR3X255boMmq+YcuJXUP4JwInU=";
   };
 
   nativeBuildInputs = [ cmake ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/pipewire/0.2.nix b/third_party/nixpkgs/pkgs/development/libraries/pipewire/0.2.nix
index cf2448bddf..7bcacad37d 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/pipewire/0.2.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/pipewire/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pipewire/default.nix
index 49dc2f4dd5..c0540e4080 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/pipewire/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/pipewire/default.nix
@@ -75,7 +75,7 @@ assert ldacbtSupport -> bluezSupport;
 
 stdenv.mkDerivation(finalAttrs: {
   pname = "pipewire";
-  version = "1.2.0";
+  version = "1.2.1";
 
   outputs = [
     "out"
@@ -91,7 +91,7 @@ stdenv.mkDerivation(finalAttrs: {
     owner = "pipewire";
     repo = "pipewire";
     rev = finalAttrs.version;
-    sha256 = "sha256-hjjiH7+JoyRTcdbPDvkUEpO72b5p8CbTD6Un/vZrHL8=";
+    sha256 = "sha256-CkxsVD813LbWpuZhJkNLJnqjLF6jmEn+CajXb2XTCsY=";
   };
 
   patches = [
diff --git a/third_party/nixpkgs/pkgs/development/libraries/platform-folders/default.nix b/third_party/nixpkgs/pkgs/development/libraries/platform-folders/default.nix
index 3a9780a960..27f4446891 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/platform-folders/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/podofo/0.10.x.nix b/third_party/nixpkgs/pkgs/development/libraries/podofo/0.10.x.nix
index f4bf9e7741..0916c2f9e9 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/podofo/0.10.x.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/podofo/0.10.x.nix
@@ -58,6 +58,6 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Library to work with the PDF file format";
     platforms = lib.platforms.all;
     license = with lib.licenses; [ gpl2Plus lgpl2Plus ];
-    maintainers = [];
+    maintainers = [ ];
   };
 })
diff --git a/third_party/nixpkgs/pkgs/development/libraries/polkit/default.nix b/third_party/nixpkgs/pkgs/development/libraries/polkit/default.nix
index 5b41fbdf6d..dd3c6aaea3 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/polkit/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/polkit/default.nix
@@ -19,6 +19,7 @@
 , docbook_xml_dtd_412
 , gtk-doc
 , coreutils
+, fetchpatch
 , useSystemd ? lib.meta.availableOn stdenv.hostPlatform systemdMinimal
 , systemdMinimal
 , elogind
@@ -55,6 +56,13 @@ stdenv.mkDerivation rec {
     ./0001-build-Use-datarootdir-in-Meson-generated-pkg-config-.patch
 
     ./elogind.patch
+
+    # FIXME: remove in the next release
+    # https://github.com/NixOS/nixpkgs/issues/18012
+    (fetchpatch {
+      url = "https://github.com/polkit-org/polkit/commit/f93c7466039ea3403e0576928aeb620b806d0cce.patch";
+      sha256 = "sha256-cF0nNovYmyr+XixpBgQFF0A+oJeSPGZgTkgDQkQuof8=";
+    })
   ];
 
   depsBuildBuild = [
diff --git a/third_party/nixpkgs/pkgs/development/libraries/proj-datumgrid/default.nix b/third_party/nixpkgs/pkgs/development/libraries/proj-datumgrid/default.nix
index 2fa5a4d268..cfc75ce0c5 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/proj-datumgrid/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/protobuf/generic.nix b/third_party/nixpkgs/pkgs/development/libraries/protobuf/generic.nix
index e29cbe6d73..71f8e90b77 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/protobuf/generic.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/psqlodbc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/psqlodbc/default.nix
index d8c2b3dec1..946cb50359 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/psqlodbc/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/qca/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qca/default.nix
index 66cdfe28eb..a8651c9c2a 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/qca/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/qca/default.nix
@@ -4,11 +4,11 @@ let
   isQt6 = lib.versions.major qtbase.version == "6";
 in stdenv.mkDerivation rec {
   pname = "qca";
-  version = "2.3.8";
+  version = "2.3.9";
 
   src = fetchurl {
     url = "mirror://kde/stable/qca/${version}/qca-${version}.tar.xz";
-    sha256 = "sha256-SHWcqGoCAkYdkIumYTQ4DMO7fSD+08AxufwCiXlqgmQ=";
+    sha256 = "sha256-xVXVKYzde2uv4rH5YQbzDPpUOiPUWdUMipHqwzxHbk4=";
   };
 
   buildInputs = [ openssl qtbase qt5compat ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/qgnomeplatform/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qgnomeplatform/default.nix
index 4c75b475c1..aa0926a849 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/qgnomeplatform/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/qpdf/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qpdf/default.nix
index 41d21bd7dc..4a9e520f2a 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/qpdf/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/qpdf/default.nix
@@ -11,23 +11,36 @@
 , pdfmixtool
 , pdfslicer
 , python3
+, testers
+, versionCheckHook
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "qpdf";
   version = "11.9.1";
 
   src = fetchFromGitHub {
     owner = "qpdf";
     repo = "qpdf";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-DhrOKjUPgNo61db8av0OTfM8mCNebQocQWtTWdt002s=";
   };
 
+  outputs = [
+    "bin"
+    "doc"
+    "lib"
+    "man"
+    "out"
+  ];
+
   nativeBuildInputs = [ cmake perl ];
 
   buildInputs = [ zlib libjpeg ];
 
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
+
   preConfigure = ''
     patchShebangs qtest/bin/qtest-driver
     patchShebangs run-qtest
@@ -38,6 +51,7 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   passthru.tests = {
+    pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; };
     inherit (python3.pkgs) pikepdf;
     inherit
       cups-filters
@@ -46,13 +60,14 @@ stdenv.mkDerivation rec {
     ;
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://qpdf.sourceforge.io/";
     description = "C++ library and set of programs that inspect and manipulate the structure of PDF files";
-    license = licenses.asl20; # as of 7.0.0, people may stay at artistic2
-    maintainers = with maintainers; [ abbradar ];
-    platforms = platforms.all;
-    changelog = "https://github.com/qpdf/qpdf/blob/v${version}/ChangeLog";
+    license = lib.licenses.asl20; # as of 7.0.0, people may stay at artistic2
+    maintainers = with lib.maintainers; [ abbradar ];
     mainProgram = "qpdf";
+    platforms = lib.platforms.all;
+    changelog = "https://github.com/qpdf/qpdf/blob/v${finalAttrs.version}/ChangeLog";
+    pkgConfigModules = [ "libqpdf" ];
   };
-}
+})
diff --git a/third_party/nixpkgs/pkgs/development/libraries/qrencode/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qrencode/default.nix
index ba6c5066d0..237751c6f8 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/qrencode/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix
index 9442049b93..af2f431dfb 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/5.15/default.nix
@@ -314,7 +314,7 @@ let
           in if stdenv'.isDarwin then overrideSDK stdenv' "11.0" else stdenv';
         inherit (srcs.qtwebengine) version;
         python = python3;
-        inherit (darwin) cctools xnu;
+        inherit (darwin) xnu;
         inherit (darwin.apple_sdk_11_0) libpm libunwind;
         inherit (darwin.apple_sdk_11_0.libs) sandbox;
         inherit (darwin.apple_sdk_11_0.frameworks) ApplicationServices AVFoundation Foundation ForceFeedback GameController AppKit
diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtspeech.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtspeech.nix
index 94e66cf400..17bc16dab4 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtspeech.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/qt-5/modules/qtspeech.nix
@@ -1,9 +1,9 @@
-{ lib, qtModule, stdenv, speechd, pkg-config }:
+{ lib, qtModule, stdenv, speechd-minimal, pkg-config }:
 
 qtModule {
   pname = "qtspeech";
   propagatedBuildInputs = [ ];
-  buildInputs = lib.optionals stdenv.isLinux [ speechd ];
+  buildInputs = lib.optionals stdenv.isLinux [ speechd-minimal ];
   nativeBuildInputs = [ pkg-config ];
   outputs = [ "out" "dev" ];
 }
diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-6/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-6/default.nix
index c724bd21d1..83f9268624 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/qt-6/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/qt-6/default.nix
@@ -152,7 +152,7 @@ let
       qtwayland = callPackage ./modules/qtwayland.nix { };
       qtwebchannel = callPackage ./modules/qtwebchannel.nix { };
       qtwebengine = callPackage ./modules/qtwebengine.nix {
-        inherit (darwin) autoSignDarwinBinariesHook bootstrap_cmds cctools xnu;
+        inherit (darwin) autoSignDarwinBinariesHook bootstrap_cmds xnu;
         inherit (darwin.apple_sdk_11_0) libpm libunwind;
         inherit (darwin.apple_sdk_11_0.libs) sandbox;
         inherit (darwin.apple_sdk_11_0.frameworks)
diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-6/modules/qtspeech.nix b/third_party/nixpkgs/pkgs/development/libraries/qt-6/modules/qtspeech.nix
index 15672de8b9..3fbfa6e5d9 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/qt-6/modules/qtspeech.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/qt-6/modules/qtspeech.nix
@@ -6,14 +6,14 @@
 , pkg-config
 , flite
 , alsa-lib
-, speechd
+, speechd-minimal
 , Cocoa
 }:
 
 qtModule {
   pname = "qtspeech";
   nativeBuildInputs = [ pkg-config ];
-  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ flite alsa-lib speechd ];
+  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ flite alsa-lib speechd-minimal ];
   propagatedBuildInputs = [ qtbase qtmultimedia ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [ Cocoa ];
 }
diff --git a/third_party/nixpkgs/pkgs/development/libraries/range-v3/default.nix b/third_party/nixpkgs/pkgs/development/libraries/range-v3/default.nix
index 9b9c2bd39d..3ef599887e 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/range-v3/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/rapidcheck/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rapidcheck/default.nix
index ad8252f48e..ce369eb6ff 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/rapidcheck/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/rapidjson/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rapidjson/default.nix
index edd427da72..9aa2394585 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/rapidjson/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/rapidjson/default.nix
@@ -1,65 +1,79 @@
 { lib
 , stdenv
 , fetchFromGitHub
-, fetchpatch
-, pkg-config
 , cmake
+, doxygen
+, graphviz
 , gtest
 , valgrind
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "rapidjson";
-  version = "1.1.0";
+  version = "unstable-2024-04-09";
+
+  outputs = [
+    "out"
+    "doc"
+  ];
 
   src = fetchFromGitHub {
     owner = "Tencent";
     repo = "rapidjson";
-    rev = "v${version}";
-    sha256 = "1jixgb8w97l9gdh3inihz7avz7i770gy2j2irvvlyrq3wi41f5ab";
+    rev = "ab1842a2dae061284c0a62dca1cc6d5e7e37e346";
+    hash = "sha256-kAGVJfDHEUV2qNR1LpnWq3XKBJy4hD3Swh6LX5shJpM=";
   };
 
   patches = [
-    (fetchpatch {
-      url = "https://src.fedoraproject.org/rpms/rapidjson/raw/48402da9f19d060ffcd40bf2b2e6987212c58b0c/f/rapidjson-1.1.0-c++20.patch";
-      sha256 = "1qm62iad1xfsixv1li7qy475xc7gc04hmi2q21qdk6l69gk7mf82";
-    })
-    (fetchpatch {
-      name = "do-not-include-gtest-src-dir.patch";
-      url = "https://git.alpinelinux.org/aports/plain/community/rapidjson/do-not-include-gtest-src-dir.patch?id=9e5eefc7a5fcf5938a8dc8a3be8c75e9e6809909";
-      hash = "sha256-BjSZEwfCXA/9V+kxQ/2JPWbc26jQn35CfN8+8NW24s4=";
-    })
-    # One of these three tests reports memcpy overlap after update to glibc-2.38
-    ./test-skip-valgrind.diff
+    ./use-nixpkgs-gtest.patch
+    # https://github.com/Tencent/rapidjson/issues/2214
+    ./suppress-valgrind-failures.patch
   ];
 
   postPatch = ''
-    find -name CMakeLists.txt | xargs \
-      sed -i -e "s/-Werror//g" -e "s/-march=native//g"
+    for f in doc/Doxyfile.*; do
+      substituteInPlace $f \
+        --replace-fail "WARN_IF_UNDOCUMENTED   = YES" "WARN_IF_UNDOCUMENTED   = NO"
+    done
   '';
 
-  nativeBuildInputs = [ pkg-config cmake ];
-
-  # for tests, adding gtest to checkInputs does not work
-  # https://github.com/NixOS/nixpkgs/pull/212200
-  buildInputs = [ gtest ];
-  cmakeFlags = [
-    "-DGTEST_SOURCE_DIR=${gtest.dev}/include"
-
-    # Build rapidjson with std=c++17 so gtest 1.13.0+ works
-    # https://github.com/NixOS/nixpkgs/pull/282245#issuecomment-1951796902
-    "-DRAPIDJSON_BUILD_CXX11=OFF"
-    "-DRAPIDJSON_BUILD_CXX17=ON"
+  nativeBuildInputs = [
+    cmake
+    doxygen
+    graphviz
   ];
 
-  nativeCheckInputs = [ valgrind ];
-  doCheck = !stdenv.hostPlatform.isStatic && !stdenv.isDarwin;
+  buildInputs = [
+    gtest
+  ];
+
+  strictDeps = true;
+
+  cmakeFlags = [
+    (lib.cmakeBool "RAPIDJSON_BUILD_DOC" true)
+    (lib.cmakeBool "RAPIDJSON_BUILD_TESTS" true)
+    (lib.cmakeBool "RAPIDJSON_BUILD_EXAMPLES" true)
+    # gtest 1.13+ requires C++14 or later.
+    (lib.cmakeBool "RAPIDJSON_BUILD_CXX11" false)
+    (lib.cmakeBool "RAPIDJSON_BUILD_CXX17" true)
+    # Prevent -march=native
+    (lib.cmakeBool "RAPIDJSON_ENABLE_INSTRUMENTATION_OPT" false)
+    # Disable -Werror by using build type specific flags, which are
+    # added after general CMAKE_CXX_FLAGS.
+    (lib.cmakeFeature "CMAKE_CXX_FLAGS_RELEASE" "-Wno-error")
+  ];
+
+  doCheck = !(stdenv.hostPlatform.isStatic || stdenv.isDarwin);
+
+  nativeCheckInputs = [
+    valgrind
+  ];
 
   meta = with lib; {
     description = "Fast JSON parser/generator for C++ with both SAX/DOM style API";
     homepage = "http://rapidjson.org/";
     license = licenses.mit;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ dotlambda ];
+    maintainers = with maintainers; [ dotlambda Madouura tobim ];
   };
-}
+})
diff --git a/third_party/nixpkgs/pkgs/development/libraries/rapidjson/0001-unstable-valgrind-suppress-failures.patch b/third_party/nixpkgs/pkgs/development/libraries/rapidjson/suppress-valgrind-failures.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/development/libraries/rapidjson/0001-unstable-valgrind-suppress-failures.patch
rename to third_party/nixpkgs/pkgs/development/libraries/rapidjson/suppress-valgrind-failures.patch
diff --git a/third_party/nixpkgs/pkgs/development/libraries/rapidjson/test-skip-valgrind.diff b/third_party/nixpkgs/pkgs/development/libraries/rapidjson/test-skip-valgrind.diff
deleted file mode 100644
index a791d88699..0000000000
--- a/third_party/nixpkgs/pkgs/development/libraries/rapidjson/test-skip-valgrind.diff
+++ /dev/null
@@ -1,7 +0,0 @@
---- a/test/unittest/CMakeLists.txt
-+++ b/test/unittest/CMakeLists.txt
-@@ -82,3 +81,0 @@
--    add_test(NAME valgrind_unittest
--        COMMAND valgrind --leak-check=full --error-exitcode=1 ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/unittest --gtest_filter=-SIMD.*
--        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/bin)
-
diff --git a/third_party/nixpkgs/pkgs/development/libraries/rapidjson/unstable.nix b/third_party/nixpkgs/pkgs/development/libraries/rapidjson/unstable.nix
deleted file mode 100644
index fd7ffe61ba..0000000000
--- a/third_party/nixpkgs/pkgs/development/libraries/rapidjson/unstable.nix
+++ /dev/null
@@ -1,80 +0,0 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, cmake
-, doxygen
-, graphviz
-, gtest
-, valgrind
-, buildDocs ? true
-, buildTests ? !stdenv.hostPlatform.isStatic && !stdenv.isDarwin
-, buildExamples ? true
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "rapidjson";
-  version = "unstable-2023-09-28";
-
-  outputs = [
-    "out"
-  ] ++ lib.optionals buildDocs [
-    "doc"
-  ] ++ lib.optionals buildExamples [
-    "example"
-  ];
-
-  src = fetchFromGitHub {
-    owner = "Tencent";
-    repo = "rapidjson";
-    rev = "f9d53419e912910fd8fa57d5705fa41425428c35";
-    hash = "sha256-rl7iy14jn1K2I5U2DrcZnoTQVEGEDKlxmdaOCF/3hfY=";
-  };
-
-  patches = lib.optionals buildTests [
-    ./0000-unstable-use-nixpkgs-gtest.patch
-    # https://github.com/Tencent/rapidjson/issues/2214
-    ./0001-unstable-valgrind-suppress-failures.patch
-  ];
-
-  nativeBuildInputs = [
-    cmake
-  ] ++ lib.optionals buildDocs [
-    doxygen
-    graphviz
-  ];
-
-  cmakeFlags = [
-    (lib.cmakeBool "RAPIDJSON_BUILD_DOC" buildDocs)
-    (lib.cmakeBool "RAPIDJSON_BUILD_TESTS" buildTests)
-    (lib.cmakeBool "RAPIDJSON_BUILD_EXAMPLES" buildExamples)
-    # gtest 1.13+ requires C++14 or later.
-    (lib.cmakeBool "RAPIDJSON_BUILD_CXX11" false)
-    (lib.cmakeBool "RAPIDJSON_BUILD_CXX17" true)
-  ] ++ lib.optionals buildTests [
-    (lib.cmakeFeature "GTEST_INCLUDE_DIR" "${lib.getDev gtest}")
-  ];
-
-  doCheck = buildTests;
-
-  nativeCheckInputs = [
-    gtest
-    valgrind
-  ];
-
-  postInstall = lib.optionalString buildExamples ''
-    mkdir -p $example/bin
-
-    find bin -type f -executable \
-      -not -name "perftest" \
-      -not -name "unittest" \
-      -exec cp -a {} $example/bin \;
-  '';
-
-  meta = with lib; {
-    description = "Fast JSON parser/generator for C++ with both SAX/DOM style API";
-    homepage = "http://rapidjson.org/";
-    license = licenses.mit;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ Madouura ];
-  };
-})
diff --git a/third_party/nixpkgs/pkgs/development/libraries/rapidjson/0000-unstable-use-nixpkgs-gtest.patch b/third_party/nixpkgs/pkgs/development/libraries/rapidjson/use-nixpkgs-gtest.patch
similarity index 62%
rename from third_party/nixpkgs/pkgs/development/libraries/rapidjson/0000-unstable-use-nixpkgs-gtest.patch
rename to third_party/nixpkgs/pkgs/development/libraries/rapidjson/use-nixpkgs-gtest.patch
index df334cc912..878182ea5a 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/rapidjson/0000-unstable-use-nixpkgs-gtest.patch
+++ b/third_party/nixpkgs/pkgs/development/libraries/rapidjson/use-nixpkgs-gtest.patch
@@ -1,28 +1,33 @@
+From b9206d360c19412d185263795d67c884feab281a Mon Sep 17 00:00:00 2001
+From: Tobias Mayer <tobim@fastmail.fm>
+Date: Mon, 29 Jul 2024 07:26:50 +0200
+Subject: [PATCH] Use nixpkgs gtest
+
+---
+ test/CMakeLists.txt | 24 ++++++------------------
+ 1 file changed, 6 insertions(+), 18 deletions(-)
+
 diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
-index 11c1b04c..762eaa75 100644
+index 11c1b04c..3d02d475 100644
 --- a/test/CMakeLists.txt
 +++ b/test/CMakeLists.txt
-@@ -1,20 +1,14 @@
+@@ -1,20 +1,8 @@
 -find_package(GTestSrc)
++find_package(GTest REQUIRED)
 +enable_testing()
  
 -IF(GTESTSRC_FOUND)
 -    enable_testing()
-+if (WIN32 AND (NOT CYGWIN) AND (NOT MINGW))
-+    set(gtest_disable_pthreads ON)
-+    set(gtest_force_shared_crt ON)
-+endif()
++set(TEST_LIBRARIES GTest::gtest GTest::gtest_main)
  
 -    if (WIN32 AND (NOT CYGWIN) AND (NOT MINGW))
 -        set(gtest_disable_pthreads ON)
 -        set(gtest_force_shared_crt ON)
 -    endif()
-+include_directories(SYSTEM ${GTEST_INCLUDE_DIR})
- 
+-
 -    add_subdirectory(${GTEST_SOURCE_DIR} ${CMAKE_BINARY_DIR}/googletest)
 -    include_directories(SYSTEM ${GTEST_INCLUDE_DIR})
-+set(TEST_LIBRARIES gtest gtest_main)
- 
+-
 -    set(TEST_LIBRARIES gtest gtest_main)
 -
 -    add_custom_target(tests ALL)
@@ -33,3 +38,6 @@ index 11c1b04c..762eaa75 100644
 +add_custom_target(tests ALL)
 +add_subdirectory(perftest)
 +add_subdirectory(unittest)
+-- 
+2.45.2
+
diff --git a/third_party/nixpkgs/pkgs/development/libraries/rapidxml/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rapidxml/default.nix
index 1b20f76eaa..c433f32728 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/rapidxml/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/rapidyaml/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rapidyaml/default.nix
index e67719d142..0ba51a8689 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/rapidyaml/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/raylib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/raylib/default.nix
index 47823f45ef..944896d1cf 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/raylib/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/re2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/re2/default.nix
index 09d2f7539f..278d63702e 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/re2/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/re2/default.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "re2";
-  version = "2024-06-01";
+  version = "2024-07-02";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "re2";
     rev = finalAttrs.version;
-    hash = "sha256-iQETsjdIFcYM5I/W8ytvV3z/4va6TaZ/+KkSjb8CtF0=";
+    hash = "sha256-IeANwJlJl45yf8iu/AZNDoiyIvTCZIeK1b74sdCfAIc=";
   };
 
   outputs = [
@@ -36,20 +36,19 @@ stdenv.mkDerivation (finalAttrs: {
     ninja
   ];
 
-  buildInputs = lib.optionals finalAttrs.doCheck [
+  buildInputs = [
     gbenchmark
     gtest
   ];
 
-  propagatedBuildInputs = [
-    abseil-cpp
-    icu
-  ];
+  propagatedBuildInputs = [ abseil-cpp ] ++ lib.optionals (!stdenv.hostPlatform.isStatic) [ icu ];
 
-  cmakeFlags = [
-    (lib.cmakeBool "RE2_BUILD_TESTING" finalAttrs.doCheck)
-    (lib.cmakeBool "RE2_USE_ICU" true)
-  ] ++ lib.optional (!stdenv.hostPlatform.isStatic) (lib.cmakeBool "BUILD_SHARED_LIBS" true);
+  cmakeFlags =
+    [ (lib.cmakeBool "RE2_BUILD_TESTING" true) ]
+    ++ lib.optionals (!stdenv.hostPlatform.isStatic) [
+      (lib.cmakeBool "RE2_USE_ICU" true)
+      (lib.cmakeBool "BUILD_SHARED_LIBS" true)
+    ];
 
   doCheck = true;
 
diff --git a/third_party/nixpkgs/pkgs/development/libraries/rinutils/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rinutils/default.nix
index c7f5303c5b..45b9f299aa 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/rinutils/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/rtlcss/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rtlcss/default.nix
index 327e7b2626..4143e649ea 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/rtlcss/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/s2n-tls/default.nix b/third_party/nixpkgs/pkgs/development/libraries/s2n-tls/default.nix
index d4a440e587..73148c5069 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/s2n-tls/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/s2n-tls/default.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   pname = "s2n-tls";
-  version = "1.4.16";
+  version = "1.4.17";
 
   src = fetchFromGitHub {
     owner = "aws";
-    repo = pname;
+    repo = "s2n-tls";
     rev = "v${version}";
-    hash = "sha256-HkpOd05/5YIDsBm4L3hLuI0obm7uAwsV1dC2/e2f5aw=";
+    hash = "sha256-Go6p+6VidsoN7IMfBp7BMGnIcttaEA0q3CRAKDO5b+c=";
   };
 
   nativeBuildInputs = [ cmake ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/openmm/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/openmm/default.nix
index f23f59ed5d..35aa46d270 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/openmm/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/science/chemistry/openmm/default.nix
@@ -14,7 +14,7 @@
 , config
 , enableCuda ? config.cudaSupport
 , cudaPackages
-, addOpenGLRunpath
+, addDriverRunpath
 }:
 
 stdenv.mkDerivation rec {
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
     python3Packages.build
     python3Packages.installer
     python3Packages.wheel
-  ] ++ lib.optional enableCuda addOpenGLRunpath;
+  ] ++ lib.optional enableCuda addDriverRunpath;
 
   buildInputs = [ fftwSinglePrec ]
     ++ lib.optionals enableOpencl [ ocl-icd opencl-headers ]
@@ -94,7 +94,7 @@ stdenv.mkDerivation rec {
 
   postFixup = ''
     for lib in $out/lib/plugins/*CUDA.so $out/lib/plugins/*Cuda*.so; do
-      addOpenGLRunpath "$lib"
+      addDriverRunpath "$lib"
     done
   '';
 
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/clblas/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/clblas/default.nix
index e5ad0e3e63..910c40a4e0 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/science/math/clblas/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/clblas/default.nix
@@ -42,10 +42,9 @@ stdenv.mkDerivation rec {
      "-DBUILD_TEST=OFF"
   ];
 
-  nativeBuildInputs = [ cmake gfortran ];
+  nativeBuildInputs = [ cmake gfortran python3 ];
   buildInputs = [
     blas
-    python3
     boost
   ] ++ lib.optionals (!stdenv.isDarwin) [
     ocl-icd
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/faiss/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/faiss/default.nix
index 9b7b4d2681..9d0dea3ff6 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/science/math/faiss/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/faiss/default.nix
@@ -1,32 +1,33 @@
-{ lib
-, config
-, fetchFromGitHub
-, fetchpatch2
-, stdenv
-, cmake
-, cudaPackages ? { }
-, cudaSupport ? config.cudaSupport
-, pythonSupport ? true
-, pythonPackages
-, llvmPackages
-, blas
-, swig
-, addOpenGLRunpath
-, optLevel ? let
-    optLevels =
-      lib.optionals stdenv.hostPlatform.avx2Support [ "avx2" ]
-      ++ lib.optionals stdenv.hostPlatform.sse4_1Support [ "sse4" ]
-      ++ [ "generic" ];
-  in
-  # Choose the maximum available optimization level
-  builtins.head optLevels
-, faiss # To run demos in the tests
-, runCommand
+{
+  lib,
+  config,
+  fetchFromGitHub,
+  stdenv,
+  cmake,
+  cudaPackages ? { },
+  cudaSupport ? config.cudaSupport,
+  pythonSupport ? true,
+  pythonPackages,
+  llvmPackages,
+  blas,
+  swig,
+  autoAddDriverRunpath,
+  optLevel ?
+    let
+      optLevels =
+        lib.optionals stdenv.hostPlatform.avx2Support [ "avx2" ]
+        ++ lib.optionals stdenv.hostPlatform.sse4_1Support [ "sse4" ]
+        ++ [ "generic" ];
+    in
+    # Choose the maximum available optimization level
+    builtins.head optLevels,
+  faiss, # To run demos in the tests
+  runCommand,
 }@inputs:
 
 let
   pname = "faiss";
-  version = "1.7.4";
+  version = "1.8.0";
 
   inherit (cudaPackages) flags backendStdenv;
 
@@ -45,65 +46,67 @@ in
 stdenv.mkDerivation {
   inherit pname version;
 
-  outputs = [ "out" "demos" ];
+  outputs = [
+    "out"
+    "demos"
+    "dist"
+  ];
 
   src = fetchFromGitHub {
     owner = "facebookresearch";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-WSce9X6sLZmGM5F0ZkK54VqpIy8u1VB0e9/l78co29M=";
+    hash = "sha256-nS8nhkNGGb2oAJKfr/MIAZjAwMxBGbNd16/CkEtv67I=";
   };
 
-  patches = [
-    (fetchpatch2 {
-      # Replace distutils with packaging for version checks
-      url = "https://github.com/facebookresearch/faiss/commit/c540e762ca0ecf8f43da0bfc215da148c5cf420e.patch";
-      includes = [ "faiss/python/loader.py" ];
-      hash = "sha256-yMHAXo0+oDXknSpv1fxUgil3R/WG1+vTLyxvwVR3VtE=";
-    })
-  ];
+  # Remove the following substituteInPlace when updating
+  # to a release that contains change from PR
+  # https://github.com/facebookresearch/faiss/issues/3239
+  # that fixes building faiss with swig 4.2.x
+  postPatch = ''
+    substituteInPlace faiss/python/swigfaiss.swig \
+      --replace-fail '#ifdef SWIGWORDSIZE64' '#if (__SIZEOF_LONG__ == 8)'
+  '';
 
-  buildInputs = [
-    blas
-    swig
-  ] ++ lib.optionals pythonSupport [
-    pythonPackages.setuptools
-    pythonPackages.pip
-    pythonPackages.wheel
-  ] ++ lib.optionals stdenv.cc.isClang [
-    llvmPackages.openmp
-  ] ++ lib.optionals cudaSupport cudaComponents;
+  nativeBuildInputs =
+    [ cmake ]
+    ++ lib.optionals cudaSupport [
+      cudaPackages.cuda_nvcc
+      autoAddDriverRunpath
+    ]
+    ++ lib.optionals pythonSupport [
+      pythonPackages.python
+      pythonPackages.setuptools
+      pythonPackages.pip
+      pythonPackages.wheel
+    ];
 
-  propagatedBuildInputs = lib.optionals pythonSupport [
-    pythonPackages.numpy
-    pythonPackages.packaging
-  ];
+  buildInputs =
+    [
+      blas
+      swig
+    ]
+    ++ lib.optionals pythonSupport [ pythonPackages.numpy ]
+    ++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ]
+    ++ lib.optionals cudaSupport cudaComponents;
 
-  nativeBuildInputs = [ cmake ] ++ lib.optionals cudaSupport [
-    cudaPackages.cuda_nvcc
-    addOpenGLRunpath
-  ] ++ lib.optionals pythonSupport [
-    pythonPackages.python
-  ];
+  cmakeFlags =
+    [
+      (lib.cmakeBool "FAISS_ENABLE_GPU" cudaSupport)
+      (lib.cmakeBool "FAISS_ENABLE_PYTHON" pythonSupport)
+      (lib.cmakeFeature "FAISS_OPT_LEVEL" optLevel)
+    ]
+    ++ lib.optionals cudaSupport [
+      (lib.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" flags.cmakeCudaArchitecturesString)
+    ];
 
-  passthru.extra-requires.all = [
-    pythonPackages.numpy
-  ];
-
-  cmakeFlags = [
-    "-DFAISS_ENABLE_GPU=${if cudaSupport then "ON" else "OFF"}"
-    "-DFAISS_ENABLE_PYTHON=${if pythonSupport then "ON" else "OFF"}"
-    "-DFAISS_OPT_LEVEL=${optLevel}"
-  ] ++ lib.optionals cudaSupport [
-    "-DCMAKE_CUDA_ARCHITECTURES=${flags.cmakeCudaArchitecturesString}"
-  ];
-
-  buildFlags = [
-    "faiss"
-    "demo_ivfpq_indexing"
-  ] ++ lib.optionals pythonSupport [
-    "swigfaiss"
-  ];
+  buildFlags =
+    [ "faiss" ]
+    # This is just a demo app used as a test.
+    # Disabled because linkage fails:
+    # https://github.com/facebookresearch/faiss/issues/3484
+    ++ lib.optionals (!cudaSupport) [ "demo_ivfpq_indexing" ]
+    ++ lib.optionals pythonSupport [ "swigfaiss" ];
 
   # pip wheel->pip install commands copied over from opencv4
 
@@ -112,36 +115,30 @@ stdenv.mkDerivation {
      python -m pip wheel --verbose --no-index --no-deps --no-clean --no-build-isolation --wheel-dir dist .)
   '';
 
-  postInstall = ''
-    mkdir -p $demos/bin
-    cp ./demos/demo_ivfpq_indexing $demos/bin/
-  '' + lib.optionalString pythonSupport ''
-    mkdir -p $out/${pythonPackages.python.sitePackages}
-    (cd faiss/python && python -m pip install dist/*.whl --no-index --no-warn-script-location --prefix="$out" --no-cache)
-  '';
-
-  postFixup = lib.optionalString (pythonSupport && cudaSupport) ''
-    addOpenGLRunpath $out/${pythonPackages.python.sitePackages}/faiss/*.so
-    addOpenGLRunpath $demos/bin/*
-  '';
-
-  # Need buildPythonPackage for this one
-  # pythonImportsCheck = [
-  #   "faiss"
-  # ];
+  postInstall =
+    ''
+      mkdir -p $demos/bin
+      if [[ "$buildInputs" == *demo_ivfpq_indexing* ]] ; then
+        cp ./demos/demo_ivfpq_indexing $demos/bin/
+      fi
+    ''
+    + lib.optionalString pythonSupport ''
+      mkdir "$dist"
+      cp faiss/python/dist/*.whl "$dist/"
+    '';
 
   passthru = {
     inherit cudaSupport cudaPackages pythonSupport;
 
     tests = {
-      runDemos = runCommand "${pname}-run-demos"
-        { buildInputs = [ faiss.demos ]; }
-        # There are more demos, we run just the one that documentation mentions
-        ''
-          demo_ivfpq_indexing && touch $out
-        '';
-    } // lib.optionalAttrs pythonSupport {
-      pytest = pythonPackages.callPackage ./tests.nix { };
+      runDemos =
+        runCommand "${pname}-run-demos" { buildInputs = [ faiss.demos ]; }
+          # There are more demos, we run just the one that documentation mentions
+          ''
+            demo_ivfpq_indexing && touch $out
+          '';
+      pythonFaiss = pythonPackages.faiss;
+      pytest = pythonPackages.faiss.tests.pytest;
     };
   };
 
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/itpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/itpp/default.nix
index d2f6b1ee8a..a1a1ed8a69 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/science/math/itpp/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/bin.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/bin.nix
index 8e77ac25dd..92050cd172 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/bin.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/libtorch/bin.nix
@@ -6,7 +6,7 @@
 , llvmPackages
 , config
 
-, addOpenGLRunpath
+, addDriverRunpath
 , patchelf
 , fixDarwinDylibNames
 
@@ -32,7 +32,7 @@ in stdenv.mkDerivation {
 
   nativeBuildInputs =
     if stdenv.isDarwin then [ fixDarwinDylibNames ]
-    else [ patchelf ] ++ lib.optionals cudaSupport [ addOpenGLRunpath ];
+    else [ patchelf ] ++ lib.optionals cudaSupport [ addDriverRunpath ];
 
   dontBuild = true;
   dontConfigure = true;
@@ -65,7 +65,7 @@ in stdenv.mkDerivation {
       echo "setting rpath for $lib..."
       patchelf --set-rpath "${rpath}:$out/lib" "$lib"
       ${lib.optionalString cudaSupport ''
-        addOpenGLRunpath "$lib"
+        addDriverRunpath "$lib"
       ''}
     done
   '' + lib.optionalString stdenv.isDarwin ''
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/mkl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/mkl/default.nix
index 90e6c05da7..607b6c89e4 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/science/math/mkl/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/mkl/default.nix
@@ -5,7 +5,7 @@
 , fetchurl
 , rpmextract
 , _7zz
-, darwin
+, cctools
 , validatePkgConfig
 , enableStatic ? stdenv.hostPlatform.isStatic
 }:
@@ -72,7 +72,7 @@ in stdenvNoCC.mkDerivation ({
 
   nativeBuildInputs = [ validatePkgConfig ] ++ (if stdenvNoCC.isDarwin
     then
-      [ _7zz darwin.cctools ]
+      [ _7zz cctools ]
     else
       [ rpmextract ]);
 
diff --git a/third_party/nixpkgs/pkgs/development/libraries/scmccid/default.nix b/third_party/nixpkgs/pkgs/development/libraries/scmccid/default.nix
index daa861b31e..73fb6a6dcf 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/scmccid/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/scmccid/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
     description = "PCSC drivers for linux, for the SCM SCR3310 v2.0 card and others";
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     license = lib.licenses.unfree;
-    maintainers = with lib.maintainers; [viric];
+    maintainers = [ ];
     platforms = with lib.platforms; linux;
   };
 }
diff --git a/third_party/nixpkgs/pkgs/development/libraries/sope/default.nix b/third_party/nixpkgs/pkgs/development/libraries/sope/default.nix
index f8f1af00fe..89372fca3f 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/sope/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/soqt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/soqt/default.nix
index 3ce5f8e7be..14ff1ee135 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/soqt/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/soqt/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/coin3d/soqt";
     license = licenses.bsd3;
     description = "Glue between Coin high-level 3D visualization library and Qt";
-    maintainers = with maintainers; [ gebner viric ];
+    maintainers = with maintainers; [ gebner ];
     platforms = platforms.linux;
   };
 }
diff --git a/third_party/nixpkgs/pkgs/development/libraries/speechd/default.nix b/third_party/nixpkgs/pkgs/development/libraries/speechd/default.nix
index 9b44c8e46d..b0472e1b00 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/speechd/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/speechd/default.nix
@@ -21,6 +21,7 @@
 , withEspeak ? true, espeak, sonic, pcaudiolib
 , mbrola
 , withPico ? true, svox
+, libsOnly ? false
 }:
 
 let
@@ -101,14 +102,16 @@ in stdenv.mkDerivation rec {
     substituteInPlace src/modules/pico.c --replace "/usr/share/pico/lang" "${svox}/share/pico/lang"
   '';
 
-  postInstall = ''
+  postInstall = if libsOnly then ''
+    rm -rf $out/{bin,etc,lib/speech-dispatcher,lib/systemd,libexec,share}
+  '' else ''
     wrapPythonPrograms
   '';
 
   enableParallelBuilding = true;
 
   meta = with lib; {
-    description = "Common interface to speech synthesis";
+    description = "Common interface to speech synthesis" + lib.optionalString libsOnly " - client libraries only";
     homepage = "https://devel.freebsoft.org/speechd";
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [
@@ -116,5 +119,6 @@ in stdenv.mkDerivation rec {
       jtojnar
     ];
     platforms = platforms.linux;
+    mainProgram = "speech-dispatcher";
   };
 }
diff --git a/third_party/nixpkgs/pkgs/development/libraries/sqlcipher/default.nix b/third_party/nixpkgs/pkgs/development/libraries/sqlcipher/default.nix
index af7848cdf8..c5dc183dd1 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/sqlcipher/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/sqlite/default.nix b/third_party/nixpkgs/pkgs/development/libraries/sqlite/default.nix
index f7a870e276..f2de9320ce 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/sqlite/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/sqlite/default.nix
@@ -16,13 +16,13 @@ in
 
 stdenv.mkDerivation rec {
   pname = "sqlite${lib.optionalString interactive "-interactive"}";
-  version = "3.45.3";
+  version = "3.46.0";
 
   # nixpkgs-update: no auto update
   # NB! Make sure to update ./tools.nix src (in the same directory).
   src = fetchurl {
     url = "https://sqlite.org/2024/sqlite-autoconf-${archiveVersion version}.tar.gz";
-    hash = "sha256-soCcpTEkwZxg9Cv2J3NurgEa/cwgW7SCcKXumjgZFTE=";
+    hash = "sha256-b45qezNSc3SIFvmztiu9w3Koid6HgtfwSMZTpEdBen0=";
   };
 
   outputs = [ "bin" "dev" "out" ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/sqlite/tools.nix b/third_party/nixpkgs/pkgs/development/libraries/sqlite/tools.nix
index 0f6fe766a3..2b843c0b22 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/sqlite/tools.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/sqlite/tools.nix
@@ -4,12 +4,12 @@ let
   archiveVersion = import ./archive-version.nix lib;
   mkTool = { pname, makeTarget, description, homepage, mainProgram }: stdenv.mkDerivation rec {
     inherit pname;
-    version = "3.45.3";
+    version = "3.46.0";
 
     # nixpkgs-update: no auto update
     src = assert version == sqlite.version; fetchurl {
       url = "https://sqlite.org/2024/sqlite-src-${archiveVersion version}.zip";
-      hash = "sha256-7AyVnkLLXxgEE10FVfjqMr5v8gSOsYG8zTZ8j1PxhdE=";
+      hash = "sha256-BwNiEJvraJn2V5dXG5i4gkyPQ39bKSb4juBo2Y7zaOw=";
     };
 
     nativeBuildInputs = [ unzip ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/sregex/default.nix b/third_party/nixpkgs/pkgs/development/libraries/sregex/default.nix
index f69e09c887..58ef91c319 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/sregex/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/stb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/stb/default.nix
index f96bb0724b..5e3cc62ea4 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/stb/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/stxxl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/stxxl/default.nix
index a11544dd78..5d58212d70 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/stxxl/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/tk/generic.nix b/third_party/nixpkgs/pkgs/development/libraries/tk/generic.nix
index 2e2f411502..4978f8b96f 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/tk/generic.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/tl-expected/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tl-expected/default.nix
index 68550b5ab4..078ae201ea 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/tl-expected/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/ucommon/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ucommon/default.nix
index 09e6e2d6a0..4ee7a90dd3 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/ucommon/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/uhttpmock/default.nix b/third_party/nixpkgs/pkgs/development/libraries/uhttpmock/default.nix
index d22ff81c25..710979057d 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/uhttpmock/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/umockdev/default.nix b/third_party/nixpkgs/pkgs/development/libraries/umockdev/default.nix
index b7926eecb4..38b36267ef 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/umockdev/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/umockdev/default.nix
@@ -21,13 +21,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "umockdev";
-  version = "0.18.2";
+  version = "0.18.3";
 
   outputs = [ "bin" "out" "dev" "devdoc" ];
 
   src = fetchurl {
     url = "https://github.com/martinpitt/umockdev/releases/download/${finalAttrs.version}/umockdev-${finalAttrs.version}.tar.xz";
-    hash = "sha256-1HKV6IA8bWfgdgMcIlgeP470aIAj1I925ed2qM7IkHM=";
+    hash = "sha256-q6lcMjA3yELxYXkxJgIxuFV9EZqiiRy8qLgR/MVZKUo=";
   };
 
   patches = [
diff --git a/third_party/nixpkgs/pkgs/development/libraries/unittest-cpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/unittest-cpp/default.nix
index 6a6407eb32..04d33b66e5 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/unittest-cpp/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/unittest-cpp/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/unittest-cpp/unittest-cpp";
     description = "Lightweight unit testing framework for C++";
     license = lib.licenses.mit;
-    maintainers = [];
+    maintainers = [ ];
     platforms = lib.platforms.unix;
   };
 }
diff --git a/third_party/nixpkgs/pkgs/development/libraries/vapoursynth/editor.nix b/third_party/nixpkgs/pkgs/development/libraries/vapoursynth/editor.nix
index 88fa1d763f..09ec29e704 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/vapoursynth/editor.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/vigra/default.nix b/third_party/nixpkgs/pkgs/development/libraries/vigra/default.nix
index 4e3aab9a55..7db1d0d491 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/vigra/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/vigra/default.nix
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
     mainProgram = "vigra-config";
     homepage = "https://hci.iwr.uni-heidelberg.de/vigra";
     license = licenses.mit;
-    maintainers = [ maintainers.viric ];
+    maintainers = [ ];
     platforms = platforms.unix;
   };
 }
diff --git a/third_party/nixpkgs/pkgs/development/libraries/vmime/default.nix b/third_party/nixpkgs/pkgs/development/libraries/vmime/default.nix
index c2b585965b..909a9fcbab 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/vmime/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/vmime/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     homepage = "https://www.vmime.org/";
     description = "Free mail library for C++";
     license = lib.licenses.gpl3;
-    maintainers = with lib.maintainers; [viric];
+    maintainers = [ ];
     platforms = with lib.platforms; linux;
   };
 }
diff --git a/third_party/nixpkgs/pkgs/development/libraries/volume-key/default.nix b/third_party/nixpkgs/pkgs/development/libraries/volume-key/default.nix
index ea40b8a27d..b005582b7f 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/volume-key/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/vulkan-loader/default.nix b/third_party/nixpkgs/pkgs/development/libraries/vulkan-loader/default.nix
index 023bba6ee8..97e5131078 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/vulkan-loader/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/vulkan-loader/default.nix
@@ -1,5 +1,5 @@
 { lib, stdenv, fetchFromGitHub, cmake, pkg-config, libX11, libxcb
-, libXrandr, wayland, moltenvk, vulkan-headers, addOpenGLRunpath
+, libXrandr, wayland, moltenvk, vulkan-headers, addDriverRunpath
 , testers }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   cmakeFlags = [ "-DCMAKE_INSTALL_INCLUDEDIR=${vulkan-headers}/include" ]
     ++ lib.optional stdenv.isDarwin "-DSYSCONFDIR=${moltenvk}/share"
-    ++ lib.optional stdenv.isLinux "-DSYSCONFDIR=${addOpenGLRunpath.driverLink}/share"
+    ++ lib.optional stdenv.isLinux "-DSYSCONFDIR=${addDriverRunpath.driverLink}/share"
     ++ lib.optional (stdenv.buildPlatform != stdenv.hostPlatform) "-DUSE_GAS=OFF";
 
   outputs = [ "out" "dev" ];
diff --git a/third_party/nixpkgs/pkgs/development/libraries/vxl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/vxl/default.nix
index 48b075add0..b7173ed937 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/vxl/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/vxl/default.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
     # license appears contradictory; see https://github.com/vxl/vxl/issues/752
     # (and see https://github.com/InsightSoftwareConsortium/ITK/pull/1920/files for potential patch)
     license = [ lib.licenses.unfree ];
-    maintainers = with lib.maintainers; [ viric ];
+    maintainers = [ ];
     platforms = with lib.platforms; linux;
   };
 })
diff --git a/third_party/nixpkgs/pkgs/development/libraries/wayland/darwin.patch b/third_party/nixpkgs/pkgs/development/libraries/wayland/darwin.patch
index 965294dfa5..8300307398 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/wayland/darwin.patch
+++ b/third_party/nixpkgs/pkgs/development/libraries/wayland/darwin.patch
@@ -1,13 +1,13 @@
 diff --git a/meson.build b/meson.build
-index 35c3b95..f27e472 100644
+index 8e28f2a..c8d1dc9 100644
 --- a/meson.build
 +++ b/meson.build
 @@ -16,7 +16,7 @@ config_h.set_quoted('PACKAGE', meson.project_name())
  config_h.set_quoted('PACKAGE_VERSION', meson.project_version())
  
  cc_args = []
--if host_machine.system() != 'freebsd'
-+if host_machine.system() not in ['darwin', 'freebsd']
+-if host_machine.system() not in ['freebsd', 'openbsd']
++if host_machine.system() not in ['darwin', 'freebsd', 'openbsd']
  	cc_args += ['-D_POSIX_C_SOURCE=200809L']
  endif
  add_project_arguments(cc_args, language: 'c')
@@ -24,16 +24,16 @@ index 35c3b95..f27e472 100644
  config_h.set10('HAVE_BROKEN_MSG_CMSG_CLOEXEC', have_broken_msg_cmsg_cloexec)
  
  if get_option('libraries')
--	if host_machine.system() == 'freebsd'
-+	if host_machine.system() in ['darwin', 'freebsd']
+-	if host_machine.system() in ['freebsd', 'openbsd']
++	if host_machine.system() in ['darwin', 'freebsd', 'openbsd']
  		# When building for FreeBSD, epoll(7) is provided by a userspace
  		# wrapper around kqueue(2).
  		epoll_dep = dependency('epoll-shim')
 diff --git a/src/event-loop.c b/src/event-loop.c
-index 37cf95d..49a38cb 100644
+index 45222f7..fb3b464 100644
 --- a/src/event-loop.c
 +++ b/src/event-loop.c
-@@ -48,6 +48,13 @@
+@@ -49,6 +49,13 @@
  
  #define TIMER_REMOVED -2
  
@@ -48,22 +48,22 @@ index 37cf95d..49a38cb 100644
  struct wl_event_source_interface;
  struct wl_event_source_timer;
 diff --git a/src/wayland-os.c b/src/wayland-os.c
-index a9066ca..483fe64 100644
+index f00ead4..4dc01d0 100644
 --- a/src/wayland-os.c
 +++ b/src/wayland-os.c
-@@ -69,17 +69,19 @@ wl_os_socket_cloexec(int domain, int type, int protocol)
+@@ -75,17 +75,19 @@ wl_os_socket_cloexec(int domain, int type, int protocol)
  {
  	int fd;
  
 +#ifdef SOCK_CLOEXEC
- 	fd = socket(domain, type | SOCK_CLOEXEC, protocol);
+ 	fd = wl_socket(domain, type | SOCK_CLOEXEC, protocol);
  	if (fd >= 0)
  		return fd;
  	if (errno != EINVAL)
  		return -1;
 +#endif
  
- 	fd = socket(domain, type, protocol);
+ 	fd = wl_socket(domain, type, protocol);
  	return set_cloexec_or_close(fd);
  }
  
diff --git a/third_party/nixpkgs/pkgs/development/libraries/wayland/default.nix b/third_party/nixpkgs/pkgs/development/libraries/wayland/default.nix
index 8bc53de162..5a78a5c993 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/wayland/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/wayland/default.nix
@@ -34,11 +34,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "wayland";
-  version = "1.22.0";
+  version = "1.23.0";
 
   src = fetchurl {
     url = with finalAttrs; "https://gitlab.freedesktop.org/wayland/wayland/-/releases/${version}/downloads/${pname}-${version}.tar.xz";
-    hash = "sha256-FUCvHqaYpHHC2OnSiDMsfg/TYMjx0Sk267fny8JCWEI=";
+    hash = "sha256-BbPhV00+Z2JrWXT4YvNrW0J8fO65Zcs2pObC00LkWrI=";
   };
 
   patches = [
diff --git a/third_party/nixpkgs/pkgs/development/libraries/wayland/protocols.nix b/third_party/nixpkgs/pkgs/development/libraries/wayland/protocols.nix
index a260b2b63b..ca1e84b1c6 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/wayland/protocols.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/wayland/protocols.nix
@@ -6,14 +6,14 @@
 
 stdenv.mkDerivation rec {
   pname = "wayland-protocols";
-  version = "1.35";
+  version = "1.36";
 
   # https://gitlab.freedesktop.org/wayland/wayland-protocols/-/issues/48
   doCheck = stdenv.hostPlatform == stdenv.buildPlatform && stdenv.hostPlatform.linker == "bfd" && wayland.withLibraries;
 
   src = fetchurl {
     url = "https://gitlab.freedesktop.org/wayland/${pname}/-/releases/${version}/downloads/${pname}-${version}.tar.xz";
-    hash = "sha256-N6JxaigTPcgZNBxWiinSHoy3ITDlwSah/PyfQsI9las=";
+    hash = "sha256-cf1N4F55+aHKVZ+sMMH4Nl+hA0ZCL5/nlfdNd7nvfpI=";
   };
 
   postPatch = lib.optionalString doCheck ''
diff --git a/third_party/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix
index 2b80e05f0d..b1fb3231a2 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/webkitgtk/default.nix
@@ -62,7 +62,7 @@
 , substituteAll
 , glib
 , unifdef
-, addOpenGLRunpath
+, addDriverRunpath
 , enableGeoLocation ? true
 , enableExperimental ? false
 , withLibsecret ? true
@@ -90,7 +90,7 @@ stdenv.mkDerivation (finalAttrs: {
     (substituteAll {
       src = ./fix-bubblewrap-paths.patch;
       inherit (builtins) storeDir;
-      inherit (addOpenGLRunpath) driverLink;
+      inherit (addDriverRunpath) driverLink;
     })
   ];
 
diff --git a/third_party/nixpkgs/pkgs/development/libraries/wfa2-lib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/wfa2-lib/default.nix
index 49db133382..519343ff5a 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/wfa2-lib/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/wlroots/default.nix b/third_party/nixpkgs/pkgs/development/libraries/wlroots/default.nix
index 687a51832f..81b7b9140a 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/wlroots/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/wolfssl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/wolfssl/default.nix
index affe693fe8..c55ad0010d 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/wolfssl/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/wolfssl/default.nix
@@ -10,7 +10,7 @@
 # requiring to build a special variant for that software. Example: 'haproxy'
 , variant ? "all"
 , extraConfigureFlags ? []
-, enableLto ? !(stdenv.isDarwin || stdenv.hostPlatform.isStatic || stdenv.cc.isClang)
+, enableLto ? !(stdenv.hostPlatform.isStatic || stdenv.cc.isClang)
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "wolfssl-${variant}";
diff --git a/third_party/nixpkgs/pkgs/development/libraries/wxsqlite3/default.nix b/third_party/nixpkgs/pkgs/development/libraries/wxsqlite3/default.nix
index 3a414166c7..e986ab87ff 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/wxsqlite3/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/x264/default.nix b/third_party/nixpkgs/pkgs/development/libraries/x264/default.nix
index e46599634d..2be8ea48b8 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/x264/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/x265/default.nix b/third_party/nixpkgs/pkgs/development/libraries/x265/default.nix
index 7f44834d48..9d485f7d6d 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/x265/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/x265/fix-clang-asm.patch b/third_party/nixpkgs/pkgs/development/libraries/x265/fix-clang-asm.patch
new file mode 100644
index 0000000000..6aa5fe2f0a
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/xmlsec/default.nix b/third_party/nixpkgs/pkgs/development/libraries/xmlsec/default.nix
index 2cf0cc3ef8..c0194ed843 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/xmlsec/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/yas/default.nix b/third_party/nixpkgs/pkgs/development/libraries/yas/default.nix
index b06d995007..0dad3fbf76 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/yas/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/yubico-pam/default.nix b/third_party/nixpkgs/pkgs/development/libraries/yubico-pam/default.nix
index 742f581f7e..3af451ec84 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/yubico-pam/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/libraries/zlib-ng/default.nix b/third_party/nixpkgs/pkgs/development/libraries/zlib-ng/default.nix
index c6fa9cb2a2..6abb1b160c 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/zlib-ng/default.nix
+++ b/third_party/nixpkgs/pkgs/development/libraries/zlib-ng/default.nix
@@ -5,13 +5,13 @@
 
 stdenv.mkDerivation rec {
   pname = "zlib-ng";
-  version = "2.1.7";
+  version = "2.2.1";
 
   src = fetchFromGitHub {
     owner = "zlib-ng";
     repo = "zlib-ng";
     rev = version;
-    hash = "sha256-fNebnLeME0HXUx8M7YfTT0aMJQggEmMs9EbJFWL1zC4=";
+    hash = "sha256-XTu4Wo9wQOvXrjDxo3KTpCiy0NsqVnYtCuYsCHP5LFc=";
   };
 
   outputs = [ "out" "dev" "bin" ];
diff --git a/third_party/nixpkgs/pkgs/development/lua-modules/generated-packages.nix b/third_party/nixpkgs/pkgs/development/lua-modules/generated-packages.nix
index b19c2f826e..e99fd42b85 100644
--- a/third_party/nixpkgs/pkgs/development/lua-modules/generated-packages.nix
+++ b/third_party/nixpkgs/pkgs/development/lua-modules/generated-packages.nix
@@ -620,14 +620,14 @@ buildLuarocksPackage {
 haskell-tools-nvim = callPackage({ buildLuarocksPackage, fetchurl, fetchzip, luaOlder }:
 buildLuarocksPackage {
   pname = "haskell-tools.nvim";
-  version = "3.1.10-1";
+  version = "4.0.0-1";
   knownRockspec = (fetchurl {
-    url    = "mirror://luarocks/haskell-tools.nvim-3.1.10-1.rockspec";
-    sha256 = "0s7haq3l29b26x9yj88j4xh70gm9bnnqn4q7qnkrwand3bj9m48q";
+    url    = "mirror://luarocks/haskell-tools.nvim-4.0.0-1.rockspec";
+    sha256 = "1iz7bgy7a0zclsg31rmf6hcrjxnikhqwzh5blirif3m9bdi9mv6v";
   }).outPath;
   src = fetchzip {
-    url    = "https://github.com/mrcjkb/haskell-tools.nvim/archive/3.1.10.zip";
-    sha256 = "1cxfv2f4vvkqmx1k936k476mxsy1yn85blg0qyfsjfagca25ymmv";
+    url    = "https://github.com/mrcjkb/haskell-tools.nvim/archive/4.0.0.zip";
+    sha256 = "0k6kw42n4c2hc7mqjv8ahwcwqia7wdgmszy1np96sc9dd0bkiqx9";
   };
 
   disabled = luaOlder "5.1";
@@ -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/third_party/nixpkgs/pkgs/development/lua-modules/lib.nix b/third_party/nixpkgs/pkgs/development/lua-modules/lib.nix
index dc7cbcc5f7..a527b2e118 100644
--- a/third_party/nixpkgs/pkgs/development/lua-modules/lib.nix
+++ b/third_party/nixpkgs/pkgs/development/lua-modules/lib.nix
@@ -93,7 +93,6 @@ rec {
       externalDeps ? []
     # a list of lua derivations
     , requiredLuaRocks ? []
-    , rocksSubdir ? "rocks-subdir"
     , ...
     }@args: let
       rocksTrees = lib.imap0
@@ -125,9 +124,6 @@ rec {
 
       generatedConfig = ({
 
-        # To prevent collisions when creating environments, we install the rock
-        # files into per-package subdirectories
-        rocks_subdir = rocksSubdir;
 
         # first tree is the default target where new rocks are installed,
         # any other trees in the list are treated as additional sources of installed rocks for matching dependencies.
diff --git a/third_party/nixpkgs/pkgs/development/lua-modules/overrides.nix b/third_party/nixpkgs/pkgs/development/lua-modules/overrides.nix
index 1c9352ae1b..b5b5cf9acd 100644
--- a/third_party/nixpkgs/pkgs/development/lua-modules/overrides.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/misc/loc/default.nix b/third_party/nixpkgs/pkgs/development/misc/loc/default.nix
index 11375b48fe..113bf9e76d 100644
--- a/third_party/nixpkgs/pkgs/development/misc/loc/default.nix
+++ b/third_party/nixpkgs/pkgs/development/misc/loc/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0086asrx48qlmc484pjz5r5znli85q6qgpfbd81gjlzylj7f57gg";
   };
 
-  cargoSha256 = "1qfqhqimp56g34bir30zgl273yssrbmwf1h8h8yvdpzkybpd92gx";
+  cargoHash = "sha256-/YnU7vLz37Y9gggGx+vKWvtxBH0fjBwXGc+UWyOG2OE=";
 
   meta = {
     homepage = "https://github.com/cgag/loc";
diff --git a/third_party/nixpkgs/pkgs/development/mobile/imgpatchtools/default.nix b/third_party/nixpkgs/pkgs/development/mobile/imgpatchtools/default.nix
index ff6dc5656b..737457a646 100644
--- a/third_party/nixpkgs/pkgs/development/mobile/imgpatchtools/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/mobile/titanium-alloy/default.nix b/third_party/nixpkgs/pkgs/development/mobile/titanium-alloy/default.nix
index bb45289e3f..e0e534db5d 100644
--- a/third_party/nixpkgs/pkgs/development/mobile/titanium-alloy/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/mobile/titanium/default.nix b/third_party/nixpkgs/pkgs/development/mobile/titanium/default.nix
index 0318ceeb18..28a92af107 100644
--- a/third_party/nixpkgs/pkgs/development/mobile/titanium/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/mobile/webos/cmake-modules.nix b/third_party/nixpkgs/pkgs/development/mobile/webos/cmake-modules.nix
index 5ee1d58615..81ea134dd2 100644
--- a/third_party/nixpkgs/pkgs/development/mobile/webos/cmake-modules.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/mobile/webos/novacom.nix b/third_party/nixpkgs/pkgs/development/mobile/webos/novacom.nix
index d82e6daeda..e62808ee9b 100644
--- a/third_party/nixpkgs/pkgs/development/mobile/webos/novacom.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/mobile/webos/novacomd.nix b/third_party/nixpkgs/pkgs/development/mobile/webos/novacomd.nix
index 64ec15661c..390b201d93 100644
--- a/third_party/nixpkgs/pkgs/development/mobile/webos/novacomd.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/node-packages/aliases.nix b/third_party/nixpkgs/pkgs/development/node-packages/aliases.nix
index 42ee799db7..5bbe69039d 100644
--- a/third_party/nixpkgs/pkgs/development/node-packages/aliases.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/node-packages/composition.nix b/third_party/nixpkgs/pkgs/development/node-packages/composition.nix
index d9c0daef78..2e54104d7d 100644
--- a/third_party/nixpkgs/pkgs/development/node-packages/composition.nix
+++ b/third_party/nixpkgs/pkgs/development/node-packages/composition.nix
@@ -8,7 +8,7 @@ let
   nodeEnv = import ./node-env.nix {
     inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript;
     inherit pkgs nodejs;
-    libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
+    libtool = if pkgs.stdenv.isDarwin then pkgs.cctools or pkgs.darwin.cctools else null;
   };
 in
 import ./node-packages.nix {
diff --git a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json
index 89836eaf6a..4a23f5a836 100644
--- a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix
index cc7b8f3b24..1613637d8a 100644
--- a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix
+++ b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix
@@ -13,13 +13,13 @@ let
         sha512 = "E3Qku4mTzdrlwVWGPxklDnME5ANrEGetvYw4i2GCRlppWXXE4QD66j7pwb8HelZwS6LnqEChhrSOGCXpbiu6MQ==";
       };
     };
-    "@adobe/css-tools-4.3.2" = {
+    "@adobe/css-tools-4.3.3" = {
       name = "_at_adobe_slash_css-tools";
       packageName = "@adobe/css-tools";
-      version = "4.3.2";
+      version = "4.3.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.3.2.tgz";
-        sha512 = "DA5a1C0gD/pLOvhv33YMrbf2FK3oUzwNl9oOJqE4XVjuEtt6XIakRcsd7eLiOSPkp1kTRQGICTA8cKra/vFbjw==";
+        url = "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.3.3.tgz";
+        sha512 = "rE0Pygv0sEZ4vBWHlAgJLGDU7Pm8xoO6p3wsEceb7GYAjScrOHpEo8KK/eVkAcnSM+slAEtXjA2JpdjLp4fJQQ==";
       };
     };
     "@alcalzone/ansi-tokenize-0.1.3" = {
@@ -49,31 +49,31 @@ let
         sha512 = "30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==";
       };
     };
-    "@angular-devkit/architect-0.1800.4" = {
+    "@angular-devkit/architect-0.1801.2" = {
       name = "_at_angular-devkit_slash_architect";
       packageName = "@angular-devkit/architect";
-      version = "0.1800.4";
+      version = "0.1801.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1800.4.tgz";
-        sha512 = "82TKhYnSO8aGIBo5TxPtyUQnZFcbV+qB2bIIYOAKsJgxAVxLeFD6QA6gTmHOZPXw5pBEPUO/+PUwq+Uk5xesgw==";
+        url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1801.2.tgz";
+        sha512 = "y2rV8wRwTnmCH/dUo632wHi6r41Gs9XucyGm/ybzB/5tN3x6dS+O3c3zajRpdqTUr8YcD6os6sT+Ay6zS31tOw==";
       };
     };
-    "@angular-devkit/core-18.0.4" = {
+    "@angular-devkit/core-18.1.2" = {
       name = "_at_angular-devkit_slash_core";
       packageName = "@angular-devkit/core";
-      version = "18.0.4";
+      version = "18.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@angular-devkit/core/-/core-18.0.4.tgz";
-        sha512 = "8vYvJ5FF2NjFUia00hv8KWakOjOZ+09PbnNqd+lntJBekIg1lHDOF/vNMlVHtU5LiE1aNi9P/69/VXTckPfU9g==";
+        url = "https://registry.npmjs.org/@angular-devkit/core/-/core-18.1.2.tgz";
+        sha512 = "WYkdKT/Ime5seBX7S7S4aWQbgCG5U3otCvAg/XiMn6scexTo3EZe2jrJl8nxGGFHNWrePoD86LvJOxhnCkEKEA==";
       };
     };
-    "@angular-devkit/schematics-18.0.4" = {
+    "@angular-devkit/schematics-18.1.2" = {
       name = "_at_angular-devkit_slash_schematics";
       packageName = "@angular-devkit/schematics";
-      version = "18.0.4";
+      version = "18.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-18.0.4.tgz";
-        sha512 = "hCHmuu/Z1teOQPx1AMJa/gcK6depk+XgU5dIpEvflC+ApW3hglNe2QKaqajDZ+34s+PKAVWa86M8IOV7o/mHuA==";
+        url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-18.1.2.tgz";
+        sha512 = "v8aCJ1tPPzXsdiCoZxkc6YzLGhzJgC/6QauT03/Z6wWo8uI6DKibQQwQBawRE5FN5lKDpuGlNDv40EDtVYkQSA==";
       };
     };
     "@apidevtools/json-schema-ref-parser-9.0.6" = {
@@ -193,22 +193,13 @@ let
         sha512 = "qrXI4+S8W7IF6e1nlDYX2KfdzxGHyAOj5kGvWk+TqBuAnA0rWQ513hJzdviiGpbB5VPnJkEhOVsDets8acKd6w==";
       };
     };
-    "@astrojs/compiler-1.8.2" = {
+    "@astrojs/compiler-2.9.2" = {
       name = "_at_astrojs_slash_compiler";
       packageName = "@astrojs/compiler";
-      version = "1.8.2";
+      version = "2.9.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@astrojs/compiler/-/compiler-1.8.2.tgz";
-        sha512 = "o/ObKgtMzl8SlpIdzaxFnt7SATKPxu4oIP/1NL+HDJRzxfJcAkOTAb/ZKMRyULbz4q+1t2/DAebs2Z1QairkZw==";
-      };
-    };
-    "@astrojs/compiler-2.8.0" = {
-      name = "_at_astrojs_slash_compiler";
-      packageName = "@astrojs/compiler";
-      version = "2.8.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@astrojs/compiler/-/compiler-2.8.0.tgz";
-        sha512 = "yrpD1WRGqsJwANaDIdtHo+YVjvIOFAjC83lu5qENIgrafwZcJgSXDuwVMXOgok4tFzpeKLsFQ6c3FoUdloLWBQ==";
+        url = "https://registry.npmjs.org/@astrojs/compiler/-/compiler-2.9.2.tgz";
+        sha512 = "Vpu0Ffsj8SoV+N0DFHlxxOMKHwSC9059Xy/OlG1t6uFYSoJXxkBC2WyF6igO7x10V+8uJrhOxaXr3nA90kJXow==";
       };
     };
     "@asyncapi/specs-4.3.1" = {
@@ -391,13 +382,13 @@ let
         sha512 = "PI6mjM0fmcV2fqkkRoivF3DYex4lnbEz7WIsOFAwpHJBbA9ykClQpiutCKcgl0x/yEWAeTNdQtrCVeAwbxYfvw==";
       };
     };
-    "@aws-sdk/client-s3-3.598.0" = {
+    "@aws-sdk/client-s3-3.617.0" = {
       name = "_at_aws-sdk_slash_client-s3";
       packageName = "@aws-sdk/client-s3";
-      version = "3.598.0";
+      version = "3.617.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.598.0.tgz";
-        sha512 = "UMxftsgF6j1vzm4Qd9vQJHs2he1NQCWWV8esZfmNFq23OpUC2BPMxkqi13ZQ9tnTAZUNs7yFT/x4Zsi/wpRZEw==";
+        url = "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.617.0.tgz";
+        sha512 = "0f954CU42BhPFVRQCCBc1jAvV9N4XW9I3D4h7tJ8tzxft7fS62MSJkgxRIXNKgWKLeGR7DUbz+XGZ1R5e7pyjA==";
       };
     };
     "@aws-sdk/client-sso-3.296.0" = {
@@ -409,13 +400,13 @@ let
         sha512 = "0P0x++jhlmhzViFPOHvTb7+Z6tSV9aONwB8CchIseg2enSPBbGfml7y5gQu1jdOTDS6pBUmrPZ+9sOI4/GvAfA==";
       };
     };
-    "@aws-sdk/client-sso-3.598.0" = {
+    "@aws-sdk/client-sso-3.616.0" = {
       name = "_at_aws-sdk_slash_client-sso";
       packageName = "@aws-sdk/client-sso";
-      version = "3.598.0";
+      version = "3.616.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.598.0.tgz";
-        sha512 = "nOI5lqPYa+YZlrrzwAJywJSw3MKVjvu6Ge2fCqQUNYMfxFB0NAaDFnl0EPjXi+sEbtCuz/uWE77poHbqiZ+7Iw==";
+        url = "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.616.0.tgz";
+        sha512 = "hwW0u1f8U4dSloAe61/eupUiGd5Q13B72BuzGxvRk0cIpYX/2m0KBG8DDl7jW1b2QQ+CflTLpG2XUf2+vRJxGA==";
       };
     };
     "@aws-sdk/client-sso-oidc-3.296.0" = {
@@ -427,13 +418,13 @@ let
         sha512 = "GRycCVdlFICvWwv9z6Mc/2BvSBOvchWO7UTklvbKXeDn6D05C+02PfxeoocMTc4r8/eFoEQWs67h5u/lPpyHDw==";
       };
     };
-    "@aws-sdk/client-sso-oidc-3.598.0" = {
+    "@aws-sdk/client-sso-oidc-3.616.0" = {
       name = "_at_aws-sdk_slash_client-sso-oidc";
       packageName = "@aws-sdk/client-sso-oidc";
-      version = "3.598.0";
+      version = "3.616.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.598.0.tgz";
-        sha512 = "jfdH1pAO9Tt8Nkta/JJLoUnwl7jaRdxToQTJfUtE+o3+0JP5sA4LfC2rBkJSWcU5BdAA+kyOs5Lv776DlN04Vg==";
+        url = "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.616.0.tgz";
+        sha512 = "YY1hpYS/G1uRGjQf88dL8VLHkP/IjGxKeXdhy+JnzMdCkAWl3V9j0fEALw40NZe0x79gr6R2KUOUH/IKYQfUmg==";
       };
     };
     "@aws-sdk/client-sts-3.296.0" = {
@@ -445,13 +436,13 @@ let
         sha512 = "ew7hSVNpitnLCIRVhnI2L1HZB/yYpRQFReR62fOqCUnpKqm6WGga37bnvgYbY5y0Rv23C0VHARovwunVg1gabA==";
       };
     };
-    "@aws-sdk/client-sts-3.598.0" = {
+    "@aws-sdk/client-sts-3.616.0" = {
       name = "_at_aws-sdk_slash_client-sts";
       packageName = "@aws-sdk/client-sts";
-      version = "3.598.0";
+      version = "3.616.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.598.0.tgz";
-        sha512 = "bXhz/cHL0iB9UH9IFtMaJJf4F8mV+HzncETCRFzZ9SyUMt5rP9j8A7VZknqGYSx/6mI8SsB1XJQkWSbhn6FiSQ==";
+        url = "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.616.0.tgz";
+        sha512 = "FP7i7hS5FpReqnysQP1ukQF1OUWy8lkomaOnbu15H415YUrfCp947SIx6+BItjmx+esKxPkEjh/fbCVzw2D6hQ==";
       };
     };
     "@aws-sdk/config-resolver-3.296.0" = {
@@ -463,13 +454,13 @@ let
         sha512 = "Ecdp7fmIitHo49NRCyIEHb9xlI43J7qkvhcwaKGGqN5jvoh0YhR2vNr195wWG8Ip/9PwsD4QV4g/XT5EY7XkMA==";
       };
     };
-    "@aws-sdk/core-3.598.0" = {
+    "@aws-sdk/core-3.616.0" = {
       name = "_at_aws-sdk_slash_core";
       packageName = "@aws-sdk/core";
-      version = "3.598.0";
+      version = "3.616.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/core/-/core-3.598.0.tgz";
-        sha512 = "HaSjt7puO5Cc7cOlrXFCW0rtA0BM9lvzjl56x0A20Pt+0wxXGeTOZZOkXQIepbrFkV2e/HYukuT9e99vXDm59g==";
+        url = "https://registry.npmjs.org/@aws-sdk/core/-/core-3.616.0.tgz";
+        sha512 = "O/urkh2kECs/IqZIVZxyeyHZ7OR2ZWhLNK7btsVQBQvJKrEspLrk/Fp20Qfg5JDerQfBN83ZbyRXLJOOucdZpw==";
       };
     };
     "@aws-sdk/credential-provider-env-3.296.0" = {
@@ -481,22 +472,22 @@ let
         sha512 = "eDWSU3p04gytkkVXnYn05YzrP5SEaj/DQiafd4y+iBl8IFfF3zM6982rs6qFhvpwrHeSbLqHNfKR1HDWVwfG5g==";
       };
     };
-    "@aws-sdk/credential-provider-env-3.598.0" = {
+    "@aws-sdk/credential-provider-env-3.609.0" = {
       name = "_at_aws-sdk_slash_credential-provider-env";
       packageName = "@aws-sdk/credential-provider-env";
-      version = "3.598.0";
+      version = "3.609.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.598.0.tgz";
-        sha512 = "vi1khgn7yXzLCcgSIzQrrtd2ilUM0dWodxj3PQ6BLfP0O+q1imO3hG1nq7DVyJtq7rFHs6+9N8G4mYvTkxby2w==";
+        url = "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.609.0.tgz";
+        sha512 = "v69ZCWcec2iuV9vLVJMa6fAb5xwkzN4jYIT8yjo2c4Ia/j976Q+TPf35Pnz5My48Xr94EFcaBazrWedF+kwfuQ==";
       };
     };
-    "@aws-sdk/credential-provider-http-3.598.0" = {
+    "@aws-sdk/credential-provider-http-3.616.0" = {
       name = "_at_aws-sdk_slash_credential-provider-http";
       packageName = "@aws-sdk/credential-provider-http";
-      version = "3.598.0";
+      version = "3.616.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.598.0.tgz";
-        sha512 = "N7cIafi4HVlQvEgvZSo1G4T9qb/JMLGMdBsDCT5XkeJrF0aptQWzTFH0jIdZcLrMYvzPcuEyO3yCBe6cy/ba0g==";
+        url = "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.616.0.tgz";
+        sha512 = "1rgCkr7XvEMBl7qWCo5BKu3yAxJs71dRaZ55Xnjte/0ZHH6Oc93ZrHzyYy6UH6t0nZrH+FAuw7Yko2YtDDwDeg==";
       };
     };
     "@aws-sdk/credential-provider-imds-3.296.0" = {
@@ -517,13 +508,13 @@ let
         sha512 = "U0ecY0GX2jeDAgmTzaVO9YgjlLUfb8wgZSu1OwbOxCJscL/5eFkhcF0/xJQXDbRgcj4H4dlquqeSWsBVl/PgvQ==";
       };
     };
-    "@aws-sdk/credential-provider-ini-3.598.0" = {
+    "@aws-sdk/credential-provider-ini-3.616.0" = {
       name = "_at_aws-sdk_slash_credential-provider-ini";
       packageName = "@aws-sdk/credential-provider-ini";
-      version = "3.598.0";
+      version = "3.616.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.598.0.tgz";
-        sha512 = "/ppcIVUbRwDIwJDoYfp90X3+AuJo2mvE52Y1t2VSrvUovYn6N4v95/vXj6LS8CNDhz2jvEJYmu+0cTMHdhI6eA==";
+        url = "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.616.0.tgz";
+        sha512 = "5gQdMr9cca3xV7FF2SxpxWGH2t6+t4o+XBGiwsHm8muEjf4nUmw7Ij863x25Tjt2viPYV0UStczSb5Sihp7bkA==";
       };
     };
     "@aws-sdk/credential-provider-node-3.296.0" = {
@@ -535,13 +526,13 @@ let
         sha512 = "oCkmh2b1DQhHkhd/qA9jiSIOkrBBK7cMg1/PVIgLw8e15NkzUHBObLJ/ZQw6ZzCxZzjlMYaFv9oCB8hyO8txmA==";
       };
     };
-    "@aws-sdk/credential-provider-node-3.598.0" = {
+    "@aws-sdk/credential-provider-node-3.616.0" = {
       name = "_at_aws-sdk_slash_credential-provider-node";
       packageName = "@aws-sdk/credential-provider-node";
-      version = "3.598.0";
+      version = "3.616.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.598.0.tgz";
-        sha512 = "sXTlqL5I/awlF9Dg2MQ17SfrEaABVnsj2mf4jF5qQrIRhfbvQOIYdEqdy8Rn1AWlJMz/N450SGzc0XJ5owxxqw==";
+        url = "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.616.0.tgz";
+        sha512 = "Se+u6DAxjDPjKE3vX1X2uxjkWgGq69BTo0uTB0vDUiWwBVgh16s9BsBhSAlKEH1CCbbJHvOg4YdTrzjwzqyClg==";
       };
     };
     "@aws-sdk/credential-provider-process-3.296.0" = {
@@ -553,13 +544,13 @@ let
         sha512 = "AY7sTX2dGi8ripuCpcJLYHOZB2wJ6NnseyK/kK5TfJn/pgboKwuGtz0hkJCVprNWomKa6IpHksm7vLQ4O2E+UA==";
       };
     };
-    "@aws-sdk/credential-provider-process-3.598.0" = {
+    "@aws-sdk/credential-provider-process-3.614.0" = {
       name = "_at_aws-sdk_slash_credential-provider-process";
       packageName = "@aws-sdk/credential-provider-process";
-      version = "3.598.0";
+      version = "3.614.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.598.0.tgz";
-        sha512 = "rM707XbLW8huMk722AgjVyxu2tMZee++fNA8TJVNgs1Ma02Wx6bBrfIvlyK0rCcIRb0WdQYP6fe3Xhiu4e8IBA==";
+        url = "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.614.0.tgz";
+        sha512 = "Q0SI0sTRwi8iNODLs5+bbv8vgz8Qy2QdxbCHnPk/6Cx6LMf7i3dqmWquFbspqFRd8QiqxStrblwxrUYZi09tkA==";
       };
     };
     "@aws-sdk/credential-provider-sso-3.296.0" = {
@@ -571,13 +562,13 @@ let
         sha512 = "zPFHDX/niXfcQrKQhmBv1XPYEe4b7im4vRKrzjYXgDRpG2M3LP0KaWIwN6Ap+GRYBNBthen86vhTlmKGzyU5YA==";
       };
     };
-    "@aws-sdk/credential-provider-sso-3.598.0" = {
+    "@aws-sdk/credential-provider-sso-3.616.0" = {
       name = "_at_aws-sdk_slash_credential-provider-sso";
       packageName = "@aws-sdk/credential-provider-sso";
-      version = "3.598.0";
+      version = "3.616.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.598.0.tgz";
-        sha512 = "5InwUmrAuqQdOOgxTccRayMMkSmekdLk6s+az9tmikq0QFAHUCtofI+/fllMXSR9iL6JbGYi1940+EUmS4pHJA==";
+        url = "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.616.0.tgz";
+        sha512 = "3rsWs9GBi8Z8Gps5ROwqguxtw+J6OIg1vawZMLRNMqqZoBvbOToe9wEnpid8ylU+27+oG8uibJNlNuRyXApUjw==";
       };
     };
     "@aws-sdk/credential-provider-web-identity-3.296.0" = {
@@ -589,13 +580,13 @@ let
         sha512 = "Rl6Ohoekxe+pccA55XXQDW5wApbg3rGWr6FkmPRcg7Ld6Vfe+HL8OtfsFf83/0eoFerevbif+00BdknXWT05LA==";
       };
     };
-    "@aws-sdk/credential-provider-web-identity-3.598.0" = {
+    "@aws-sdk/credential-provider-web-identity-3.609.0" = {
       name = "_at_aws-sdk_slash_credential-provider-web-identity";
       packageName = "@aws-sdk/credential-provider-web-identity";
-      version = "3.598.0";
+      version = "3.609.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.598.0.tgz";
-        sha512 = "GV5GdiMbz5Tz9JO4NJtRoFXjW0GPEujA0j+5J/B723rTN+REHthJu48HdBKouHGhdzkDWkkh1bu52V02Wprw8w==";
+        url = "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.609.0.tgz";
+        sha512 = "U+PG8NhlYYF45zbr1km3ROtBMYqyyj/oK8NRp++UHHeuavgrP+4wJ4wQnlEaKvJBjevfo3+dlIBcaeQ7NYejWg==";
       };
     };
     "@aws-sdk/eventstream-codec-3.296.0" = {
@@ -697,13 +688,13 @@ let
         sha512 = "SCIt10cr5dud7hvwveU4wkLjvkGssJ3GrcbHCds2NwI+JHmpcaaNYLAqi305JAuT29T36U5ssTFDSmrrEOcfag==";
       };
     };
-    "@aws-sdk/lib-storage-3.598.0" = {
+    "@aws-sdk/lib-storage-3.617.0" = {
       name = "_at_aws-sdk_slash_lib-storage";
       packageName = "@aws-sdk/lib-storage";
-      version = "3.598.0";
+      version = "3.617.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/lib-storage/-/lib-storage-3.598.0.tgz";
-        sha512 = "la1ZY8MHH6oGUZ6nocl+2ebGNhkzgE15dB5iC0ZPHjfW0aNEfcrF2crGVxnkJQFv0LeDPQN26drajlmLnq86UA==";
+        url = "https://registry.npmjs.org/@aws-sdk/lib-storage/-/lib-storage-3.617.0.tgz";
+        sha512 = "bR+3E66Dp3CyuSGywxMSwrYQCfwuFu7gRJxOpk1i2AKV1Wh7g0y1eANXHVKnk+UbVRz4S53UCD8LEiKp2KYShA==";
       };
     };
     "@aws-sdk/md5-js-3.296.0" = {
@@ -724,13 +715,13 @@ let
         sha512 = "Xhzucs5psscjXJW7V6vMrjJWGmej8Xtw8XIKd91RLmbxdmecMy85/mQC3bIqxgTGhC/e3pKqWSp8z/YjV6iPZg==";
       };
     };
-    "@aws-sdk/middleware-bucket-endpoint-3.598.0" = {
+    "@aws-sdk/middleware-bucket-endpoint-3.616.0" = {
       name = "_at_aws-sdk_slash_middleware-bucket-endpoint";
       packageName = "@aws-sdk/middleware-bucket-endpoint";
-      version = "3.598.0";
+      version = "3.616.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/middleware-bucket-endpoint/-/middleware-bucket-endpoint-3.598.0.tgz";
-        sha512 = "PM7BcFfGUSkmkT6+LU9TyJiB4S8yI7dfuKQDwK5ZR3P7MKaK4Uj4yyDiv0oe5xvkF6+O2+rShj+eh8YuWkOZ/Q==";
+        url = "https://registry.npmjs.org/@aws-sdk/middleware-bucket-endpoint/-/middleware-bucket-endpoint-3.616.0.tgz";
+        sha512 = "KZv78s8UE7+s3qZCfG3pE9U9XV5WTP478aNWis5gDXmsb5LF7QWzEeR8kve5dnjNlK6qVQ33v+mUZa6lR5PwMw==";
       };
     };
     "@aws-sdk/middleware-content-length-3.296.0" = {
@@ -760,13 +751,13 @@ let
         sha512 = "aVCv9CdAVWt9AlZKQZRweIywkAszRrZUCo8K5bBUJNdD4061DoDqLK/6jmqXmObas0j1wQr/eNzjYbv99MZBCg==";
       };
     };
-    "@aws-sdk/middleware-expect-continue-3.598.0" = {
+    "@aws-sdk/middleware-expect-continue-3.616.0" = {
       name = "_at_aws-sdk_slash_middleware-expect-continue";
       packageName = "@aws-sdk/middleware-expect-continue";
-      version = "3.598.0";
+      version = "3.616.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/middleware-expect-continue/-/middleware-expect-continue-3.598.0.tgz";
-        sha512 = "ZuHW18kaeHR8TQyhEOYMr8VwiIh0bMvF7J1OTqXHxDteQIavJWA3CbfZ9sgS4XGtrBZDyHJhjZKeCfLhN2rq3w==";
+        url = "https://registry.npmjs.org/@aws-sdk/middleware-expect-continue/-/middleware-expect-continue-3.616.0.tgz";
+        sha512 = "IM1pfJPm7pDUXa55js9bnGjS8o3ldzDwf95mL9ZAYdEsm10q6i0ZxZbbro2gTq25Ap5ykdeeS34lOSzIqPiW1A==";
       };
     };
     "@aws-sdk/middleware-flexible-checksums-3.296.0" = {
@@ -778,13 +769,13 @@ let
         sha512 = "F5wVMhLIgA86PKsK/Az7LGIiNVDdZjoSn0+boe6fYW/AIAmgJhPf//500Md0GsKsLOCcPcxiQC43a0hVT2zbew==";
       };
     };
-    "@aws-sdk/middleware-flexible-checksums-3.598.0" = {
+    "@aws-sdk/middleware-flexible-checksums-3.616.0" = {
       name = "_at_aws-sdk_slash_middleware-flexible-checksums";
       packageName = "@aws-sdk/middleware-flexible-checksums";
-      version = "3.598.0";
+      version = "3.616.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/middleware-flexible-checksums/-/middleware-flexible-checksums-3.598.0.tgz";
-        sha512 = "xukAzds0GQXvMEY9G6qt+CzwVzTx8NyKKh04O2Q+nOch6QQ8Rs+2kTRy3Z4wQmXq2pK9hlOWb5nXA7HWpmz6Ng==";
+        url = "https://registry.npmjs.org/@aws-sdk/middleware-flexible-checksums/-/middleware-flexible-checksums-3.616.0.tgz";
+        sha512 = "Mrco/dURoTXVqwcnYRcyrFaPTIg36ifg2PK0kUYfSVTGEOClZOQXlVG5zYCZoo3yEMgy/gLT907FjUQxwoifIw==";
       };
     };
     "@aws-sdk/middleware-host-header-3.296.0" = {
@@ -796,13 +787,13 @@ let
         sha512 = "V47dFtfkX5lXWv9GDp71gZVCRws4fEdQ9QF9BQ/2UMSNrYjQLg6mFe7NibH+IJoNOid2FIwWIl94Eos636VGYQ==";
       };
     };
-    "@aws-sdk/middleware-host-header-3.598.0" = {
+    "@aws-sdk/middleware-host-header-3.616.0" = {
       name = "_at_aws-sdk_slash_middleware-host-header";
       packageName = "@aws-sdk/middleware-host-header";
-      version = "3.598.0";
+      version = "3.616.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.598.0.tgz";
-        sha512 = "WiaG059YBQwQraNejLIi0gMNkX7dfPZ8hDIhvMr5aVPRbaHH8AYF3iNSsXYCHvA2Cfa1O9haYXsuMF9flXnCmA==";
+        url = "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.616.0.tgz";
+        sha512 = "mhNfHuGhCDZwYCABebaOvTgOM44UCZZRq2cBpgPZLVKP0ydAv5aFHXv01goexxXHqgHoEGx0uXWxlw0s2EpFDg==";
       };
     };
     "@aws-sdk/middleware-location-constraint-3.296.0" = {
@@ -814,13 +805,13 @@ let
         sha512 = "KHkWaIrZOtJmV1/WO9KOf7kSK41ngfqts3YIun956NYglKTDKyrBIOPCgmXTT/03odnYsKVT/UfbEIh/v4RxGA==";
       };
     };
-    "@aws-sdk/middleware-location-constraint-3.598.0" = {
+    "@aws-sdk/middleware-location-constraint-3.609.0" = {
       name = "_at_aws-sdk_slash_middleware-location-constraint";
       packageName = "@aws-sdk/middleware-location-constraint";
-      version = "3.598.0";
+      version = "3.609.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/middleware-location-constraint/-/middleware-location-constraint-3.598.0.tgz";
-        sha512 = "8oybQxN3F1ISOMULk7JKJz5DuAm5hCUcxMW9noWShbxTJuStNvuHf/WLUzXrf8oSITyYzIHPtf8VPlKR7I3orQ==";
+        url = "https://registry.npmjs.org/@aws-sdk/middleware-location-constraint/-/middleware-location-constraint-3.609.0.tgz";
+        sha512 = "xzsdoTkszGVqGVPjUmgoP7TORiByLueMHieI1fhQL888WPdqctwAx3ES6d/bA9Q/i8jnc6hs+Fjhy8UvBTkE9A==";
       };
     };
     "@aws-sdk/middleware-logger-3.296.0" = {
@@ -832,13 +823,13 @@ let
         sha512 = "LzfEEFyBR9LXdWwLdtBrmi1vLdzgdJNntEgzqktVF8LwaCyY+9xIE6TGu/2V+9fJHAwECxjOC1eQbNQdAZ0Tmw==";
       };
     };
-    "@aws-sdk/middleware-logger-3.598.0" = {
+    "@aws-sdk/middleware-logger-3.609.0" = {
       name = "_at_aws-sdk_slash_middleware-logger";
       packageName = "@aws-sdk/middleware-logger";
-      version = "3.598.0";
+      version = "3.609.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.598.0.tgz";
-        sha512 = "bxBjf/VYiu3zfu8SYM2S9dQQc3tz5uBAOcPz/Bt8DyyK3GgOpjhschH/2XuUErsoUO1gDJqZSdGOmuHGZQn00Q==";
+        url = "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.609.0.tgz";
+        sha512 = "S62U2dy4jMDhDFDK5gZ4VxFdWzCtLzwbYyFZx2uvPYTECkepLUfzLic2BHg2Qvtu4QjX+oGE3P/7fwaGIsGNuQ==";
       };
     };
     "@aws-sdk/middleware-recursion-detection-3.296.0" = {
@@ -850,13 +841,13 @@ let
         sha512 = "UG7TLDPz9ImQG0uVklHTxE9Us7rTImwN+6el6qZCpoTBuGeXgOkfb0/p8izJyFgY/hMUR4cZqs7IdCDUkxQF3w==";
       };
     };
-    "@aws-sdk/middleware-recursion-detection-3.598.0" = {
+    "@aws-sdk/middleware-recursion-detection-3.616.0" = {
       name = "_at_aws-sdk_slash_middleware-recursion-detection";
       packageName = "@aws-sdk/middleware-recursion-detection";
-      version = "3.598.0";
+      version = "3.616.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.598.0.tgz";
-        sha512 = "vjT9BeFY9FeN0f8hm2l6F53tI0N5bUq6RcDkQXKNabXBnQxKptJRad6oP2X5y3FoVfBLOuDkQgiC2940GIPxtQ==";
+        url = "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.616.0.tgz";
+        sha512 = "LQKAcrZRrR9EGez4fdCIVjdn0Ot2HMN12ChnoMGEU6oIxnQ2aSC7iASFFCV39IYfeMh7iSCPj7Wopqw8rAouzg==";
       };
     };
     "@aws-sdk/middleware-retry-3.296.0" = {
@@ -877,13 +868,13 @@ let
         sha512 = "zH4uZKEqumo01wn+dTwrYnvOui9GjDiuBHdECnSjnA0Mkxo/tfMPYzYD7mE8kUlBz7HfQcXeXlyaApj9fPkxvg==";
       };
     };
-    "@aws-sdk/middleware-sdk-s3-3.598.0" = {
+    "@aws-sdk/middleware-sdk-s3-3.617.0" = {
       name = "_at_aws-sdk_slash_middleware-sdk-s3";
       packageName = "@aws-sdk/middleware-sdk-s3";
-      version = "3.598.0";
+      version = "3.617.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.598.0.tgz";
-        sha512 = "5AGtLAh9wyK6ANPYfaKTqJY1IFJyePIxsEbxa7zS6REheAqyVmgJFaGu3oQ5XlxfGr5Uq59tFTRkyx26G1HkHA==";
+        url = "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.617.0.tgz";
+        sha512 = "zVOS6sNGcLGhq7i+5POmVqmSPNmrQYDFsynpnWMSLsNaej+xvkdSOnytLrUvag3Du4kAxfO5NNIC0GuNj9lcCg==";
       };
     };
     "@aws-sdk/middleware-sdk-sts-3.296.0" = {
@@ -913,13 +904,13 @@ let
         sha512 = "wyiG+WPDvugGTIPpKchGOdvvpcMZEN2IfP6iK//QAqGXsC6rDm5+SNZ3+elvduZjPUdVA06W0CcFYBAkVz8D7Q==";
       };
     };
-    "@aws-sdk/middleware-signing-3.598.0" = {
+    "@aws-sdk/middleware-signing-3.616.0" = {
       name = "_at_aws-sdk_slash_middleware-signing";
       packageName = "@aws-sdk/middleware-signing";
-      version = "3.598.0";
+      version = "3.616.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/middleware-signing/-/middleware-signing-3.598.0.tgz";
-        sha512 = "XKb05DYx/aBPqz6iCapsCbIl8aD8EihTuPCs51p75QsVfbQoVr4TlFfIl5AooMSITzojdAQqxt021YtvxjtxIQ==";
+        url = "https://registry.npmjs.org/@aws-sdk/middleware-signing/-/middleware-signing-3.616.0.tgz";
+        sha512 = "wwzZFlXyURwo40oz1NmufreQa5DqwnCF8hR8tIP5+oKCyhbkmlmv8xG4Wn51bzY2WEbQhvFebgZSFTEvelCoCg==";
       };
     };
     "@aws-sdk/middleware-ssec-3.296.0" = {
@@ -931,13 +922,13 @@ let
         sha512 = "vcSyXxEXAC9rWzUd7rq2/JxPdt87DKiA+wfiBrpGvFV+bacocIV0TFcpJncgZqMOoP8b6Osd+mW4BjlkwBamtA==";
       };
     };
-    "@aws-sdk/middleware-ssec-3.598.0" = {
+    "@aws-sdk/middleware-ssec-3.609.0" = {
       name = "_at_aws-sdk_slash_middleware-ssec";
       packageName = "@aws-sdk/middleware-ssec";
-      version = "3.598.0";
+      version = "3.609.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/middleware-ssec/-/middleware-ssec-3.598.0.tgz";
-        sha512 = "f0p2xP8IC1uJ5e/tND1l81QxRtRFywEdnbtKCE0H6RSn4UIt2W3Dohe1qQDbnh27okF0PkNW6BJGdSAz3p7qbA==";
+        url = "https://registry.npmjs.org/@aws-sdk/middleware-ssec/-/middleware-ssec-3.609.0.tgz";
+        sha512 = "GZSD1s7+JswWOTamVap79QiDaIV7byJFssBW68GYjyRS5EBjNfwA/8s+6uE6g39R3ojyTbYOmvcANoZEhSULXg==";
       };
     };
     "@aws-sdk/middleware-stack-3.296.0" = {
@@ -958,13 +949,13 @@ let
         sha512 = "L7jacxSt6gxX1gD3tQtfwHqBDk5rT2wWD3rxBa6rs7f81b9ObgY/sPT2IgRT7JNCVzvKLYFxJaTklDj65mY1SQ==";
       };
     };
-    "@aws-sdk/middleware-user-agent-3.598.0" = {
+    "@aws-sdk/middleware-user-agent-3.616.0" = {
       name = "_at_aws-sdk_slash_middleware-user-agent";
       packageName = "@aws-sdk/middleware-user-agent";
-      version = "3.598.0";
+      version = "3.616.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.598.0.tgz";
-        sha512 = "4tjESlHG5B5MdjUaLK7tQs/miUtHbb6deauQx8ryqSBYOhfHVgb1ZnzvQR0bTrhpqUg0WlybSkDaZAICf9xctg==";
+        url = "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.616.0.tgz";
+        sha512 = "iMcAb4E+Z3vuEcrDsG6T2OBNiqWAquwahP9qepHqfmnmJqHr1mSHtXDYTGBNid31+621sUQmneUQ+fagpGAe4w==";
       };
     };
     "@aws-sdk/node-config-provider-3.296.0" = {
@@ -1021,22 +1012,22 @@ let
         sha512 = "nLNZKVQfK42euv7101cE5qfg17YCtGcfccx3B5XSAzvyTROR46kwYqbEvYSsWisbZoRhbQc905gB/5E0U5HDIw==";
       };
     };
-    "@aws-sdk/region-config-resolver-3.598.0" = {
+    "@aws-sdk/region-config-resolver-3.614.0" = {
       name = "_at_aws-sdk_slash_region-config-resolver";
       packageName = "@aws-sdk/region-config-resolver";
-      version = "3.598.0";
+      version = "3.614.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.598.0.tgz";
-        sha512 = "oYXhmTokSav4ytmWleCr3rs/1nyvZW/S0tdi6X7u+dLNL5Jee+uMxWGzgOrWK6wrQOzucLVjS4E/wA11Kv2GTw==";
+        url = "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.614.0.tgz";
+        sha512 = "vDCeMXvic/LU0KFIUjpC3RiSTIkkvESsEfbVHiHH0YINfl8HnEqR5rj+L8+phsCeVg2+LmYwYxd5NRz4PHxt5g==";
       };
     };
-    "@aws-sdk/s3-presigned-post-3.598.0" = {
+    "@aws-sdk/s3-presigned-post-3.617.0" = {
       name = "_at_aws-sdk_slash_s3-presigned-post";
       packageName = "@aws-sdk/s3-presigned-post";
-      version = "3.598.0";
+      version = "3.617.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/s3-presigned-post/-/s3-presigned-post-3.598.0.tgz";
-        sha512 = "FH4htNIfh+wyYP0nKPCGOboFnSGe98xhipf0Uu9FZkMonxqMwUMj8tVhYE9YlrFxwhgUVY9Mca0/z4o0rgoWSw==";
+        url = "https://registry.npmjs.org/@aws-sdk/s3-presigned-post/-/s3-presigned-post-3.617.0.tgz";
+        sha512 = "5PCjZ3vux7FvlJYtVbXQZCO6J4yGPaZlWxgt1XdX43wcXe2GNWhxHB9OvCmKOJR2N379Ihw/ABq8UWze6LIzxA==";
       };
     };
     "@aws-sdk/s3-request-presigner-3.296.0" = {
@@ -1048,13 +1039,13 @@ let
         sha512 = "BQv+oNA5EzJymrfh7cnMun/ougmTX3eo6bGCWn/bQdL1LyxodeVdRZacD5tN+lAUYtjhQ7yS23ozYh0lvWNEXw==";
       };
     };
-    "@aws-sdk/s3-request-presigner-3.598.0" = {
+    "@aws-sdk/s3-request-presigner-3.617.0" = {
       name = "_at_aws-sdk_slash_s3-request-presigner";
       packageName = "@aws-sdk/s3-request-presigner";
-      version = "3.598.0";
+      version = "3.617.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/s3-request-presigner/-/s3-request-presigner-3.598.0.tgz";
-        sha512 = "IC06/HrZNlYxdyKH5+4A9B98NwcxJjgXOSUV581X7GpqHHspZ0T6tih8shBus3zzW8WfVqRAhJVwZtfMY55hdw==";
+        url = "https://registry.npmjs.org/@aws-sdk/s3-request-presigner/-/s3-request-presigner-3.617.0.tgz";
+        sha512 = "zszOwBmu3Ei5rRgddcQ3sbKFCtzLtUNDcmeybh4OhxENfgzHZHOeTOt8C+C16DD5YDQqeP4JYPRUp0LPuybkvg==";
       };
     };
     "@aws-sdk/service-error-classification-3.296.0" = {
@@ -1084,13 +1075,13 @@ let
         sha512 = "NQyJ/FClty4VmF1WoV4rOkbN0Unn0zevzy8iJrYhqxE3Sc7lySM4Btnsd4Iqelm2dR6l+jNRApGgD8NvoGjGig==";
       };
     };
-    "@aws-sdk/signature-v4-crt-3.598.0" = {
+    "@aws-sdk/signature-v4-crt-3.617.0" = {
       name = "_at_aws-sdk_slash_signature-v4-crt";
       packageName = "@aws-sdk/signature-v4-crt";
-      version = "3.598.0";
+      version = "3.617.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/signature-v4-crt/-/signature-v4-crt-3.598.0.tgz";
-        sha512 = "laxTj/Ieq13nLHCcIl983ySD0lzIxWVaAik90zcXFH8nLNWwuR4V/Yfz9pcrnWZxF4taUi0CPwZbij9FKftPXg==";
+        url = "https://registry.npmjs.org/@aws-sdk/signature-v4-crt/-/signature-v4-crt-3.617.0.tgz";
+        sha512 = "mTZ438M8VYQhupltwKXOJCBA/WFdd9PCYjRwmbFv3b1QpOMWr5VQYldbz6lwKqOcv0N93PJkNFZnHBC//DTw5A==";
       };
     };
     "@aws-sdk/signature-v4-multi-region-3.296.0" = {
@@ -1102,13 +1093,13 @@ let
         sha512 = "BNMXS0YJEgflPhO2KxXG4f0iTMOGdyxslDMNGmMWGGQm6bbwtqZ7Y9ZyMQYKfzk3GUPpfGQcaaSNiGfURPOCOg==";
       };
     };
-    "@aws-sdk/signature-v4-multi-region-3.598.0" = {
+    "@aws-sdk/signature-v4-multi-region-3.617.0" = {
       name = "_at_aws-sdk_slash_signature-v4-multi-region";
       packageName = "@aws-sdk/signature-v4-multi-region";
-      version = "3.598.0";
+      version = "3.617.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/signature-v4-multi-region/-/signature-v4-multi-region-3.598.0.tgz";
-        sha512 = "1r/EyTrO1gSa1FirnR8V7mabr7gk+l+HkyTI0fcTSr8ucB7gmYyW6WjkY8JCz13VYHFK62usCEDS7yoJoJOzTA==";
+        url = "https://registry.npmjs.org/@aws-sdk/signature-v4-multi-region/-/signature-v4-multi-region-3.617.0.tgz";
+        sha512 = "kGbLs9q0/ziuzA1huf0BBh05ChxDeZ8ZWc/kedb80ocq6izOLaGgeqqUR8oB0ianwjel4AQq/iv1fsOIt3wmAA==";
       };
     };
     "@aws-sdk/smithy-client-3.296.0" = {
@@ -1129,13 +1120,13 @@ let
         sha512 = "yC1ku7A5S+o/CLlgbgDB2bx8+Wq43qj8xfohmTuIhpiP2m/NyUiRVv6S6ARONLI6bVeo1T2/BFk5Q9DfE2xzAQ==";
       };
     };
-    "@aws-sdk/token-providers-3.598.0" = {
+    "@aws-sdk/token-providers-3.614.0" = {
       name = "_at_aws-sdk_slash_token-providers";
       packageName = "@aws-sdk/token-providers";
-      version = "3.598.0";
+      version = "3.614.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.598.0.tgz";
-        sha512 = "TKY1EVdHVBnZqpyxyTHdpZpa1tUpb6nxVeRNn1zWG8QB5MvH4ALLd/jR+gtmWDNQbIG4cVuBOZFVL8hIYicKTA==";
+        url = "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.614.0.tgz";
+        sha512 = "okItqyY6L9IHdxqs+Z116y5/nda7rHxLvROxtAJdLavWTYDydxrZstImNgGWTeVdmc0xX2gJCI77UYUTQWnhRw==";
       };
     };
     "@aws-sdk/types-3.296.0" = {
@@ -1147,13 +1138,13 @@ let
         sha512 = "s0wIac64rrMEo2ioUxP9IarGiiCGmelCspNcoNTPSjGl25QqjhyfQqTeGgS58qJ4fHoQb07qra39930xp1IzJg==";
       };
     };
-    "@aws-sdk/types-3.598.0" = {
+    "@aws-sdk/types-3.609.0" = {
       name = "_at_aws-sdk_slash_types";
       packageName = "@aws-sdk/types";
-      version = "3.598.0";
+      version = "3.609.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/types/-/types-3.598.0.tgz";
-        sha512 = "742uRl6z7u0LFmZwDrFP6r1wlZcgVPw+/TilluDJmCAR8BgRw3IR+743kUXKBGd8QZDRW2n6v/PYsi/AWCDDMQ==";
+        url = "https://registry.npmjs.org/@aws-sdk/types/-/types-3.609.0.tgz";
+        sha512 = "+Tqnh9w0h2LcrUsdXyT1F8mNhXz+tVYBtP19LpeEGntmvHwa2XzvLUCWpoIAIVsHp5+HdB2X9Sn0KAtmbFXc2Q==";
       };
     };
     "@aws-sdk/url-parser-3.296.0" = {
@@ -1264,13 +1255,13 @@ let
         sha512 = "YraGGLJepXM6HCTaqEGTFf8RFRBdJ0C6uG5k0kVhiXmYxBkeupn8J07CVp9jfWqcPYWElAnMGVEZKU1OjRo4HQ==";
       };
     };
-    "@aws-sdk/util-endpoints-3.598.0" = {
+    "@aws-sdk/util-endpoints-3.614.0" = {
       name = "_at_aws-sdk_slash_util-endpoints";
       packageName = "@aws-sdk/util-endpoints";
-      version = "3.598.0";
+      version = "3.614.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.598.0.tgz";
-        sha512 = "Qo9UoiVVZxcOEdiOMZg3xb1mzkTxrhd4qSlg5QQrfWPJVx/QOg+Iy0NtGxPtHtVZNHZxohYwDwV/tfsnDSE2gQ==";
+        url = "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.614.0.tgz";
+        sha512 = "wK2cdrXHH4oz4IomV/yrGkftU9A+ITB6nFL+rxxyO78is2ifHJpFdV4aqk4LSkXYPi6CXWNru/Dqc7yiKXgJPw==";
       };
     };
     "@aws-sdk/util-format-url-3.296.0" = {
@@ -1282,13 +1273,13 @@ let
         sha512 = "CcYECzkUAnHL5q3uyPicafn2OY0GiklIYfuOUHPZ/4FMxIesd1BnCDDRjTlFxLWjuNuiihIdwB7Qb1pDzxc3Iw==";
       };
     };
-    "@aws-sdk/util-format-url-3.598.0" = {
+    "@aws-sdk/util-format-url-3.609.0" = {
       name = "_at_aws-sdk_slash_util-format-url";
       packageName = "@aws-sdk/util-format-url";
-      version = "3.598.0";
+      version = "3.609.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/util-format-url/-/util-format-url-3.598.0.tgz";
-        sha512 = "1X0PlREk5K6tQg8rFZOjoKVtDyI1WgbKJNCymHhMye6STryY6fhuuayKstiDThkqDYxqahjUJz/Tl2p5W3rbcw==";
+        url = "https://registry.npmjs.org/@aws-sdk/util-format-url/-/util-format-url-3.609.0.tgz";
+        sha512 = "fuk29BI/oLQlJ7pfm6iJ4gkEpHdavffAALZwXh9eaY1vQ0ip0aKfRTiNudPoJjyyahnz5yJ1HkmlcDitlzsOrQ==";
       };
     };
     "@aws-sdk/util-hex-encoding-3.295.0" = {
@@ -1363,13 +1354,13 @@ let
         sha512 = "MGGG+09VkF0N+8KEht8NNE6Q7bqmddgqLkUbvzSky0y18UPEZyq9LTC4JZtzDDOzf/swgbq2IQ/5wtB81iouog==";
       };
     };
-    "@aws-sdk/util-user-agent-browser-3.598.0" = {
+    "@aws-sdk/util-user-agent-browser-3.609.0" = {
       name = "_at_aws-sdk_slash_util-user-agent-browser";
       packageName = "@aws-sdk/util-user-agent-browser";
-      version = "3.598.0";
+      version = "3.609.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.598.0.tgz";
-        sha512 = "36Sxo6F+ykElaL1mWzWjlg+1epMpSe8obwhCN1yGE7Js9ywy5U6k6l+A3q3YM9YRbm740sNxncbwLklMvuhTKw==";
+        url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.609.0.tgz";
+        sha512 = "fojPU+mNahzQ0YHYBsx0ZIhmMA96H+ZIZ665ObU9tl+SGdbLneVZVikGve+NmHTQwHzwkFsZYYnVKAkreJLAtA==";
       };
     };
     "@aws-sdk/util-user-agent-node-3.296.0" = {
@@ -1381,13 +1372,13 @@ let
         sha512 = "AMWac8aIBnaa9nxAEpZ752j29a/UQTViRfR5gnCX38ECBKGfOQMpgYnee5HdlMr4GHJj0WkOzQxBtInW4pV58g==";
       };
     };
-    "@aws-sdk/util-user-agent-node-3.598.0" = {
+    "@aws-sdk/util-user-agent-node-3.614.0" = {
       name = "_at_aws-sdk_slash_util-user-agent-node";
       packageName = "@aws-sdk/util-user-agent-node";
-      version = "3.598.0";
+      version = "3.614.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.598.0.tgz";
-        sha512 = "oyWGcOlfTdzkC6SVplyr0AGh54IMrDxbhg5RxJ5P+V4BKfcDoDcZV9xenUk9NsOi9MuUjxMumb9UJGkDhM1m0A==";
+        url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.614.0.tgz";
+        sha512 = "15ElZT88peoHnq5TEoEtZwoXTXRxNrk60TZNdpl/TUBJ5oNJ9Dqb5Z4ryb8ofN6nm9aFf59GVAerFDz8iUoHBA==";
       };
     };
     "@aws-sdk/util-utf8-3.295.0" = {
@@ -1426,13 +1417,13 @@ let
         sha512 = "7VX3Due7Ip73yfYErFDHZvhgBohC4IyMTfW49DI4C/LFKFCcAoB888MdevUkB87GoiNaRLeT3ZMZ86IWlSEaow==";
       };
     };
-    "@aws-sdk/xml-builder-3.598.0" = {
+    "@aws-sdk/xml-builder-3.609.0" = {
       name = "_at_aws-sdk_slash_xml-builder";
       packageName = "@aws-sdk/xml-builder";
-      version = "3.598.0";
+      version = "3.609.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/xml-builder/-/xml-builder-3.598.0.tgz";
-        sha512 = "ZIa2RK7CHFTZ4gwK77WRtsZ6vF7xwRXxJ8KQIxK2duhoTVcn0xYxpFLdW9WZZZvdP9GIF3Loqvf8DRdeU5Jc7Q==";
+        url = "https://registry.npmjs.org/@aws-sdk/xml-builder/-/xml-builder-3.609.0.tgz";
+        sha512 = "l9XxNcA4HX98rwCC2/KoiWcmEiRfZe4G+mYwDbCFT87JIMj6GBhLDkAzr/W8KAaA2IDr8Vc6J8fZPgVulxxfMA==";
       };
     };
     "@azure/abort-controller-1.1.0" = {
@@ -1507,13 +1498,13 @@ let
         sha512 = "Kji9k6TOFRDB5ZMTw8qUf2IJ+CeJtsuMdAHox9eqpTf1cefiNMpzrfnF6sINEBZJsaVaWgQ0o48B6kcUH68niA==";
       };
     };
-    "@azure/core-rest-pipeline-1.16.0" = {
+    "@azure/core-rest-pipeline-1.16.2" = {
       name = "_at_azure_slash_core-rest-pipeline";
       packageName = "@azure/core-rest-pipeline";
-      version = "1.16.0";
+      version = "1.16.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.16.0.tgz";
-        sha512 = "CeuTvsXxCUmEuxH5g/aceuSl6w2EugvNHKAtKKVdiX915EjJJxAwfzNNWZreNnbxHZ2fi0zaM6wwS23x2JVqSQ==";
+        url = "https://registry.npmjs.org/@azure/core-rest-pipeline/-/core-rest-pipeline-1.16.2.tgz";
+        sha512 = "Hnhm/PG9/SQ07JJyLDv3l9Qr8V3xgAe1hFoBYzt6LaalMxfL/ZqFaZf/bz5VN3pMcleCPwl8ivlS2Fjxq/iC8Q==";
       };
     };
     "@azure/core-tracing-1.0.0-preview.13" = {
@@ -1543,22 +1534,13 @@ let
         sha512 = "ffGIw+Qs8bNKNLxz5UPkz4/VBM/EZY07mPve1ZYFqYUdPwFqRj0RPk0U7LZMOfT7GCck9YjuT1Rfp1PApNl1ng==";
       };
     };
-    "@azure/core-util-1.9.0" = {
+    "@azure/core-util-1.9.1" = {
       name = "_at_azure_slash_core-util";
       packageName = "@azure/core-util";
-      version = "1.9.0";
+      version = "1.9.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@azure/core-util/-/core-util-1.9.0.tgz";
-        sha512 = "AfalUQ1ZppaKuxPPMsFEUdX6GZPB3d9paR9d/TTL7Ow2De8cJaC7ibi7kWVlFAVPCYo31OcnGymc0R89DX8Oaw==";
-      };
-    };
-    "@azure/identity-4.0.1" = {
-      name = "_at_azure_slash_identity";
-      packageName = "@azure/identity";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@azure/identity/-/identity-4.0.1.tgz";
-        sha512 = "yRdgF03SFLqUMZZ1gKWt0cs0fvrDIkq2bJ6Oidqcoo5uM85YMBnXWMzYKK30XqIT76lkFyAaoAAy5knXhrG4Lw==";
+        url = "https://registry.npmjs.org/@azure/core-util/-/core-util-1.9.1.tgz";
+        sha512 = "OLsq0etbHO1MA7j6FouXFghuHrAFGk+5C1imcpQ2e+0oZhYF07WLA+NW2Vqs70R7d+zOAWiWM3tbE1sXcDN66g==";
       };
     };
     "@azure/identity-4.2.1" = {
@@ -1570,40 +1552,49 @@ let
         sha512 = "U8hsyC9YPcEIzoaObJlRDvp7KiF0MGS7xcWbyJSVvXRkC/HXo1f0oYeBYmEvVgRfacw7GHf6D6yAoh9JHz6A5Q==";
       };
     };
-    "@azure/logger-1.1.2" = {
+    "@azure/identity-4.4.0" = {
+      name = "_at_azure_slash_identity";
+      packageName = "@azure/identity";
+      version = "4.4.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@azure/identity/-/identity-4.4.0.tgz";
+        sha512 = "oG6oFNMxUuoivYg/ElyZWVSZfw42JQyHbrp+lR7VJ1BYWsGzt34NwyDw3miPp1QI7Qm5+4KAd76wGsbHQmkpkg==";
+      };
+    };
+    "@azure/logger-1.1.3" = {
       name = "_at_azure_slash_logger";
       packageName = "@azure/logger";
-      version = "1.1.2";
+      version = "1.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@azure/logger/-/logger-1.1.2.tgz";
-        sha512 = "l170uE7bsKpIU6B/giRc9i4NI0Mj+tANMMMxf7Zi/5cKzEqPayP7+X1WPrG7e+91JgY8N+7K7nF2WOi7iVhXvg==";
+        url = "https://registry.npmjs.org/@azure/logger/-/logger-1.1.3.tgz";
+        sha512 = "J8/cIKNQB1Fc9fuYqBVnrppiUtW+5WWJPCj/tAokC5LdSTwkWWttN+jsRgw9BLYD7JDBx7PceiqOBxJJ1tQz3Q==";
       };
     };
-    "@azure/msal-browser-3.17.0" = {
+    "@azure/msal-browser-3.20.0" = {
       name = "_at_azure_slash_msal-browser";
       packageName = "@azure/msal-browser";
-      version = "3.17.0";
+      version = "3.20.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-3.17.0.tgz";
-        sha512 = "csccKXmW2z7EkZ0I3yAoW/offQt+JECdTIV/KrnRoZyM7wCSsQWODpwod8ZhYy7iOyamcHApR9uCh0oD1M+0/A==";
+        url = "https://registry.npmjs.org/@azure/msal-browser/-/msal-browser-3.20.0.tgz";
+        sha512 = "ErsxbfCGIwdqD8jipqdxpfAGiUEQS7MWUe39Rjhl0ZVPsb1JEe9bZCe2+0g23HDH6DGyCAtnTNN9scPtievrMQ==";
       };
     };
-    "@azure/msal-common-14.12.0" = {
+    "@azure/msal-common-14.14.0" = {
       name = "_at_azure_slash_msal-common";
       packageName = "@azure/msal-common";
-      version = "14.12.0";
+      version = "14.14.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@azure/msal-common/-/msal-common-14.12.0.tgz";
-        sha512 = "IDDXmzfdwmDkv4SSmMEyAniJf6fDu3FJ7ncOjlxkDuT85uSnLEhZi3fGZpoR7T4XZpOMx9teM9GXBgrfJgyeBw==";
+        url = "https://registry.npmjs.org/@azure/msal-common/-/msal-common-14.14.0.tgz";
+        sha512 = "OxcOk9H1/1fktHh6//VCORgSNJc2dCQObTm6JNmL824Z6iZSO6eFo/Bttxe0hETn9B+cr7gDouTQtsRq3YPuSQ==";
       };
     };
-    "@azure/msal-node-2.9.2" = {
+    "@azure/msal-node-2.12.0" = {
       name = "_at_azure_slash_msal-node";
       packageName = "@azure/msal-node";
-      version = "2.9.2";
+      version = "2.12.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@azure/msal-node/-/msal-node-2.9.2.tgz";
-        sha512 = "8tvi6Cos3m+0KmRbPjgkySXi+UQU/QiuVRFnrxIwt5xZlEEFa69O04RTaNESGgImyBBlYbo2mfE8/U8Bbdk1WQ==";
+        url = "https://registry.npmjs.org/@azure/msal-node/-/msal-node-2.12.0.tgz";
+        sha512 = "jmk5Im5KujRA2AcyCb0awA3buV8niSrwXZs+NBJWIvxOz76RvNlusGIqi43A0h45BPUy93Qb+CPdpJn82NFTIg==";
       };
     };
     "@azure/opentelemetry-instrumentation-azure-sdk-1.0.0-beta.5" = {
@@ -1624,13 +1615,13 @@ let
         sha512 = "sM4vpsCpcCApagRW5UIjQNlNylo02my2opgp0Emi8x888hZUvJ3dN69Oq20cEGXkMUWnoCrBaB0zyS3yeB87sQ==";
       };
     };
-    "@babel/cli-7.24.7" = {
+    "@babel/cli-7.24.8" = {
       name = "_at_babel_slash_cli";
       packageName = "@babel/cli";
-      version = "7.24.7";
+      version = "7.24.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/cli/-/cli-7.24.7.tgz";
-        sha512 = "8dfPprJgV4O14WTx+AQyEA+opgUKPrsIXX/MdL50J1n06EQJ6m1T+CdsJe0qEC0B/Xl85i+Un5KVAxd/PACX9A==";
+        url = "https://registry.npmjs.org/@babel/cli/-/cli-7.24.8.tgz";
+        sha512 = "isdp+G6DpRyKc+3Gqxy2rjzgF7Zj9K0mzLNnxz+E/fgeag8qT3vVulX4gY9dGO1q0y+0lUv6V3a+uhUzMzrwXg==";
       };
     };
     "@babel/code-frame-7.10.4" = {
@@ -1669,22 +1660,22 @@ let
         sha512 = "BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==";
       };
     };
-    "@babel/compat-data-7.24.7" = {
+    "@babel/compat-data-7.24.9" = {
       name = "_at_babel_slash_compat-data";
       packageName = "@babel/compat-data";
-      version = "7.24.7";
+      version = "7.24.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.24.7.tgz";
-        sha512 = "qJzAIcv03PyaWqxRgO4mSU3lihncDT296vnyuE2O8uA4w3UHWI4S3hgeZd1L8W1Bft40w9JxJ2b412iDUFFRhw==";
+        url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.24.9.tgz";
+        sha512 = "e701mcfApCJqMMueQI0Fb68Amflj83+dvAvHawoBpAz+GDjCIyGHzNwnefjsWJ3xiYAqqiQFoWbspGYBdb2/ng==";
       };
     };
-    "@babel/core-7.24.7" = {
+    "@babel/core-7.24.9" = {
       name = "_at_babel_slash_core";
       packageName = "@babel/core";
-      version = "7.24.7";
+      version = "7.24.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/core/-/core-7.24.7.tgz";
-        sha512 = "nykK+LEK86ahTkX/3TgauT0ikKoNCfKHEaZYTUVupJdTLzGNvrblu4u6fa7DhZONAltdf8e662t/abY8idrd/g==";
+        url = "https://registry.npmjs.org/@babel/core/-/core-7.24.9.tgz";
+        sha512 = "5e3FI4Q3M3Pbr21+5xJwCv6ZT6KmGkI0vw3Tozy5ODAQFTIWe37iT8Cr7Ice2Ntb+M3iSKCEWMB1MBgKrW3whg==";
       };
     };
     "@babel/generator-7.18.2" = {
@@ -1696,13 +1687,13 @@ let
         sha512 = "W1lG5vUwFvfMd8HVXqdfbuG7RuaSrTCCD8cl8fP8wOivdbtbIg2Db3IWUcgvfxKbbn6ZBGYRW/Zk1MIwK49mgw==";
       };
     };
-    "@babel/generator-7.24.4" = {
+    "@babel/generator-7.24.10" = {
       name = "_at_babel_slash_generator";
       packageName = "@babel/generator";
-      version = "7.24.4";
+      version = "7.24.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/generator/-/generator-7.24.4.tgz";
-        sha512 = "Xd6+v6SnjWVx/nus+y0l1sxMOTOMBkyL4+BIdbALyatQnAe/SRVjANeDPSCYaX+i1iJmuGSKf3Z+E+V/va1Hvw==";
+        url = "https://registry.npmjs.org/@babel/generator/-/generator-7.24.10.tgz";
+        sha512 = "o9HBZL1G2129luEUlG1hB4N/nlYNWHnpwlND9eOMclRqqu1YDy2sSYVCFUZwl8I1Gxh+QSRrP2vD7EpUmFVXxg==";
       };
     };
     "@babel/generator-7.24.7" = {
@@ -1732,22 +1723,22 @@ let
         sha512 = "xZeCVVdwb4MsDBkkyZ64tReWYrLRHlMN72vP7Bdm3OUOuyFZExhsHUUnuWnm2/XOlAJzR0LfPpB56WXZn0X/lA==";
       };
     };
-    "@babel/helper-compilation-targets-7.24.7" = {
+    "@babel/helper-compilation-targets-7.24.8" = {
       name = "_at_babel_slash_helper-compilation-targets";
       packageName = "@babel/helper-compilation-targets";
-      version = "7.24.7";
+      version = "7.24.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.24.7.tgz";
-        sha512 = "ctSdRHBi20qWOfy27RUb4Fhp07KSJ3sXcuSvTrXrc4aG8NSYDo1ici3Vhg9bg69y5bj0Mr1lh0aeEgTvc12rMg==";
+        url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.24.8.tgz";
+        sha512 = "oU+UoqCHdp+nWVDkpldqIQL/i/bvAv53tRqLG/s+cOXxe66zOYLU7ar/Xs3LdmBihrUMEUhwu6dMZwbNOYDwvw==";
       };
     };
-    "@babel/helper-create-class-features-plugin-7.24.7" = {
+    "@babel/helper-create-class-features-plugin-7.24.8" = {
       name = "_at_babel_slash_helper-create-class-features-plugin";
       packageName = "@babel/helper-create-class-features-plugin";
-      version = "7.24.7";
+      version = "7.24.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.24.7.tgz";
-        sha512 = "kTkaDl7c9vO80zeX1rJxnuRpEsD5tA81yh11X1gQo+PhSti3JS+7qeZo9U4RHobKRiFPKaGK3svUAeb8D0Q7eg==";
+        url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.24.8.tgz";
+        sha512 = "4f6Oqnmyp2PP3olgUMmOwC3akxSm5aBYraQ6YDdKy7NcAMkDECHWG0DEnV6M2UAkERgIBhYt8S27rURPg7SxWA==";
       };
     };
     "@babel/helper-create-regexp-features-plugin-7.24.7" = {
@@ -1795,13 +1786,13 @@ let
         sha512 = "MJJwhkoGy5c4ehfoRyrJ/owKeMl19U54h27YYftT0o2teQ3FJ3nQUf/I3LlJsX4l3qlw7WRXUmiyajvHXoTubQ==";
       };
     };
-    "@babel/helper-member-expression-to-functions-7.24.7" = {
+    "@babel/helper-member-expression-to-functions-7.24.8" = {
       name = "_at_babel_slash_helper-member-expression-to-functions";
       packageName = "@babel/helper-member-expression-to-functions";
-      version = "7.24.7";
+      version = "7.24.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.24.7.tgz";
-        sha512 = "LGeMaf5JN4hAT471eJdBs/GK1DoYIJ5GCtZN/EsL6KUiiDZOvO/eKE11AMZJa2zP4zk4qe9V2O/hxAmkRc8p6w==";
+        url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.24.8.tgz";
+        sha512 = "LABppdt+Lp/RlBxqrh4qgf1oEH/WxdzQNDJIu5gC/W1GyvPVrOBiItmmM8wan2fm4oYqFuFfkXmlGpLQhPY8CA==";
       };
     };
     "@babel/helper-module-imports-7.24.7" = {
@@ -1813,13 +1804,13 @@ let
         sha512 = "8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA==";
       };
     };
-    "@babel/helper-module-transforms-7.24.7" = {
+    "@babel/helper-module-transforms-7.24.9" = {
       name = "_at_babel_slash_helper-module-transforms";
       packageName = "@babel/helper-module-transforms";
-      version = "7.24.7";
+      version = "7.24.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.24.7.tgz";
-        sha512 = "1fuJEwIrp+97rM4RWdO+qrRsZlAeL1lQJoPqtCYWv0NL115XM93hIH4CSRln2w52SqvmY5hqdtauB6QFCDiZNQ==";
+        url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.24.9.tgz";
+        sha512 = "oYbh+rtFKj/HwBQkFlUzvcybzklmVdVV3UU+mN7n2t/q3yGHbuVdNxyFvSBO1tfvjyArpHNcWMAzsSPdyI46hw==";
       };
     };
     "@babel/helper-optimise-call-expression-7.24.7" = {
@@ -1831,13 +1822,13 @@ let
         sha512 = "jKiTsW2xmWwxT1ixIdfXUZp+P5yURx2suzLZr5Hi64rURpDYdMW0pv+Uf17EYk2Rd428Lx4tLsnjGJzYKDM/6A==";
       };
     };
-    "@babel/helper-plugin-utils-7.24.7" = {
+    "@babel/helper-plugin-utils-7.24.8" = {
       name = "_at_babel_slash_helper-plugin-utils";
       packageName = "@babel/helper-plugin-utils";
-      version = "7.24.7";
+      version = "7.24.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.7.tgz";
-        sha512 = "Rq76wjt7yz9AAc1KnlRKNAi/dMSVWgDRx43FHoJEbcYU6xOWaE2dVPwcdTukJrjxS65GITyfbvEYHvkirZ6uEg==";
+        url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.24.8.tgz";
+        sha512 = "FFWx5142D8h2Mgr/iPVGH5G7w6jDn4jUSpZTyDnQO0Yn7Ks2Kuz6Pci8H6MPCoUJegd/UZQ3tAvfLCxQSnWWwg==";
       };
     };
     "@babel/helper-remap-async-to-generator-7.24.7" = {
@@ -1885,13 +1876,13 @@ let
         sha512 = "oy5V7pD+UvfkEATUKvIjvIAH/xCzfsFVw7ygW2SI6NClZzquT+mwdTfgfdbUiceh6iQO0CHtCPsyze/MZ2YbAA==";
       };
     };
-    "@babel/helper-string-parser-7.24.7" = {
+    "@babel/helper-string-parser-7.24.8" = {
       name = "_at_babel_slash_helper-string-parser";
       packageName = "@babel/helper-string-parser";
-      version = "7.24.7";
+      version = "7.24.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.7.tgz";
-        sha512 = "7MbVt6xrwFQbunH2DNQsAP5sTGxfqQtErvBIvIMi6EQnbgUOuVYanvREcmFrOPhoXBrTtjhhP+lW+o5UfK+tDg==";
+        url = "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.8.tgz";
+        sha512 = "pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ==";
       };
     };
     "@babel/helper-validator-identifier-7.24.7" = {
@@ -1903,13 +1894,13 @@ let
         sha512 = "rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==";
       };
     };
-    "@babel/helper-validator-option-7.24.7" = {
+    "@babel/helper-validator-option-7.24.8" = {
       name = "_at_babel_slash_helper-validator-option";
       packageName = "@babel/helper-validator-option";
-      version = "7.24.7";
+      version = "7.24.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.24.7.tgz";
-        sha512 = "yy1/KvjhV/ZCL+SM7hBrvnZJ3ZuT9OuZgIJAGpPEToANvc3iM6iDvBnRjtElWibHU6n8/LPR/EjX9EtIEYO3pw==";
+        url = "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.24.8.tgz";
+        sha512 = "xb8t9tD1MHLungh/AIoWYN+gVHaB9kwlu8gffXGSt3FFEIT7RjS+xWbc2vUD1UTZdIpKj/ab3rdqJ7ufngyi2Q==";
       };
     };
     "@babel/helper-wrap-function-7.24.7" = {
@@ -1921,13 +1912,13 @@ let
         sha512 = "N9JIYk3TD+1vq/wn77YnJOqMtfWhNewNE+DJV4puD2X7Ew9J4JvrzrFDfTfyv5EgEXVy9/Wt8QiOErzEmv5Ifw==";
       };
     };
-    "@babel/helpers-7.24.7" = {
+    "@babel/helpers-7.24.8" = {
       name = "_at_babel_slash_helpers";
       packageName = "@babel/helpers";
-      version = "7.24.7";
+      version = "7.24.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.24.7.tgz";
-        sha512 = "NlmJJtvcw72yRJRcnCmGvSi+3jDEg8qFu3z0AFoymmzLx5ERVWyzd9kVXr7Th9/8yIJi2Zc6av4Tqz3wFs8QWg==";
+        url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.24.8.tgz";
+        sha512 = "gV2265Nkcz7weJJfvDoAEVzC1e2OTDpkGbEsebse8koXUJUXPsCMi7sRo/+SPMuMZ9MtUPnGwITTnQnU5YjyaQ==";
       };
     };
     "@babel/highlight-7.24.7" = {
@@ -1939,13 +1930,13 @@ let
         sha512 = "EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==";
       };
     };
-    "@babel/node-7.24.7" = {
+    "@babel/node-7.24.8" = {
       name = "_at_babel_slash_node";
       packageName = "@babel/node";
-      version = "7.24.7";
+      version = "7.24.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/node/-/node-7.24.7.tgz";
-        sha512 = "BCYNLxUQjGTgy8bAq12jy+Lt8soGWa/5u3s7U3aTVXxviIp0YVS+/Wm0b4eaitLVvetYrEoAiRF0QOk4WKsHAQ==";
+        url = "https://registry.npmjs.org/@babel/node/-/node-7.24.8.tgz";
+        sha512 = "4JgQZJOVDrMCe2OwP7g4nBEvv0kbTkWYVvkEhFdq8JdEhsy9J5E5ChibbIchTrntKB62lx2I7fVTdM+Se7KVFg==";
       };
     };
     "@babel/parser-7.18.4" = {
@@ -1957,13 +1948,13 @@ let
         sha512 = "FDge0dFazETFcxGw/EXzOkN8uJp0PC7Qbm+Pe9T+av2zlBpOgunFHkQPPn+eRuClU73JF+98D531UgayY89tow==";
       };
     };
-    "@babel/parser-7.24.7" = {
+    "@babel/parser-7.24.8" = {
       name = "_at_babel_slash_parser";
       packageName = "@babel/parser";
-      version = "7.24.7";
+      version = "7.24.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/parser/-/parser-7.24.7.tgz";
-        sha512 = "9uUYRm6OqQrCqQdG1iCBwBPZgN8ciDBro2nIOFaiRz1/BCxaI7CNvQbDHvsArAC7Tw9Hda/B3U+6ui9u4HWXPw==";
+        url = "https://registry.npmjs.org/@babel/parser/-/parser-7.24.8.tgz";
+        sha512 = "WzfbgXOkGzZiXXCqk43kKwZjzwx4oulxZi3nq2TYL9mOjQv6kYwul9mz6ID36njuL7Xkp6nJEfok848Zj10j/w==";
       };
     };
     "@babel/plugin-bugfix-firefox-class-in-computed-class-key-7.24.7" = {
@@ -2353,13 +2344,13 @@ let
         sha512 = "HMXK3WbBPpZQufbMG4B46A90PkuuhN9vBCb5T8+VAHqvAqvcLi+2cKoukcpmUYkszLhScU3l1iudhrks3DggRQ==";
       };
     };
-    "@babel/plugin-transform-classes-7.24.7" = {
+    "@babel/plugin-transform-classes-7.24.8" = {
       name = "_at_babel_slash_plugin-transform-classes";
       packageName = "@babel/plugin-transform-classes";
-      version = "7.24.7";
+      version = "7.24.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.24.7.tgz";
-        sha512 = "CFbbBigp8ln4FU6Bpy6g7sE8B/WmCmzvivzUC6xDAdWVsjYTXijpuuGJmYkAaoWAzcItGKT3IOAbxRItZ5HTjw==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.24.8.tgz";
+        sha512 = "VXy91c47uujj758ud9wx+OMgheXm4qJfyhj1P18YvlrQkNOSrwsteHk+EFS3OMGfhMhpZa0A+81eE7G4QC+3CA==";
       };
     };
     "@babel/plugin-transform-computed-properties-7.24.7" = {
@@ -2371,13 +2362,13 @@ let
         sha512 = "25cS7v+707Gu6Ds2oY6tCkUwsJ9YIDbggd9+cu9jzzDgiNq7hR/8dkzxWfKWnTic26vsI3EsCXNd4iEB6e8esQ==";
       };
     };
-    "@babel/plugin-transform-destructuring-7.24.7" = {
+    "@babel/plugin-transform-destructuring-7.24.8" = {
       name = "_at_babel_slash_plugin-transform-destructuring";
       packageName = "@babel/plugin-transform-destructuring";
-      version = "7.24.7";
+      version = "7.24.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.24.7.tgz";
-        sha512 = "19eJO/8kdCQ9zISOf+SEUJM/bAUIsvY3YDnXZTupUCQ8LgrWnsG/gFB9dvXqdXnRXMAM8fvt7b0CBKQHNGy1mw==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.24.8.tgz";
+        sha512 = "36e87mfY8TnRxc7yc6M9g9gOB7rKgSahqkIKwLpz4Ppk2+zC2Cy1is0uwtuSG6AE4zlTOUa+7JGz9jCJGLqQFQ==";
       };
     };
     "@babel/plugin-transform-dotall-regex-7.24.7" = {
@@ -2497,13 +2488,13 @@ let
         sha512 = "9+pB1qxV3vs/8Hdmz/CulFB8w2tuu6EB94JZFsjdqxQokwGa9Unap7Bo2gGBGIvPmDIVvQrom7r5m/TCDMURhg==";
       };
     };
-    "@babel/plugin-transform-modules-commonjs-7.24.7" = {
+    "@babel/plugin-transform-modules-commonjs-7.24.8" = {
       name = "_at_babel_slash_plugin-transform-modules-commonjs";
       packageName = "@babel/plugin-transform-modules-commonjs";
-      version = "7.24.7";
+      version = "7.24.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.24.7.tgz";
-        sha512 = "iFI8GDxtevHJ/Z22J5xQpVqFLlMNstcLXh994xifFwxxGslr2ZXXLWgtBeLctOD63UFDArdvN6Tg8RFw+aEmjQ==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.24.8.tgz";
+        sha512 = "WHsk9H8XxRs3JXKWFiqtQebdh9b/pTk4EgueygFzYlTKAg0Ud985mSevdNjdXdFBATSKVJGQXP1tv6aGbssLKA==";
       };
     };
     "@babel/plugin-transform-modules-systemjs-7.24.7" = {
@@ -2587,13 +2578,13 @@ let
         sha512 = "uLEndKqP5BfBbC/5jTwPxLh9kqPWWgzN/f8w6UwAIirAEqiIVJWWY312X72Eub09g5KF9+Zn7+hT7sDxmhRuKA==";
       };
     };
-    "@babel/plugin-transform-optional-chaining-7.24.7" = {
+    "@babel/plugin-transform-optional-chaining-7.24.8" = {
       name = "_at_babel_slash_plugin-transform-optional-chaining";
       packageName = "@babel/plugin-transform-optional-chaining";
-      version = "7.24.7";
+      version = "7.24.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.24.7.tgz";
-        sha512 = "tK+0N9yd4j+x/4hxF3F0e0fu/VdcxU18y5SevtyM/PCFlQvXbR0Zmlo2eBrKtVipGNFzpq56o8WsIIKcJFUCRQ==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-optional-chaining/-/plugin-transform-optional-chaining-7.24.8.tgz";
+        sha512 = "5cTOLSMs9eypEy8JUVvIKOu6NgvbJMnpG62VpIHrTmROdQ+L5mDAaI40g25k5vXti55JWNX5jCkq3HZxXBQANw==";
       };
     };
     "@babel/plugin-transform-parameters-7.24.7" = {
@@ -2731,22 +2722,22 @@ let
         sha512 = "AfDTQmClklHCOLxtGoP7HkeMw56k1/bTQjwsfhL6pppo/M4TOBSq+jjBUBLmV/4oeFg4GWMavIl44ZeCtmmZTw==";
       };
     };
-    "@babel/plugin-transform-typeof-symbol-7.24.7" = {
+    "@babel/plugin-transform-typeof-symbol-7.24.8" = {
       name = "_at_babel_slash_plugin-transform-typeof-symbol";
       packageName = "@babel/plugin-transform-typeof-symbol";
-      version = "7.24.7";
+      version = "7.24.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.24.7.tgz";
-        sha512 = "VtR8hDy7YLB7+Pet9IarXjg/zgCMSF+1mNS/EQEiEaUPoFXCVsHG64SIxcaaI2zJgRiv+YmgaQESUfWAdbjzgg==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.24.8.tgz";
+        sha512 = "adNTUpDCVnmAE58VEqKlAA6ZBlNkMnWD0ZcW76lyNFN3MJniyGFZfNwERVk8Ap56MCnXztmDr19T4mPTztcuaw==";
       };
     };
-    "@babel/plugin-transform-typescript-7.24.7" = {
+    "@babel/plugin-transform-typescript-7.24.8" = {
       name = "_at_babel_slash_plugin-transform-typescript";
       packageName = "@babel/plugin-transform-typescript";
-      version = "7.24.7";
+      version = "7.24.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.24.7.tgz";
-        sha512 = "iLD3UNkgx2n/HrjBesVbYX6j0yqn/sJktvbtKKgcaLIQ4bTTQ8obAypc1VpyHPD2y4Phh9zHOaAt8e/L14wCpw==";
+        url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.24.8.tgz";
+        sha512 = "CgFgtN61BbdOGCP4fLaAMOPkzWUh6yQZNMr5YSt8uz2cZSSiQONCQFWqsE4NeVfOIhqDOlS9CR3WD91FzMeB2Q==";
       };
     };
     "@babel/plugin-transform-unicode-escapes-7.24.7" = {
@@ -2794,22 +2785,13 @@ let
         sha512 = "X0pi0V6gxLi6lFZpGmeNa4zxtwEmCs42isWLNjZZDE0Y8yVfgu0T2OAHlzBbdYlqbW/YXVvoBHpATEM+goCj8g==";
       };
     };
-    "@babel/preset-env-7.24.7" = {
+    "@babel/preset-env-7.24.8" = {
       name = "_at_babel_slash_preset-env";
       packageName = "@babel/preset-env";
-      version = "7.24.7";
+      version = "7.24.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.24.7.tgz";
-        sha512 = "1YZNsc+y6cTvWlDHidMBsQZrZfEFjRIo/BZCT906PMdzOyXtSLTgqGdrpcuTDCXyd11Am5uQULtDIcCfnTc8fQ==";
-      };
-    };
-    "@babel/preset-flow-7.24.7" = {
-      name = "_at_babel_slash_preset-flow";
-      packageName = "@babel/preset-flow";
-      version = "7.24.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/preset-flow/-/preset-flow-7.24.7.tgz";
-        sha512 = "NL3Lo0NorCU607zU3NwRyJbpaB6E3t0xtd3LfAQKDfkeX4/ggcDXvkmkW42QWT5owUeW/jAe4hn+2qvkV1IbfQ==";
+        url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.24.8.tgz";
+        sha512 = "vObvMZB6hNWuDxhSaEPTKCwcqkAIuDtE+bQGn4XMXne1DSLzFVY8Vmj1bm+mUQXYNN8NmaQEO+r8MMbzPr1jBQ==";
       };
     };
     "@babel/preset-modules-0.1.6-no-external-plugins" = {
@@ -2848,13 +2830,13 @@ let
         sha512 = "x/rqGMdzj+fWZvCOYForTghzbtqPDZ5gPwaoNGHdgDfF2QA/XZbCBp4Moo5scrkAMPhB7z26XM/AaHuIJdgauA==";
       };
     };
-    "@babel/runtime-7.24.7" = {
+    "@babel/runtime-7.24.8" = {
       name = "_at_babel_slash_runtime";
       packageName = "@babel/runtime";
-      version = "7.24.7";
+      version = "7.24.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.24.7.tgz";
-        sha512 = "UwgBRMjJP+xv857DCngvqXI3Iq6J4v0wXmwc6sapg+zyhbwmQX67LUEFrkK5tbyJ30jGuG3ZvWpBiB9LCy1kWw==";
+        url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.24.8.tgz";
+        sha512 = "5F7SDGs1T72ZczbRwbGO9lQi0NLjQxzl6i4lJxLxfW9U5UluCSyEJeniWvnhl3/euNiqQVbo8zruhsDfid0esA==";
       };
     };
     "@babel/runtime-7.9.0" = {
@@ -2866,15 +2848,6 @@ let
         sha512 = "cTIudHnzuWLS56ik4DnRnqqNf8MkdUzV4iFFI1h7Jo9xvrpQROYaAnaSd2mHLQAzzZAPfATynX5ord6YlNYNMA==";
       };
     };
-    "@babel/template-7.24.0" = {
-      name = "_at_babel_slash_template";
-      packageName = "@babel/template";
-      version = "7.24.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/template/-/template-7.24.0.tgz";
-        sha512 = "Bkf2q8lMB0AFpX0NFEqSbx1OkTHf0f+0j82mkw+ZpzBnkk7e9Ql0891vlfgi+kHwOk8tQjiQHpqh4LaSa0fKEA==";
-      };
-    };
     "@babel/template-7.24.7" = {
       name = "_at_babel_slash_template";
       packageName = "@babel/template";
@@ -2884,13 +2857,13 @@ let
         sha512 = "jYqfPrU9JTF0PmPy1tLYHW4Mp4KlgxJD9l2nP9fD6yT/ICi554DmrWBAEYpIelzjHf1msDP3PxJIRt/nFNfBig==";
       };
     };
-    "@babel/traverse-7.24.7" = {
+    "@babel/traverse-7.24.8" = {
       name = "_at_babel_slash_traverse";
       packageName = "@babel/traverse";
-      version = "7.24.7";
+      version = "7.24.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.24.7.tgz";
-        sha512 = "yb65Ed5S/QAcewNPh0nZczy9JdYXkkAbIsEo+P7BE7yO3txAY30Y/oPa3QkQ5It3xVG2kpKMg9MsdxZaO31uKA==";
+        url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.24.8.tgz";
+        sha512 = "t0P1xxAPzEDcEPmjprAQq19NWum4K0EQPjMwZQZbHt+GiZqvjCHjj755Weq1YRPVzBI+3zSfvScfpnuIecVFJQ==";
       };
     };
     "@babel/types-7.19.0" = {
@@ -2902,15 +2875,6 @@ let
         sha512 = "YuGopBq3ke25BVSiS6fgF49Ul9gH1x70Bcr6bqRLjWCkcX8Hre1/5+z+IiWOIerRMSSEfGZVB9z9kyq7wVs9YA==";
       };
     };
-    "@babel/types-7.24.0" = {
-      name = "_at_babel_slash_types";
-      packageName = "@babel/types";
-      version = "7.24.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/types/-/types-7.24.0.tgz";
-        sha512 = "+j7a5c253RfKh8iABBhywc8NSfP5LURe7Uh4qpsh6jc+aLJguvmIUBdjSdEMQv2bENrCR5MfRdjGo7vzS/ob7w==";
-      };
-    };
     "@babel/types-7.24.7" = {
       name = "_at_babel_slash_types";
       packageName = "@babel/types";
@@ -2920,22 +2884,31 @@ let
         sha512 = "XEFXSlxiG5td2EJRe8vOmRbaXVgfcBlszKujvVmWIK/UpywWljQCfzAv3RQCGujWQ1RD4YYWEAqDXfuJiy8f5Q==";
       };
     };
-    "@bmewburn/js-beautify-1.14.9" = {
-      name = "_at_bmewburn_slash_js-beautify";
-      packageName = "@bmewburn/js-beautify";
-      version = "1.14.9";
+    "@babel/types-7.24.9" = {
+      name = "_at_babel_slash_types";
+      packageName = "@babel/types";
+      version = "7.24.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@bmewburn/js-beautify/-/js-beautify-1.14.9.tgz";
-        sha512 = "PNz0Y8TElejGkQ3N6aiqoBLLa+kaIAQAgu6KFn/PN625W/t2LZVyoL68df5gRSvbpelrsczvQlVLsNp0mcJFgA==";
+        url = "https://registry.npmjs.org/@babel/types/-/types-7.24.9.tgz";
+        sha512 = "xm8XrMKz0IlUdocVbYJe0Z9xEgidU7msskG8BbhnTPK/HZ2z/7FP7ykqPgrUH+C+r414mNfNWam1f2vqOjqjYQ==";
       };
     };
-    "@bmewburn/vscode-html-languageserver-1.10.0" = {
+    "@bmewburn/js-beautify-1.15.2" = {
+      name = "_at_bmewburn_slash_js-beautify";
+      packageName = "@bmewburn/js-beautify";
+      version = "1.15.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@bmewburn/js-beautify/-/js-beautify-1.15.2.tgz";
+        sha512 = "TGLBQLYEow0ncfCap5ZSTeU7z/LlUemNvwirys5la3A44P+NZVIvuJSFCbo8+Sjsau/nthTLuwe76oiSthvm7Q==";
+      };
+    };
+    "@bmewburn/vscode-html-languageserver-1.11.0" = {
       name = "_at_bmewburn_slash_vscode-html-languageserver";
       packageName = "@bmewburn/vscode-html-languageserver";
-      version = "1.10.0";
+      version = "1.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@bmewburn/vscode-html-languageserver/-/vscode-html-languageserver-1.10.0.tgz";
-        sha512 = "0lHL4Y1EJKHdRIEpXPZHnlIoxCKNglADDPloOYFcIoRj/O7zfRDrdPWPJgr2LeJDgXHklX6ltH6wp0Ywxa98AQ==";
+        url = "https://registry.npmjs.org/@bmewburn/vscode-html-languageserver/-/vscode-html-languageserver-1.11.0.tgz";
+        sha512 = "9uyCkXlu5eHyQB4Knux5mHJzuAglJXoix7B8i8xxurM+03lhSJz3QJ9LeBTP2YSSCnE/vTu4vCXDGDzANA4R7g==";
       };
     };
     "@braintree/sanitize-url-6.0.4" = {
@@ -2947,49 +2920,49 @@ let
         sha512 = "s3jaWicZd0pkP0jf5ysyHUI/RE7MHos6qlToFcGWXVp+ykHOy77OUMrfbgJ9it2C5bow7OIQwYYaHjk9XlBQ2A==";
       };
     };
-    "@cdktf/cli-core-0.20.7" = {
+    "@cdktf/cli-core-0.20.8" = {
       name = "_at_cdktf_slash_cli-core";
       packageName = "@cdktf/cli-core";
-      version = "0.20.7";
+      version = "0.20.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@cdktf/cli-core/-/cli-core-0.20.7.tgz";
-        sha512 = "KGTRZ68PHUfiW75GkwOIetp2N9tjIdmTHwmt773jwlNFbi+OMaOEm07XQjtIz2AcuvLpx9u4N0u/uI4T+JfwSg==";
+        url = "https://registry.npmjs.org/@cdktf/cli-core/-/cli-core-0.20.8.tgz";
+        sha512 = "ZMMedejI0ITMwKecsg9+Z7IqX7VH0y8DYx2kr9DciyCDuvbE6gYlo/pYRbgpdC5ObpnNYg39rFY4x0yKRytCzw==";
       };
     };
-    "@cdktf/commons-0.20.7" = {
+    "@cdktf/commons-0.20.8" = {
       name = "_at_cdktf_slash_commons";
       packageName = "@cdktf/commons";
-      version = "0.20.7";
+      version = "0.20.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@cdktf/commons/-/commons-0.20.7.tgz";
-        sha512 = "X1HnLlJjKyOfoWTOIoUbm5cRxWIqKw2gtHs4QgDlTGZm9kc5lW1IbwMuEOv7B1IHFXFFRFwnYg03V56TuoEvqQ==";
+        url = "https://registry.npmjs.org/@cdktf/commons/-/commons-0.20.8.tgz";
+        sha512 = "VkAz/9b070fceB7d/yk9LasIG7viHq6sqBi9+/4VSU1ZkY9Eyvq99I/OluWD9lRQdiho7OkxZtR+LGhmrhu3XA==";
       };
     };
-    "@cdktf/hcl-tools-0.20.7" = {
+    "@cdktf/hcl-tools-0.20.8" = {
       name = "_at_cdktf_slash_hcl-tools";
       packageName = "@cdktf/hcl-tools";
-      version = "0.20.7";
+      version = "0.20.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@cdktf/hcl-tools/-/hcl-tools-0.20.7.tgz";
-        sha512 = "B/1/UqoCu9V40oV/qLsBRwqp/Q+0wQOcm7WtgZEKNEvNb+5y01E7UbWLoIvs3k7TX8pzHU9Bl1gACXtHbezpsw==";
+        url = "https://registry.npmjs.org/@cdktf/hcl-tools/-/hcl-tools-0.20.8.tgz";
+        sha512 = "eS8h0Vjs1lO3twH5NEPpJv57A+lFAMZry2vM/VBKJaIemeuJll9cICFeonsluQ42f8YCuEGQiHhIAxgfoaTY4g==";
       };
     };
-    "@cdktf/hcl2cdk-0.20.7" = {
+    "@cdktf/hcl2cdk-0.20.8" = {
       name = "_at_cdktf_slash_hcl2cdk";
       packageName = "@cdktf/hcl2cdk";
-      version = "0.20.7";
+      version = "0.20.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@cdktf/hcl2cdk/-/hcl2cdk-0.20.7.tgz";
-        sha512 = "xGrVa/SxnLrYM8pSwRfvvAFaj7ak3B3xvuwhj9xTWKZ39f89sX4vPkTuJgoiwIG83iAIlNapUcqMQ0PeqogeBw==";
+        url = "https://registry.npmjs.org/@cdktf/hcl2cdk/-/hcl2cdk-0.20.8.tgz";
+        sha512 = "p+bju8Qj84COvDLuCQlDmp1iPlIwWoqcW6QpuHNmip3HWLnJuUipO0BMxRcVofcsaljJQmkIbE6We0DZOooG9g==";
       };
     };
-    "@cdktf/hcl2json-0.20.7" = {
+    "@cdktf/hcl2json-0.20.8" = {
       name = "_at_cdktf_slash_hcl2json";
       packageName = "@cdktf/hcl2json";
-      version = "0.20.7";
+      version = "0.20.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@cdktf/hcl2json/-/hcl2json-0.20.7.tgz";
-        sha512 = "325Swm3ySUEbscSIXrtrNOt0mJCyVTheD5SNuDTcMYLyTPQNgu/6LgKu36YQt0AKK3zUp+f56pEYMitpR9FmLQ==";
+        url = "https://registry.npmjs.org/@cdktf/hcl2json/-/hcl2json-0.20.8.tgz";
+        sha512 = "MOt5HHZYmHiRleaS8YwhEz913H4xzDCOO6MF1GO5RNZ74DYl6Bv6Y+JY4196E0THtiJ1Ibo9IvLfTIlTUrQ+Bw==";
       };
     };
     "@cdktf/node-pty-prebuilt-multiarch-0.10.1-pre.11" = {
@@ -3001,22 +2974,22 @@ let
         sha512 = "qvga/nzEtdCJMu/6jJfDqpzbRejvXtNhWFnbubfuYyN5nMNORNXX+POT4j+mQSDQar5bIQ1a812szw/zr47cfw==";
       };
     };
-    "@cdktf/provider-generator-0.20.7" = {
+    "@cdktf/provider-generator-0.20.8" = {
       name = "_at_cdktf_slash_provider-generator";
       packageName = "@cdktf/provider-generator";
-      version = "0.20.7";
+      version = "0.20.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@cdktf/provider-generator/-/provider-generator-0.20.7.tgz";
-        sha512 = "O3ZyDp/q73Kg2zn/axA4V62c3QvaGEO44G94eiyi4z6GRokTVQ4eOlkpoqp3spejizhMkA8Lzq+OQ2cvsQygeA==";
+        url = "https://registry.npmjs.org/@cdktf/provider-generator/-/provider-generator-0.20.8.tgz";
+        sha512 = "ZD3A3IVMp5RKsA83NjRj1pYhBoSiCnXKVGmXLaORhoitzrg/uxoi2bEegNWpgHIt1BXthoKS33bZ23xZ7fK9Pg==";
       };
     };
-    "@cdktf/provider-schema-0.20.7" = {
+    "@cdktf/provider-schema-0.20.8" = {
       name = "_at_cdktf_slash_provider-schema";
       packageName = "@cdktf/provider-schema";
-      version = "0.20.7";
+      version = "0.20.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@cdktf/provider-schema/-/provider-schema-0.20.7.tgz";
-        sha512 = "KVV5YMaMoXgrmT+AsU1y3vCLfyie5/XbSKVVrUnVp5sCrwhsFMl6U59HTDQ52QX3aHWxwTAqEZbljdg6ZUbk9A==";
+        url = "https://registry.npmjs.org/@cdktf/provider-schema/-/provider-schema-0.20.8.tgz";
+        sha512 = "beQuJgjN/7zLS0zVv0d5VyErbBjx61/CI77qg7LFa6KZHRd/OWegkSQ/8DayhLzYfaW8GEYvP7WXbJLl86jIgg==";
       };
     };
     "@chemzqm/msgpack-lite-0.1.29" = {
@@ -3037,24 +3010,6 @@ let
         sha512 = "m7lZj00lP1fNMzXITOV1uNdsYXjsmMbFB7Sl8OXfhRWYDQuBr6EPNzIzAonzIcmvTA2JNs8WMq0ZU76XXzpP6w==";
       };
     };
-    "@cloudflare/kv-asset-handler-0.3.2" = {
-      name = "_at_cloudflare_slash_kv-asset-handler";
-      packageName = "@cloudflare/kv-asset-handler";
-      version = "0.3.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@cloudflare/kv-asset-handler/-/kv-asset-handler-0.3.2.tgz";
-        sha512 = "EeEjMobfuJrwoctj7FA1y1KEbM0+Q1xSjobIEyie9k4haVEBB7vkDvsasw1pM3rO39mL2akxIAzLMUAtrMHZhA==";
-      };
-    };
-    "@cloudflare/workers-types-4.20240605.0" = {
-      name = "_at_cloudflare_slash_workers-types";
-      packageName = "@cloudflare/workers-types";
-      version = "4.20240605.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@cloudflare/workers-types/-/workers-types-4.20240605.0.tgz";
-        sha512 = "zJw4Q6CnkaQ5JZmHRkNiSs5GfiRgUIUL8BIHPQkd2XUHZkIBv9M9yc0LKEwMYGpCFC+oSOltet6c9RjP9uQ99g==";
-      };
-    };
     "@colors/colors-1.6.0" = {
       name = "_at_colors_slash_colors";
       packageName = "@colors/colors";
@@ -3217,58 +3172,58 @@ let
         sha512 = "gB5C5nDIacLUdsMuW8YsM9SzK3vaFANe4J11CVXpovpy7bZUGrcJKmc6m/0gWG789pKr6XSZY2aEetjFvSRw5g==";
       };
     };
-    "@cspell/cspell-bundled-dicts-8.8.4" = {
+    "@cspell/cspell-bundled-dicts-8.12.1" = {
       name = "_at_cspell_slash_cspell-bundled-dicts";
       packageName = "@cspell/cspell-bundled-dicts";
-      version = "8.8.4";
+      version = "8.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@cspell/cspell-bundled-dicts/-/cspell-bundled-dicts-8.8.4.tgz";
-        sha512 = "k9ZMO2kayQFXB3B45b1xXze3MceAMNy9U+D7NTnWB1i3S0y8LhN53U9JWWgqHGPQaHaLHzizL7/w1aGHTA149Q==";
+        url = "https://registry.npmjs.org/@cspell/cspell-bundled-dicts/-/cspell-bundled-dicts-8.12.1.tgz";
+        sha512 = "55wCxlKwRsYCt8uWB65C0xiJ4bP43UE3b/GK01ekyz2fZ11mudMWGMrX/pdKwGIOXFfFqDz3DCRxFs+fHS58oA==";
       };
     };
-    "@cspell/cspell-json-reporter-8.8.4" = {
+    "@cspell/cspell-json-reporter-8.12.1" = {
       name = "_at_cspell_slash_cspell-json-reporter";
       packageName = "@cspell/cspell-json-reporter";
-      version = "8.8.4";
+      version = "8.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@cspell/cspell-json-reporter/-/cspell-json-reporter-8.8.4.tgz";
-        sha512 = "ITpOeNyDHD+4B9QmLJx6YYtrB1saRsrCLluZ34YaICemNLuumVRP1vSjcdoBtefvGugCOn5nPK7igw0r/vdAvA==";
+        url = "https://registry.npmjs.org/@cspell/cspell-json-reporter/-/cspell-json-reporter-8.12.1.tgz";
+        sha512 = "nO/3GTk3rBpLRBzkmcKFxbtEDd3FKXfQ5uTCpJ27XYVHYjlU+d4McOYYMClMhpFianVol2JCyberpGAj6bVgLg==";
       };
     };
-    "@cspell/cspell-pipe-8.8.4" = {
+    "@cspell/cspell-pipe-8.12.1" = {
       name = "_at_cspell_slash_cspell-pipe";
       packageName = "@cspell/cspell-pipe";
-      version = "8.8.4";
+      version = "8.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@cspell/cspell-pipe/-/cspell-pipe-8.8.4.tgz";
-        sha512 = "Uis9iIEcv1zOogXiDVSegm9nzo5NRmsRDsW8CteLRg6PhyZ0nnCY1PZIUy3SbGF0vIcb/M+XsdLSh2wOPqTXww==";
+        url = "https://registry.npmjs.org/@cspell/cspell-pipe/-/cspell-pipe-8.12.1.tgz";
+        sha512 = "lh0zIm43r/Fj3sQWXc68msKnXNrfPOo8VvzL1hOP0v/j2eH61fvELH08/K+nQJ8cCutNZ4zhk9+KMDU4KmsMtw==";
       };
     };
-    "@cspell/cspell-resolver-8.8.4" = {
+    "@cspell/cspell-resolver-8.12.1" = {
       name = "_at_cspell_slash_cspell-resolver";
       packageName = "@cspell/cspell-resolver";
-      version = "8.8.4";
+      version = "8.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@cspell/cspell-resolver/-/cspell-resolver-8.8.4.tgz";
-        sha512 = "eZVw31nSeh6xKl7TzzkZVMTX/mgwhUw40/q1Sqo7CTPurIBg66oelEqKRclX898jzd2/qSK+ZFwBDxvV7QH38A==";
+        url = "https://registry.npmjs.org/@cspell/cspell-resolver/-/cspell-resolver-8.12.1.tgz";
+        sha512 = "3HE04m7DS/6xYpWPN2QBGCHr26pvxHa78xYk+PjiPD2Q49ceqTNdFcZOYd+Wba8HbRXSukchSLhrTujmPEzqpw==";
       };
     };
-    "@cspell/cspell-service-bus-8.8.4" = {
+    "@cspell/cspell-service-bus-8.12.1" = {
       name = "_at_cspell_slash_cspell-service-bus";
       packageName = "@cspell/cspell-service-bus";
-      version = "8.8.4";
+      version = "8.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@cspell/cspell-service-bus/-/cspell-service-bus-8.8.4.tgz";
-        sha512 = "KtwJ38uPLrm2Q8osmMIAl2NToA/CMyZCxck4msQJnskdo30IPSdA1Rh0w6zXinmh1eVe0zNEVCeJ2+x23HqW+g==";
+        url = "https://registry.npmjs.org/@cspell/cspell-service-bus/-/cspell-service-bus-8.12.1.tgz";
+        sha512 = "UQPddS38dQ/FG00y2wginCzdS6yxryiGrWXSD/P59idCrYYDCYnI9pPsx4u10tmRkW1zJ+O7gGCsXw7xa5DAJQ==";
       };
     };
-    "@cspell/cspell-types-8.8.4" = {
+    "@cspell/cspell-types-8.12.1" = {
       name = "_at_cspell_slash_cspell-types";
       packageName = "@cspell/cspell-types";
-      version = "8.8.4";
+      version = "8.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@cspell/cspell-types/-/cspell-types-8.8.4.tgz";
-        sha512 = "ya9Jl4+lghx2eUuZNY6pcbbrnResgEAomvglhdbEGqy+B5MPEqY5Jt45APEmGqHzTNks7oFFaiTIbXYJAFBR7A==";
+        url = "https://registry.npmjs.org/@cspell/cspell-types/-/cspell-types-8.12.1.tgz";
+        sha512 = "17POyyRgl7m7mMuv1qk2xX6E5bdT0F3247vloBCdUMyaVtmtN4uEiQ/jqU5vtW02vxlKjKS0HcTvKz4EVfSlzQ==";
       };
     };
     "@cspell/dict-ada-4.0.2" = {
@@ -3289,13 +3244,13 @@ let
         sha512 = "K21CfB4ZpKYwwDQiPfic2zJA/uxkbsd4IQGejEvDAhE3z8wBs6g6BwwqdVO767M9NgZqc021yAVpr79N5pWe3w==";
       };
     };
-    "@cspell/dict-aws-4.0.2" = {
+    "@cspell/dict-aws-4.0.3" = {
       name = "_at_cspell_slash_dict-aws";
       packageName = "@cspell/dict-aws";
-      version = "4.0.2";
+      version = "4.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@cspell/dict-aws/-/dict-aws-4.0.2.tgz";
-        sha512 = "aNGHWSV7dRLTIn8WJemzLoMF62qOaiUQlgnsCwH5fRCD/00gsWCwg106pnbkmK4AyabyxzneOV4dfecDJWkSxw==";
+        url = "https://registry.npmjs.org/@cspell/dict-aws/-/dict-aws-4.0.3.tgz";
+        sha512 = "0C0RQ4EM29fH0tIYv+EgDQEum0QI6OrmjENC9u98pB8UcnYxGG/SqinuPxo+TgcEuInj0Q73MsBpJ1l5xUnrsw==";
       };
     };
     "@cspell/dict-bash-1.0.18" = {
@@ -3325,13 +3280,13 @@ let
         sha512 = "Aw07qiTroqSST2P5joSrC4uOA05zTXzI2wMb+me3q4Davv1D9sCkzXY0TGoC2vzhNv5ooemRi9KATGaBSdU1sw==";
       };
     };
-    "@cspell/dict-companies-3.1.2" = {
+    "@cspell/dict-companies-3.1.3" = {
       name = "_at_cspell_slash_dict-companies";
       packageName = "@cspell/dict-companies";
-      version = "3.1.2";
+      version = "3.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@cspell/dict-companies/-/dict-companies-3.1.2.tgz";
-        sha512 = "OwR5i1xbYuJX7FtHQySmTy3iJtPV1rZQ3jFCxFGwrA1xRQ4rtRcDQ+sTXBCIAoJHkXa84f9J3zsngOKmMGyS/w==";
+        url = "https://registry.npmjs.org/@cspell/dict-companies/-/dict-companies-3.1.3.tgz";
+        sha512 = "qaAmfKtQLA7Sbe9zfFVpcwyG92cx6+EiWIpPURv11Ng2QMv2PKhYcterUJBooAvgqD0/qq+AsLN8MREloY5Mdw==";
       };
     };
     "@cspell/dict-cpp-1.1.40" = {
@@ -3343,13 +3298,13 @@ let
         sha512 = "sscfB3woNDNj60/yGXAdwNtIRWZ89y35xnIaJVDMk5TPMMpaDvuk0a34iOPIq0g4V+Y8e3RyAg71SH6ADwSjGw==";
       };
     };
-    "@cspell/dict-cpp-5.1.9" = {
+    "@cspell/dict-cpp-5.1.12" = {
       name = "_at_cspell_slash_dict-cpp";
       packageName = "@cspell/dict-cpp";
-      version = "5.1.9";
+      version = "5.1.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@cspell/dict-cpp/-/dict-cpp-5.1.9.tgz";
-        sha512 = "lZmPKn3qfkWQ7tr+yw6JhuhscsyRgRHEOpOd0fhtPt0N154FNsGebGGLW0SOZUuGgW7Nk3lCCwHP85GIemnlqQ==";
+        url = "https://registry.npmjs.org/@cspell/dict-cpp/-/dict-cpp-5.1.12.tgz";
+        sha512 = "6lXLOFIa+k/qBcu0bjaE/Kc6v3sh9VhsDOXD1Dalm3zgd0QIMjp5XBmkpSdCAK3pWCPV0Se7ysVLDfCea1BuXg==";
       };
     };
     "@cspell/dict-cryptocurrencies-1.0.10" = {
@@ -3487,13 +3442,13 @@ let
         sha512 = "g+uKLWvOp9IEZvrIvBPTr/oaO6619uH/wyqypqvwpmnmpjcfi8+/hqZH8YNKt15oviK8k4CkINIqNhyndG9d9Q==";
       };
     };
-    "@cspell/dict-en-common-misspellings-2.0.1" = {
+    "@cspell/dict-en-common-misspellings-2.0.3" = {
       name = "_at_cspell_slash_dict-en-common-misspellings";
       packageName = "@cspell/dict-en-common-misspellings";
-      version = "2.0.1";
+      version = "2.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@cspell/dict-en-common-misspellings/-/dict-en-common-misspellings-2.0.1.tgz";
-        sha512 = "uWaP8UG4uvcPyqaG0FzPKCm5kfmhsiiQ45Fs6b3/AEAqfq7Fj1JW0+S3qRt85FQA9SoU6gUJCz9wkK/Ylh7m5A==";
+        url = "https://registry.npmjs.org/@cspell/dict-en-common-misspellings/-/dict-en-common-misspellings-2.0.3.tgz";
+        sha512 = "8nF1z9nUiSgMyikL66HTbDO7jCGtB24TxKBasXIBwkBKMDZgA2M883iXdeByy6m1JJUcCGFkSftVYp2W0bUgjw==";
       };
     };
     "@cspell/dict-en-gb-1.1.33" = {
@@ -3514,13 +3469,13 @@ let
         sha512 = "UPwR4rfiJCxnS+Py+EK9E4AUj3aPZE4p/yBRSHN+5aBQConlI0lLDtMceH5wlupA/sQTU1ERZGPJA9L96jVSyQ==";
       };
     };
-    "@cspell/dict-en_us-4.3.21" = {
+    "@cspell/dict-en_us-4.3.23" = {
       name = "_at_cspell_slash_dict-en_us";
       packageName = "@cspell/dict-en_us";
-      version = "4.3.21";
+      version = "4.3.23";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@cspell/dict-en_us/-/dict-en_us-4.3.21.tgz";
-        sha512 = "Bzoo2aS4Pej/MGIFlATpp0wMt9IzVHrhDjdV7FgkAIXbjrOn67ojbTxCgWs8AuCNVfK8lBYGEvs5+ElH1msF8w==";
+        url = "https://registry.npmjs.org/@cspell/dict-en_us/-/dict-en_us-4.3.23.tgz";
+        sha512 = "l0SoEQBsi3zDSl3OuL4/apBkxjuj4hLIg/oy6+gZ7LWh03rKdF6VNtSZNXWAmMY+pmb1cGA3ouleTiJIglbsIg==";
       };
     };
     "@cspell/dict-filetypes-1.1.8" = {
@@ -3577,13 +3532,13 @@ let
         sha512 = "Mbi+zWdiP9yzL+X4YD9Tgcm5YQ95Ql+Y3vF2LRnOY6g2QWaijTRN1rgksVuxzpFqHi//+bx2uoUb0XEKBYDi8g==";
       };
     };
-    "@cspell/dict-fullstack-3.1.8" = {
+    "@cspell/dict-fullstack-3.2.0" = {
       name = "_at_cspell_slash_dict-fullstack";
       packageName = "@cspell/dict-fullstack";
-      version = "3.1.8";
+      version = "3.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@cspell/dict-fullstack/-/dict-fullstack-3.1.8.tgz";
-        sha512 = "YRlZupL7uqMCtEBK0bDP9BrcPnjDhz7m4GBqCc1EYqfXauHbLmDT8ELha7T/E7wsFKniHSjzwDZzhNXo2lusRQ==";
+        url = "https://registry.npmjs.org/@cspell/dict-fullstack/-/dict-fullstack-3.2.0.tgz";
+        sha512 = "sIGQwU6G3rLTo+nx0GKyirR5dQSFeTIzFTOrURw51ISf+jKG9a3OmvsVtc2OANfvEAOLOC9Wfd8WYhmsO8KRDQ==";
       };
     };
     "@cspell/dict-gaming-terms-1.0.5" = {
@@ -3712,13 +3667,13 @@ let
         sha512 = "4JsCLCRhhLMLiaHpmR7zHFjj1qOauzDI5ZzCNQS31TUMfsOo26jAKDfo0jljFAKgw5M2fEG7sKr8IlPpQAYrmQ==";
       };
     };
-    "@cspell/dict-k8s-1.0.5" = {
+    "@cspell/dict-k8s-1.0.6" = {
       name = "_at_cspell_slash_dict-k8s";
       packageName = "@cspell/dict-k8s";
-      version = "1.0.5";
+      version = "1.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@cspell/dict-k8s/-/dict-k8s-1.0.5.tgz";
-        sha512 = "Cj+/ZV4S+MKlwfocSJZqe/2UAd/sY8YtlZjbK25VN1nCnrsKrBjfkX29vclwSj1U9aJg4Z9jw/uMjoaKu9ZrpQ==";
+        url = "https://registry.npmjs.org/@cspell/dict-k8s/-/dict-k8s-1.0.6.tgz";
+        sha512 = "srhVDtwrd799uxMpsPOQqeDJY+gEocgZpoK06EFrb4GRYGhv7lXo9Fb+xQMyQytzOW9dw4DNOEck++nacDuymg==";
       };
     };
     "@cspell/dict-latex-1.0.25" = {
@@ -3820,13 +3775,13 @@ let
         sha512 = "RwkuZGcYBxL3Yux3cSG/IOWGlQ1e9HLCpHeyMtTVGYKAIkFAVUnGrz20l16/Q7zUG7IEktBz5O42kAozrEnqMQ==";
       };
     };
-    "@cspell/dict-npm-5.0.16" = {
+    "@cspell/dict-npm-5.0.18" = {
       name = "_at_cspell_slash_dict-npm";
       packageName = "@cspell/dict-npm";
-      version = "5.0.16";
+      version = "5.0.18";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@cspell/dict-npm/-/dict-npm-5.0.16.tgz";
-        sha512 = "ZWPnLAziEcSCvV0c8k9Qj88pfMu+wZwM5Qks87ShsfBgI8uLZ9tGHravA7gmjH1Gd7Bgxy2ulvXtSqIWPh1lew==";
+        url = "https://registry.npmjs.org/@cspell/dict-npm/-/dict-npm-5.0.18.tgz";
+        sha512 = "weMTyxWpzz19q4wv9n183BtFvdD5fCjtze+bFKpl+4rO/YlPhHL2cXLAeexJz/VDSBecwX4ybTZYoknd1h2J4w==";
       };
     };
     "@cspell/dict-php-1.0.25" = {
@@ -3856,13 +3811,13 @@ let
         sha512 = "zF/raM/lkhXeHf4I43OtK0gP9rBeEJFArscTVwLWOCIvNk21MJcNoTYoaGw+c056+Q+hJL0psGLO7QN+mxYH1A==";
       };
     };
-    "@cspell/dict-powershell-5.0.4" = {
+    "@cspell/dict-powershell-5.0.5" = {
       name = "_at_cspell_slash_dict-powershell";
       packageName = "@cspell/dict-powershell";
-      version = "5.0.4";
+      version = "5.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@cspell/dict-powershell/-/dict-powershell-5.0.4.tgz";
-        sha512 = "eosDShapDgBWN9ULF7+sRNdUtzRnUdsfEdBSchDm8FZA4HOqxUSZy3b/cX/Rdw0Fnw0AKgk0kzgXw7tS6vwJMQ==";
+        url = "https://registry.npmjs.org/@cspell/dict-powershell/-/dict-powershell-5.0.5.tgz";
+        sha512 = "3JVyvMoDJesAATYGOxcUWPbQPUvpZmkinV3m8HL1w1RrjeMVXXuK7U1jhopSneBtLhkU+9HKFwgh9l9xL9mY2Q==";
       };
     };
     "@cspell/dict-public-licenses-2.0.7" = {
@@ -3883,13 +3838,13 @@ let
         sha512 = "KuyOQaby9NID/pn7EkXilpUxjVIvvyLzhr7BPsDS6FcvUE8Yhss6bJowEDHSv6pa+W2387phoqbDf2rTicquAA==";
       };
     };
-    "@cspell/dict-python-4.2.1" = {
+    "@cspell/dict-python-4.2.3" = {
       name = "_at_cspell_slash_dict-python";
       packageName = "@cspell/dict-python";
-      version = "4.2.1";
+      version = "4.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@cspell/dict-python/-/dict-python-4.2.1.tgz";
-        sha512 = "9X2jRgyM0cxBoFQRo4Zc8oacyWnXi+0/bMI5FGibZNZV4y/o9UoFEr6agjU260/cXHTjIdkX233nN7eb7dtyRg==";
+        url = "https://registry.npmjs.org/@cspell/dict-python/-/dict-python-4.2.3.tgz";
+        sha512 = "C1CPX9wwEGgcHv/p7KfjuIOp1G6KNyx5gWYweAd6/KPv+ZpeM1v572zFUTmpO8WDuAfKFf00nqYL8/GmCENWBw==";
       };
     };
     "@cspell/dict-r-2.0.1" = {
@@ -3928,13 +3883,13 @@ let
         sha512 = "lR4boDzs79YD6+30mmiSGAMMdwh7HTBAPUFSB0obR3Kidibfc3GZ+MHWZXay5dxZ4nBKM06vyjtanF9VJ8q1Iw==";
       };
     };
-    "@cspell/dict-rust-4.0.4" = {
+    "@cspell/dict-rust-4.0.5" = {
       name = "_at_cspell_slash_dict-rust";
       packageName = "@cspell/dict-rust";
-      version = "4.0.4";
+      version = "4.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@cspell/dict-rust/-/dict-rust-4.0.4.tgz";
-        sha512 = "v9/LcZknt/Xq7m1jdTWiQEtmkVVKdE1etAfGL2sgcWpZYewEa459HeWndNA0gfzQrpWX9sYay18mt7pqClJEdA==";
+        url = "https://registry.npmjs.org/@cspell/dict-rust/-/dict-rust-4.0.5.tgz";
+        sha512 = "DIvlPRDemjKQy8rCqftAgGNZxY5Bg+Ps7qAIJjxkSjmMETyDgl0KTVuaJPt7EK4jJt6uCZ4ILy96npsHDPwoXA==";
       };
     };
     "@cspell/dict-scala-1.0.21" = {
@@ -3946,13 +3901,13 @@ let
         sha512 = "5V/R7PRbbminTpPS3ywgdAalI9BHzcEjEj9ug4kWYvBIGwSnS7T6QCFCiu+e9LvEGUqQC+NHgLY4zs1NaBj2vA==";
       };
     };
-    "@cspell/dict-scala-5.0.2" = {
+    "@cspell/dict-scala-5.0.3" = {
       name = "_at_cspell_slash_dict-scala";
       packageName = "@cspell/dict-scala";
-      version = "5.0.2";
+      version = "5.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@cspell/dict-scala/-/dict-scala-5.0.2.tgz";
-        sha512 = "v97ClgidZt99JUm7OjhQugDHmhx4U8fcgunHvD/BsXWjXNj4cTr0m0YjofyZoL44WpICsNuFV9F/sv9OM5HUEw==";
+        url = "https://registry.npmjs.org/@cspell/dict-scala/-/dict-scala-5.0.3.tgz";
+        sha512 = "4yGb4AInT99rqprxVNT9TYb1YSpq58Owzq7zi3ZS5T0u899Y4VsxsBiOgHnQ/4W+ygi+sp+oqef8w8nABR2lkg==";
       };
     };
     "@cspell/dict-software-terms-1.0.48" = {
@@ -3964,13 +3919,13 @@ let
         sha512 = "pfF3Ys2gRffu5ElqkH7FQMDMi/iZMyOzpGMb3FSH0PJ2AnRQ5rRNWght1h2L36YxvXl0mWVaFrrfwiOyRIc8ZQ==";
       };
     };
-    "@cspell/dict-software-terms-3.4.6" = {
+    "@cspell/dict-software-terms-4.0.3" = {
       name = "_at_cspell_slash_dict-software-terms";
       packageName = "@cspell/dict-software-terms";
-      version = "3.4.6";
+      version = "4.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@cspell/dict-software-terms/-/dict-software-terms-3.4.6.tgz";
-        sha512 = "Cap+WL4iM9NgwxdVIa93aDEGKGNm1t+DLJTnjoWkGHXxSBPG8Kcbnlss6mTtwLv9/NYPmQsmJi5qHXruuHx2ow==";
+        url = "https://registry.npmjs.org/@cspell/dict-software-terms/-/dict-software-terms-4.0.3.tgz";
+        sha512 = "65QAVMc3YlcI7PcqWRY5ox53tTWC8aktUZdJYCVs4VDBPUCTSDnTSmSreeg4F5Z468clv9KF/S0PkxbLjgW72A==";
       };
     };
     "@cspell/dict-sql-2.1.3" = {
@@ -4018,13 +3973,13 @@ let
         sha512 = "yIuGeeZtQA2gqpGefGjZqBl8iGJpIYWz0QzDqsscNi2qfSnLsbjM0RkRbTehM8y9gGGe7xfgUP5adxceJa5Krg==";
       };
     };
-    "@cspell/dict-typescript-3.1.5" = {
+    "@cspell/dict-typescript-3.1.6" = {
       name = "_at_cspell_slash_dict-typescript";
       packageName = "@cspell/dict-typescript";
-      version = "3.1.5";
+      version = "3.1.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@cspell/dict-typescript/-/dict-typescript-3.1.5.tgz";
-        sha512 = "EkIwwNV/xqEoBPJml2S16RXj65h1kvly8dfDLgXerrKw6puybZdvAHerAph6/uPTYdtLcsPyJYkPt5ISOJYrtw==";
+        url = "https://registry.npmjs.org/@cspell/dict-typescript/-/dict-typescript-3.1.6.tgz";
+        sha512 = "1beC6O4P/j23VuxX+i0+F7XqPVc3hhiAzGJHEKqnWf5cWAXQtg0xz3xQJ5MvYx2a7iLaSa+lu7+05vG9UHyu9Q==";
       };
     };
     "@cspell/dict-vue-3.0.0" = {
@@ -4036,22 +3991,31 @@ let
         sha512 = "niiEMPWPV9IeRBRzZ0TBZmNnkK3olkOPYxC1Ny2AX4TGlYRajcW0WUtoSHmvvjZNfWLSg2L6ruiBeuPSbjnG6A==";
       };
     };
-    "@cspell/dynamic-import-8.8.4" = {
+    "@cspell/dynamic-import-8.12.1" = {
       name = "_at_cspell_slash_dynamic-import";
       packageName = "@cspell/dynamic-import";
-      version = "8.8.4";
+      version = "8.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@cspell/dynamic-import/-/dynamic-import-8.8.4.tgz";
-        sha512 = "tseSxrybznkmsmPaAB4aoHB9wr8Q2fOMIy3dm+yQv+U1xj+JHTN9OnUvy9sKiq0p3DQGWm/VylgSgsYaXrEHKQ==";
+        url = "https://registry.npmjs.org/@cspell/dynamic-import/-/dynamic-import-8.12.1.tgz";
+        sha512 = "18faXHALiMsXtG3v67qeyDhNRZVtkhX5Je2qw8iZQB/i61y0Mfm22iiZeXsKImrXbwP0acyhRkRA1sp1NaQmOw==";
       };
     };
-    "@cspell/strong-weak-map-8.8.4" = {
+    "@cspell/strong-weak-map-8.12.1" = {
       name = "_at_cspell_slash_strong-weak-map";
       packageName = "@cspell/strong-weak-map";
-      version = "8.8.4";
+      version = "8.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@cspell/strong-weak-map/-/strong-weak-map-8.8.4.tgz";
-        sha512 = "gticEJGR6yyGeLjf+mJ0jZotWYRLVQ+J0v1VpsR1nKnXTRJY15BWXgEA/ifbU/+clpyCek79NiCIXCvmP1WT4A==";
+        url = "https://registry.npmjs.org/@cspell/strong-weak-map/-/strong-weak-map-8.12.1.tgz";
+        sha512 = "0O5qGHRXoKl0+hXGdelox2awrCMr8LXObUcWwYbSih7HIm4DwhxMO4qjDFye1NdjW0P88yhpQ23J2ceSto9C5Q==";
+      };
+    };
+    "@cspell/url-8.12.1" = {
+      name = "_at_cspell_slash_url";
+      packageName = "@cspell/url";
+      version = "8.12.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@cspell/url/-/url-8.12.1.tgz";
+        sha512 = "mUYaDniHVLw0YXn2egT2e21MYubMAf+1LDeC0kkbg4VWNxSlC1Ksyv6pqhos495esaa8OCjizdIdnGSF6al9Rw==";
       };
     };
     "@cspotcode/source-map-support-0.8.1" = {
@@ -4306,13 +4270,13 @@ let
         sha512 = "mvBSwIBUeiRscrCeJE1LwctAriBj65eUDm0Pc11iE5gRwzkmsdbS7FnZ1XUWjpSeQWL1L5g12Fc/SchPM9DUOw==";
       };
     };
-    "@electron/get-3.0.0" = {
+    "@electron/get-3.1.0" = {
       name = "_at_electron_slash_get";
       packageName = "@electron/get";
-      version = "3.0.0";
+      version = "3.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@electron/get/-/get-3.0.0.tgz";
-        sha512 = "hLv4BYFiyrNRI+U0Mm2X7RxCCdJLkDUn8GCEp9QJzbLpZRko+UaLlCjOMkj6TEtirNLPyBA7y1SeGfnpOB21aQ==";
+        url = "https://registry.npmjs.org/@electron/get/-/get-3.1.0.tgz";
+        sha512 = "F+nKc0xW+kVbBRhFzaMgPy3KwmuNTYX1fx6+FxxoSnNgwYX6LD7AKBTWkU0MQ6IBoe7dz069CNkR673sPAgkCQ==";
       };
     };
     "@electron/notarize-2.3.2" = {
@@ -4324,22 +4288,22 @@ let
         sha512 = "zfayxCe19euNwRycCty1C7lF7snk9YwfRpB5M8GLr1a4ICH63znxaPNAubrMvj0yDvVozqfgsdYpXVUnpWBDpg==";
       };
     };
-    "@electron/osx-sign-1.3.0" = {
+    "@electron/osx-sign-1.3.1" = {
       name = "_at_electron_slash_osx-sign";
       packageName = "@electron/osx-sign";
-      version = "1.3.0";
+      version = "1.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@electron/osx-sign/-/osx-sign-1.3.0.tgz";
-        sha512 = "TEXhxlYSDRr9JWK5nWdOv5MtuUdaZ412uxIIEQ0hLt80o0HYWtQJBlW5QmrQDMtebzATaOjKG9UfCzLyA90zWQ==";
+        url = "https://registry.npmjs.org/@electron/osx-sign/-/osx-sign-1.3.1.tgz";
+        sha512 = "BAfviURMHpmb1Yb50YbCxnOY0wfwaLXH5KJ4+80zS0gUkzDX3ec23naTlEqKsN+PwYn+a1cCzM7BJ4Wcd3sGzw==";
       };
     };
-    "@electron/packager-18.3.2" = {
+    "@electron/packager-18.3.3" = {
       name = "_at_electron_slash_packager";
       packageName = "@electron/packager";
-      version = "18.3.2";
+      version = "18.3.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@electron/packager/-/packager-18.3.2.tgz";
-        sha512 = "orjylavppgIh24qkNpWm2B/LQUpCS/YLOoKoU+eMK/hJgIhShLDsusPIQzgUGVwNCichu8/zPAGfdQZXHG0gtw==";
+        url = "https://registry.npmjs.org/@electron/packager/-/packager-18.3.3.tgz";
+        sha512 = "hGXzwbUdxv49XvlYwlVPC6W6j6WaXUAzKkYyyTeiwdhxvHFMfQSEJxVHsQpqMFzZZ7wrr7iqiokOFZ/qkgEzUQ==";
       };
     };
     "@electron/rebuild-3.6.0" = {
@@ -4360,13 +4324,13 @@ let
         sha512 = "fKpv9kg4SPmt+hY7SVBnIYULE9QJl8L3sCfcBsnqbJwwBwAeTLokJ9TRt9y7bK0JAzIW2y78TVVjvnQEms/yyA==";
       };
     };
-    "@electron/windows-sign-1.1.2" = {
+    "@electron/windows-sign-1.1.3" = {
       name = "_at_electron_slash_windows-sign";
       packageName = "@electron/windows-sign";
-      version = "1.1.2";
+      version = "1.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@electron/windows-sign/-/windows-sign-1.1.2.tgz";
-        sha512 = "eXEiZjDtxW3QORCWfRUarANPRTlH9B6At4jqBZJ0NzokSGutXQUVLPA6WmGpIhDW6w2yCMdHW1EJd1HrXtU5sg==";
+        url = "https://registry.npmjs.org/@electron/windows-sign/-/windows-sign-1.1.3.tgz";
+        sha512 = "OqVSdAe+/88fIjvTDWiy+5Ho1nXsiBhE5RTsIQ6M/zcxcDAEP2TlQCkOyusItnmzXRN+XTFaK9gKhiZ6KGyXQw==";
       };
     };
     "@emmetio/abbreviation-2.3.3" = {
@@ -4441,31 +4405,31 @@ let
         sha512 = "ZsZ2I9Vzso3Ho/pjZFsmmZ++FWeEd/txqybHTm4OgaZzdS8V9V/YYWQwg5TC38Z7uLWUV1vavpLLbjJtKubR1A==";
       };
     };
-    "@esbuild-plugins/node-globals-polyfill-0.2.3" = {
-      name = "_at_esbuild-plugins_slash_node-globals-polyfill";
-      packageName = "@esbuild-plugins/node-globals-polyfill";
-      version = "0.2.3";
+    "@emnapi/core-1.2.0" = {
+      name = "_at_emnapi_slash_core";
+      packageName = "@emnapi/core";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@esbuild-plugins/node-globals-polyfill/-/node-globals-polyfill-0.2.3.tgz";
-        sha512 = "r3MIryXDeXDOZh7ih1l/yE9ZLORCd5e8vWg02azWRGj5SPTuoh69A2AIyn0Z31V/kHBfZ4HgWJ+OK3GTTwLmnw==";
+        url = "https://registry.npmjs.org/@emnapi/core/-/core-1.2.0.tgz";
+        sha512 = "E7Vgw78I93we4ZWdYCb4DGAwRROGkMIXk7/y87UmANR+J6qsWusmC3gLt0H+O0KOt5e6O38U8oJamgbudrES/w==";
       };
     };
-    "@esbuild-plugins/node-modules-polyfill-0.2.2" = {
-      name = "_at_esbuild-plugins_slash_node-modules-polyfill";
-      packageName = "@esbuild-plugins/node-modules-polyfill";
-      version = "0.2.2";
+    "@emnapi/runtime-1.2.0" = {
+      name = "_at_emnapi_slash_runtime";
+      packageName = "@emnapi/runtime";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@esbuild-plugins/node-modules-polyfill/-/node-modules-polyfill-0.2.2.tgz";
-        sha512 = "LXV7QsWJxRuMYvKbiznh+U1ilIop3g2TeKRzUxOG5X3YITc8JyyTa90BmLwqqv0YnX4v32CSlG+vsziZp9dMvA==";
+        url = "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.2.0.tgz";
+        sha512 = "bV21/9LQmcQeCPEg3BDFtvwL6cwiTMksYNWQQ4KOxCZikEGalWtenoZ0wCiukJINlGCIi2KXx01g4FoH/LxpzQ==";
       };
     };
-    "@esbuild/android-arm-0.17.19" = {
-      name = "_at_esbuild_slash_android-arm";
-      packageName = "@esbuild/android-arm";
-      version = "0.17.19";
+    "@emnapi/wasi-threads-1.0.1" = {
+      name = "_at_emnapi_slash_wasi-threads";
+      packageName = "@emnapi/wasi-threads";
+      version = "1.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.17.19.tgz";
-        sha512 = "rIKddzqhmav7MSmoFCmDIb6e2W57geRsM94gV2l38fzhXMwq7hZoClug9USI2pFRGL06f4IOPHHpFNOkWieR8A==";
+        url = "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.0.1.tgz";
+        sha512 = "iIBu7mwkq4UQGeMEM8bLwNK962nXdhodeScX4slfQnRhEMMzvYivHhutCIk8uojvmASXXPC2WNEjwxFWk72Oqw==";
       };
     };
     "@esbuild/android-arm-0.19.8" = {
@@ -4477,15 +4441,6 @@ let
         sha512 = "31E2lxlGM1KEfivQl8Yf5aYU/mflz9g06H6S15ITUFQueMFtFjESRMoDSkvMo8thYvLBax+VKTPlpnx+sPicOA==";
       };
     };
-    "@esbuild/android-arm64-0.17.19" = {
-      name = "_at_esbuild_slash_android-arm64";
-      packageName = "@esbuild/android-arm64";
-      version = "0.17.19";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.17.19.tgz";
-        sha512 = "KBMWvEZooR7+kzY0BtbTQn0OAYY7CsiydT63pVEaPtVYF0hXbUaOyZog37DKxK7NF3XacBJOpYT4adIJh+avxA==";
-      };
-    };
     "@esbuild/android-arm64-0.19.8" = {
       name = "_at_esbuild_slash_android-arm64";
       packageName = "@esbuild/android-arm64";
@@ -4495,15 +4450,6 @@ let
         sha512 = "B8JbS61bEunhfx8kasogFENgQfr/dIp+ggYXwTqdbMAgGDhRa3AaPpQMuQU0rNxDLECj6FhDzk1cF9WHMVwrtA==";
       };
     };
-    "@esbuild/android-x64-0.17.19" = {
-      name = "_at_esbuild_slash_android-x64";
-      packageName = "@esbuild/android-x64";
-      version = "0.17.19";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.17.19.tgz";
-        sha512 = "uUTTc4xGNDT7YSArp/zbtmbhO0uEEK9/ETW29Wk1thYUJBz3IVnvgEiEwEa9IeLyvnpKrWK64Utw2bgUmDveww==";
-      };
-    };
     "@esbuild/android-x64-0.19.8" = {
       name = "_at_esbuild_slash_android-x64";
       packageName = "@esbuild/android-x64";
@@ -4513,15 +4459,6 @@ let
         sha512 = "rdqqYfRIn4jWOp+lzQttYMa2Xar3OK9Yt2fhOhzFXqg0rVWEfSclJvZq5fZslnz6ypHvVf3CT7qyf0A5pM682A==";
       };
     };
-    "@esbuild/darwin-arm64-0.17.19" = {
-      name = "_at_esbuild_slash_darwin-arm64";
-      packageName = "@esbuild/darwin-arm64";
-      version = "0.17.19";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.17.19.tgz";
-        sha512 = "80wEoCfF/hFKM6WE1FyBHc9SfUblloAWx6FJkFWTWiCoht9Mc0ARGEM47e67W9rI09YoUxJL68WHfDRYEAvOhg==";
-      };
-    };
     "@esbuild/darwin-arm64-0.19.8" = {
       name = "_at_esbuild_slash_darwin-arm64";
       packageName = "@esbuild/darwin-arm64";
@@ -4531,15 +4468,6 @@ let
         sha512 = "RQw9DemMbIq35Bprbboyf8SmOr4UXsRVxJ97LgB55VKKeJOOdvsIPy0nFyF2l8U+h4PtBx/1kRf0BelOYCiQcw==";
       };
     };
-    "@esbuild/darwin-x64-0.17.19" = {
-      name = "_at_esbuild_slash_darwin-x64";
-      packageName = "@esbuild/darwin-x64";
-      version = "0.17.19";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.17.19.tgz";
-        sha512 = "IJM4JJsLhRYr9xdtLytPLSH9k/oxR3boaUIYiHkAawtwNOXKE8KoU8tMvryogdcT8AU+Bflmh81Xn6Q0vTZbQw==";
-      };
-    };
     "@esbuild/darwin-x64-0.19.8" = {
       name = "_at_esbuild_slash_darwin-x64";
       packageName = "@esbuild/darwin-x64";
@@ -4549,15 +4477,6 @@ let
         sha512 = "3sur80OT9YdeZwIVgERAysAbwncom7b4bCI2XKLjMfPymTud7e/oY4y+ci1XVp5TfQp/bppn7xLw1n/oSQY3/Q==";
       };
     };
-    "@esbuild/freebsd-arm64-0.17.19" = {
-      name = "_at_esbuild_slash_freebsd-arm64";
-      packageName = "@esbuild/freebsd-arm64";
-      version = "0.17.19";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.17.19.tgz";
-        sha512 = "pBwbc7DufluUeGdjSU5Si+P3SoMF5DQ/F/UmTSb8HXO80ZEAJmrykPyzo1IfNbAoaqw48YRpv8shwd1NoI0jcQ==";
-      };
-    };
     "@esbuild/freebsd-arm64-0.19.8" = {
       name = "_at_esbuild_slash_freebsd-arm64";
       packageName = "@esbuild/freebsd-arm64";
@@ -4567,15 +4486,6 @@ let
         sha512 = "WAnPJSDattvS/XtPCTj1tPoTxERjcTpH6HsMr6ujTT+X6rylVe8ggxk8pVxzf5U1wh5sPODpawNicF5ta/9Tmw==";
       };
     };
-    "@esbuild/freebsd-x64-0.17.19" = {
-      name = "_at_esbuild_slash_freebsd-x64";
-      packageName = "@esbuild/freebsd-x64";
-      version = "0.17.19";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.17.19.tgz";
-        sha512 = "4lu+n8Wk0XlajEhbEffdy2xy53dpR06SlzvhGByyg36qJw6Kpfk7cp45DR/62aPH9mtJRmIyrXAS5UWBrJT6TQ==";
-      };
-    };
     "@esbuild/freebsd-x64-0.19.8" = {
       name = "_at_esbuild_slash_freebsd-x64";
       packageName = "@esbuild/freebsd-x64";
@@ -4585,15 +4495,6 @@ let
         sha512 = "ICvZyOplIjmmhjd6mxi+zxSdpPTKFfyPPQMQTK/w+8eNK6WV01AjIztJALDtwNNfFhfZLux0tZLC+U9nSyA5Zg==";
       };
     };
-    "@esbuild/linux-arm-0.17.19" = {
-      name = "_at_esbuild_slash_linux-arm";
-      packageName = "@esbuild/linux-arm";
-      version = "0.17.19";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.17.19.tgz";
-        sha512 = "cdmT3KxjlOQ/gZ2cjfrQOtmhG4HJs6hhvm3mWSRDPtZ/lP5oe8FWceS10JaSJC13GBd4eH/haHnqf7hhGNLerA==";
-      };
-    };
     "@esbuild/linux-arm-0.19.8" = {
       name = "_at_esbuild_slash_linux-arm";
       packageName = "@esbuild/linux-arm";
@@ -4603,15 +4504,6 @@ let
         sha512 = "H4vmI5PYqSvosPaTJuEppU9oz1dq2A7Mr2vyg5TF9Ga+3+MGgBdGzcyBP7qK9MrwFQZlvNyJrvz6GuCaj3OukQ==";
       };
     };
-    "@esbuild/linux-arm64-0.17.19" = {
-      name = "_at_esbuild_slash_linux-arm64";
-      packageName = "@esbuild/linux-arm64";
-      version = "0.17.19";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.17.19.tgz";
-        sha512 = "ct1Tg3WGwd3P+oZYqic+YZF4snNl2bsnMKRkb3ozHmnM0dGWuxcPTTntAF6bOP0Sp4x0PjSF+4uHQ1xvxfRKqg==";
-      };
-    };
     "@esbuild/linux-arm64-0.19.8" = {
       name = "_at_esbuild_slash_linux-arm64";
       packageName = "@esbuild/linux-arm64";
@@ -4621,15 +4513,6 @@ let
         sha512 = "z1zMZivxDLHWnyGOctT9JP70h0beY54xDDDJt4VpTX+iwA77IFsE1vCXWmprajJGa+ZYSqkSbRQ4eyLCpCmiCQ==";
       };
     };
-    "@esbuild/linux-ia32-0.17.19" = {
-      name = "_at_esbuild_slash_linux-ia32";
-      packageName = "@esbuild/linux-ia32";
-      version = "0.17.19";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.17.19.tgz";
-        sha512 = "w4IRhSy1VbsNxHRQpeGCHEmibqdTUx61Vc38APcsRbuVgK0OPEnQ0YD39Brymn96mOx48Y2laBQGqgZ0j9w6SQ==";
-      };
-    };
     "@esbuild/linux-ia32-0.19.8" = {
       name = "_at_esbuild_slash_linux-ia32";
       packageName = "@esbuild/linux-ia32";
@@ -4639,15 +4522,6 @@ let
         sha512 = "1a8suQiFJmZz1khm/rDglOc8lavtzEMRo0v6WhPgxkrjcU0LkHj+TwBrALwoz/OtMExvsqbbMI0ChyelKabSvQ==";
       };
     };
-    "@esbuild/linux-loong64-0.17.19" = {
-      name = "_at_esbuild_slash_linux-loong64";
-      packageName = "@esbuild/linux-loong64";
-      version = "0.17.19";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.17.19.tgz";
-        sha512 = "2iAngUbBPMq439a+z//gE+9WBldoMp1s5GWsUSgqHLzLJ9WoZLZhpwWuym0u0u/4XmZ3gpHmzV84PonE+9IIdQ==";
-      };
-    };
     "@esbuild/linux-loong64-0.19.8" = {
       name = "_at_esbuild_slash_linux-loong64";
       packageName = "@esbuild/linux-loong64";
@@ -4657,15 +4531,6 @@ let
         sha512 = "fHZWS2JJxnXt1uYJsDv9+b60WCc2RlvVAy1F76qOLtXRO+H4mjt3Tr6MJ5l7Q78X8KgCFudnTuiQRBhULUyBKQ==";
       };
     };
-    "@esbuild/linux-mips64el-0.17.19" = {
-      name = "_at_esbuild_slash_linux-mips64el";
-      packageName = "@esbuild/linux-mips64el";
-      version = "0.17.19";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.17.19.tgz";
-        sha512 = "LKJltc4LVdMKHsrFe4MGNPp0hqDFA1Wpt3jE1gEyM3nKUvOiO//9PheZZHfYRfYl6AwdTH4aTcXSqBerX0ml4A==";
-      };
-    };
     "@esbuild/linux-mips64el-0.19.8" = {
       name = "_at_esbuild_slash_linux-mips64el";
       packageName = "@esbuild/linux-mips64el";
@@ -4675,15 +4540,6 @@ let
         sha512 = "Wy/z0EL5qZYLX66dVnEg9riiwls5IYnziwuju2oUiuxVc+/edvqXa04qNtbrs0Ukatg5HEzqT94Zs7J207dN5Q==";
       };
     };
-    "@esbuild/linux-ppc64-0.17.19" = {
-      name = "_at_esbuild_slash_linux-ppc64";
-      packageName = "@esbuild/linux-ppc64";
-      version = "0.17.19";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.17.19.tgz";
-        sha512 = "/c/DGybs95WXNS8y3Ti/ytqETiW7EU44MEKuCAcpPto3YjQbyK3IQVKfF6nbghD7EcLUGl0NbiL5Rt5DMhn5tg==";
-      };
-    };
     "@esbuild/linux-ppc64-0.19.8" = {
       name = "_at_esbuild_slash_linux-ppc64";
       packageName = "@esbuild/linux-ppc64";
@@ -4693,15 +4549,6 @@ let
         sha512 = "ETaW6245wK23YIEufhMQ3HSeHO7NgsLx8gygBVldRHKhOlD1oNeNy/P67mIh1zPn2Hr2HLieQrt6tWrVwuqrxg==";
       };
     };
-    "@esbuild/linux-riscv64-0.17.19" = {
-      name = "_at_esbuild_slash_linux-riscv64";
-      packageName = "@esbuild/linux-riscv64";
-      version = "0.17.19";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.17.19.tgz";
-        sha512 = "FC3nUAWhvFoutlhAkgHf8f5HwFWUL6bYdvLc/TTuxKlvLi3+pPzdZiFKSWz/PF30TB1K19SuCxDTI5KcqASJqA==";
-      };
-    };
     "@esbuild/linux-riscv64-0.19.8" = {
       name = "_at_esbuild_slash_linux-riscv64";
       packageName = "@esbuild/linux-riscv64";
@@ -4711,15 +4558,6 @@ let
         sha512 = "T2DRQk55SgoleTP+DtPlMrxi/5r9AeFgkhkZ/B0ap99zmxtxdOixOMI570VjdRCs9pE4Wdkz7JYrsPvsl7eESg==";
       };
     };
-    "@esbuild/linux-s390x-0.17.19" = {
-      name = "_at_esbuild_slash_linux-s390x";
-      packageName = "@esbuild/linux-s390x";
-      version = "0.17.19";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.17.19.tgz";
-        sha512 = "IbFsFbxMWLuKEbH+7sTkKzL6NJmG2vRyy6K7JJo55w+8xDk7RElYn6xvXtDW8HCfoKBFK69f3pgBJSUSQPr+4Q==";
-      };
-    };
     "@esbuild/linux-s390x-0.19.8" = {
       name = "_at_esbuild_slash_linux-s390x";
       packageName = "@esbuild/linux-s390x";
@@ -4729,15 +4567,6 @@ let
         sha512 = "NPxbdmmo3Bk7mbNeHmcCd7R7fptJaczPYBaELk6NcXxy7HLNyWwCyDJ/Xx+/YcNH7Im5dHdx9gZ5xIwyliQCbg==";
       };
     };
-    "@esbuild/linux-x64-0.17.19" = {
-      name = "_at_esbuild_slash_linux-x64";
-      packageName = "@esbuild/linux-x64";
-      version = "0.17.19";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.17.19.tgz";
-        sha512 = "68ngA9lg2H6zkZcyp22tsVt38mlhWde8l3eJLWkyLrp4HwMUr3c1s/M2t7+kHIhvMjglIBrFpncX1SzMckomGw==";
-      };
-    };
     "@esbuild/linux-x64-0.19.8" = {
       name = "_at_esbuild_slash_linux-x64";
       packageName = "@esbuild/linux-x64";
@@ -4747,15 +4576,6 @@ let
         sha512 = "lytMAVOM3b1gPypL2TRmZ5rnXl7+6IIk8uB3eLsV1JwcizuolblXRrc5ShPrO9ls/b+RTp+E6gbsuLWHWi2zGg==";
       };
     };
-    "@esbuild/netbsd-x64-0.17.19" = {
-      name = "_at_esbuild_slash_netbsd-x64";
-      packageName = "@esbuild/netbsd-x64";
-      version = "0.17.19";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.17.19.tgz";
-        sha512 = "CwFq42rXCR8TYIjIfpXCbRX0rp1jo6cPIUPSaWwzbVI4aOfX96OXY8M6KNmtPcg7QjYeDmN+DD0Wp3LaBOLf4Q==";
-      };
-    };
     "@esbuild/netbsd-x64-0.19.8" = {
       name = "_at_esbuild_slash_netbsd-x64";
       packageName = "@esbuild/netbsd-x64";
@@ -4765,15 +4585,6 @@ let
         sha512 = "hvWVo2VsXz/8NVt1UhLzxwAfo5sioj92uo0bCfLibB0xlOmimU/DeAEsQILlBQvkhrGjamP0/el5HU76HAitGw==";
       };
     };
-    "@esbuild/openbsd-x64-0.17.19" = {
-      name = "_at_esbuild_slash_openbsd-x64";
-      packageName = "@esbuild/openbsd-x64";
-      version = "0.17.19";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.17.19.tgz";
-        sha512 = "cnq5brJYrSZ2CF6c35eCmviIN3k3RczmHz8eYaVlNasVqsNY+JKohZU5MKmaOI+KkllCdzOKKdPs762VCPC20g==";
-      };
-    };
     "@esbuild/openbsd-x64-0.19.8" = {
       name = "_at_esbuild_slash_openbsd-x64";
       packageName = "@esbuild/openbsd-x64";
@@ -4783,15 +4594,6 @@ let
         sha512 = "/7Y7u77rdvmGTxR83PgaSvSBJCC2L3Kb1M/+dmSIvRvQPXXCuC97QAwMugBNG0yGcbEGfFBH7ojPzAOxfGNkwQ==";
       };
     };
-    "@esbuild/sunos-x64-0.17.19" = {
-      name = "_at_esbuild_slash_sunos-x64";
-      packageName = "@esbuild/sunos-x64";
-      version = "0.17.19";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.17.19.tgz";
-        sha512 = "vCRT7yP3zX+bKWFeP/zdS6SqdWB8OIpaRq/mbXQxTGHnIxspRtigpkUcDMlSCOejlHowLqII7K2JKevwyRP2rg==";
-      };
-    };
     "@esbuild/sunos-x64-0.19.8" = {
       name = "_at_esbuild_slash_sunos-x64";
       packageName = "@esbuild/sunos-x64";
@@ -4801,15 +4603,6 @@ let
         sha512 = "9Lc4s7Oi98GqFA4HzA/W2JHIYfnXbUYgekUP/Sm4BG9sfLjyv6GKKHKKVs83SMicBF2JwAX6A1PuOLMqpD001w==";
       };
     };
-    "@esbuild/win32-arm64-0.17.19" = {
-      name = "_at_esbuild_slash_win32-arm64";
-      packageName = "@esbuild/win32-arm64";
-      version = "0.17.19";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.17.19.tgz";
-        sha512 = "yYx+8jwowUstVdorcMdNlzklLYhPxjniHWFKgRqH7IFlUEa0Umu3KuYplf1HUZZ422e3NU9F4LGb+4O0Kdcaag==";
-      };
-    };
     "@esbuild/win32-arm64-0.19.8" = {
       name = "_at_esbuild_slash_win32-arm64";
       packageName = "@esbuild/win32-arm64";
@@ -4819,15 +4612,6 @@ let
         sha512 = "rq6WzBGjSzihI9deW3fC2Gqiak68+b7qo5/3kmB6Gvbh/NYPA0sJhrnp7wgV4bNwjqM+R2AApXGxMO7ZoGhIJg==";
       };
     };
-    "@esbuild/win32-ia32-0.17.19" = {
-      name = "_at_esbuild_slash_win32-ia32";
-      packageName = "@esbuild/win32-ia32";
-      version = "0.17.19";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.17.19.tgz";
-        sha512 = "eggDKanJszUtCdlVs0RB+h35wNlb5v4TWEkq4vZcmVt5u/HiDZrTXe2bWFQUez3RgNHwx/x4sk5++4NSSicKkw==";
-      };
-    };
     "@esbuild/win32-ia32-0.19.8" = {
       name = "_at_esbuild_slash_win32-ia32";
       packageName = "@esbuild/win32-ia32";
@@ -4837,15 +4621,6 @@ let
         sha512 = "AIAbverbg5jMvJznYiGhrd3sumfwWs8572mIJL5NQjJa06P8KfCPWZQ0NwZbPQnbQi9OWSZhFVSUWjjIrn4hSw==";
       };
     };
-    "@esbuild/win32-x64-0.17.19" = {
-      name = "_at_esbuild_slash_win32-x64";
-      packageName = "@esbuild/win32-x64";
-      version = "0.17.19";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.17.19.tgz";
-        sha512 = "lAhycmKnVOuRYNtRtatQR1LPQf2oYCkRGkSFnseDAKPl8lu5SOsK/e1sXe5a0Pc5kHIHe6P2I/ilntNv2xf3cA==";
-      };
-    };
     "@esbuild/win32-x64-0.19.8" = {
       name = "_at_esbuild_slash_win32-x64";
       packageName = "@esbuild/win32-x64";
@@ -4864,22 +4639,22 @@ let
         sha512 = "1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==";
       };
     };
-    "@eslint-community/regexpp-4.10.1" = {
+    "@eslint-community/regexpp-4.11.0" = {
       name = "_at_eslint-community_slash_regexpp";
       packageName = "@eslint-community/regexpp";
-      version = "4.10.1";
+      version = "4.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.10.1.tgz";
-        sha512 = "Zm2NGpWELsQAD1xsJzGQpYfvICSsFkEpU0jxBjfdC6uNEWXcHnfs9hScFWtXVDVl+rBQJGrl4g1vcKIejpH9dA==";
+        url = "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.11.0.tgz";
+        sha512 = "G/M/tIiMrTAxEWRfLfQJMmGNX28IxBg4PBz8XqQhqUHLFI6TL2htpIB1iQCj144V5ee/JaKyT9/WZ0MGZWfA7A==";
       };
     };
-    "@eslint/config-array-0.16.0" = {
+    "@eslint/config-array-0.17.1" = {
       name = "_at_eslint_slash_config-array";
       packageName = "@eslint/config-array";
-      version = "0.16.0";
+      version = "0.17.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.16.0.tgz";
-        sha512 = "/jmuSd74i4Czf1XXn7wGRWZCuyaUZ330NH1Bek0Pplatt4Sy1S5haN21SCLLdbeKslQ+S0wEJ+++v5YibSi+Lg==";
+        url = "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.17.1.tgz";
+        sha512 = "BlYOpej8AQ8Ev9xVqroV7a02JK3SkBAaN9GfMMH9W6Ch8FlQlkjGw4Ir7+FgYwfirivAf4t+GtzuAxqfukmISA==";
       };
     };
     "@eslint/eslintrc-0.4.3" = {
@@ -4918,13 +4693,13 @@ let
         sha512 = "Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==";
       };
     };
-    "@eslint/js-9.5.0" = {
+    "@eslint/js-9.7.0" = {
       name = "_at_eslint_slash_js";
       packageName = "@eslint/js";
-      version = "9.5.0";
+      version = "9.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@eslint/js/-/js-9.5.0.tgz";
-        sha512 = "A7+AOT2ICkodvtsWnxZP4Xxk3NbZ3VMHd8oihydLRGrJgqqdEz1qSeEgXYyT/Cu8h1TWWsQRejIx48mtjZ5y1w==";
+        url = "https://registry.npmjs.org/@eslint/js/-/js-9.7.0.tgz";
+        sha512 = "ChuWDQenef8OSFnvuxv0TCVxEwmu3+hPNKvM9B34qpM0rDRbjL8t5QkQeHHeAfsKQjuH9wS82WeCi1J/owatng==";
       };
     };
     "@eslint/object-schema-2.1.4" = {
@@ -4981,13 +4756,13 @@ let
         sha512 = "V8gMy1C63oAYlvkSjhfGYOET7sOmRIUAYv/wVcKJZiVAMZ5MQ2geeXCpLGC4+vuOQe2Hs3+qAgl4y0/b8OUO+A==";
       };
     };
-    "@expo/apple-utils-1.7.0" = {
+    "@expo/apple-utils-1.7.1" = {
       name = "_at_expo_slash_apple-utils";
       packageName = "@expo/apple-utils";
-      version = "1.7.0";
+      version = "1.7.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@expo/apple-utils/-/apple-utils-1.7.0.tgz";
-        sha512 = "RVzZTiOeuNT04fE5V4f536XmIyxbRFOJ3m/rE6kImbIZ65upOS7xdIQpihEdYOiHB5uZAcD3JClUEsMfFhTv4w==";
+        url = "https://registry.npmjs.org/@expo/apple-utils/-/apple-utils-1.7.1.tgz";
+        sha512 = "oKHKRMfpPsVIlMSwHsartqrFhxKR1PnwGzaM3i+d4/g9XE9A+bKMu5YIUT4IXX561E0YYoaeaRHuxiIzcmEmRw==";
       };
     };
     "@expo/bunyan-4.0.0" = {
@@ -5125,22 +4900,22 @@ let
         sha512 = "FyWghLu7rUaZEZSTLt/XNRukm0c9GFfwP0iFaswoDWpV6alvVg+zRAfCLdIVQEz1SVcQ3zo1hMZFDrnKGvkCuQ==";
       };
     };
-    "@expo/eas-build-job-1.0.117" = {
+    "@expo/eas-build-job-1.0.119" = {
       name = "_at_expo_slash_eas-build-job";
       packageName = "@expo/eas-build-job";
-      version = "1.0.117";
+      version = "1.0.119";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@expo/eas-build-job/-/eas-build-job-1.0.117.tgz";
-        sha512 = "l1EBpRH4lqRg0uPKl4/xn3V77dzWDrSAIU0r88aNq+Slznpu8U8HCkEZSh2YyF/BFhhs5lG7v8yQclVaflVBrQ==";
+        url = "https://registry.npmjs.org/@expo/eas-build-job/-/eas-build-job-1.0.119.tgz";
+        sha512 = "uWgriDXF/cKSKl62lqD0OnoCTtX8+s00te2KQ54S/tz3/LYfiE4JBRsLazQq9hIfz8JPEXwmfKN713BDeV/TOg==";
       };
     };
-    "@expo/eas-json-10.0.0" = {
+    "@expo/eas-json-10.0.3" = {
       name = "_at_expo_slash_eas-json";
       packageName = "@expo/eas-json";
-      version = "10.0.0";
+      version = "10.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@expo/eas-json/-/eas-json-10.0.0.tgz";
-        sha512 = "3RIzqeNGhiWLfU8IGH9sxgI8OaWAAjEMprDuec1//C2QARylA6agx2knqLEi5BmSCZDPiw7QwUN3+XskHKq85w==";
+        url = "https://registry.npmjs.org/@expo/eas-json/-/eas-json-10.0.3.tgz";
+        sha512 = "eMgV1YuGP9bmGzB8+8tiJMcIiH2aEfwFwpqd1CqPs1gs5YPAQT/VmnkRIuC4DjWLuqhFr/fX9rO+yvOpr2MsIw==";
       };
     };
     "@expo/fingerprint-0.6.1" = {
@@ -5431,13 +5206,13 @@ let
         sha512 = "QdWi16+CHB9JYP7gma19OVVg0BFkvU8zNj9GjWorYI8Iv8FUxjOCcYRuAmX4s/h91e4e7BPsskc8cSrZYho9Ew==";
       };
     };
-    "@expo/steps-1.0.117" = {
+    "@expo/steps-1.0.119" = {
       name = "_at_expo_slash_steps";
       packageName = "@expo/steps";
-      version = "1.0.117";
+      version = "1.0.119";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@expo/steps/-/steps-1.0.117.tgz";
-        sha512 = "MjBYD5/F4tLB1TERyBCk8jF9bmhh99b2lgC6NHGD3J4QrFYSyct9CxIHJixdgaEo0QLMe0ltf3zQsJQSM+kWDw==";
+        url = "https://registry.npmjs.org/@expo/steps/-/steps-1.0.119.tgz";
+        sha512 = "raPlBDsMkRO5pOlGDa9PnjgCIJdiDTgU92GtTML0UZ+hPiy5H7Vbx2JxqtqMiZcl21mxQ7V60toqdbo7DF5iJQ==";
       };
     };
     "@expo/timeago.js-1.0.0" = {
@@ -5521,40 +5296,31 @@ let
         sha512 = "k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==";
       };
     };
-    "@gitbeaker/core-40.0.3" = {
+    "@gitbeaker/core-40.1.2" = {
       name = "_at_gitbeaker_slash_core";
       packageName = "@gitbeaker/core";
-      version = "40.0.3";
+      version = "40.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@gitbeaker/core/-/core-40.0.3.tgz";
-        sha512 = "MzeY4oCtoa9zmPIkQIdC2KU8cGmHIXwnAi0L6jjjouqjy6kcA4BydZf8W5Xsj27Rw5iiyhfj8YC1/O3CgrzvCQ==";
+        url = "https://registry.npmjs.org/@gitbeaker/core/-/core-40.1.2.tgz";
+        sha512 = "KjP40EIdPWDX2w+GZUjgc5f9L/a0VsA6A2dkiKdH27m5BUpVrH3eHC3M0h1SsIA5edO3BiebqWFO2ipkGJCBZA==";
       };
     };
-    "@gitbeaker/requester-utils-40.0.3" = {
+    "@gitbeaker/requester-utils-40.1.2" = {
       name = "_at_gitbeaker_slash_requester-utils";
       packageName = "@gitbeaker/requester-utils";
-      version = "40.0.3";
+      version = "40.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@gitbeaker/requester-utils/-/requester-utils-40.0.3.tgz";
-        sha512 = "L8JpuMIsvXTHfu/2wXzkc5QyfQJSWg4XyEPStHq1ig5SAcbxxqbBoe8ed27eUXLah+PcGrPInMK4cCMxhQm41g==";
+        url = "https://registry.npmjs.org/@gitbeaker/requester-utils/-/requester-utils-40.1.2.tgz";
+        sha512 = "s3c2TzJpBk3VGujEo/57+TAntg36kEhdob28i2kAEDztFWlNp0sfDT/jlDwUywKF6AbmYIJYe3FikLNyAiv+iA==";
       };
     };
-    "@gitbeaker/rest-40.0.3" = {
+    "@gitbeaker/rest-40.1.2" = {
       name = "_at_gitbeaker_slash_rest";
       packageName = "@gitbeaker/rest";
-      version = "40.0.3";
+      version = "40.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@gitbeaker/rest/-/rest-40.0.3.tgz";
-        sha512 = "ihaA0GX3yCo4oUWbISkcjFMIw+WxDAC9L+bEYq2irz4wpv/0EpAU/0jKjggPzY4cGWL9VAyPhew77VeACv4YWw==";
-      };
-    };
-    "@grammarly/sdk-1.11.0" = {
-      name = "_at_grammarly_slash_sdk";
-      packageName = "@grammarly/sdk";
-      version = "1.11.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@grammarly/sdk/-/sdk-1.11.0.tgz";
-        sha512 = "/LDNozZ+6qTS0yqMXo/ki6yJqTVx2s6ncOM/m/t4PjqeXrN8ejTwoiNDoDVZq18bsHjZBPP4o03M2goFYWJCHA==";
+        url = "https://registry.npmjs.org/@gitbeaker/rest/-/rest-40.1.2.tgz";
+        sha512 = "q9FYEC0SQcEbj1Hu+EOVFGRBjxbUFciK/iVD3BhBx+ZUGIPfHYS32EWL4uqVSBLq/zSUEd2gWjLy7LRVq/Pz3A==";
       };
     };
     "@graphql-cli/common-4.1.0" = {
@@ -5602,13 +5368,13 @@ let
         sha512 = "gVnnlWs0Ua+5FkuHHEriFUOI3OIbHv6DS1utxf28n6NkfGMJldC4j0xlJRY0LS6dWK34IGYgD4HelKYz2l8KiA==";
       };
     };
-    "@graphql-tools/delegate-10.0.11" = {
+    "@graphql-tools/delegate-10.0.16" = {
       name = "_at_graphql-tools_slash_delegate";
       packageName = "@graphql-tools/delegate";
-      version = "10.0.11";
+      version = "10.0.16";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-10.0.11.tgz";
-        sha512 = "+sKeecdIVXhFB/66e5yjeKYZ3Lpn52yNG637ElVhciuLGgFc153rC6l6zcuNd9yx5wMrNx35U/h3HsMIEI3xNw==";
+        url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-10.0.16.tgz";
+        sha512 = "no4jIdHsTrHzR6Vv1YlwbxFeBnHBwPhBpemvLVnQ7CHhAviwIUWkCOHs4Uyzc5GYuHFyKJOZEXqhOz+da3hR3A==";
       };
     };
     "@graphql-tools/delegate-7.1.5" = {
@@ -5620,40 +5386,40 @@ let
         sha512 = "bQu+hDd37e+FZ0CQGEEczmRSfQRnnXeUxI/0miDV+NV/zCbEdIJj5tYFNrKT03W6wgdqx8U06d8L23LxvGri/g==";
       };
     };
-    "@graphql-tools/executor-1.2.6" = {
+    "@graphql-tools/executor-1.3.0" = {
       name = "_at_graphql-tools_slash_executor";
       packageName = "@graphql-tools/executor";
-      version = "1.2.6";
+      version = "1.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@graphql-tools/executor/-/executor-1.2.6.tgz";
-        sha512 = "+1kjfqzM5T2R+dCw7F4vdJ3CqG+fY/LYJyhNiWEFtq0ToLwYzR/KKyD8YuzTirEjSxWTVlcBh7endkx5n5F6ew==";
+        url = "https://registry.npmjs.org/@graphql-tools/executor/-/executor-1.3.0.tgz";
+        sha512 = "e+rmEf/2EO4hDnbkO8mTS2FI+jGUNmYkSDKw5TgPVlO8VOKS+TXmJBK6E9v4Gc/39yVkZsffYfW/R8obJrA0mg==";
       };
     };
-    "@graphql-tools/executor-graphql-ws-1.1.2" = {
+    "@graphql-tools/executor-graphql-ws-1.2.0" = {
       name = "_at_graphql-tools_slash_executor-graphql-ws";
       packageName = "@graphql-tools/executor-graphql-ws";
-      version = "1.1.2";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@graphql-tools/executor-graphql-ws/-/executor-graphql-ws-1.1.2.tgz";
-        sha512 = "+9ZK0rychTH1LUv4iZqJ4ESbmULJMTsv3XlFooPUngpxZkk00q6LqHKJRrsLErmQrVaC7cwQCaRBJa0teK17Lg==";
+        url = "https://registry.npmjs.org/@graphql-tools/executor-graphql-ws/-/executor-graphql-ws-1.2.0.tgz";
+        sha512 = "tSYC1QdrabWexLrYV0UI3uRGbde9WCY/bRhq6Jc+VXMZcfq6ea6pP5NEAVTfwbhUQ4xZvJABVVbKXtKb9uTg1w==";
       };
     };
-    "@graphql-tools/executor-http-1.0.9" = {
+    "@graphql-tools/executor-http-1.1.5" = {
       name = "_at_graphql-tools_slash_executor-http";
       packageName = "@graphql-tools/executor-http";
-      version = "1.0.9";
+      version = "1.1.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@graphql-tools/executor-http/-/executor-http-1.0.9.tgz";
-        sha512 = "+NXaZd2MWbbrWHqU4EhXcrDbogeiCDmEbrAN+rMn4Nu2okDjn2MTFDbTIab87oEubQCH4Te1wDkWPKrzXup7+Q==";
+        url = "https://registry.npmjs.org/@graphql-tools/executor-http/-/executor-http-1.1.5.tgz";
+        sha512 = "ZAsVGUwafPc1GapLA1yoJuRx7ihpVdAv7JDHmlI2eHRQsJnMVQwcxHnjfUb/id9YAEBrP86/s4pgEoRyad3Zng==";
       };
     };
-    "@graphql-tools/executor-legacy-ws-1.0.6" = {
+    "@graphql-tools/executor-legacy-ws-1.1.0" = {
       name = "_at_graphql-tools_slash_executor-legacy-ws";
       packageName = "@graphql-tools/executor-legacy-ws";
-      version = "1.0.6";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@graphql-tools/executor-legacy-ws/-/executor-legacy-ws-1.0.6.tgz";
-        sha512 = "lDSxz9VyyquOrvSuCCnld3256Hmd+QI2lkmkEv7d4mdzkxkK4ddAWW1geQiWrQvWmdsmcnGGlZ7gDGbhEExwqg==";
+        url = "https://registry.npmjs.org/@graphql-tools/executor-legacy-ws/-/executor-legacy-ws-1.1.0.tgz";
+        sha512 = "k+6ZyiaAd8SmwuzbEOfA/LVkuI1nqidhoMw+CJ7c41QGOjSMzc0VS0UZbJyeitI0n7a+uP/Meln1wjzJ2ReDtQ==";
       };
     };
     "@graphql-tools/graphql-file-loader-6.2.7" = {
@@ -5818,13 +5584,13 @@ let
         sha512 = "1dKp2K8UuFn7DFo1qX5c1cyazQv2h2ICwA9esHblEqCYrgf69Nk8N7SODmsfWg94OEaI74IqMoM12t7eIGwFzQ==";
       };
     };
-    "@graphql-tools/utils-10.2.2" = {
+    "@graphql-tools/utils-10.3.2" = {
       name = "_at_graphql-tools_slash_utils";
       packageName = "@graphql-tools/utils";
-      version = "10.2.2";
+      version = "10.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-10.2.2.tgz";
-        sha512 = "ueoplzHIgFfxhFrF4Mf/niU/tYHuO6Uekm2nCYU72qpI+7Hn9dA2/o5XOBvFXDk27Lp5VSvQY5WfmRbqwVxaYQ==";
+        url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-10.3.2.tgz";
+        sha512 = "iaqOHS4f90KNADBHqVsRBjKpM6iSvsUg1q5GhWMK03loYLaDzftrEwcsl0OkSSnRhJvAsT7q4q3r3YzRoV0v1g==";
       };
     };
     "@graphql-tools/utils-6.2.4" = {
@@ -5935,13 +5701,13 @@ let
         sha512 = "foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg==";
       };
     };
-    "@hpcc-js/wasm-2.16.2" = {
+    "@hpcc-js/wasm-2.18.0" = {
       name = "_at_hpcc-js_slash_wasm";
       packageName = "@hpcc-js/wasm";
-      version = "2.16.2";
+      version = "2.18.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@hpcc-js/wasm/-/wasm-2.16.2.tgz";
-        sha512 = "THiidUMYR8/cIfFT3MVcWuRE7bQKh295nrFBxGvUNc4Nq8e2uU1LtiplHs7AUkJ0GxgvZoR+8TQ1/E3Qb/uE2g==";
+        url = "https://registry.npmjs.org/@hpcc-js/wasm/-/wasm-2.18.0.tgz";
+        sha512 = "M9XVIvAXGH4Xcyb5UoiohWcn6fil89pcos/gClNdBZG2v+W48xSf2bjcA8BW131X/AFHUerVY28n1P1Jw81/9A==";
       };
     };
     "@httptoolkit/websocket-stream-6.0.1" = {
@@ -6034,13 +5800,13 @@ let
         sha512 = "trnsAYxU3xnS1gPHPyU961coFyLkh4gAD/0zQ5mymY4yOZ+CYvsPqUbOFSw0aDM4y0tV7tiFxL/1XfXPNC6IPg==";
       };
     };
-    "@ibm-cloud/openapi-ruleset-1.17.1" = {
+    "@ibm-cloud/openapi-ruleset-1.18.2" = {
       name = "_at_ibm-cloud_slash_openapi-ruleset";
       packageName = "@ibm-cloud/openapi-ruleset";
-      version = "1.17.1";
+      version = "1.18.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ibm-cloud/openapi-ruleset/-/openapi-ruleset-1.17.1.tgz";
-        sha512 = "LtmPscvla4FuCwkX7SSFpKUriIrbmh/MgHJDp1B5yNe656/uDvNgCppi87eXdTg1fjwalj400Ldk2Di1sVks6w==";
+        url = "https://registry.npmjs.org/@ibm-cloud/openapi-ruleset/-/openapi-ruleset-1.18.2.tgz";
+        sha512 = "Nbdp0Bsadpx2zvwbFadukmtN5QvL8kC/a6V/OxTk9yEDQytfVOssnboZ76IA+OC+IpAehxwjj1EpEirBWIdQKw==";
       };
     };
     "@ibm-cloud/openapi-ruleset-utilities-1.3.2" = {
@@ -6061,6 +5827,15 @@ let
         sha512 = "CifrkgQjDkUkWexmgYYNyB5603HhTHI91vLFeQXh6qrTKiCMVASol01Rs1cv6LP/A2WccZSRlJKZhbaBIs/9ZA==";
       };
     };
+    "@inquirer/checkbox-2.4.2" = {
+      name = "_at_inquirer_slash_checkbox";
+      packageName = "@inquirer/checkbox";
+      version = "2.4.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@inquirer/checkbox/-/checkbox-2.4.2.tgz";
+        sha512 = "iZRNbTlSB9xXt/+jdMFViBdxw1ILWu3365rzfM5OLwAyOScbDFFGSH7LEUwoq1uOIo48ymOEwYSqP5y8hQMlmA==";
+      };
+    };
     "@inquirer/confirm-2.0.17" = {
       name = "_at_inquirer_slash_confirm";
       packageName = "@inquirer/confirm";
@@ -6070,6 +5845,15 @@ let
         sha512 = "EqzhGryzmGpy2aJf6LxJVhndxYmFs+m8cxXzf8nejb1DE3sabf6mUgBcp4J0jAUEiAcYzqmkqRr7LPFh/WdnXA==";
       };
     };
+    "@inquirer/confirm-3.1.17" = {
+      name = "_at_inquirer_slash_confirm";
+      packageName = "@inquirer/confirm";
+      version = "3.1.17";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@inquirer/confirm/-/confirm-3.1.17.tgz";
+        sha512 = "qCpt/AABzPynz8tr69VDvhcjwmzAryipWXtW8Vi6m651da4H/d0Bdn55LkxXD7Rp2gfgxvxzTdb66AhIA8gzBA==";
+      };
+    };
     "@inquirer/core-2.3.1" = {
       name = "_at_inquirer_slash_core";
       packageName = "@inquirer/core";
@@ -6088,6 +5872,15 @@ let
         sha512 = "fKi63Khkisgda3ohnskNf5uZJj+zXOaBvOllHsOkdsXRA/ubQLJQrZchFFi57NKbZzkTunXiBMdvWOv71alonw==";
       };
     };
+    "@inquirer/core-9.0.5" = {
+      name = "_at_inquirer_slash_core";
+      packageName = "@inquirer/core";
+      version = "9.0.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@inquirer/core/-/core-9.0.5.tgz";
+        sha512 = "QWG41I7vn62O9stYKg/juKXt1PEbr/4ZZCPb4KgXDQGwgA9M5NBTQ7FnOvT1ridbxkm/wTxLCNraUs7y47pIRQ==";
+      };
+    };
     "@inquirer/editor-1.2.15" = {
       name = "_at_inquirer_slash_editor";
       packageName = "@inquirer/editor";
@@ -6097,6 +5890,15 @@ let
         sha512 = "gQ77Ls09x5vKLVNMH9q/7xvYPT6sIs5f7URksw+a2iJZ0j48tVS6crLqm2ugG33tgXHIwiEqkytY60Zyh5GkJQ==";
       };
     };
+    "@inquirer/editor-2.1.17" = {
+      name = "_at_inquirer_slash_editor";
+      packageName = "@inquirer/editor";
+      version = "2.1.17";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@inquirer/editor/-/editor-2.1.17.tgz";
+        sha512 = "hwx3VpFQzOY2hFWnY+XPsUGCIUVQ5kYxH6+CExv/RbMiAoN3zXtzj8DyrWBOHami0vBrrnPS8CTq3uQWc7N2BA==";
+      };
+    };
     "@inquirer/expand-1.1.16" = {
       name = "_at_inquirer_slash_expand";
       packageName = "@inquirer/expand";
@@ -6106,13 +5908,22 @@ let
         sha512 = "TGLU9egcuo+s7PxphKUCnJnpCIVY32/EwPCLLuu+gTvYiD8hZgx8Z2niNQD36sa6xcfpdLY6xXDBiL/+g1r2XQ==";
       };
     };
-    "@inquirer/figures-1.0.3" = {
+    "@inquirer/expand-2.1.17" = {
+      name = "_at_inquirer_slash_expand";
+      packageName = "@inquirer/expand";
+      version = "2.1.17";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@inquirer/expand/-/expand-2.1.17.tgz";
+        sha512 = "s4V/dC+GeE5s97xoTtZSmC440uNKePKqZgzqEf0XM63ciilnXAtKGvoAWOePFdlK+oGTz0d8bhbPKwpKGvRYfg==";
+      };
+    };
+    "@inquirer/figures-1.0.5" = {
       name = "_at_inquirer_slash_figures";
       packageName = "@inquirer/figures";
-      version = "1.0.3";
+      version = "1.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@inquirer/figures/-/figures-1.0.3.tgz";
-        sha512 = "ErXXzENMH5pJt5/ssXV0DfWUZqly8nGzf0UcBV9xTnP+KyffE2mqyxIMBrZ8ijQck2nU0TQm40EQB53YreyWHw==";
+        url = "https://registry.npmjs.org/@inquirer/figures/-/figures-1.0.5.tgz";
+        sha512 = "79hP/VWdZ2UVc9bFGJnoQ/lQMpL74mGgzSYX1xUqCVk7/v73vJCMw1VuyWN1jGkZ9B3z7THAbySqGbCNefcjfA==";
       };
     };
     "@inquirer/input-1.2.16" = {
@@ -6124,6 +5935,15 @@ let
         sha512 = "Ou0LaSWvj1ni+egnyQ+NBtfM1885UwhRCMtsRt2bBO47DoC1dwtCa+ZUNgrxlnCHHF0IXsbQHYtIIjFGAavI4g==";
       };
     };
+    "@inquirer/input-2.2.4" = {
+      name = "_at_inquirer_slash_input";
+      packageName = "@inquirer/input";
+      version = "2.2.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@inquirer/input/-/input-2.2.4.tgz";
+        sha512 = "wvYnDITPQn+ltktj/O9kQjPxOvpmwcpxLWh8brAyD+jlEbihxtrx9cZdZcxqaCVQj3caw4eZa2Uq5xELo4yXkA==";
+      };
+    };
     "@inquirer/password-1.1.16" = {
       name = "_at_inquirer_slash_password";
       packageName = "@inquirer/password";
@@ -6133,6 +5953,15 @@ let
         sha512 = "aZYZVHLUXZ2gbBot+i+zOJrks1WaiI95lvZCn1sKfcw6MtSSlYC8uDX8sTzQvAsQ8epHoP84UNvAIT0KVGOGqw==";
       };
     };
+    "@inquirer/password-2.1.17" = {
+      name = "_at_inquirer_slash_password";
+      packageName = "@inquirer/password";
+      version = "2.1.17";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@inquirer/password/-/password-2.1.17.tgz";
+        sha512 = "/u6DM/fDHXoBWyA+9aRhghkeo5smE7wO9k4E2UoJbgiRCkt3JjBEuBqLOJNrz8E16M0ez4UM1vd5cXrmICHW+A==";
+      };
+    };
     "@inquirer/prompts-2.3.1" = {
       name = "_at_inquirer_slash_prompts";
       packageName = "@inquirer/prompts";
@@ -6151,6 +5980,15 @@ let
         sha512 = "k52mOMRvTUejrqyF1h8Z07chC+sbaoaUYzzr1KrJXyj7yaX7Nrh0a9vktv8TuocRwIJOQMaj5oZEmkspEcJFYQ==";
       };
     };
+    "@inquirer/prompts-5.0.7" = {
+      name = "_at_inquirer_slash_prompts";
+      packageName = "@inquirer/prompts";
+      version = "5.0.7";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@inquirer/prompts/-/prompts-5.0.7.tgz";
+        sha512 = "GFcigCxJTKCH3aECzMIu4FhgLJWnFvMXzpI4CCSoELWFtkOOU2P+goYA61+OKpGrB8fPE7q6n8zAXBSlZRrHjQ==";
+      };
+    };
     "@inquirer/rawlist-1.2.16" = {
       name = "_at_inquirer_slash_rawlist";
       packageName = "@inquirer/rawlist";
@@ -6160,6 +5998,15 @@ let
         sha512 = "pZ6TRg2qMwZAOZAV6TvghCtkr53dGnK29GMNQ3vMZXSNguvGqtOVc4j/h1T8kqGJFagjyfBZhUPGwNS55O5qPQ==";
       };
     };
+    "@inquirer/rawlist-2.1.17" = {
+      name = "_at_inquirer_slash_rawlist";
+      packageName = "@inquirer/rawlist";
+      version = "2.1.17";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@inquirer/rawlist/-/rawlist-2.1.17.tgz";
+        sha512 = "RFrw34xU5aVlMA3ZJCaeKGxYjhu3j4i46O2GMmaRRGeLObCRM1yOKQOsRclSTzjd4A7+M5QleR2iuW/68J9Kwg==";
+      };
+    };
     "@inquirer/select-1.3.3" = {
       name = "_at_inquirer_slash_select";
       packageName = "@inquirer/select";
@@ -6169,13 +6016,31 @@ let
         sha512 = "RzlRISXWqIKEf83FDC9ZtJ3JvuK1l7aGpretf41BCWYrvla2wU8W8MTRNMiPrPJ+1SIqrRC1nZdZ60hD9hRXLg==";
       };
     };
-    "@inquirer/type-1.3.3" = {
+    "@inquirer/select-2.4.2" = {
+      name = "_at_inquirer_slash_select";
+      packageName = "@inquirer/select";
+      version = "2.4.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@inquirer/select/-/select-2.4.2.tgz";
+        sha512 = "r78JlgShqRxyAtBDeBHSDtfrOhSQwm2ecWGGaxe7kD9JwgL3UN563G1ncVRYdsWD7/tigflcskfipVeoDLhLJg==";
+      };
+    };
+    "@inquirer/type-1.5.1" = {
       name = "_at_inquirer_slash_type";
       packageName = "@inquirer/type";
-      version = "1.3.3";
+      version = "1.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@inquirer/type/-/type-1.3.3.tgz";
-        sha512 = "xTUt0NulylX27/zMx04ZYar/kr1raaiFTVvQ5feljQsiAgdm0WPj4S73/ye0fbslh+15QrIuDvfCXTek7pMY5A==";
+        url = "https://registry.npmjs.org/@inquirer/type/-/type-1.5.1.tgz";
+        sha512 = "m3YgGQlKNS0BM+8AFiJkCsTqHEFCWn6s/Rqye3mYwvqY6LdfUv12eSwbsgNzrYyrLXiy7IrrjDLPysaSBwEfhw==";
+      };
+    };
+    "@ioredis/commands-1.2.0" = {
+      name = "_at_ioredis_slash_commands";
+      packageName = "@ioredis/commands";
+      version = "1.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@ioredis/commands/-/commands-1.2.0.tgz";
+        sha512 = "Sx1pU8EM64o2BrqNpEO1CNLtKQwyhuXuqyfH7oGKCk+1a33d2r5saW8zNwm3j6BTExtjrv2BxTgzzkMwts6vGg==";
       };
     };
     "@isaacs/cliui-8.0.2" = {
@@ -6187,6 +6052,24 @@ let
         sha512 = "O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==";
       };
     };
+    "@isaacs/fs-minipass-4.0.1" = {
+      name = "_at_isaacs_slash_fs-minipass";
+      packageName = "@isaacs/fs-minipass";
+      version = "4.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@isaacs/fs-minipass/-/fs-minipass-4.0.1.tgz";
+        sha512 = "wgm9Ehl2jpeqP3zw/7mo3kRHFp5MEDhqAdwy1fTGkHAwnkGOVsgpvQhL8B5n1qlb01jV3n/bI0ZfZp5lWA1k4w==";
+      };
+    };
+    "@isaacs/string-locale-compare-1.1.0" = {
+      name = "_at_isaacs_slash_string-locale-compare";
+      packageName = "@isaacs/string-locale-compare";
+      version = "1.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@isaacs/string-locale-compare/-/string-locale-compare-1.1.0.tgz";
+        sha512 = "SQ7Kzhh9+D+ZW9MA0zkYv3VXhIDNx+LzM6EJ+/65I3QY+enU6Itte7E5XX7EWrqLW2FN4n06GWzBnPoC3th2aQ==";
+      };
+    };
     "@jcubic/lily-0.3.0" = {
       name = "_at_jcubic_slash_lily";
       packageName = "@jcubic/lily";
@@ -6493,85 +6376,85 @@ let
         sha512 = "VyCpkZzFTHXtKgVO35iKN0sYR10psGpV6SkcSeV4oF7eSYlR8Bl6aQLCzVeFjvESF7mxTmIiI3/XrMobVrtxDA==";
       };
     };
-    "@joplin/fork-htmlparser2-4.1.51" = {
+    "@joplin/fork-htmlparser2-4.1.52" = {
       name = "_at_joplin_slash_fork-htmlparser2";
       packageName = "@joplin/fork-htmlparser2";
-      version = "4.1.51";
+      version = "4.1.52";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@joplin/fork-htmlparser2/-/fork-htmlparser2-4.1.51.tgz";
-        sha512 = "IaZAttfsyppAo1q1KwI/ln0U/+bpUYpX0AWm7M/gWNYorWU6g/EakQwZIkmVRIcAD+6gji4T+xR4oF8fBxJ8HA==";
+        url = "https://registry.npmjs.org/@joplin/fork-htmlparser2/-/fork-htmlparser2-4.1.52.tgz";
+        sha512 = "QXapybOIiEE7WVxuejgScVkx+Z+gcMdQt5lcD41/l2f1XnvKOEzd2QRmwjl/6V+g6pHkwg43uStTGsm4y64Y4g==";
       };
     };
-    "@joplin/fork-sax-1.2.55" = {
+    "@joplin/fork-sax-1.2.56" = {
       name = "_at_joplin_slash_fork-sax";
       packageName = "@joplin/fork-sax";
-      version = "1.2.55";
+      version = "1.2.56";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@joplin/fork-sax/-/fork-sax-1.2.55.tgz";
-        sha512 = "FgwqhVEZfN3yrArhDdkjMQJ9CG2V/9ed8NPFsDIK/QR6CK+vzWTPuAKFq57CN76ydvr6c0kX8nOSDpxJatzhpw==";
+        url = "https://registry.npmjs.org/@joplin/fork-sax/-/fork-sax-1.2.56.tgz";
+        sha512 = "TZx71MLGjjbCToOCvYBimIzDtqn4xROMrsnKon+DJ+wrhOfBRmebwrGVVs/tC06MMAuj3k1MLBLtixnKnqV+FQ==";
       };
     };
-    "@joplin/fork-uslug-1.0.16" = {
+    "@joplin/fork-uslug-1.0.17" = {
       name = "_at_joplin_slash_fork-uslug";
       packageName = "@joplin/fork-uslug";
-      version = "1.0.16";
+      version = "1.0.17";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@joplin/fork-uslug/-/fork-uslug-1.0.16.tgz";
-        sha512 = "N3UyuqUG+t67YXH37HPS9qSr7Z+GdciZ1FfHHZ7FjgVElR+Ch049OWrI+NX/ruHFkfofmQKHLNRKVmNrPnclNA==";
+        url = "https://registry.npmjs.org/@joplin/fork-uslug/-/fork-uslug-1.0.17.tgz";
+        sha512 = "N893VhVBchv8Q+9HqK0ycJW5noYIb2gyiw+SCLg5lCnZefb8VT51KmKcDUdDU60RLVkdv92YsYxJ3JKqdwE5LA==";
       };
     };
-    "@joplin/htmlpack-2.14.1" = {
+    "@joplin/htmlpack-3.0.1" = {
       name = "_at_joplin_slash_htmlpack";
       packageName = "@joplin/htmlpack";
-      version = "2.14.1";
+      version = "3.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@joplin/htmlpack/-/htmlpack-2.14.1.tgz";
-        sha512 = "ZIQBkfVffFbFURT+lLoB9oYSkDFcE3KJ5IE434Rd3i6BCSXn4qYQyVF8K6t0oVPHGJAmTnnM5RpTVhRx+mBERw==";
+        url = "https://registry.npmjs.org/@joplin/htmlpack/-/htmlpack-3.0.1.tgz";
+        sha512 = "pQgr2DS6/pR3mrtQyOQyTp9MHB3JUQO3S+DZ+NZJADcDx23ajnVFXlYR9lbpyyIBCZAObqVUyRCisOjBKcn8eg==";
       };
     };
-    "@joplin/lib-2.14.1" = {
+    "@joplin/lib-3.0.1" = {
       name = "_at_joplin_slash_lib";
       packageName = "@joplin/lib";
-      version = "2.14.1";
+      version = "3.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@joplin/lib/-/lib-2.14.1.tgz";
-        sha512 = "EnvOoj4b8vG/oq58QFWSyyoAiQ/BnMyffw58iacmPAG9jGIwbPPDA4HP3RLCirwwdgrdtTlRxl7WaLHnSO3h6A==";
+        url = "https://registry.npmjs.org/@joplin/lib/-/lib-3.0.1.tgz";
+        sha512 = "agvscTfUaxkFS6dWg0ijGrH7ZET2x3A16OPXdBy+ym9wI4YFZ0jQuIQiUlms48hLdlw300ZOnR5OIP2IJm1ufw==";
       };
     };
-    "@joplin/renderer-2.14.1" = {
+    "@joplin/renderer-3.0.1" = {
       name = "_at_joplin_slash_renderer";
       packageName = "@joplin/renderer";
-      version = "2.14.1";
+      version = "3.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@joplin/renderer/-/renderer-2.14.1.tgz";
-        sha512 = "AbnE1g976pNrx3rjdKOR6JYWgowdmH3kTN8yWmSYnU2OD8qPhTovMROClxF6m7fLc3N49fxEBZwCjbRFLv35iA==";
+        url = "https://registry.npmjs.org/@joplin/renderer/-/renderer-3.0.1.tgz";
+        sha512 = "YTsrp2Ib41B6p67LZBgln0prfWKV38TEFh0yOChqA559rujI125pYmxVKTPRjia2vjplIiyycsXua+/ke9oATw==";
       };
     };
-    "@joplin/turndown-4.0.73" = {
+    "@joplin/turndown-4.0.74" = {
       name = "_at_joplin_slash_turndown";
       packageName = "@joplin/turndown";
-      version = "4.0.73";
+      version = "4.0.74";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@joplin/turndown/-/turndown-4.0.73.tgz";
-        sha512 = "5u5CUih9otHMkWpvH1VtHLyF0VMYnl2FVxv+/QvAX7PfwvGdmfMQISzC/wwb3MueMb/yhemv5c+6oiN4RCNlWw==";
+        url = "https://registry.npmjs.org/@joplin/turndown/-/turndown-4.0.74.tgz";
+        sha512 = "yISsLt6wQCVtJHWf6XaSQv3hw4FxzmL8jLa7GJNZAIpFSg9cWBp9f9+tIbEwT6fzCFt1Vs9dQJSVujUYP/hTzA==";
       };
     };
-    "@joplin/turndown-plugin-gfm-1.0.55" = {
+    "@joplin/turndown-plugin-gfm-1.0.56" = {
       name = "_at_joplin_slash_turndown-plugin-gfm";
       packageName = "@joplin/turndown-plugin-gfm";
-      version = "1.0.55";
+      version = "1.0.56";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@joplin/turndown-plugin-gfm/-/turndown-plugin-gfm-1.0.55.tgz";
-        sha512 = "ij5DquSAWnu1fVM02N2m32uMxslJZcdMuTsLJfTHYEVs96R8MKFaHtWjbQycpx9PRYdlL5jW4SaW9A92OCccxA==";
+        url = "https://registry.npmjs.org/@joplin/turndown-plugin-gfm/-/turndown-plugin-gfm-1.0.56.tgz";
+        sha512 = "q9Pul+xfmjXNHgNgB+ksRkwcBf13X7C89CDxT4sShrh17dmGsc7AUy+GbnwlmavauMDvsdiDIG8pvGqa1L002g==";
       };
     };
-    "@joplin/utils-2.14.1" = {
+    "@joplin/utils-3.0.1" = {
       name = "_at_joplin_slash_utils";
       packageName = "@joplin/utils";
-      version = "2.14.1";
+      version = "3.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@joplin/utils/-/utils-2.14.1.tgz";
-        sha512 = "HOR9UOivlbFiANAVPeK5TNYRE5KQ3dCxVC7Sus8bcA+ZIrJxM0P73Ng1p96HkzsZAE71OEqVKn6HMd67gZOy4Q==";
+        url = "https://registry.npmjs.org/@joplin/utils/-/utils-3.0.1.tgz";
+        sha512 = "rvHU/8iesDo6pPovjh9F/4Sv4adm/OuaOiNYTqbfT8Y2fn7eaDQBK8UbgABXg2ZIBToD5Tto+D3YCiO1PWGJMg==";
       };
     };
     "@jridgewell/gen-mapping-0.3.5" = {
@@ -6610,13 +6493,13 @@ let
         sha512 = "1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==";
       };
     };
-    "@jridgewell/sourcemap-codec-1.4.15" = {
+    "@jridgewell/sourcemap-codec-1.5.0" = {
       name = "_at_jridgewell_slash_sourcemap-codec";
       packageName = "@jridgewell/sourcemap-codec";
-      version = "1.4.15";
+      version = "1.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz";
-        sha512 = "eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==";
+        url = "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz";
+        sha512 = "gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==";
       };
     };
     "@jridgewell/trace-mapping-0.3.25" = {
@@ -6673,22 +6556,13 @@ let
         sha512 = "qtLGzCNzPVJ3kdH6/zoLWDPjauHIKiLSBAR71Wa0+PWvGA8wODUQvRgxtpUA5YqAYL3CQ8S4qXhd/9WuWTZirg==";
       };
     };
-    "@jsii/check-node-1.100.0" = {
+    "@jsii/check-node-1.101.0" = {
       name = "_at_jsii_slash_check-node";
       packageName = "@jsii/check-node";
-      version = "1.100.0";
+      version = "1.101.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@jsii/check-node/-/check-node-1.100.0.tgz";
-        sha512 = "4bsO7Y6YyekBk4v4iatAl5E7QQs2UUPtHoP9gfT3UnpbKzyMjH8XholSVCjfcNSKBwFobPMb8iA7NCMIMqFKsQ==";
-      };
-    };
-    "@jsii/check-node-1.95.0" = {
-      name = "_at_jsii_slash_check-node";
-      packageName = "@jsii/check-node";
-      version = "1.95.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@jsii/check-node/-/check-node-1.95.0.tgz";
-        sha512 = "E5njkBk6X4WrQHtGeO0ed+cvkMxqinQZY83TJZ9RFEIwrndDfj7asMgWkRkYQRF05AlQXks+Eh8wza7ErIl85Q==";
+        url = "https://registry.npmjs.org/@jsii/check-node/-/check-node-1.101.0.tgz";
+        sha512 = "io8u1GAF9XGp2crx0C/WGiJeUnHGw5X0du4fisbrNJHmVVFwcJbBMjbfXKWq+JSzl8fo/JV3F1LqtjsnawKA2A==";
       };
     };
     "@jsii/check-node-1.98.0" = {
@@ -6700,22 +6574,13 @@ let
         sha512 = "hI53TMW/fylHyY3CrJvqWvfSPJvBL82GSAB1m2CKNC0yHb0pZHCdBZnLrrr4rgTCQx8kIJjcUc0rQ/Ba3w+GaA==";
       };
     };
-    "@jsii/check-node-1.99.0" = {
-      name = "_at_jsii_slash_check-node";
-      packageName = "@jsii/check-node";
-      version = "1.99.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@jsii/check-node/-/check-node-1.99.0.tgz";
-        sha512 = "RJeVopU3U+/ZxGj//KKJgXmDM8N7uP5QIqypb0QFVJPtIcQMM9nuEQWp4hOB3ajhk4VNaXGrG6PwlqFtFsqbbQ==";
-      };
-    };
-    "@jsii/spec-1.100.0" = {
+    "@jsii/spec-1.101.0" = {
       name = "_at_jsii_slash_spec";
       packageName = "@jsii/spec";
-      version = "1.100.0";
+      version = "1.101.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@jsii/spec/-/spec-1.100.0.tgz";
-        sha512 = "4LJCpSkmi3Hfcbmbchv+2JPIquV+cgrkhQcwglBAWqS4liLGbWPwgfHRL22sMXEKXiyXeHfitVwkP+IoGIyJ8g==";
+        url = "https://registry.npmjs.org/@jsii/spec/-/spec-1.101.0.tgz";
+        sha512 = "855OnjKm4RTzRA78GGTNBG/GLe6X/vHJYD58zg7Rw8rWS7sU6iB65TM/7P7R3cufVew8umjjPjvW7ygS6ZqITQ==";
       };
     };
     "@jsonjoy.com/base64-1.1.2" = {
@@ -6736,13 +6601,13 @@ let
         sha512 = "aOcSN4MeAtFROysrbqG137b7gaDDSmVrl5mpo6sT/w+kcXpWnzhMjmY/Fh/sDx26NBxyIE7MB1seqLeCAzy9Sg==";
       };
     };
-    "@jsonjoy.com/util-1.1.3" = {
+    "@jsonjoy.com/util-1.2.0" = {
       name = "_at_jsonjoy.com_slash_util";
       packageName = "@jsonjoy.com/util";
-      version = "1.1.3";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@jsonjoy.com/util/-/util-1.1.3.tgz";
-        sha512 = "g//kkF4kOwUjemValCtOc/xiYzmwMRmWq3Bn+YnzOzuZLHq2PpMOxxIayN3cKbo7Ko2Np65t6D9H81IvXbXhqg==";
+        url = "https://registry.npmjs.org/@jsonjoy.com/util/-/util-1.2.0.tgz";
+        sha512 = "4B8B+3vFsY4eo33DMKyJPlQ3sBMpPFUZK2dr3O3rXrOGKKbYG44J0XSFkDo1VOQiri5HFEhIeVvItjR2xcazmg==";
       };
     };
     "@kamilkisiela/fast-url-parser-1.1.4" = {
@@ -6781,13 +6646,13 @@ let
         sha512 = "Vo+PSpZG2/fmgmiNzYK9qWRh8h/CHrwD0mo1h1DzL4yzHNSfWYujGTYsWGreD000gcgmZ7K4Ys6Tx9TxtsKdDw==";
       };
     };
-    "@lerna/create-8.1.3" = {
+    "@lerna/create-8.1.7" = {
       name = "_at_lerna_slash_create";
       packageName = "@lerna/create";
-      version = "8.1.3";
+      version = "8.1.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@lerna/create/-/create-8.1.3.tgz";
-        sha512 = "JFvIYrlvR8Txa8h7VZx8VIQDltukEKOKaZL/muGO7Q/5aE2vjOKHsD/jkWYe/2uFy1xv37ubdx17O1UXQNadPg==";
+        url = "https://registry.npmjs.org/@lerna/create/-/create-8.1.7.tgz";
+        sha512 = "ch81CgU5pBNOiUCQx44F/ZtN4DxxJjUQtuytYRBFWJSHAJ+XPJtiC/yQ9zjr1I1yaUlmNYYblkopoOyziOdJ1w==";
       };
     };
     "@lezer/common-1.2.1" = {
@@ -6808,13 +6673,13 @@ let
         sha512 = "CHsKq8DMKBf9b3yXPDIU4DbH+ZJd/sJdYOW2llbW/HudP5u0VS6Bfq1hLYfgU7uAYGFIyGGQIsSOXGPEErZiJw==";
       };
     };
-    "@ljharb/through-2.3.13" = {
-      name = "_at_ljharb_slash_through";
-      packageName = "@ljharb/through";
-      version = "2.3.13";
+    "@listr2/prompt-adapter-inquirer-2.0.13" = {
+      name = "_at_listr2_slash_prompt-adapter-inquirer";
+      packageName = "@listr2/prompt-adapter-inquirer";
+      version = "2.0.13";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@ljharb/through/-/through-2.3.13.tgz";
-        sha512 = "/gKJun8NNiWGZJkGzI/Ragc53cOdcLNdzjLaIa+GEjguQs0ulsurx8WN0jijdK9yPqDvziX995sMRLyLt1uZMQ==";
+        url = "https://registry.npmjs.org/@listr2/prompt-adapter-inquirer/-/prompt-adapter-inquirer-2.0.13.tgz";
+        sha512 = "nAl6teTt7EWSjttNavAnv3uFR3w3vPP3OTYmHyPNHzKhAj2NoBDHmbS3MGpvvO8KXXPASnHjEGrrKrdKTMKPnQ==";
       };
     };
     "@lmdb/lmdb-darwin-arm64-2.5.3" = {
@@ -6943,13 +6808,13 @@ let
         sha512 = "Yhlar6v9WQgUp/He7BdgzOz8lqMQ8sU+jkCq7Wx8Myc5YFJLbEe7lgui/V7G1qB1DJykHSGwreceSaD60Y0PUQ==";
       };
     };
-    "@microsoft/applicationinsights-web-snippet-1.1.2" = {
+    "@microsoft/applicationinsights-web-snippet-1.2.1" = {
       name = "_at_microsoft_slash_applicationinsights-web-snippet";
       packageName = "@microsoft/applicationinsights-web-snippet";
-      version = "1.1.2";
+      version = "1.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@microsoft/applicationinsights-web-snippet/-/applicationinsights-web-snippet-1.1.2.tgz";
-        sha512 = "qPoOk3MmEx3gS6hTc1/x8JWQG5g4BvRdH7iqZMENBsKCL927b7D7Mvl19bh3sW9Ucrg1fVrF+4hqShwQNdqLxQ==";
+        url = "https://registry.npmjs.org/@microsoft/applicationinsights-web-snippet/-/applicationinsights-web-snippet-1.2.1.tgz";
+        sha512 = "+Cy9zFqdQgdAbMK1dpm7B+3DUnrByai0Tq6XG9v737HJpW6G1EiNNbTuFeXdPWyGaq6FIx9jxm/SUcxA6/Rxxg==";
       };
     };
     "@microsoft/fetch-event-source-2.0.1" = {
@@ -6961,13 +6826,13 @@ let
         sha512 = "W6CLUJ2eBMw3Rec70qrsEW0jOm/3twwJv21mrmj2yORiaVmVYGS4sSS5yUwvQc1ZlDLYGPnClVWmUUMagKNsfA==";
       };
     };
-    "@microsoft/rush-lib-5.128.1" = {
+    "@microsoft/rush-lib-5.130.2" = {
       name = "_at_microsoft_slash_rush-lib";
       packageName = "@microsoft/rush-lib";
-      version = "5.128.1";
+      version = "5.130.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@microsoft/rush-lib/-/rush-lib-5.128.1.tgz";
-        sha512 = "8U1c3puDh10ZVNHR+Fk/juAQCwNdxRUNEVjRNkyoxDeAznca8Uo7ix7RoWOOQChh43JkeewRXmaHwmY4yiiL+g==";
+        url = "https://registry.npmjs.org/@microsoft/rush-lib/-/rush-lib-5.130.2.tgz";
+        sha512 = "8QgiqTh9osfqbweaZFikkaQx4Malve8sIGZhEfoPsHJw4bYPjjU7wA2NhQoeQu+0scdVOOL02kPvL7srWkGqFA==";
       };
     };
     "@mischnic/json-sourcemap-0.1.1" = {
@@ -6979,6 +6844,15 @@ let
         sha512 = "iA7+tyVqfrATAIsIRWQG+a7ZLLD0VaOCKV2Wd/v4mqIU3J9c4jx9p7S0nw1XH3gJCKNBOOwACOPYYSUu9pgT+w==";
       };
     };
+    "@mixmark-io/domino-2.2.0" = {
+      name = "_at_mixmark-io_slash_domino";
+      packageName = "@mixmark-io/domino";
+      version = "2.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@mixmark-io/domino/-/domino-2.2.0.tgz";
+        sha512 = "Y28PR25bHXUg88kCV7nivXrP2Nj2RueZ3/l/jdx6J9f8J4nsEGcgX0Qe6lt7Pa+J79+kPiJU3LguR6O/6zrLOw==";
+      };
+    };
     "@module-federation/runtime-0.1.6" = {
       name = "_at_module-federation_slash_runtime";
       packageName = "@module-federation/runtime";
@@ -7024,13 +6898,22 @@ let
         sha512 = "h9u4u/jiIRKbq25PM+zymTyW6bhTzELvOoUd+AvYriWOAKpLGnIamaET3pnHYoI5iYphAHBI4ayx0MehR+VVPQ==";
       };
     };
-    "@noble/curves-1.4.0" = {
+    "@napi-rs/wasm-runtime-0.2.4" = {
+      name = "_at_napi-rs_slash_wasm-runtime";
+      packageName = "@napi-rs/wasm-runtime";
+      version = "0.2.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-0.2.4.tgz";
+        sha512 = "9zESzOO5aDByvhIAsOy9TbpZ0Ur2AJbUI7UT73kcUTS2mxAMHOBaa1st/jAymNoCtvrit99kkzT1FZuXVcgfIQ==";
+      };
+    };
+    "@noble/curves-1.4.2" = {
       name = "_at_noble_slash_curves";
       packageName = "@noble/curves";
-      version = "1.4.0";
+      version = "1.4.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@noble/curves/-/curves-1.4.0.tgz";
-        sha512 = "p+4cb332SFCrReJkCYe8Xzm0OWi4Jji5jVdIZRL/PmacmDkFNw6MrrV+gGpiPxLHbV+zKFRywUWbaseT+tZRXg==";
+        url = "https://registry.npmjs.org/@noble/curves/-/curves-1.4.2.tgz";
+        sha512 = "TavHr8qycMChk8UwMld0ZDRvatedkzWfH8IiaeGCfymOP5i0hSCozz9vHOL0nkwk7HRMlFnAiKpS2jrUmSybcw==";
       };
     };
     "@noble/hashes-1.4.0" = {
@@ -7042,58 +6925,193 @@ let
         sha512 = "V1JJ1WTRUqHHrOSh597hURcMqVKVGL/ea3kv0gSnEdsEZ0/+VyPghM1lMNGc00z7CIQorSvbKpuJkxvuHbvdbg==";
       };
     };
-    "@node-red/editor-api-3.1.10" = {
+    "@node-red/editor-api-4.0.2" = {
       name = "_at_node-red_slash_editor-api";
       packageName = "@node-red/editor-api";
-      version = "3.1.10";
+      version = "4.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-3.1.10.tgz";
-        sha512 = "6W9W3CHOVIG4UC1YescfNqGhW04XDWg9UJQSMGSbRMoiMRhk+X3K1If1xtU7oE18pHKTH1+69oJELH7yh4msGw==";
+        url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-4.0.2.tgz";
+        sha512 = "ZG0n1fpwAP5qhwa1vXdhHGhtVm6flmQKp1N++RPxqmF8uZlkI5wI0FzDrF3V/En7+gUD+o5ylcca4kq+I8GIdA==";
       };
     };
-    "@node-red/editor-client-3.1.10" = {
+    "@node-red/editor-client-4.0.2" = {
       name = "_at_node-red_slash_editor-client";
       packageName = "@node-red/editor-client";
-      version = "3.1.10";
+      version = "4.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-3.1.10.tgz";
-        sha512 = "l5ircZrEL8PzP7RHA49H7AVdSQY+vGJIoy57YaL6G0vHuCYO6u9Bh6chJ9s+6RWIRCqcU6HorTdSS3gzVspGdA==";
+        url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-4.0.2.tgz";
+        sha512 = "B8UsqaxnTeIshgUFhMKj7hk/ddyxSXFTcRnuSw0uC39+ki3UUQ3pWJT8FLOr0NVypCFD4jq8qDzMundD0FVLFw==";
       };
     };
-    "@node-red/nodes-3.1.10" = {
+    "@node-red/nodes-4.0.2" = {
       name = "_at_node-red_slash_nodes";
       packageName = "@node-red/nodes";
-      version = "3.1.10";
+      version = "4.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-3.1.10.tgz";
-        sha512 = "e7NvnF/gdM6HnqR6NwMz5M9I3vW6RWqfEvu8aIkNVNj3ojJnTzxKXLVs5pSaC56M/Q309McrGSuyG0ysI9fXDA==";
+        url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-4.0.2.tgz";
+        sha512 = "dK+S6WJ2S8RQ/WMH1kSzYKvubM0+5zyRq7oEvrAyjk3xqQCwkf7Mfb48zdtHh6zW73/qv1pquY0iikIyZOkU6Q==";
       };
     };
-    "@node-red/registry-3.1.10" = {
+    "@node-red/registry-4.0.2" = {
       name = "_at_node-red_slash_registry";
       packageName = "@node-red/registry";
-      version = "3.1.10";
+      version = "4.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@node-red/registry/-/registry-3.1.10.tgz";
-        sha512 = "iy2GP5AyArOTHnAKXJ0FBIrllfexQOA1LE43hbAZtZWtsgckuTxMWTW1m1U7hYzFvYJNKfAEPz3DNP5pVadd7g==";
+        url = "https://registry.npmjs.org/@node-red/registry/-/registry-4.0.2.tgz";
+        sha512 = "1R9DBH4EhWOH5UJffNZ8Wdemch1onc7ZwRPoylnCD0aFpRWT2q1nEqHJDthtBF2l9x9CZejB31/LBAmU1KCkTQ==";
       };
     };
-    "@node-red/runtime-3.1.10" = {
+    "@node-red/runtime-4.0.2" = {
       name = "_at_node-red_slash_runtime";
       packageName = "@node-red/runtime";
-      version = "3.1.10";
+      version = "4.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-3.1.10.tgz";
-        sha512 = "pFTY/khvBX3wZQ9ibDFVKL1raCvgJ018idBQ7WxcjemYIUTk096iWNofsje08tsR904KNwC1ZZ437cf+s6Xt7Q==";
+        url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-4.0.2.tgz";
+        sha512 = "wW1l8ZIeaLvSB8rKj/g7RsGBLq8Q6ladbCm3Zv4tTbuLmx61t04FZo2DNYTrVlMIR3O5R+vmc5UbzJco7WpVxA==";
       };
     };
-    "@node-red/util-3.1.10" = {
+    "@node-red/util-4.0.2" = {
       name = "_at_node-red_slash_util";
       packageName = "@node-red/util";
-      version = "3.1.10";
+      version = "4.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@node-red/util/-/util-3.1.10.tgz";
-        sha512 = "1wL5HS+F0w48QkmHeIy5/II+CJdoW30P2zdm53JlvrE8OG0887mTapjGqmEG+djkJAfDIO/0El+8Q8U2qt9W5A==";
+        url = "https://registry.npmjs.org/@node-red/util/-/util-4.0.2.tgz";
+        sha512 = "pnAyC3N0JeORyvQQBpW4WQjBJU8iFNC5eG6W6LLfzhW3FvXndOUr85rx4fFtpWXZs8wMtWG4dBw7J4F4QLNJAQ==";
+      };
+    };
+    "@node-rs/bcrypt-1.10.4" = {
+      name = "_at_node-rs_slash_bcrypt";
+      packageName = "@node-rs/bcrypt";
+      version = "1.10.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@node-rs/bcrypt/-/bcrypt-1.10.4.tgz";
+        sha512 = "Kzs8HKt2eBeT5VnkeKgiz/QKTjOO3URcvSNEQZahNwZnL6dBeeJQTxxYisc/6969+5n6c3+gNwKvqJsZzmGe7g==";
+      };
+    };
+    "@node-rs/bcrypt-android-arm-eabi-1.10.4" = {
+      name = "_at_node-rs_slash_bcrypt-android-arm-eabi";
+      packageName = "@node-rs/bcrypt-android-arm-eabi";
+      version = "1.10.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@node-rs/bcrypt-android-arm-eabi/-/bcrypt-android-arm-eabi-1.10.4.tgz";
+        sha512 = "55ajutuTdfK1hKseyliflnxzNtxszQQ/EoLtgJlgCe7rI24vGP9EEEZDznB/u9OaJ14/AYzZtIhkEOYdbIdw0A==";
+      };
+    };
+    "@node-rs/bcrypt-android-arm64-1.10.4" = {
+      name = "_at_node-rs_slash_bcrypt-android-arm64";
+      packageName = "@node-rs/bcrypt-android-arm64";
+      version = "1.10.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@node-rs/bcrypt-android-arm64/-/bcrypt-android-arm64-1.10.4.tgz";
+        sha512 = "dCgQT7nH65tORmJw2hQ6zQgFmmC+/JBYZUWtf7pPZI76AVAn5tc7cIUrxYoV4OT1+uD63b9Av+mS1fT2EPzWEg==";
+      };
+    };
+    "@node-rs/bcrypt-darwin-arm64-1.10.4" = {
+      name = "_at_node-rs_slash_bcrypt-darwin-arm64";
+      packageName = "@node-rs/bcrypt-darwin-arm64";
+      version = "1.10.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@node-rs/bcrypt-darwin-arm64/-/bcrypt-darwin-arm64-1.10.4.tgz";
+        sha512 = "gmHdWikHL3YVZgqXAHT+X/PG+kqIyNlPeFAWKdby83RkDI8FUiPV4qqGilgNnBmVWKkobRae9/I1HDbc4Sbhyg==";
+      };
+    };
+    "@node-rs/bcrypt-darwin-x64-1.10.4" = {
+      name = "_at_node-rs_slash_bcrypt-darwin-x64";
+      packageName = "@node-rs/bcrypt-darwin-x64";
+      version = "1.10.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@node-rs/bcrypt-darwin-x64/-/bcrypt-darwin-x64-1.10.4.tgz";
+        sha512 = "WDzL1WKRtoyTkH6IMPx95Mkd6XaeN0VWJbSDMqQY6AFBOk03yJEj7YYXshCcF+Ur6KBBVSwRf6sdFJ15NI1Z3g==";
+      };
+    };
+    "@node-rs/bcrypt-freebsd-x64-1.10.4" = {
+      name = "_at_node-rs_slash_bcrypt-freebsd-x64";
+      packageName = "@node-rs/bcrypt-freebsd-x64";
+      version = "1.10.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@node-rs/bcrypt-freebsd-x64/-/bcrypt-freebsd-x64-1.10.4.tgz";
+        sha512 = "seSPJi+4MIUd1faL/n/wmDdDwaynd/FTkvTnb7qzCk8LBT+/dxi7MTz+uaD8KYDREcB9Wmhv+lwr0S9/jBTcjg==";
+      };
+    };
+    "@node-rs/bcrypt-linux-arm-gnueabihf-1.10.4" = {
+      name = "_at_node-rs_slash_bcrypt-linux-arm-gnueabihf";
+      packageName = "@node-rs/bcrypt-linux-arm-gnueabihf";
+      version = "1.10.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@node-rs/bcrypt-linux-arm-gnueabihf/-/bcrypt-linux-arm-gnueabihf-1.10.4.tgz";
+        sha512 = "YcMLUtN9cGNTWKnaXslxGO1M0S5b4QN9KYhuyG6Kju27RfqvU5UbmpKElCsEUO2EIjxGwzvPu59T+Fyh6sVbwg==";
+      };
+    };
+    "@node-rs/bcrypt-linux-arm64-gnu-1.10.4" = {
+      name = "_at_node-rs_slash_bcrypt-linux-arm64-gnu";
+      packageName = "@node-rs/bcrypt-linux-arm64-gnu";
+      version = "1.10.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@node-rs/bcrypt-linux-arm64-gnu/-/bcrypt-linux-arm64-gnu-1.10.4.tgz";
+        sha512 = "uYGUK/mO8SiftqmVSAePWxgK82vg+X/gtrVRJi95yq2iwp1+fYJX3ndxCyYPmeplBbd3NJ/F5lPT3FC/IHTTGw==";
+      };
+    };
+    "@node-rs/bcrypt-linux-arm64-musl-1.10.4" = {
+      name = "_at_node-rs_slash_bcrypt-linux-arm64-musl";
+      packageName = "@node-rs/bcrypt-linux-arm64-musl";
+      version = "1.10.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@node-rs/bcrypt-linux-arm64-musl/-/bcrypt-linux-arm64-musl-1.10.4.tgz";
+        sha512 = "rLvSMW/gVUBd2k2gAqQfuOReHWd9+jvz58E3i1TbkRE3a5ChvjOFc9qKPEmXuXuD9Mdj7gUwcYwpq8MdB5MtNw==";
+      };
+    };
+    "@node-rs/bcrypt-linux-x64-gnu-1.10.4" = {
+      name = "_at_node-rs_slash_bcrypt-linux-x64-gnu";
+      packageName = "@node-rs/bcrypt-linux-x64-gnu";
+      version = "1.10.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@node-rs/bcrypt-linux-x64-gnu/-/bcrypt-linux-x64-gnu-1.10.4.tgz";
+        sha512 = "I++6bh+BIp70X/D/crlSgCq8K0s9nGvzmvAGFkqSG4h3LBtjJx4RKbygnoWvcBV9ErK1rvcjfMyjwZt1ukueFA==";
+      };
+    };
+    "@node-rs/bcrypt-linux-x64-musl-1.10.4" = {
+      name = "_at_node-rs_slash_bcrypt-linux-x64-musl";
+      packageName = "@node-rs/bcrypt-linux-x64-musl";
+      version = "1.10.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@node-rs/bcrypt-linux-x64-musl/-/bcrypt-linux-x64-musl-1.10.4.tgz";
+        sha512 = "f9RPl/5n2NS0mMJXB4IYbodKnq5HzOK5x1b9eKbcjsY0rw3mJC3K0XRFc8iaw1a5chA+xV1TPXz5mkykmr2CQQ==";
+      };
+    };
+    "@node-rs/bcrypt-wasm32-wasi-1.10.4" = {
+      name = "_at_node-rs_slash_bcrypt-wasm32-wasi";
+      packageName = "@node-rs/bcrypt-wasm32-wasi";
+      version = "1.10.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@node-rs/bcrypt-wasm32-wasi/-/bcrypt-wasm32-wasi-1.10.4.tgz";
+        sha512 = "VaDOf+wic0yoHFimMkC5VMa/33BNqg6ieD+C/ibb7Av3NnVW4/W9YpDpqAWMR2w3fA40uTLWZ7FZSrcFck27oA==";
+      };
+    };
+    "@node-rs/bcrypt-win32-arm64-msvc-1.10.4" = {
+      name = "_at_node-rs_slash_bcrypt-win32-arm64-msvc";
+      packageName = "@node-rs/bcrypt-win32-arm64-msvc";
+      version = "1.10.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@node-rs/bcrypt-win32-arm64-msvc/-/bcrypt-win32-arm64-msvc-1.10.4.tgz";
+        sha512 = "M7sGnbKPvhYJ5b76ywXiEwR4mIs/JSDHjRrhm9fshKAvltQrwc3Mou22TJggvDN3gKOF1W85uPiM2OgGX/jxMg==";
+      };
+    };
+    "@node-rs/bcrypt-win32-ia32-msvc-1.10.4" = {
+      name = "_at_node-rs_slash_bcrypt-win32-ia32-msvc";
+      packageName = "@node-rs/bcrypt-win32-ia32-msvc";
+      version = "1.10.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@node-rs/bcrypt-win32-ia32-msvc/-/bcrypt-win32-ia32-msvc-1.10.4.tgz";
+        sha512 = "zn/n4DYnuOfC2JgmVDa0JHP+5DUqAOTl2jmV3yrMrmN+StDT4Om5wtvWxvEmgv3CkeZAuAU3Y/fwjSXIpZ0Fhg==";
+      };
+    };
+    "@node-rs/bcrypt-win32-x64-msvc-1.10.4" = {
+      name = "_at_node-rs_slash_bcrypt-win32-x64-msvc";
+      packageName = "@node-rs/bcrypt-win32-x64-msvc";
+      version = "1.10.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@node-rs/bcrypt-win32-x64-msvc/-/bcrypt-win32-x64-msvc-1.10.4.tgz";
+        sha512 = "ynQokTTGbuLu/cckaD8dNcE+Zsfam1zElE+teNol8AxcL7Jv+ghJItSnRthPRV/vLxuycDF2DIICgpXG/p9jrQ==";
       };
     };
     "@nodelib/fs.scandir-2.1.5" = {
@@ -7132,6 +7150,15 @@ let
         sha512 = "OrcNPXdpSl9UX7qPVRWbmWMCSXrcDa2M9DvrbOTj7ao1S4PlqVFYv9/yLKMkrJKZ/V5A/kDBC690or307i26Og==";
       };
     };
+    "@npmcli/arborist-7.5.3" = {
+      name = "_at_npmcli_slash_arborist";
+      packageName = "@npmcli/arborist";
+      version = "7.5.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@npmcli/arborist/-/arborist-7.5.3.tgz";
+        sha512 = "7gbMdDNSYUzi0j2mpb6FoXRg3BxXWplMQZH1MZlvNjSdWFObaUz2Ssvo0Nlh2xmWks1OPo+gpsE6qxpT/5M7lQ==";
+      };
+    };
     "@npmcli/config-6.4.1" = {
       name = "_at_npmcli_slash_config";
       packageName = "@npmcli/config";
@@ -7141,13 +7168,13 @@ let
         sha512 = "uSz+elSGzjCMANWa5IlbGczLYPkNI/LeR+cHrgaTqTrTSh9RHhOFA4daD2eRUz6lMtOW+Fnsb+qv7V2Zz8ML0g==";
       };
     };
-    "@npmcli/config-8.3.3" = {
+    "@npmcli/config-8.3.4" = {
       name = "_at_npmcli_slash_config";
       packageName = "@npmcli/config";
-      version = "8.3.3";
+      version = "8.3.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@npmcli/config/-/config-8.3.3.tgz";
-        sha512 = "sIMKHiiYr91ALiHjhPq64F5P/SCaiSyDfpNmgYHtlIJtLY445+3+r3VoREzpdDrOwIqwQ6iEHinbTfaocL0UgA==";
+        url = "https://registry.npmjs.org/@npmcli/config/-/config-8.3.4.tgz";
+        sha512 = "01rtHedemDNhUXdicU7s+QYz/3JyV5Naj84cvdXGH4mgCdL+agmSYaLF4LUG4vMCLzhBO8YtS0gPpH1FGvbgAw==";
       };
     };
     "@npmcli/fs-1.1.1" = {
@@ -7177,13 +7204,13 @@ let
         sha512 = "q9CRWjpHCMIh5sVyefoD1cA7PkvILqCZsnSOEUUivORLjxCO/Irmue2DprETiNgEqktDBZaM1Bi+jrarx1XdCg==";
       };
     };
-    "@npmcli/git-5.0.7" = {
+    "@npmcli/git-5.0.8" = {
       name = "_at_npmcli_slash_git";
       packageName = "@npmcli/git";
-      version = "5.0.7";
+      version = "5.0.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@npmcli/git/-/git-5.0.7.tgz";
-        sha512 = "WaOVvto604d5IpdCRV2KjQu8PzkfE96d50CQGKgywXh2GxXmDeUO5EWcBC4V57uFyrNqx83+MewuJh3WTR3xPA==";
+        url = "https://registry.npmjs.org/@npmcli/git/-/git-5.0.8.tgz";
+        sha512 = "liASfw5cqhjNW9UFd+ruwwdEf/lbOAQjLL2XY2dFW/bkJheXDYZgOyul/4gVvEV4BWkTXjYGmDqMw9uegdbJNQ==";
       };
     };
     "@npmcli/installed-package-contents-2.1.0" = {
@@ -7204,6 +7231,15 @@ let
         sha512 = "tkYs0OYnzQm6iIRdfy+LcLBjcKuQCeE5YLb8KnrIlutJfheNaPvPpgoFEyEFgbjzl5PLZ3IA/BWAwRU0eHuQDA==";
       };
     };
+    "@npmcli/metavuln-calculator-7.1.1" = {
+      name = "_at_npmcli_slash_metavuln-calculator";
+      packageName = "@npmcli/metavuln-calculator";
+      version = "7.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@npmcli/metavuln-calculator/-/metavuln-calculator-7.1.1.tgz";
+        sha512 = "Nkxf96V0lAx3HCpVda7Vw4P23RILgdi/5K1fmj2tZkWIYLpXAN8k2UVVOsW16TsS5F8Ws2I7Cm+PU1/rsVF47g==";
+      };
+    };
     "@npmcli/move-file-1.1.2" = {
       name = "_at_npmcli_slash_move-file";
       packageName = "@npmcli/move-file";
@@ -7258,13 +7294,13 @@ let
         sha512 = "xhfYPXoV5Dy4UkY0D+v2KkwvnDfiA/8Mt3sWCGI/hM03NsYIH8ZaG6QzS9x7pje5vHZBZJ2v6VRFVTWACnqcmQ==";
       };
     };
-    "@npmcli/redact-1.1.0" = {
-      name = "_at_npmcli_slash_redact";
-      packageName = "@npmcli/redact";
-      version = "1.1.0";
+    "@npmcli/query-3.1.0" = {
+      name = "_at_npmcli_slash_query";
+      packageName = "@npmcli/query";
+      version = "3.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@npmcli/redact/-/redact-1.1.0.tgz";
-        sha512 = "PfnWuOkQgu7gCbnSsAisaX7hKOdZ4wSAhAzH3/ph5dSGau52kCRrMMGbiSQLwyTZpgldkZ49b0brkOr1AzGBHQ==";
+        url = "https://registry.npmjs.org/@npmcli/query/-/query-3.1.0.tgz";
+        sha512 = "C/iR0tk7KSKGldibYIB9x8GtO/0Bd0I2mhOaDb8ucQL/bQVTmGoeREaFj64Z5+iCBRf3dQfed0CjJL7I8iTkiQ==";
       };
     };
     "@npmcli/redact-2.0.1" = {
@@ -7276,15 +7312,6 @@ let
         sha512 = "YgsR5jCQZhVmTJvjduTOIHph0L73pK8xwMVaDY0PatySqVM9AZj93jpoXYSJqfHFxFkN9dmqTw6OiqExsS3LPw==";
       };
     };
-    "@npmcli/run-script-7.0.2" = {
-      name = "_at_npmcli_slash_run-script";
-      packageName = "@npmcli/run-script";
-      version = "7.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@npmcli/run-script/-/run-script-7.0.2.tgz";
-        sha512 = "Omu0rpA8WXvcGeY6DDzyRoY1i5DkCBkzyJ+m2u7PD6quzb0TvSqdIPOkTn8ZBOj7LbbcbMfZ3c5skwSu6m8y2w==";
-      };
-    };
     "@npmcli/run-script-8.1.0" = {
       name = "_at_npmcli_slash_run-script";
       packageName = "@npmcli/run-script";
@@ -7294,31 +7321,31 @@ let
         sha512 = "y7efHHwghQfk28G2z3tlZ67pLG0XdfYbcVG26r7YIXALRsrVQcTq4/tdenSmdOrEsNahIYA/eh8aEVROWGFUDg==";
       };
     };
-    "@nrwl/devkit-19.3.0" = {
+    "@nrwl/devkit-19.5.3" = {
       name = "_at_nrwl_slash_devkit";
       packageName = "@nrwl/devkit";
-      version = "19.3.0";
+      version = "19.5.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@nrwl/devkit/-/devkit-19.3.0.tgz";
-        sha512 = "WRcph/7U37HkTLIRzQ2oburZVfEFkPHJUn7vmo46gCq+N2cAKy3qwONO0RbthhjFIsG94YPXqFWFlV6k4nXpxA==";
+        url = "https://registry.npmjs.org/@nrwl/devkit/-/devkit-19.5.3.tgz";
+        sha512 = "kd6eIQjWuFHdO14wVu0rzGtoPbO3EdYM/3gATOupxBzlqD+7dmkvv1Olbri9v598mDApXQNo8q81L2masTAhvg==";
       };
     };
-    "@nrwl/tao-19.3.0" = {
+    "@nrwl/tao-19.5.3" = {
       name = "_at_nrwl_slash_tao";
       packageName = "@nrwl/tao";
-      version = "19.3.0";
+      version = "19.5.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@nrwl/tao/-/tao-19.3.0.tgz";
-        sha512 = "MyGYeHbh9O4Tv9xmz3Du+/leY5sKUHaPy4ancfNyShHgYi21hemX0/YYjzzoYHi44D8GzSc1XG2rAuwba7Kilw==";
+        url = "https://registry.npmjs.org/@nrwl/tao/-/tao-19.5.3.tgz";
+        sha512 = "SHtPlQi7zofDdbFjqcrTb/A0Mo9tT8S88H8nJa1+GzhKpGUB9rykHtq0qoYdiRBnQfmfR5LoKfe/jft61Ktvdg==";
       };
     };
-    "@nx/devkit-19.3.0" = {
+    "@nx/devkit-19.5.3" = {
       name = "_at_nx_slash_devkit";
       packageName = "@nx/devkit";
-      version = "19.3.0";
+      version = "19.5.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@nx/devkit/-/devkit-19.3.0.tgz";
-        sha512 = "Natya5nzvHH0qTOIL1w/EZtwMgDx87Dgz0LgeY7te2fULaNFcj5fVrP+mUKEJZR+NccO7GPumT2RPhuEl9rPnQ==";
+        url = "https://registry.npmjs.org/@nx/devkit/-/devkit-19.5.3.tgz";
+        sha512 = "OUi8OJkoT+y3LwXACO6ugF9l6QppUyHrBIZYOTffBa1ZrnkpJrw03smy+GhAt+BDoeNGEuOPHGvOSV4AmRxnmg==";
       };
     };
     "@oclif/color-1.0.13" = {
@@ -7780,13 +7807,13 @@ let
         sha512 = "3giAOQvZiH5F9bMlMiv8+GSPMeqg0dbaeo58/0SlA9sxSqZhnUtxzX9/2FzyhS9sWQf5S0GJE0AKBrFqjpeYcg==";
       };
     };
-    "@opentelemetry/core-1.25.0" = {
+    "@opentelemetry/core-1.25.1" = {
       name = "_at_opentelemetry_slash_core";
       packageName = "@opentelemetry/core";
-      version = "1.25.0";
+      version = "1.25.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@opentelemetry/core/-/core-1.25.0.tgz";
-        sha512 = "n0B3s8rrqGrasTgNkXLKXzN0fXo+6IYP7M5b7AMsrZM33f/y6DS6kJ0Btd7SespASWq8bgL3taLo0oe0vB52IQ==";
+        url = "https://registry.npmjs.org/@opentelemetry/core/-/core-1.25.1.tgz";
+        sha512 = "GeT/l6rBYWVQ4XArluLVB6WWQ8flHbdb6r2FCHC3smtdOAbrJBIv35tpV/yp9bmYUJf+xmZpu9DRTIeJVhFbEQ==";
       };
     };
     "@opentelemetry/instrumentation-0.41.2" = {
@@ -7798,112 +7825,112 @@ let
         sha512 = "rxU72E0pKNH6ae2w5+xgVYZLzc5mlxAbGzF4shxMVK8YC2QQsfN38B2GPbj0jvrKWWNUElfclQ+YTykkNg/grw==";
       };
     };
-    "@opentelemetry/resources-1.25.0" = {
+    "@opentelemetry/resources-1.25.1" = {
       name = "_at_opentelemetry_slash_resources";
       packageName = "@opentelemetry/resources";
-      version = "1.25.0";
+      version = "1.25.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@opentelemetry/resources/-/resources-1.25.0.tgz";
-        sha512 = "iHjydPMYJ+Li1auveJCq2rp5U2h6Mhq8BidiyE0jfVlDTFyR1ny8AfJHfmFzJ/RAM8vT8L7T21kcmGybxZC7lQ==";
+        url = "https://registry.npmjs.org/@opentelemetry/resources/-/resources-1.25.1.tgz";
+        sha512 = "pkZT+iFYIZsVn6+GzM0kSX+u3MSLCY9md+lIJOoKl/P+gJFfxJte/60Usdp8Ce4rOs8GduUpSPNe1ddGyDT1sQ==";
       };
     };
-    "@opentelemetry/sdk-trace-base-1.25.0" = {
+    "@opentelemetry/sdk-trace-base-1.25.1" = {
       name = "_at_opentelemetry_slash_sdk-trace-base";
       packageName = "@opentelemetry/sdk-trace-base";
-      version = "1.25.0";
+      version = "1.25.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@opentelemetry/sdk-trace-base/-/sdk-trace-base-1.25.0.tgz";
-        sha512 = "6+g2fiRQUG39guCsKVeY8ToeuUf3YUnPkN6DXRA1qDmFLprlLvZm9cS6+chgbW70cZJ406FTtSCDnJwxDC5sGQ==";
+        url = "https://registry.npmjs.org/@opentelemetry/sdk-trace-base/-/sdk-trace-base-1.25.1.tgz";
+        sha512 = "C8k4hnEbc5FamuZQ92nTOp8X/diCY56XUTnMiv9UTuJitCzaNNHAVsdm5+HLCdI8SLQsLWIrG38tddMxLVoftw==";
       };
     };
-    "@opentelemetry/semantic-conventions-1.25.0" = {
+    "@opentelemetry/semantic-conventions-1.25.1" = {
       name = "_at_opentelemetry_slash_semantic-conventions";
       packageName = "@opentelemetry/semantic-conventions";
-      version = "1.25.0";
+      version = "1.25.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.25.0.tgz";
-        sha512 = "M+kkXKRAIAiAP6qYyesfrC5TOmDpDVtsxuGfPcqd9B/iBrac+E14jYwrgm0yZBUIbIP2OnqC3j+UgkXLm1vxUQ==";
+        url = "https://registry.npmjs.org/@opentelemetry/semantic-conventions/-/semantic-conventions-1.25.1.tgz";
+        sha512 = "ZDjMJJQRlyk8A1KZFCc+bCbsyrn1wTwdNt56F7twdfUfnHUZUq77/WfONCj8p72NZOyP7pNTdUWSTYC3GTbuuQ==";
       };
     };
-    "@orval/angular-6.30.2" = {
+    "@orval/angular-6.31.0" = {
       name = "_at_orval_slash_angular";
       packageName = "@orval/angular";
-      version = "6.30.2";
+      version = "6.31.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@orval/angular/-/angular-6.30.2.tgz";
-        sha512 = "EzIhuCEDJQIjiaBePI9CA8aU27diKZOb2xp1htX/81TAM9fDu1kKhLKA40i9z3ZcABgfGupm9f+ILIrmk7LDEg==";
+        url = "https://registry.npmjs.org/@orval/angular/-/angular-6.31.0.tgz";
+        sha512 = "cVV/vh6biGUe5FMR0kaOL+pYkD5lM/oHpyHVU19d2eY/hxKCG58/CagUNVDxbowcSalzGpt7NbZOqpauc2cNOA==";
       };
     };
-    "@orval/axios-6.30.2" = {
+    "@orval/axios-6.31.0" = {
       name = "_at_orval_slash_axios";
       packageName = "@orval/axios";
-      version = "6.30.2";
+      version = "6.31.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@orval/axios/-/axios-6.30.2.tgz";
-        sha512 = "BGwxqpZembRoM77vd47k/b4LC/prPprK//nEiEvxW2WMmfIdA81UkLHk9IM3EqBjcWD8w5kawwGB13aNlID3Bw==";
+        url = "https://registry.npmjs.org/@orval/axios/-/axios-6.31.0.tgz";
+        sha512 = "OqWFJ6bDKftsSW3VI7Ouqcb3W4hDhkk8XzDkb/iisn3Dn1rkSE/wafdlHCm+62VQps4esYXaP1+7/HSk/2+Y8A==";
       };
     };
-    "@orval/core-6.30.2" = {
+    "@orval/core-6.31.0" = {
       name = "_at_orval_slash_core";
       packageName = "@orval/core";
-      version = "6.30.2";
+      version = "6.31.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@orval/core/-/core-6.30.2.tgz";
-        sha512 = "+OipnBdCHAKLNvMUAGo8yOrfB1yhk0vsUI44pinL9SlChL+2K48oSl1VZy++O31xFnjXTbtUQWEDlj6pNi4gqg==";
+        url = "https://registry.npmjs.org/@orval/core/-/core-6.31.0.tgz";
+        sha512 = "ubOPpxzLgOCGbAQsq/dzfe/MIgB4LYWRyuwgnkV2GkL8Zq7cIWfmZU09GTJZQ6cO35OclFfbbyNve0cRMfSBeA==";
       };
     };
-    "@orval/fetch-6.30.2" = {
+    "@orval/fetch-6.31.0" = {
       name = "_at_orval_slash_fetch";
       packageName = "@orval/fetch";
-      version = "6.30.2";
+      version = "6.31.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@orval/fetch/-/fetch-6.30.2.tgz";
-        sha512 = "YO7L+SRR9AfLvfMkuA4WXWAvXNWecQ+mlQe7S5wvQjZpobxaFAmNwMUEQ51quP3FEHOzzK2Can0Qrb1yY4XxfA==";
+        url = "https://registry.npmjs.org/@orval/fetch/-/fetch-6.31.0.tgz";
+        sha512 = "K4pD0TqRX3n1QgsfdzcCLxZPj4WFr4xd51VS5PhtK7wewy+EwaTp5AZeeMT+o8dL4HQcwLsKaXA1HH1YiAuOrA==";
       };
     };
-    "@orval/hono-6.30.2" = {
+    "@orval/hono-6.31.0" = {
       name = "_at_orval_slash_hono";
       packageName = "@orval/hono";
-      version = "6.30.2";
+      version = "6.31.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@orval/hono/-/hono-6.30.2.tgz";
-        sha512 = "9exEMziYJcgB8l43zpI2R/S9+xBd2G3oc71dGHP8qUossfqWf0l5m7eEbF1Eyy5UrEB2YIwNfKRaUCTSYFlD9Q==";
+        url = "https://registry.npmjs.org/@orval/hono/-/hono-6.31.0.tgz";
+        sha512 = "mM5WISLugu1quNkNUqYwp+StV/Z5/STm33VdPTWkoZyPJtV4NmEUZKPsowk0EN7sBF2kW+aYcp8lsNMXxXfHaw==";
       };
     };
-    "@orval/mock-6.30.2" = {
+    "@orval/mock-6.31.0" = {
       name = "_at_orval_slash_mock";
       packageName = "@orval/mock";
-      version = "6.30.2";
+      version = "6.31.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@orval/mock/-/mock-6.30.2.tgz";
-        sha512 = "zWsoLTwNl2x5hto1yEUgdzweaFqpSJ/ZaLIYpkymt7k26oJzDW1UUnmxFAQSHOz26UzzsKFr9/+2bfJjLtQaHw==";
+        url = "https://registry.npmjs.org/@orval/mock/-/mock-6.31.0.tgz";
+        sha512 = "UBag0IyL0eDVdXWgIMS/YxDF57Q3XC4VRDqcuZ1lB77rfBZ4UiVqTJleczQoIqMGkdtJJlBABgWzRRts1K4img==";
       };
     };
-    "@orval/query-6.30.2" = {
+    "@orval/query-6.31.0" = {
       name = "_at_orval_slash_query";
       packageName = "@orval/query";
-      version = "6.30.2";
+      version = "6.31.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@orval/query/-/query-6.30.2.tgz";
-        sha512 = "tOHAhVsgkxw2Hy/tFu/VREsnsg+r0IWq6txI4wQac7uJz3AK1SDUD71eNx7tW56noiHT6NnGjODFZdb5s2Cgqg==";
+        url = "https://registry.npmjs.org/@orval/query/-/query-6.31.0.tgz";
+        sha512 = "aVyvSU5IbpRQnVbhChNlLX2XDnmoT1cDJ59NEFS3byhiJf1EG5XlzVve98je/BHAsVROrUC8+o6XoIjCtYbW5Q==";
       };
     };
-    "@orval/swr-6.30.2" = {
+    "@orval/swr-6.31.0" = {
       name = "_at_orval_slash_swr";
       packageName = "@orval/swr";
-      version = "6.30.2";
+      version = "6.31.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@orval/swr/-/swr-6.30.2.tgz";
-        sha512 = "GFouUCSVerVIKMM+EilNqlHfUyBkq3RhhGQf6fQHlDvUPoVEYRp8PYTKNCQGxyM0Ae0KhZ+g9Uy3faBaXFCxfg==";
+        url = "https://registry.npmjs.org/@orval/swr/-/swr-6.31.0.tgz";
+        sha512 = "J9W/kym9jc94GizbTozpuY76yaZRN98rf3ahj+2+eW8+NRW1dVFui32Gew1qj9rcCSA54BwRMONgEn3Xqx6W6A==";
       };
     };
-    "@orval/zod-6.30.2" = {
+    "@orval/zod-6.31.0" = {
       name = "_at_orval_slash_zod";
       packageName = "@orval/zod";
-      version = "6.30.2";
+      version = "6.31.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@orval/zod/-/zod-6.30.2.tgz";
-        sha512 = "nLDjEcuVwIMVfIo6Ku4OYzYmML8ECPPfY1fJ7HV30mp8MGFOnSCVyLZGrVZw5InSwepO1wvh04nHRlAZYoykoA==";
+        url = "https://registry.npmjs.org/@orval/zod/-/zod-6.31.0.tgz";
+        sha512 = "v6wqGZf4s3tpWrnmMHlEBfhTLeebu5W3HmhP8vQ5BPkm8AB2asiZqzK3Ne9Y19Rvyx6X4FGnhnalKYkz+XxJ8Q==";
       };
     };
     "@parcel/bundler-default-2.12.0" = {
@@ -8680,67 +8707,67 @@ let
         sha512 = "j7P6Rgr3mmtdkeDGTe0E/aYyWEWVtc5yFXtHCRHs28/jptDEWfaVOc5T7cblqy1XKPPfCxJc/8DwQ5YgLOZOVQ==";
       };
     };
-    "@prisma/debug-5.15.0" = {
+    "@prisma/debug-5.17.0" = {
       name = "_at_prisma_slash_debug";
       packageName = "@prisma/debug";
-      version = "5.15.0";
+      version = "5.17.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@prisma/debug/-/debug-5.15.0.tgz";
-        sha512 = "QpEAOjieLPc/4sMny/WrWqtpIAmBYsgqwWlWwIctqZO0AbhQ9QcT6x2Ut3ojbDo/pFRCCA1Z1+xm2MUy7fAkZA==";
+        url = "https://registry.npmjs.org/@prisma/debug/-/debug-5.17.0.tgz";
+        sha512 = "l7+AteR3P8FXiYyo496zkuoiJ5r9jLQEdUuxIxNCN1ud8rdbH3GTxm+f+dCyaSv9l9WY+29L9czaVRXz9mULfg==";
       };
     };
-    "@prisma/engines-5.15.0" = {
+    "@prisma/engines-5.17.0" = {
       name = "_at_prisma_slash_engines";
       packageName = "@prisma/engines";
-      version = "5.15.0";
+      version = "5.17.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@prisma/engines/-/engines-5.15.0.tgz";
-        sha512 = "hXL5Sn9hh/ZpRKWiyPA5GbvF3laqBHKt6Vo70hYqqOhh5e0ZXDzHcdmxNvOefEFeqxra2DMz2hNbFoPvqrVe1w==";
+        url = "https://registry.npmjs.org/@prisma/engines/-/engines-5.17.0.tgz";
+        sha512 = "+r+Nf+JP210Jur+/X8SIPLtz+uW9YA4QO5IXA+KcSOBe/shT47bCcRMTYCbOESw3FFYFTwe7vU6KTWHKPiwvtg==";
       };
     };
-    "@prisma/engines-version-5.15.0-29.12e25d8d06f6ea5a0252864dd9a03b1bb51f3022" = {
+    "@prisma/engines-version-5.17.0-31.393aa359c9ad4a4bb28630fb5613f9c281cde053" = {
       name = "_at_prisma_slash_engines-version";
       packageName = "@prisma/engines-version";
-      version = "5.15.0-29.12e25d8d06f6ea5a0252864dd9a03b1bb51f3022";
+      version = "5.17.0-31.393aa359c9ad4a4bb28630fb5613f9c281cde053";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@prisma/engines-version/-/engines-version-5.15.0-29.12e25d8d06f6ea5a0252864dd9a03b1bb51f3022.tgz";
-        sha512 = "3BEgZ41Qb4oWHz9kZNofToRvNeS4LZYaT9pienR1gWkjhky6t6K1NyeWNBkqSj2llgraUNbgMOCQPY4f7Qp5wA==";
+        url = "https://registry.npmjs.org/@prisma/engines-version/-/engines-version-5.17.0-31.393aa359c9ad4a4bb28630fb5613f9c281cde053.tgz";
+        sha512 = "tUuxZZysZDcrk5oaNOdrBnnkoTtmNQPkzINFDjz7eG6vcs9AVDmA/F6K5Plsb2aQc/l5M2EnFqn3htng9FA4hg==";
       };
     };
-    "@prisma/fetch-engine-5.15.0" = {
+    "@prisma/fetch-engine-5.17.0" = {
       name = "_at_prisma_slash_fetch-engine";
       packageName = "@prisma/fetch-engine";
-      version = "5.15.0";
+      version = "5.17.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@prisma/fetch-engine/-/fetch-engine-5.15.0.tgz";
-        sha512 = "z6AY5yyXxc20Klj7wwnfGP0iIUkVKzybqapT02zLYR/nf9ynaeN8bq73WRmi1TkLYn+DJ5Qy+JGu7hBf1pE78A==";
+        url = "https://registry.npmjs.org/@prisma/fetch-engine/-/fetch-engine-5.17.0.tgz";
+        sha512 = "ESxiOaHuC488ilLPnrv/tM2KrPhQB5TRris/IeIV4ZvUuKeaicCl4Xj/JCQeG9IlxqOgf1cCg5h5vAzlewN91Q==";
       };
     };
-    "@prisma/get-platform-5.15.0" = {
+    "@prisma/get-platform-5.17.0" = {
       name = "_at_prisma_slash_get-platform";
       packageName = "@prisma/get-platform";
-      version = "5.15.0";
+      version = "5.17.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@prisma/get-platform/-/get-platform-5.15.0.tgz";
-        sha512 = "1GULDkW4+/VQb73vihxCBSc4Chc2x88MA+O40tcZFjmBzG4/fF44PaXFxUqKSFltxU9L9GIMLhh0Gfkk/pUbtg==";
+        url = "https://registry.npmjs.org/@prisma/get-platform/-/get-platform-5.17.0.tgz";
+        sha512 = "UlDgbRozCP1rfJ5Tlkf3Cnftb6srGrEQ4Nm3og+1Se2gWmCZ0hmPIi+tQikGDUVLlvOWx3Gyi9LzgRP+HTXV9w==";
       };
     };
-    "@prisma/prisma-schema-wasm-5.15.0-29.12e25d8d06f6ea5a0252864dd9a03b1bb51f3022" = {
+    "@prisma/prisma-schema-wasm-5.17.0-31.393aa359c9ad4a4bb28630fb5613f9c281cde053" = {
       name = "_at_prisma_slash_prisma-schema-wasm";
       packageName = "@prisma/prisma-schema-wasm";
-      version = "5.15.0-29.12e25d8d06f6ea5a0252864dd9a03b1bb51f3022";
+      version = "5.17.0-31.393aa359c9ad4a4bb28630fb5613f9c281cde053";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@prisma/prisma-schema-wasm/-/prisma-schema-wasm-5.15.0-29.12e25d8d06f6ea5a0252864dd9a03b1bb51f3022.tgz";
-        sha512 = "bZYtXnHSP6nkZf20QZm4A/vzz3Psh+u6pMld4t6cdcZlQW0ZOZQ3/WWTOf5Pe+cqS/k4kciEM5urtH2SE01GCg==";
+        url = "https://registry.npmjs.org/@prisma/prisma-schema-wasm/-/prisma-schema-wasm-5.17.0-31.393aa359c9ad4a4bb28630fb5613f9c281cde053.tgz";
+        sha512 = "mlmuu0/IPSjMlMKsqdaVVAbGTJwp5sDMFd3ZFQxl4/K8FvH7tb2uy/lTHF0KyAJbveTiV+1yW9MBWspltXZZtg==";
       };
     };
-    "@prisma/schema-files-loader-5.15.0" = {
+    "@prisma/schema-files-loader-5.17.0" = {
       name = "_at_prisma_slash_schema-files-loader";
       packageName = "@prisma/schema-files-loader";
-      version = "5.15.0";
+      version = "5.17.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@prisma/schema-files-loader/-/schema-files-loader-5.15.0.tgz";
-        sha512 = "ZDIX4Gr5MdGOiik23DSYQ8cOd/Bkat+6yo5TbAF8UlKor9tJsrEVyGRo6DFu1AEvedjSeiwS88jD1dn03sxvyA==";
+        url = "https://registry.npmjs.org/@prisma/schema-files-loader/-/schema-files-loader-5.17.0.tgz";
+        sha512 = "rmbJZEvY9nOlLduVQww4fGmYM3aU7BYAw/st0K9QNq9dQoLONgQP7t8dhcOVZbBLyNNQu2k2gJdVXSHSY96b4A==";
       };
     };
     "@protobufjs/aspromise-1.1.2" = {
@@ -8833,13 +8860,13 @@ let
         sha512 = "Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw==";
       };
     };
-    "@puppeteer/browsers-2.2.3" = {
+    "@puppeteer/browsers-2.3.0" = {
       name = "_at_puppeteer_slash_browsers";
       packageName = "@puppeteer/browsers";
-      version = "2.2.3";
+      version = "2.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-2.2.3.tgz";
-        sha512 = "bJ0UBsk0ESOs6RFcLXOt99a3yTDcOKlzfjad+rhFwdaG1Lu/Wzq58GHYCDTlZ9z6mldf4g+NTb+TXEfe0PpnsQ==";
+        url = "https://registry.npmjs.org/@puppeteer/browsers/-/browsers-2.3.0.tgz";
+        sha512 = "ioXoq9gPxkss4MYhD+SFaU9p1IHFUX0ILAWFPyjGaBdjLsYAlZw6j1iLA0N/m12uVHLFDfSYNF7EQccjinIMDA==";
       };
     };
     "@putdotio/api-client-8.49.0" = {
@@ -8860,60 +8887,6 @@ let
         sha512 = "Z1jQI2NpdFJCVgpY+8Dq/Bt3d+YUi1928Q+/CZm/oh66fzM0RUl54vvuXlPJKybH4pdCZey1eDTPaLHkMPNgWA==";
       };
     };
-    "@redis/bloom-1.2.0" = {
-      name = "_at_redis_slash_bloom";
-      packageName = "@redis/bloom";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@redis/bloom/-/bloom-1.2.0.tgz";
-        sha512 = "HG2DFjYKbpNmVXsa0keLHp/3leGJz1mjh09f2RLGGLQZzSHpkmZWuwJbAvo3QcRY8p80m5+ZdXZdYOSBLlp7Cg==";
-      };
-    };
-    "@redis/client-1.5.16" = {
-      name = "_at_redis_slash_client";
-      packageName = "@redis/client";
-      version = "1.5.16";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@redis/client/-/client-1.5.16.tgz";
-        sha512 = "X1a3xQ5kEMvTib5fBrHKh6Y+pXbeKXqziYuxOUo1ojQNECg4M5Etd1qqyhMap+lFUOAh8S7UYevgJHOm4A+NOg==";
-      };
-    };
-    "@redis/graph-1.1.1" = {
-      name = "_at_redis_slash_graph";
-      packageName = "@redis/graph";
-      version = "1.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@redis/graph/-/graph-1.1.1.tgz";
-        sha512 = "FEMTcTHZozZciLRl6GiiIB4zGm5z5F3F6a6FZCyrfxdKOhFlGkiAqlexWMBzCi4DcRoyiOsuLfW+cjlGWyExOw==";
-      };
-    };
-    "@redis/json-1.0.6" = {
-      name = "_at_redis_slash_json";
-      packageName = "@redis/json";
-      version = "1.0.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@redis/json/-/json-1.0.6.tgz";
-        sha512 = "rcZO3bfQbm2zPRpqo82XbW8zg4G/w4W3tI7X8Mqleq9goQjAGLL7q/1n1ZX4dXEAmORVZ4s1+uKLaUOg7LrUhw==";
-      };
-    };
-    "@redis/search-1.1.6" = {
-      name = "_at_redis_slash_search";
-      packageName = "@redis/search";
-      version = "1.1.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@redis/search/-/search-1.1.6.tgz";
-        sha512 = "mZXCxbTYKBQ3M2lZnEddwEAks0Kc7nauire8q20oA0oA/LoA+E/b5Y5KZn232ztPb1FkIGqo12vh3Lf+Vw5iTw==";
-      };
-    };
-    "@redis/time-series-1.0.5" = {
-      name = "_at_redis_slash_time-series";
-      packageName = "@redis/time-series";
-      version = "1.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@redis/time-series/-/time-series-1.0.5.tgz";
-        sha512 = "IFjIgTusQym2B5IZJG3XKr5llka7ey84fw/NOYqESP5WUfQs9zz1ww/9+qoz4ka/S6KcGBodzlCeZ5UImKbscg==";
-      };
-    };
     "@repeaterjs/repeater-3.0.6" = {
       name = "_at_repeaterjs_slash_repeater";
       packageName = "@repeaterjs/repeater";
@@ -8941,58 +8914,58 @@ let
         sha512 = "iKnFXr7NkdZAIHiIWE+BX5ULi/ucVFYWD6TbAV+rZctiRTY2PL6tsIKhoIOaoskiWAkgu+VsbXgUVDNLHf+InQ==";
       };
     };
-    "@rspack/binding-0.7.3" = {
+    "@rspack/binding-0.7.5" = {
       name = "_at_rspack_slash_binding";
       packageName = "@rspack/binding";
-      version = "0.7.3";
+      version = "0.7.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@rspack/binding/-/binding-0.7.3.tgz";
-        sha512 = "VYPOtaCb1lphNrHozZXy9L5ODGU76kp7ozCpYbF/CTFq8xaSkvkhNHwWMGXE2TIOvWZImMBRBuYX8/kjz/HiSA==";
+        url = "https://registry.npmjs.org/@rspack/binding/-/binding-0.7.5.tgz";
+        sha512 = "XcdOvaCz1mWWwr5vmEY9zncdInrjINEh60EWkYdqtCA67v7X7rB1fe6n4BeAI1+YLS2Eacj+lytlr+n7I+DYVg==";
       };
     };
-    "@rspack/core-0.7.3" = {
+    "@rspack/core-0.7.5" = {
       name = "_at_rspack_slash_core";
       packageName = "@rspack/core";
-      version = "0.7.3";
+      version = "0.7.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@rspack/core/-/core-0.7.3.tgz";
-        sha512 = "SUvt4P1nMML3Int2YE1Z2+noDIxjT/hzNtcKMXXqeFp4yFys37s7vC+BnCyzonvIbpxUg2gH+bCMCgav7+xR4A==";
+        url = "https://registry.npmjs.org/@rspack/core/-/core-0.7.5.tgz";
+        sha512 = "zVTe4WCyc3qsLPattosiDYZFeOzaJ32/BYukPP2I1VJtCVFa+PxGVRPVZhSoN6fXw5oy48yHg9W9v1T8CaEFhw==";
       };
     };
-    "@rushstack/heft-config-file-0.14.25" = {
+    "@rushstack/heft-config-file-0.15.2" = {
       name = "_at_rushstack_slash_heft-config-file";
       packageName = "@rushstack/heft-config-file";
-      version = "0.14.25";
+      version = "0.15.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@rushstack/heft-config-file/-/heft-config-file-0.14.25.tgz";
-        sha512 = "b/7w7aRM7bgeVe0tNFwmbf2dF5jbTC3gD8zkakztNMwqt4pjXbU2o/0OpGwVBRFfVhwd8JnQjhYfFM632CdWYA==";
+        url = "https://registry.npmjs.org/@rushstack/heft-config-file/-/heft-config-file-0.15.2.tgz";
+        sha512 = "1xHQLuWeXglFoVPxOpSb7EbjCduihFd9FXoW/awlFBfIfSMq85PAoErdCOfZBe7pUeGZ5ymwyiF7Am6hR4AAwA==";
       };
     };
-    "@rushstack/node-core-library-5.4.1" = {
+    "@rushstack/node-core-library-5.5.0" = {
       name = "_at_rushstack_slash_node-core-library";
       packageName = "@rushstack/node-core-library";
-      version = "5.4.1";
+      version = "5.5.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@rushstack/node-core-library/-/node-core-library-5.4.1.tgz";
-        sha512 = "WNnwdS8r9NZ/2K3u29tNoSRldscFa7SxU0RT+82B6Dy2I4Hl2MeCSKm4EXLXPKeNzLGvJ1cqbUhTLviSF8E6iA==";
+        url = "https://registry.npmjs.org/@rushstack/node-core-library/-/node-core-library-5.5.0.tgz";
+        sha512 = "Cl3MYQ74Je5Y/EngMxcA3SpHjGZ/022nKbAO1aycGfQ+7eKyNCBu0oywj5B1f367GCzuHBgy+3BlVLKysHkXZw==";
       };
     };
-    "@rushstack/package-deps-hash-4.1.57" = {
+    "@rushstack/package-deps-hash-4.1.61" = {
       name = "_at_rushstack_slash_package-deps-hash";
       packageName = "@rushstack/package-deps-hash";
-      version = "4.1.57";
+      version = "4.1.61";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@rushstack/package-deps-hash/-/package-deps-hash-4.1.57.tgz";
-        sha512 = "mI0tKuBPiTO2pBzAO+M2aHZVlje0Oz37iEtuycOUMUvsy2igv6T6XWNrRs/kPfQ5lhZ8XGTZOEEZ4Gbb7UESgw==";
+        url = "https://registry.npmjs.org/@rushstack/package-deps-hash/-/package-deps-hash-4.1.61.tgz";
+        sha512 = "Qhl4AxZ1TYQ/rAxaU6yD16aKVOAyFAQKd/2zolcLPSwgk/01Iqu6K3Rhwlj9acO9PMOMTDKlQVDoy4FPzQQgww==";
       };
     };
-    "@rushstack/package-extractor-0.7.16" = {
+    "@rushstack/package-extractor-0.7.20" = {
       name = "_at_rushstack_slash_package-extractor";
       packageName = "@rushstack/package-extractor";
-      version = "0.7.16";
+      version = "0.7.20";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@rushstack/package-extractor/-/package-extractor-0.7.16.tgz";
-        sha512 = "QQfjc84Gdvqq0k08852orNFIaAj1N7310H/r8KMYyjXfVRWgVlP55QIGzps7KQWDfjlq72UDPu85kEGrav2ekw==";
+        url = "https://registry.npmjs.org/@rushstack/package-extractor/-/package-extractor-0.7.20.tgz";
+        sha512 = "wZwn/bRWfin5xr1+EdVmrXtLI8W939HV3wvdJT9NbJrYh5G20bdXtsykDp10+S0QKrH33Rwb0zTu/JIa5JGLmw==";
       };
     };
     "@rushstack/rig-package-0.5.2" = {
@@ -9004,67 +8977,67 @@ let
         sha512 = "mUDecIJeH3yYGZs2a48k+pbhM6JYwWlgjs2Ca5f2n1G2/kgdgP9D/07oglEGf6mRyXEnazhEENeYTSNDRCwdqA==";
       };
     };
-    "@rushstack/rush-amazon-s3-build-cache-plugin-5.128.1" = {
+    "@rushstack/rush-amazon-s3-build-cache-plugin-5.130.2" = {
       name = "_at_rushstack_slash_rush-amazon-s3-build-cache-plugin";
       packageName = "@rushstack/rush-amazon-s3-build-cache-plugin";
-      version = "5.128.1";
+      version = "5.130.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@rushstack/rush-amazon-s3-build-cache-plugin/-/rush-amazon-s3-build-cache-plugin-5.128.1.tgz";
-        sha512 = "RWlix06urImT73M2rZmM4Yi8T2gHufiQ2ghLMLaz5m/5FwwUavppXeTkiTXSIsIv42nzdu/MKtVknXNfjfQBAg==";
+        url = "https://registry.npmjs.org/@rushstack/rush-amazon-s3-build-cache-plugin/-/rush-amazon-s3-build-cache-plugin-5.130.2.tgz";
+        sha512 = "1KMBKBQIXHcvX0vOcVGHWwJXBQkSA+IOXeWawoU0GO42XMLif4dFGEIFWZP+L+wFSvVSPu1Hs12ZH6dWYPVXGg==";
       };
     };
-    "@rushstack/rush-azure-storage-build-cache-plugin-5.128.1" = {
+    "@rushstack/rush-azure-storage-build-cache-plugin-5.130.2" = {
       name = "_at_rushstack_slash_rush-azure-storage-build-cache-plugin";
       packageName = "@rushstack/rush-azure-storage-build-cache-plugin";
-      version = "5.128.1";
+      version = "5.130.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@rushstack/rush-azure-storage-build-cache-plugin/-/rush-azure-storage-build-cache-plugin-5.128.1.tgz";
-        sha512 = "J8k9ZH8GlJTtkZT0W9D/nvi4kQX1bUM/8PyQyA0/MUYoCNxWEImGjR0IHOXn30WC1m/DrU7J73NHh3d+2p3XSg==";
+        url = "https://registry.npmjs.org/@rushstack/rush-azure-storage-build-cache-plugin/-/rush-azure-storage-build-cache-plugin-5.130.2.tgz";
+        sha512 = "naS9nrYOGs1KmIgoKpaT1jQEv7hRSS8AMkpeN/rkbY1/OnKCr0+z4aEgRuPEBiOObyFQaT/uxrsrpsgqSVQh3A==";
       };
     };
-    "@rushstack/rush-http-build-cache-plugin-5.128.1" = {
+    "@rushstack/rush-http-build-cache-plugin-5.130.2" = {
       name = "_at_rushstack_slash_rush-http-build-cache-plugin";
       packageName = "@rushstack/rush-http-build-cache-plugin";
-      version = "5.128.1";
+      version = "5.130.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@rushstack/rush-http-build-cache-plugin/-/rush-http-build-cache-plugin-5.128.1.tgz";
-        sha512 = "LlCJo3BYcIsoO85qgHtXtIpEriKc0gnoSkkkH30wy5N1AKIqIL3iUvQtxDl6WmcwtlBmHqYem4W4nw2B2Vh1wg==";
+        url = "https://registry.npmjs.org/@rushstack/rush-http-build-cache-plugin/-/rush-http-build-cache-plugin-5.130.2.tgz";
+        sha512 = "VaKNAKJ2jnBiDutQiakj90TKW2PyBu4HOtlB4ran7WHKXGQHxriepMh+UTQt2dGhESw8eJ294ZR7YTOwtuT2kg==";
       };
     };
-    "@rushstack/rush-sdk-5.128.1" = {
+    "@rushstack/rush-sdk-5.130.2" = {
       name = "_at_rushstack_slash_rush-sdk";
       packageName = "@rushstack/rush-sdk";
-      version = "5.128.1";
+      version = "5.130.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@rushstack/rush-sdk/-/rush-sdk-5.128.1.tgz";
-        sha512 = "oYrKFX54FsXpbsA03fRp/3gLAgVXWXYMIOxgi4zHb4XBs4+6p4OGa3fLAjNY4SNWaQIv6AiokU7pPCAt9bJHDg==";
+        url = "https://registry.npmjs.org/@rushstack/rush-sdk/-/rush-sdk-5.130.2.tgz";
+        sha512 = "f9ZC/NnT7AVTkd5gxVcS4Hi3qZcA/8RbXCt7F08y7HJ4mlmojVdZTfsuHhwiDhX3dLd4b1AflU8A7joZE9tYhQ==";
       };
     };
-    "@rushstack/stream-collator-4.1.56" = {
+    "@rushstack/stream-collator-4.1.60" = {
       name = "_at_rushstack_slash_stream-collator";
       packageName = "@rushstack/stream-collator";
-      version = "4.1.56";
+      version = "4.1.60";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@rushstack/stream-collator/-/stream-collator-4.1.56.tgz";
-        sha512 = "INfovUzy7sJg0fdZP/zQknnGdiPf4yb6pbnMLvHYARdXJLSZDcU9sjCpLg3DxYDx0K5PnHAnRSvgATJWbbpMww==";
+        url = "https://registry.npmjs.org/@rushstack/stream-collator/-/stream-collator-4.1.60.tgz";
+        sha512 = "qebgAhqkzmV0h0HgImOCLSVUhJq2nA/qTLXae9auWWy5XHRFS41pwQdeajyht04aYGtrxEQELSHRq7PqMtQfaA==";
       };
     };
-    "@rushstack/terminal-0.13.0" = {
+    "@rushstack/terminal-0.13.2" = {
       name = "_at_rushstack_slash_terminal";
       packageName = "@rushstack/terminal";
-      version = "0.13.0";
+      version = "0.13.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@rushstack/terminal/-/terminal-0.13.0.tgz";
-        sha512 = "Ou44Q2s81BqJu3dpYedAX54am9vn245F0HzqVrfJCMQk5pGgoKKOBOjkbfZC9QKcGNaECh6pwH2s5noJt7X6ew==";
+        url = "https://registry.npmjs.org/@rushstack/terminal/-/terminal-0.13.2.tgz";
+        sha512 = "t8i0PsGvBHmFBY8pryO3badqFlxQsm2rw3KYrzjcmVkG/WGklKg1qVkr9beAS1Oe8XWDRgj6SkoHkpNjs7aaNw==";
       };
     };
-    "@rushstack/ts-command-line-4.22.0" = {
+    "@rushstack/ts-command-line-4.22.2" = {
       name = "_at_rushstack_slash_ts-command-line";
       packageName = "@rushstack/ts-command-line";
-      version = "4.22.0";
+      version = "4.22.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@rushstack/ts-command-line/-/ts-command-line-4.22.0.tgz";
-        sha512 = "Qj28t6MO3HRgAZ72FDeFsrpdE6wBWxF3VENgvrXh7JF2qIT+CrXiOJIesW80VFZB9QwObSpkB1ilx794fGQg6g==";
+        url = "https://registry.npmjs.org/@rushstack/ts-command-line/-/ts-command-line-4.22.2.tgz";
+        sha512 = "xkvrGd6D9dPlI3I401Thc640WNsEPB1sGEmy12a2VJaPQPwhE6Ik0gEVPZJ/2G1w213eaCAdxUY1xpiTulsmpA==";
       };
     };
     "@samverschueren/stream-to-observable-0.3.1" = {
@@ -9076,13 +9049,13 @@ let
         sha512 = "c/qwwcHyafOQuVQJj0IlBjf5yYgBI7YPJ77k4fOJYesb41jio65eaJODRUmfYKhTOFBrIZ66kgvGPlNbjuoRdQ==";
       };
     };
-    "@schematics/angular-18.0.4" = {
+    "@schematics/angular-18.1.2" = {
       name = "_at_schematics_slash_angular";
       packageName = "@schematics/angular";
-      version = "18.0.4";
+      version = "18.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@schematics/angular/-/angular-18.0.4.tgz";
-        sha512 = "fN4whuym9ZmcQFdTfwLZr4j+NcZ4LzbdLk8XYrYdxt1z8c9ujs5LqJYn0LYc3UWiYl7z2RVc9NOxzNrkiXdwlw==";
+        url = "https://registry.npmjs.org/@schematics/angular/-/angular-18.1.2.tgz";
+        sha512 = "lTY9twQ30vEm3hjArUKQjKiYlbDUOHqbyY7MlynY5+T8XtYreMo20KHofxv5t5xZfPwj1z6/ppcMU2xZ4WbGUA==";
       };
     };
     "@scure/base-1.1.7" = {
@@ -9121,13 +9094,13 @@ let
         sha512 = "831qok9r2t8AlxLko40y2ebgSDhenenCatLVeW/uBtnHPyhHOvG0C7TvfgecV+wHzIm5KUICgzmVpWS+IMEAeg==";
       };
     };
-    "@segment/ajv-human-errors-2.12.0" = {
+    "@segment/ajv-human-errors-2.13.0" = {
       name = "_at_segment_slash_ajv-human-errors";
       packageName = "@segment/ajv-human-errors";
-      version = "2.12.0";
+      version = "2.13.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@segment/ajv-human-errors/-/ajv-human-errors-2.12.0.tgz";
-        sha512 = "wgQpYRaPMlgaJvxhd7gCRUQcLbrgYwwbtqXnCfpT6Vv+al5OP2pqPj27WAXNq/3OBzbwsn0NXm0m1U8ygHeybg==";
+        url = "https://registry.npmjs.org/@segment/ajv-human-errors/-/ajv-human-errors-2.13.0.tgz";
+        sha512 = "rubuhyhxCHmVdTmA5G3aMiWoN8Yutp+LG/AGUSiIKJVs1r7EEE/yjqSzSqyANGj5ZkqGUP802Ur9s19MuWelZQ==";
       };
     };
     "@segment/loosely-validate-event-2.0.0" = {
@@ -9148,94 +9121,58 @@ let
         sha512 = "P33hHGdldxGabLFjPPpaTxVolMrzrcegejx+0GxjrIb9Zv48D8yAIA/QTDR2dFl7Uz7urX8aX6+5bCZslr+gWQ==";
       };
     };
-    "@sentry-internal/tracing-7.109.0" = {
+    "@sentry-internal/tracing-7.116.0" = {
       name = "_at_sentry-internal_slash_tracing";
       packageName = "@sentry-internal/tracing";
-      version = "7.109.0";
+      version = "7.116.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@sentry-internal/tracing/-/tracing-7.109.0.tgz";
-        sha512 = "PzK/joC5tCuh2R/PRh+7dp+uuZl7pTsBIjPhVZHMTtb9+ls65WkdZJ1/uKXPouyz8NOo9Xok7aEvEo9seongyw==";
+        url = "https://registry.npmjs.org/@sentry-internal/tracing/-/tracing-7.116.0.tgz";
+        sha512 = "y5ppEmoOlfr77c/HqsEXR72092qmGYS4QE5gSz5UZFn9CiinEwGfEorcg2xIrrCuU7Ry/ZU2VLz9q3xd04drRA==";
       };
     };
-    "@sentry-internal/tracing-7.110.0" = {
-      name = "_at_sentry-internal_slash_tracing";
-      packageName = "@sentry-internal/tracing";
-      version = "7.110.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@sentry-internal/tracing/-/tracing-7.110.0.tgz";
-        sha512 = "IIHHa9e/mE7uOMJfNELI8adyoELxOy6u6TNCn5t6fphmq84w8FTc9adXkG/FY2AQpglkIvlILojfMROFB2aaAQ==";
-      };
-    };
-    "@sentry/core-7.109.0" = {
+    "@sentry/core-7.116.0" = {
       name = "_at_sentry_slash_core";
       packageName = "@sentry/core";
-      version = "7.109.0";
+      version = "7.116.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@sentry/core/-/core-7.109.0.tgz";
-        sha512 = "xwD4U0IlvvlE/x/g/W1I8b4Cfb16SsCMmiEuBf6XxvAa3OfWBxKoqLifb3GyrbxMC4LbIIZCN/SvLlnGJPgszA==";
+        url = "https://registry.npmjs.org/@sentry/core/-/core-7.116.0.tgz";
+        sha512 = "J6Wmjjx+o7RwST0weTU1KaKUAlzbc8MGkJV1rcHM9xjNTWTva+nrcCM3vFBagnk2Gm/zhwv3h0PvWEqVyp3U1Q==";
       };
     };
-    "@sentry/core-7.110.0" = {
-      name = "_at_sentry_slash_core";
-      packageName = "@sentry/core";
-      version = "7.110.0";
+    "@sentry/integrations-7.116.0" = {
+      name = "_at_sentry_slash_integrations";
+      packageName = "@sentry/integrations";
+      version = "7.116.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@sentry/core/-/core-7.110.0.tgz";
-        sha512 = "g4suCQO94mZsKVaAbyD1zLFC5YSuBQCIPHXx9fdgtfoPib7BWjWWePkllkrvsKAv4u8Oq05RfnKOhOMRHpOKqg==";
+        url = "https://registry.npmjs.org/@sentry/integrations/-/integrations-7.116.0.tgz";
+        sha512 = "UZb60gaF+7veh1Yv79RiGvgGYOnU6xA97H+hI6tKgc1uT20YpItO4X56Vhp0lvyEyUGFZzBRRH1jpMDPNGPkqw==";
       };
     };
-    "@sentry/node-7.109.0" = {
+    "@sentry/node-7.116.0" = {
       name = "_at_sentry_slash_node";
       packageName = "@sentry/node";
-      version = "7.109.0";
+      version = "7.116.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@sentry/node/-/node-7.109.0.tgz";
-        sha512 = "tqMNAES4X/iBl1eZRCmc29p//0id01FBLEiesNo5nk6ECl6/SaGMFAEwu1gsn90h/Bjgr04slwFOS4cR45V2PQ==";
+        url = "https://registry.npmjs.org/@sentry/node/-/node-7.116.0.tgz";
+        sha512 = "HB/4TrJWbnu6swNzkid+MlwzLwY/D/klGt3R0aatgrgWPo2jJm6bSl4LUT39Cr2eg5I1gsREQtXE2mAlC6gm8w==";
       };
     };
-    "@sentry/node-7.110.0" = {
-      name = "_at_sentry_slash_node";
-      packageName = "@sentry/node";
-      version = "7.110.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@sentry/node/-/node-7.110.0.tgz";
-        sha512 = "YPfweCSzo/omnx5q1xOEZfI8Em3jnPqj7OM4ObXmoSKEK+kM1oUF3BTRzw5BJOaOCSTBFY1RAsGyfVIyrwxWnA==";
-      };
-    };
-    "@sentry/types-7.109.0" = {
+    "@sentry/types-7.116.0" = {
       name = "_at_sentry_slash_types";
       packageName = "@sentry/types";
-      version = "7.109.0";
+      version = "7.116.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@sentry/types/-/types-7.109.0.tgz";
-        sha512 = "egCBnDv3YpVFoNzRLdP0soVrxVLCQ+rovREKJ1sw3rA2/MFH9WJ+DZZexsX89yeAFzy1IFsCp7/dEqudusml6g==";
+        url = "https://registry.npmjs.org/@sentry/types/-/types-7.116.0.tgz";
+        sha512 = "QCCvG5QuQrwgKzV11lolNQPP2k67Q6HHD9vllZ/C4dkxkjoIym8Gy+1OgAN3wjsR0f/kG9o5iZyglgNpUVRapQ==";
       };
     };
-    "@sentry/types-7.110.0" = {
-      name = "_at_sentry_slash_types";
-      packageName = "@sentry/types";
-      version = "7.110.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@sentry/types/-/types-7.110.0.tgz";
-        sha512 = "DqYBLyE8thC5P5MuPn+sj8tL60nCd/f5cerFFPcudn5nJ4Zs1eI6lKlwwyHYTEu5c4KFjCB0qql6kXfwAHmTyA==";
-      };
-    };
-    "@sentry/utils-7.109.0" = {
+    "@sentry/utils-7.116.0" = {
       name = "_at_sentry_slash_utils";
       packageName = "@sentry/utils";
-      version = "7.109.0";
+      version = "7.116.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@sentry/utils/-/utils-7.109.0.tgz";
-        sha512 = "3RjxMOLMBwZ5VSiH84+o/3NY2An4Zldjz0EbfEQNRY9yffRiCPJSQiCJID8EoylCFOh/PAhPimBhqbtWJxX6iw==";
-      };
-    };
-    "@sentry/utils-7.110.0" = {
-      name = "_at_sentry_slash_utils";
-      packageName = "@sentry/utils";
-      version = "7.110.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@sentry/utils/-/utils-7.110.0.tgz";
-        sha512 = "VBsdLLN+5tf73fhf/Cm7JIsUJ6y9DkJj8h4I6Mxx0rszrvOyH6S5px40K+V4jdLBzMEvVinC7q2Cbf1YM18BSw==";
+        url = "https://registry.npmjs.org/@sentry/utils/-/utils-7.116.0.tgz";
+        sha512 = "Vn9fcvwTq91wJvCd7WTMWozimqMi+dEZ3ie3EICELC2diONcN16ADFdzn65CQQbYwmUzRjN9EjDN2k41pKZWhQ==";
       };
     };
     "@sideway/address-4.1.5" = {
@@ -9265,15 +9202,6 @@ let
         sha512 = "RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==";
       };
     };
-    "@sigstore/bundle-1.1.0" = {
-      name = "_at_sigstore_slash_bundle";
-      packageName = "@sigstore/bundle";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@sigstore/bundle/-/bundle-1.1.0.tgz";
-        sha512 = "PFutXEy0SmQxYI4texPw3dd2KewuNqv7OuK1ZFtY2fM754yhvG2KdgwIhRnoEE2uHdtdGNQ8s0lb94dW9sELog==";
-      };
-    };
     "@sigstore/bundle-2.3.2" = {
       name = "_at_sigstore_slash_bundle";
       packageName = "@sigstore/bundle";
@@ -9292,15 +9220,6 @@ let
         sha512 = "JzBqdVIyqm2FRQCulY6nbQzMpJJpSiJ8XXWMhtOX9eKgaXXpfNOF53lzQEjIydlStnd/eFtuC1dW4VYdD93oRg==";
       };
     };
-    "@sigstore/protobuf-specs-0.2.1" = {
-      name = "_at_sigstore_slash_protobuf-specs";
-      packageName = "@sigstore/protobuf-specs";
-      version = "0.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@sigstore/protobuf-specs/-/protobuf-specs-0.2.1.tgz";
-        sha512 = "XTWVxnWJu+c1oCshMLwnKvz8ZQJJDVOlciMfgpJBQbThVjKTCG8dwyhgLngBD2KN0ap9F/gOV8rFDEx8uh7R2A==";
-      };
-    };
     "@sigstore/protobuf-specs-0.3.2" = {
       name = "_at_sigstore_slash_protobuf-specs";
       packageName = "@sigstore/protobuf-specs";
@@ -9310,15 +9229,6 @@ let
         sha512 = "c6B0ehIWxMI8wiS/bj6rHMPqeFvngFV7cDU/MY+B16P9Z3Mp9k8L93eYZ7BYzSickzuqAQqAq0V956b3Ju6mLw==";
       };
     };
-    "@sigstore/sign-1.0.0" = {
-      name = "_at_sigstore_slash_sign";
-      packageName = "@sigstore/sign";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@sigstore/sign/-/sign-1.0.0.tgz";
-        sha512 = "INxFVNQteLtcfGmcoldzV6Je0sbbfh9I16DM4yJPw3j5+TFP8X6uIiA18mvpEa9yyeycAKgPmOA3X9hVdVTPUA==";
-      };
-    };
     "@sigstore/sign-2.3.2" = {
       name = "_at_sigstore_slash_sign";
       packageName = "@sigstore/sign";
@@ -9328,15 +9238,6 @@ let
         sha512 = "5Vz5dPVuunIIvC5vBb0APwo7qKA4G9yM48kPWJT+OEERs40md5GoUR1yedwpekWZ4m0Hhw44m6zU+ObsON+iDA==";
       };
     };
-    "@sigstore/tuf-1.0.3" = {
-      name = "_at_sigstore_slash_tuf";
-      packageName = "@sigstore/tuf";
-      version = "1.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@sigstore/tuf/-/tuf-1.0.3.tgz";
-        sha512 = "2bRovzs0nJZFlCN3rXirE4gwxCn97JNjMmwpecqlbgV9WcxX7WRuIrgzx/X7Ib7MYRbyUTpBYE0s2x6AmZXnlg==";
-      };
-    };
     "@sigstore/tuf-2.3.4" = {
       name = "_at_sigstore_slash_tuf";
       packageName = "@sigstore/tuf";
@@ -9463,13 +9364,13 @@ let
         sha512 = "tlqY9xq5ukxTUZBmoOp+m61cqwQD5pHJtFY3Mn8CA8ps6yghLH/Hw8UPdqg4OLmFW3IFlcXnQNmo/dh8HzXYIQ==";
       };
     };
-    "@smithy/abort-controller-3.0.1" = {
+    "@smithy/abort-controller-3.1.1" = {
       name = "_at_smithy_slash_abort-controller";
       packageName = "@smithy/abort-controller";
-      version = "3.0.1";
+      version = "3.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/abort-controller/-/abort-controller-3.0.1.tgz";
-        sha512 = "Jb7jg4E+C+uvrUQi+h9kbILY6ts6fglKZzseMCHlH9ayq+1f5QdpYf8MV/xppuiN6DAMJAmwGz53GwP3213dmA==";
+        url = "https://registry.npmjs.org/@smithy/abort-controller/-/abort-controller-3.1.1.tgz";
+        sha512 = "MBJBiidoe+0cTFhyxT8g+9g7CeVccLM0IOKKUMCNQ1CNMJ/eIfoo0RTfVrXOONEI1UCN1W+zkiHSbzUNE9dZtQ==";
       };
     };
     "@smithy/chunked-blob-reader-3.0.0" = {
@@ -9490,121 +9391,121 @@ let
         sha512 = "VDkpCYW+peSuM4zJip5WDfqvg2Mo/e8yxOv3VF1m11y7B8KKMKVFtmZWDe36Fvk8rGuWrPZHHXZ7rR7uM5yWyg==";
       };
     };
-    "@smithy/config-resolver-3.0.2" = {
+    "@smithy/config-resolver-3.0.5" = {
       name = "_at_smithy_slash_config-resolver";
       packageName = "@smithy/config-resolver";
-      version = "3.0.2";
+      version = "3.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/config-resolver/-/config-resolver-3.0.2.tgz";
-        sha512 = "wUyG6ezpp2sWAvfqmSYTROwFUmJqKV78GLf55WODrosBcT0BAMd9bOLO4HRhynWBgAobPml2cF9ZOdgCe00r+g==";
+        url = "https://registry.npmjs.org/@smithy/config-resolver/-/config-resolver-3.0.5.tgz";
+        sha512 = "SkW5LxfkSI1bUC74OtfBbdz+grQXYiPYolyu8VfpLIjEoN/sHVBlLeGXMQ1vX4ejkgfv6sxVbQJ32yF2cl1veA==";
       };
     };
-    "@smithy/core-2.2.1" = {
+    "@smithy/core-2.3.0" = {
       name = "_at_smithy_slash_core";
       packageName = "@smithy/core";
-      version = "2.2.1";
+      version = "2.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/core/-/core-2.2.1.tgz";
-        sha512 = "R8Pzrr2v2oGUoj4CTZtKPr87lVtBsz7IUBGhSwS1kc6Cj0yPwNdYbkzhFsxhoDE9+BPl09VN/6rFsW9GJzWnBA==";
+        url = "https://registry.npmjs.org/@smithy/core/-/core-2.3.0.tgz";
+        sha512 = "tvSwf+PF5uurExeJsl+sSNn4bPsYShL86fJ/wcj63cioJ0IF131BxC5QxX8qkIISk7Pr7g2+UJH9ib4cCafvqw==";
       };
     };
-    "@smithy/credential-provider-imds-3.1.1" = {
+    "@smithy/credential-provider-imds-3.2.0" = {
       name = "_at_smithy_slash_credential-provider-imds";
       packageName = "@smithy/credential-provider-imds";
-      version = "3.1.1";
+      version = "3.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/credential-provider-imds/-/credential-provider-imds-3.1.1.tgz";
-        sha512 = "htndP0LwHdE3R3Nam9ZyVWhwPYOmD4xCL79kqvNxy8u/bv0huuy574CSiRY4cvEICgimv8jlVfLeZ7zZqbnB2g==";
+        url = "https://registry.npmjs.org/@smithy/credential-provider-imds/-/credential-provider-imds-3.2.0.tgz";
+        sha512 = "0SCIzgd8LYZ9EJxUjLXBmEKSZR/P/w6l7Rz/pab9culE/RWuqelAKGJvn5qUOl8BgX8Yj5HWM50A5hiB/RzsgA==";
       };
     };
-    "@smithy/eventstream-codec-3.1.0" = {
+    "@smithy/eventstream-codec-3.1.2" = {
       name = "_at_smithy_slash_eventstream-codec";
       packageName = "@smithy/eventstream-codec";
-      version = "3.1.0";
+      version = "3.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/eventstream-codec/-/eventstream-codec-3.1.0.tgz";
-        sha512 = "XFDl70ZY+FabSnTX3oQGGYvdbEaC8vPEFkCEOoBkumqaZIwR1WjjJCDu2VMXlHbKWKshefWXdT0NYteL5v6uFw==";
+        url = "https://registry.npmjs.org/@smithy/eventstream-codec/-/eventstream-codec-3.1.2.tgz";
+        sha512 = "0mBcu49JWt4MXhrhRAlxASNy0IjDRFU+aWNDRal9OtUJvJNiwDuyKMUONSOjLjSCeGwZaE0wOErdqULer8r7yw==";
       };
     };
-    "@smithy/eventstream-serde-browser-3.0.2" = {
+    "@smithy/eventstream-serde-browser-3.0.5" = {
       name = "_at_smithy_slash_eventstream-serde-browser";
       packageName = "@smithy/eventstream-serde-browser";
-      version = "3.0.2";
+      version = "3.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/eventstream-serde-browser/-/eventstream-serde-browser-3.0.2.tgz";
-        sha512 = "6147vdedQGaWn3Nt4P1KV0LuV8IH4len1SAeycyko0p8oRLWFyYyx0L8JHGclePDSphkjxZqBHtyIfyupCaTGg==";
+        url = "https://registry.npmjs.org/@smithy/eventstream-serde-browser/-/eventstream-serde-browser-3.0.5.tgz";
+        sha512 = "dEyiUYL/ekDfk+2Ra4GxV+xNnFoCmk1nuIXg+fMChFTrM2uI/1r9AdiTYzPqgb72yIv/NtAj6C3dG//1wwgakQ==";
       };
     };
-    "@smithy/eventstream-serde-config-resolver-3.0.1" = {
+    "@smithy/eventstream-serde-config-resolver-3.0.3" = {
       name = "_at_smithy_slash_eventstream-serde-config-resolver";
       packageName = "@smithy/eventstream-serde-config-resolver";
-      version = "3.0.1";
+      version = "3.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/eventstream-serde-config-resolver/-/eventstream-serde-config-resolver-3.0.1.tgz";
-        sha512 = "6+B8P+5Q1mll4u7IoI7mpmYOSW3/c2r3WQoYLdqOjbIKMixJFGmN79ZjJiNMy4X2GZ4We9kQ6LfnFuczSlhcyw==";
+        url = "https://registry.npmjs.org/@smithy/eventstream-serde-config-resolver/-/eventstream-serde-config-resolver-3.0.3.tgz";
+        sha512 = "NVTYjOuYpGfrN/VbRQgn31x73KDLfCXCsFdad8DiIc3IcdxL+dYA9zEQPyOP7Fy2QL8CPy2WE4WCUD+ZsLNfaQ==";
       };
     };
-    "@smithy/eventstream-serde-node-3.0.2" = {
+    "@smithy/eventstream-serde-node-3.0.4" = {
       name = "_at_smithy_slash_eventstream-serde-node";
       packageName = "@smithy/eventstream-serde-node";
-      version = "3.0.2";
+      version = "3.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/eventstream-serde-node/-/eventstream-serde-node-3.0.2.tgz";
-        sha512 = "DLtmGAfqxZAql8rB+HqyPlUne22u3EEVj+hxlUjgXk0hXt+SfLGK0ljzRFmiWQ3qGpHu1NdJpJA9e5JE/dJxFw==";
+        url = "https://registry.npmjs.org/@smithy/eventstream-serde-node/-/eventstream-serde-node-3.0.4.tgz";
+        sha512 = "mjlG0OzGAYuUpdUpflfb9zyLrBGgmQmrobNT8b42ZTsGv/J03+t24uhhtVEKG/b2jFtPIHF74Bq+VUtbzEKOKg==";
       };
     };
-    "@smithy/eventstream-serde-universal-3.0.2" = {
+    "@smithy/eventstream-serde-universal-3.0.4" = {
       name = "_at_smithy_slash_eventstream-serde-universal";
       packageName = "@smithy/eventstream-serde-universal";
-      version = "3.0.2";
+      version = "3.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/eventstream-serde-universal/-/eventstream-serde-universal-3.0.2.tgz";
-        sha512 = "d3SgAIQ/s4EbU8HAHJ8m2MMJPAL30nqJktyVgvqZWNznA8PJl61gJw5gj/yjIt/Fvs3d4fU8FmPPAhdp2yr/7A==";
+        url = "https://registry.npmjs.org/@smithy/eventstream-serde-universal/-/eventstream-serde-universal-3.0.4.tgz";
+        sha512 = "Od9dv8zh3PgOD7Vj4T3HSuox16n0VG8jJIM2gvKASL6aCtcS8CfHZDWe1Ik3ZXW6xBouU+45Q5wgoliWDZiJ0A==";
       };
     };
-    "@smithy/fetch-http-handler-3.0.2" = {
+    "@smithy/fetch-http-handler-3.2.3" = {
       name = "_at_smithy_slash_fetch-http-handler";
       packageName = "@smithy/fetch-http-handler";
-      version = "3.0.2";
+      version = "3.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-3.0.2.tgz";
-        sha512 = "0nW6tLK0b7EqSsfKvnOmZCgJqnodBAnvqcrlC5dotKfklLedPTRGsQamSVbVDWyuU/QGg+YbZDJUQ0CUufJXZQ==";
+        url = "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-3.2.3.tgz";
+        sha512 = "m4dzQeafWi5KKCCnDwGGHYk9lqcLs9LvlXZRB0J38DMectsEbxdiO/Rx1NaYYMIkath7AnjpR+r0clL+7dwclQ==";
       };
     };
-    "@smithy/hash-blob-browser-3.1.0" = {
+    "@smithy/hash-blob-browser-3.1.2" = {
       name = "_at_smithy_slash_hash-blob-browser";
       packageName = "@smithy/hash-blob-browser";
-      version = "3.1.0";
+      version = "3.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/hash-blob-browser/-/hash-blob-browser-3.1.0.tgz";
-        sha512 = "lKEHDN6bLzYdx5cFmdMHfYVmmTZTmjphwPBSumgkaniEYwRAXnbDEGETeuzfquS9Py1aH6cmqzXWxxkD7mV3sA==";
+        url = "https://registry.npmjs.org/@smithy/hash-blob-browser/-/hash-blob-browser-3.1.2.tgz";
+        sha512 = "hAbfqN2UbISltakCC2TP0kx4LqXBttEv2MqSPE98gVuDFMf05lU+TpC41QtqGP3Ff5A3GwZMPfKnEy0VmEUpmg==";
       };
     };
-    "@smithy/hash-node-3.0.1" = {
+    "@smithy/hash-node-3.0.3" = {
       name = "_at_smithy_slash_hash-node";
       packageName = "@smithy/hash-node";
-      version = "3.0.1";
+      version = "3.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/hash-node/-/hash-node-3.0.1.tgz";
-        sha512 = "w2ncjgk2EYO2+WhAsSQA8owzoOSY7IL1qVytlwpnL1pFGWTjIoIh5nROkEKXY51unB63bMGZqDiVoXaFbyKDlg==";
+        url = "https://registry.npmjs.org/@smithy/hash-node/-/hash-node-3.0.3.tgz";
+        sha512 = "2ctBXpPMG+B3BtWSGNnKELJ7SH9e4TNefJS0cd2eSkOOROeBnnVBnAy9LtJ8tY4vUEoe55N4CNPxzbWvR39iBw==";
       };
     };
-    "@smithy/hash-stream-node-3.1.0" = {
+    "@smithy/hash-stream-node-3.1.2" = {
       name = "_at_smithy_slash_hash-stream-node";
       packageName = "@smithy/hash-stream-node";
-      version = "3.1.0";
+      version = "3.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/hash-stream-node/-/hash-stream-node-3.1.0.tgz";
-        sha512 = "OkU9vjN17yYsXTSrouctZn2iYwG4z8WSc7F50+9ogG2crOtMopkop+22j35tX2ry2i/vLRCYgnqEmBWfvnYT2g==";
+        url = "https://registry.npmjs.org/@smithy/hash-stream-node/-/hash-stream-node-3.1.2.tgz";
+        sha512 = "PBgDMeEdDzi6JxKwbfBtwQG9eT9cVwsf0dZzLXoJF4sHKHs5HEo/3lJWpn6jibfJwT34I1EBXpBnZE8AxAft6g==";
       };
     };
-    "@smithy/invalid-dependency-3.0.1" = {
+    "@smithy/invalid-dependency-3.0.3" = {
       name = "_at_smithy_slash_invalid-dependency";
       packageName = "@smithy/invalid-dependency";
-      version = "3.0.1";
+      version = "3.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/invalid-dependency/-/invalid-dependency-3.0.1.tgz";
-        sha512 = "RSNF/32BKygXKKMyS7koyuAq1rcdW5p5c4EFa77QenBFze9As+JiRnV9OWBh2cB/ejGZalEZjvIrMLHwJl7aGA==";
+        url = "https://registry.npmjs.org/@smithy/invalid-dependency/-/invalid-dependency-3.0.3.tgz";
+        sha512 = "ID1eL/zpDULmHJbflb864k72/SNOZCADRc9i7Exq3RUNJw6raWUSlFEQ+3PX3EYs++bTxZB2dE9mEHTQLv61tw==";
       };
     };
     "@smithy/is-array-buffer-2.2.0" = {
@@ -9625,166 +9526,166 @@ let
         sha512 = "+Fsu6Q6C4RSJiy81Y8eApjEB5gVtM+oFKTffg+jSuwtvomJJrhUJBu2zS8wjXSgH/g1MKEWrzyChTBe6clb5FQ==";
       };
     };
-    "@smithy/md5-js-3.0.1" = {
+    "@smithy/md5-js-3.0.3" = {
       name = "_at_smithy_slash_md5-js";
       packageName = "@smithy/md5-js";
-      version = "3.0.1";
+      version = "3.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/md5-js/-/md5-js-3.0.1.tgz";
-        sha512 = "wQa0YGsR4Zb1GQLGwOOgRAbkj22P6CFGaFzu5bKk8K4HVNIC2dBlIxqZ/baF0pLiSZySAPdDZT7CdZ7GkGXt5A==";
+        url = "https://registry.npmjs.org/@smithy/md5-js/-/md5-js-3.0.3.tgz";
+        sha512 = "O/SAkGVwpWmelpj/8yDtsaVe6sINHLB1q8YE/+ZQbDxIw3SRLbTZuRaI10K12sVoENdnHqzPp5i3/H+BcZ3m3Q==";
       };
     };
-    "@smithy/middleware-content-length-3.0.1" = {
+    "@smithy/middleware-content-length-3.0.5" = {
       name = "_at_smithy_slash_middleware-content-length";
       packageName = "@smithy/middleware-content-length";
-      version = "3.0.1";
+      version = "3.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/middleware-content-length/-/middleware-content-length-3.0.1.tgz";
-        sha512 = "6QdK/VbrCfXD5/QolE2W/ok6VqxD+SM28Ds8iSlEHXZwv4buLsvWyvoEEy0322K/g5uFgPzBmZjGqesTmPL+yQ==";
+        url = "https://registry.npmjs.org/@smithy/middleware-content-length/-/middleware-content-length-3.0.5.tgz";
+        sha512 = "ILEzC2eyxx6ncej3zZSwMpB5RJ0zuqH7eMptxC4KN3f+v9bqT8ohssKbhNR78k/2tWW+KS5Spw+tbPF4Ejyqvw==";
       };
     };
-    "@smithy/middleware-endpoint-3.0.2" = {
+    "@smithy/middleware-endpoint-3.1.0" = {
       name = "_at_smithy_slash_middleware-endpoint";
       packageName = "@smithy/middleware-endpoint";
-      version = "3.0.2";
+      version = "3.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-3.0.2.tgz";
-        sha512 = "gWEaGYB3Bei17Oiy/F2IlUPpBazNXImytoOdJ1xbrUOaJKAOiUhx8/4FOnYLLJHdAwa9PlvJ2ULda2f/Dnwi9w==";
+        url = "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-3.1.0.tgz";
+        sha512 = "5y5aiKCEwg9TDPB4yFE7H6tYvGFf1OJHNczeY10/EFF8Ir8jZbNntQJxMWNfeQjC1mxPsaQ6mR9cvQbf+0YeMw==";
       };
     };
-    "@smithy/middleware-retry-3.0.4" = {
+    "@smithy/middleware-retry-3.0.12" = {
       name = "_at_smithy_slash_middleware-retry";
       packageName = "@smithy/middleware-retry";
-      version = "3.0.4";
+      version = "3.0.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-3.0.4.tgz";
-        sha512 = "Tu+FggbLNF5G9L6Wi8o32Mg4bhlBInWlhhaFKyytGRnkfxGopxFVXJQn7sjZdFYJyTz6RZZa06tnlvavUgtoVg==";
+        url = "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-3.0.12.tgz";
+        sha512 = "CncrlzNiBzuZZYLJ49H4dC6FEz62hnv0Y0nJyl/oZ73FX/9CDHWkIRD4ZOf5ntB6QyYWx0G3mXAOHOcM5omlLg==";
       };
     };
-    "@smithy/middleware-serde-3.0.1" = {
+    "@smithy/middleware-serde-3.0.3" = {
       name = "_at_smithy_slash_middleware-serde";
       packageName = "@smithy/middleware-serde";
-      version = "3.0.1";
+      version = "3.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/middleware-serde/-/middleware-serde-3.0.1.tgz";
-        sha512 = "ak6H/ZRN05r5+SR0/IUc5zOSyh2qp3HReg1KkrnaSLXmncy9lwOjNqybX4L4x55/e5mtVDn1uf/gQ6bw5neJPw==";
+        url = "https://registry.npmjs.org/@smithy/middleware-serde/-/middleware-serde-3.0.3.tgz";
+        sha512 = "puUbyJQBcg9eSErFXjKNiGILJGtiqmuuNKEYNYfUD57fUl4i9+mfmThtQhvFXU0hCVG0iEJhvQUipUf+/SsFdA==";
       };
     };
-    "@smithy/middleware-stack-3.0.1" = {
+    "@smithy/middleware-stack-3.0.3" = {
       name = "_at_smithy_slash_middleware-stack";
       packageName = "@smithy/middleware-stack";
-      version = "3.0.1";
+      version = "3.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/middleware-stack/-/middleware-stack-3.0.1.tgz";
-        sha512 = "fS5uT//y1SlBdkzIvgmWQ9FufwMXrHSSbuR25ygMy1CRDIZkcBMoF4oTMYNfR9kBlVBcVzlv7joFdNrFuQirPA==";
+        url = "https://registry.npmjs.org/@smithy/middleware-stack/-/middleware-stack-3.0.3.tgz";
+        sha512 = "r4klY9nFudB0r9UdSMaGSyjyQK5adUyPnQN/ZM6M75phTxOdnc/AhpvGD1fQUvgmqjQEBGCwpnPbDm8pH5PapA==";
       };
     };
-    "@smithy/node-config-provider-3.1.1" = {
+    "@smithy/node-config-provider-3.1.4" = {
       name = "_at_smithy_slash_node-config-provider";
       packageName = "@smithy/node-config-provider";
-      version = "3.1.1";
+      version = "3.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/node-config-provider/-/node-config-provider-3.1.1.tgz";
-        sha512 = "z5G7+ysL4yUtMghUd2zrLkecu0mTfnYlt5dR76g/HsFqf7evFazwiZP1ag2EJenGxNBDwDM5g8nm11NPogiUVA==";
+        url = "https://registry.npmjs.org/@smithy/node-config-provider/-/node-config-provider-3.1.4.tgz";
+        sha512 = "YvnElQy8HR4vDcAjoy7Xkx9YT8xZP4cBXcbJSgm/kxmiQu08DwUwj8rkGnyoJTpfl/3xYHH+d8zE+eHqoDCSdQ==";
       };
     };
-    "@smithy/node-http-handler-3.0.1" = {
+    "@smithy/node-http-handler-3.1.4" = {
       name = "_at_smithy_slash_node-http-handler";
       packageName = "@smithy/node-http-handler";
-      version = "3.0.1";
+      version = "3.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-3.0.1.tgz";
-        sha512 = "hlBI6MuREA4o1wBMEt+QNhUzoDtFFvwR6ecufimlx9D79jPybE/r8kNorphXOi91PgSO9S2fxRjcKCLk7Jw8zA==";
+        url = "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-3.1.4.tgz";
+        sha512 = "+UmxgixgOr/yLsUxcEKGH0fMNVteJFGkmRltYFHnBMlogyFdpzn2CwqWmxOrfJELhV34v0WSlaqG1UtE1uXlJg==";
       };
     };
-    "@smithy/property-provider-3.1.1" = {
+    "@smithy/property-provider-3.1.3" = {
       name = "_at_smithy_slash_property-provider";
       packageName = "@smithy/property-provider";
-      version = "3.1.1";
+      version = "3.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/property-provider/-/property-provider-3.1.1.tgz";
-        sha512 = "YknOMZcQkB5on+MU0DvbToCmT2YPtTETMXW0D3+/Iln7ezT+Zm1GMHhCW1dOH/X/+LkkQD9aXEoCX/B10s4Xdw==";
+        url = "https://registry.npmjs.org/@smithy/property-provider/-/property-provider-3.1.3.tgz";
+        sha512 = "zahyOVR9Q4PEoguJ/NrFP4O7SMAfYO1HLhB18M+q+Z4KFd4V2obiMnlVoUFzFLSPeVt1POyNWneHHrZaTMoc/g==";
       };
     };
-    "@smithy/protocol-http-4.0.1" = {
+    "@smithy/protocol-http-4.1.0" = {
       name = "_at_smithy_slash_protocol-http";
       packageName = "@smithy/protocol-http";
-      version = "4.0.1";
+      version = "4.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-4.0.1.tgz";
-        sha512 = "eBhm9zwcFPEazc654c0BEWtxYAzrw+OhoSf5pkwKzfftWKXRoqEhwOE2Pvn30v0iAdo7Mfsfb6pi1NnZlGCMpg==";
+        url = "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-4.1.0.tgz";
+        sha512 = "dPVoHYQ2wcHooGXg3LQisa1hH0e4y0pAddPMeeUPipI1tEOqL6A4N0/G7abeq+K8wrwSgjk4C0wnD1XZpJm5aA==";
       };
     };
-    "@smithy/querystring-builder-3.0.1" = {
+    "@smithy/querystring-builder-3.0.3" = {
       name = "_at_smithy_slash_querystring-builder";
       packageName = "@smithy/querystring-builder";
-      version = "3.0.1";
+      version = "3.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/querystring-builder/-/querystring-builder-3.0.1.tgz";
-        sha512 = "vKitpnG/2KOMVlx3x1S3FkBH075EROG3wcrcDaNerQNh8yuqnSL23btCD2UyX4i4lpPzNW6VFdxbn2Z25b/g5Q==";
+        url = "https://registry.npmjs.org/@smithy/querystring-builder/-/querystring-builder-3.0.3.tgz";
+        sha512 = "vyWckeUeesFKzCDaRwWLUA1Xym9McaA6XpFfAK5qI9DKJ4M33ooQGqvM4J+LalH4u/Dq9nFiC8U6Qn1qi0+9zw==";
       };
     };
-    "@smithy/querystring-parser-3.0.1" = {
+    "@smithy/querystring-parser-3.0.3" = {
       name = "_at_smithy_slash_querystring-parser";
       packageName = "@smithy/querystring-parser";
-      version = "3.0.1";
+      version = "3.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/querystring-parser/-/querystring-parser-3.0.1.tgz";
-        sha512 = "Qt8DMC05lVS8NcQx94lfVbZSX+2Ym7032b/JR8AlboAa/D669kPzqb35dkjkvAG6+NWmUchef3ENtrD6F+5n8Q==";
+        url = "https://registry.npmjs.org/@smithy/querystring-parser/-/querystring-parser-3.0.3.tgz";
+        sha512 = "zahM1lQv2YjmznnfQsWbYojFe55l0SLG/988brlLv1i8z3dubloLF+75ATRsqPBboUXsW6I9CPGE5rQgLfY0vQ==";
       };
     };
-    "@smithy/service-error-classification-3.0.1" = {
+    "@smithy/service-error-classification-3.0.3" = {
       name = "_at_smithy_slash_service-error-classification";
       packageName = "@smithy/service-error-classification";
-      version = "3.0.1";
+      version = "3.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/service-error-classification/-/service-error-classification-3.0.1.tgz";
-        sha512 = "ubFUvIePjDCyIzZ+pLETqNC6KXJ/fc6g+/baqel7Zf6kJI/kZKgjwkCI7zbUhoUuOZ/4eA/87YasVu40b/B4bA==";
+        url = "https://registry.npmjs.org/@smithy/service-error-classification/-/service-error-classification-3.0.3.tgz";
+        sha512 = "Jn39sSl8cim/VlkLsUhRFq/dKDnRUFlfRkvhOJaUbLBXUsLRLNf9WaxDv/z9BjuQ3A6k/qE8af1lsqcwm7+DaQ==";
       };
     };
-    "@smithy/shared-ini-file-loader-3.1.1" = {
+    "@smithy/shared-ini-file-loader-3.1.4" = {
       name = "_at_smithy_slash_shared-ini-file-loader";
       packageName = "@smithy/shared-ini-file-loader";
-      version = "3.1.1";
+      version = "3.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-3.1.1.tgz";
-        sha512 = "nD6tXIX2126/P9e3wqRY1bm9dTtPZwRDyjVOd18G28o+1UOG+kOVgUwujE795HslSuPlEgqzsH5sgNP1hDjj9g==";
+        url = "https://registry.npmjs.org/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-3.1.4.tgz";
+        sha512 = "qMxS4hBGB8FY2GQqshcRUy1K6k8aBWP5vwm8qKkCT3A9K2dawUwOIJfqh9Yste/Bl0J2lzosVyrXDj68kLcHXQ==";
       };
     };
-    "@smithy/signature-v4-3.1.0" = {
+    "@smithy/signature-v4-4.1.0" = {
       name = "_at_smithy_slash_signature-v4";
       packageName = "@smithy/signature-v4";
-      version = "3.1.0";
+      version = "4.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/signature-v4/-/signature-v4-3.1.0.tgz";
-        sha512 = "m0/6LW3IQ3/JBcdhqjpkpABPTPhcejqeAn0U877zxBdNLiWAnG2WmCe5MfkUyVuvpFTPQnQwCo/0ZBR4uF5kxg==";
+        url = "https://registry.npmjs.org/@smithy/signature-v4/-/signature-v4-4.1.0.tgz";
+        sha512 = "aRryp2XNZeRcOtuJoxjydO6QTaVhxx/vjaR+gx7ZjaFgrgPRyZ3HCTbfwqYj6ZWEBHkCSUfcaymKPURaByukag==";
       };
     };
-    "@smithy/smithy-client-3.1.2" = {
+    "@smithy/smithy-client-3.1.10" = {
       name = "_at_smithy_slash_smithy-client";
       packageName = "@smithy/smithy-client";
-      version = "3.1.2";
+      version = "3.1.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-3.1.2.tgz";
-        sha512 = "f3eQpczBOFUtdT/ptw2WpUKu1qH1K7xrssrSiHYtd9TuLXkvFqb88l9mz9FHeUVNSUxSnkW1anJnw6rLwUKzQQ==";
+        url = "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-3.1.10.tgz";
+        sha512 = "OLHJo0DAmhX69YUF3WbNfzzxGIncGdxao+v27o24msdhin2AWTxJMaBQ3iPGfIrWMjy+8YGMXUJ7PrkJlpznTw==";
       };
     };
-    "@smithy/types-3.1.0" = {
+    "@smithy/types-3.3.0" = {
       name = "_at_smithy_slash_types";
       packageName = "@smithy/types";
-      version = "3.1.0";
+      version = "3.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/types/-/types-3.1.0.tgz";
-        sha512 = "qi4SeCVOUPjhSSZrxxB/mB8DrmuSFUcJnD9KXjuP+7C3LV/KFV4kpuUSH3OHDZgQB9TEH/1sO/Fq/5HyaK9MPw==";
+        url = "https://registry.npmjs.org/@smithy/types/-/types-3.3.0.tgz";
+        sha512 = "IxvBBCTFDHbVoK7zIxqA1ZOdc4QfM5HM7rGleCuHi7L1wnKv5Pn69xXJQ9hgxH60ZVygH9/JG0jRgtUncE3QUA==";
       };
     };
-    "@smithy/url-parser-3.0.1" = {
+    "@smithy/url-parser-3.0.3" = {
       name = "_at_smithy_slash_url-parser";
       packageName = "@smithy/url-parser";
-      version = "3.0.1";
+      version = "3.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/url-parser/-/url-parser-3.0.1.tgz";
-        sha512 = "G140IlNFlzYWVCedC4E2d6NycM1dCUbe5CnsGW1hmGt4hYKiGOw0v7lVru9WAn5T2w09QEjl4fOESWjGmCvVmg==";
+        url = "https://registry.npmjs.org/@smithy/url-parser/-/url-parser-3.0.3.tgz";
+        sha512 = "pw3VtZtX2rg+s6HMs6/+u9+hu6oY6U7IohGhVNnjbgKy86wcIsSZwgHrFR+t67Uyxvp4Xz3p3kGXXIpTNisq8A==";
       };
     };
     "@smithy/util-base64-3.0.0" = {
@@ -9841,31 +9742,31 @@ let
         sha512 = "pbjk4s0fwq3Di/ANL+rCvJMKM5bzAQdE5S/6RL5NXgMExFAi6UgQMPOm5yPaIWPpr+EOXKXRonJ3FoxKf4mCJQ==";
       };
     };
-    "@smithy/util-defaults-mode-browser-3.0.4" = {
+    "@smithy/util-defaults-mode-browser-3.0.12" = {
       name = "_at_smithy_slash_util-defaults-mode-browser";
       packageName = "@smithy/util-defaults-mode-browser";
-      version = "3.0.4";
+      version = "3.0.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-3.0.4.tgz";
-        sha512 = "sXtin3Mue3A3xo4+XkozpgPptgmRwvNPOqTvb3ANGTCzzoQgAPBNjpE+aXCINaeSMXwHmv7E2oEn2vWdID+SAQ==";
+        url = "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-3.0.12.tgz";
+        sha512 = "5b81UUPKjD61DMg7JBYzkSM1Vny/RfRRhnZYzuWjm25OyrEXsar3RgbbXYR+otdx+wrPR3QmuFtbDZmEgGpwVg==";
       };
     };
-    "@smithy/util-defaults-mode-node-3.0.4" = {
+    "@smithy/util-defaults-mode-node-3.0.12" = {
       name = "_at_smithy_slash_util-defaults-mode-node";
       packageName = "@smithy/util-defaults-mode-node";
-      version = "3.0.4";
+      version = "3.0.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-3.0.4.tgz";
-        sha512 = "CUF6TyxLh3CgBRVYgZNOPDfzHQjeQr0vyALR6/DkQkOm7rNfGEzW1BRFi88C73pndmfvoiIT7ochuT76OPz9Dw==";
+        url = "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-3.0.12.tgz";
+        sha512 = "g2NdtGDN67PepBs0t/mkrlQ2nVkhKUDJZCNmEJIarzYq2sK4mKO9t61Nzlv+gHEEC3ESfRaMCC/Ol3ZfCZYg7Q==";
       };
     };
-    "@smithy/util-endpoints-2.0.2" = {
+    "@smithy/util-endpoints-2.0.5" = {
       name = "_at_smithy_slash_util-endpoints";
       packageName = "@smithy/util-endpoints";
-      version = "2.0.2";
+      version = "2.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/util-endpoints/-/util-endpoints-2.0.2.tgz";
-        sha512 = "4zFOcBFQvifd2LSD4a1dKvfIWWwh4sWNtS3oZ7mpob/qPPmJseqKB148iT+hWCDsG//TmI+8vjYPgZdvnkYlTg==";
+        url = "https://registry.npmjs.org/@smithy/util-endpoints/-/util-endpoints-2.0.5.tgz";
+        sha512 = "ReQP0BWihIE68OAblC/WQmDD40Gx+QY1Ez8mTdFMXpmjfxSyz2fVQu3A4zXRfQU9sZXtewk3GmhfOHswvX+eNg==";
       };
     };
     "@smithy/util-hex-encoding-3.0.0" = {
@@ -9877,31 +9778,31 @@ let
         sha512 = "eFndh1WEK5YMUYvy3lPlVmYY/fZcQE1D8oSf41Id2vCeIkKJXPcYDCZD+4+xViI6b1XSd7tE+s5AmXzz5ilabQ==";
       };
     };
-    "@smithy/util-middleware-3.0.1" = {
+    "@smithy/util-middleware-3.0.3" = {
       name = "_at_smithy_slash_util-middleware";
       packageName = "@smithy/util-middleware";
-      version = "3.0.1";
+      version = "3.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/util-middleware/-/util-middleware-3.0.1.tgz";
-        sha512 = "WRODCQtUsO7vIvfrdxS8RFPeLKcewYtaCglZsBsedIKSUGIIvMlZT5oh+pCe72I+1L+OjnZuqRNpN2LKhWA4KQ==";
+        url = "https://registry.npmjs.org/@smithy/util-middleware/-/util-middleware-3.0.3.tgz";
+        sha512 = "l+StyYYK/eO3DlVPbU+4Bi06Jjal+PFLSMmlWM1BEwyLxZ3aKkf1ROnoIakfaA7mC6uw3ny7JBkau4Yc+5zfWw==";
       };
     };
-    "@smithy/util-retry-3.0.1" = {
+    "@smithy/util-retry-3.0.3" = {
       name = "_at_smithy_slash_util-retry";
       packageName = "@smithy/util-retry";
-      version = "3.0.1";
+      version = "3.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/util-retry/-/util-retry-3.0.1.tgz";
-        sha512 = "5lRtYm+8fNFEUTdqZXg5M4ppVp40rMIJfR1TpbHAhKQgPIDpWT+iYMaqgnwEbtpi9U1smyUOPv5Sg+M1neOBgw==";
+        url = "https://registry.npmjs.org/@smithy/util-retry/-/util-retry-3.0.3.tgz";
+        sha512 = "AFw+hjpbtVApzpNDhbjNG5NA3kyoMs7vx0gsgmlJF4s+yz1Zlepde7J58zpIRIsdjc+emhpAITxA88qLkPF26w==";
       };
     };
-    "@smithy/util-stream-3.0.2" = {
+    "@smithy/util-stream-3.1.2" = {
       name = "_at_smithy_slash_util-stream";
       packageName = "@smithy/util-stream";
-      version = "3.0.2";
+      version = "3.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-3.0.2.tgz";
-        sha512 = "n5Obp5AnlI6qHo8sbupwrcpBe6vFp4qkl0SRNuExKPNrH3ABAMG2ZszRTIUIv2b4AsFrCO+qiy4uH1Q3z1dxTA==";
+        url = "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-3.1.2.tgz";
+        sha512 = "08zDzB7BqvybHfZKnav5lL1UniFDK6o6nZ3OWp60PKsi/na2LpU6OX8MCtDNVaPBpKpc8EH26fvFhNT6wvMlbw==";
       };
     };
     "@smithy/util-uri-escape-3.0.0" = {
@@ -9931,13 +9832,13 @@ let
         sha512 = "rUeT12bxFnplYDe815GXbq/oixEGHfRFFtcTF3YdDi/JaENIM6aSYYLJydG83UNzLXeRI5K8abYd/8Sp/QM0kA==";
       };
     };
-    "@smithy/util-waiter-3.0.1" = {
+    "@smithy/util-waiter-3.1.2" = {
       name = "_at_smithy_slash_util-waiter";
       packageName = "@smithy/util-waiter";
-      version = "3.0.1";
+      version = "3.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/util-waiter/-/util-waiter-3.0.1.tgz";
-        sha512 = "wwnrVQdjQxvWGOAiLmqlEhENGCcDIN+XJ/+usPOgSZObAslrCXgKlkX7rNVwIWW2RhPguTKthvF+4AoO0Z6KpA==";
+        url = "https://registry.npmjs.org/@smithy/util-waiter/-/util-waiter-3.1.2.tgz";
+        sha512 = "4pP0EV3iTsexDx+8PPGAKCQpd/6hsQBaQhqWzU4hqKPHN5epPsxKbvUTIiYIHTxaKt6/kEaqPBpu/ufvfbrRzw==";
       };
     };
     "@socket.io/component-emitter-3.1.2" = {
@@ -9958,13 +9859,13 @@ let
         sha512 = "0p9uXkuB22qGdNfy3VeEhxkU5uwvp/KrBTAbrLBURv6ilxIVwanKwjMc41lQfIVgPGcOkmLbTolfFrSsueu7zA==";
       };
     };
-    "@stoplight/json-3.21.0" = {
+    "@stoplight/json-3.21.4" = {
       name = "_at_stoplight_slash_json";
       packageName = "@stoplight/json";
-      version = "3.21.0";
+      version = "3.21.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@stoplight/json/-/json-3.21.0.tgz";
-        sha512 = "5O0apqJ/t4sIevXCO3SBN9AHCEKKR/Zb4gaj7wYe5863jme9g02Q0n/GhM7ZCALkL+vGPTe4ZzTETP8TFtsw3g==";
+        url = "https://registry.npmjs.org/@stoplight/json/-/json-3.21.4.tgz";
+        sha512 = "dNfiOuyl3/62Bs7o21v6EUvvhUFsPTK5kJMlST1SMnEyjyyMB/b0uoc7w3Df+TSGB2j2+vep4gdsKG3eUpc7Lg==";
       };
     };
     "@stoplight/json-ref-readers-1.2.2" = {
@@ -10147,40 +10048,40 @@ let
         sha512 = "2kGbqUVJUGE8dM+bMzXG/PYUWKkjLIkRLWNh39OaADkiabDRdw8ATFCgbMz5xdIcvwspPAluSL7uY+ZiTWdWmQ==";
       };
     };
-    "@swc-node/core-1.13.1" = {
+    "@swc-node/core-1.13.3" = {
       name = "_at_swc-node_slash_core";
       packageName = "@swc-node/core";
-      version = "1.13.1";
+      version = "1.13.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@swc-node/core/-/core-1.13.1.tgz";
-        sha512 = "emB5l2nZsXjUEAuusqjYvWnQMLWZp6K039Mv8aq5SX1rsNM/N7DNhw1i4/DX7AyzNZ0tT+ASWyTvqEURldp5HA==";
+        url = "https://registry.npmjs.org/@swc-node/core/-/core-1.13.3.tgz";
+        sha512 = "OGsvXIid2Go21kiNqeTIn79jcaX4l0G93X2rAnas4LFoDyA9wAwVK7xZdm+QsKoMn5Mus2yFLCc4OtX2dD/PWA==";
       };
     };
-    "@swc-node/register-1.9.2" = {
+    "@swc-node/register-1.10.9" = {
       name = "_at_swc-node_slash_register";
       packageName = "@swc-node/register";
-      version = "1.9.2";
+      version = "1.10.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@swc-node/register/-/register-1.9.2.tgz";
-        sha512 = "BBjg0QNuEEmJSoU/++JOXhrjWdu3PTyYeJWsvchsI0Aqtj8ICkz/DqlwtXbmZVZ5vuDPpTfFlwDBZe81zgShMA==";
+        url = "https://registry.npmjs.org/@swc-node/register/-/register-1.10.9.tgz";
+        sha512 = "iXy2sjP0phPEpK2yivjRC3PAgoLaT4sjSk0LDWCTdcTBJmR4waEog0E6eJbvoOkLkOtWw37SB8vCkl/bbh4+8A==";
       };
     };
-    "@swc-node/sourcemap-support-0.5.0" = {
+    "@swc-node/sourcemap-support-0.5.1" = {
       name = "_at_swc-node_slash_sourcemap-support";
       packageName = "@swc-node/sourcemap-support";
-      version = "0.5.0";
+      version = "0.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@swc-node/sourcemap-support/-/sourcemap-support-0.5.0.tgz";
-        sha512 = "fbhjL5G0YvFoWwNhWleuBUfotiX+USiA9oJqu9STFw+Hb0Cgnddn+HVS/K5fI45mn92e8V+cHD2jgFjk4w2T9Q==";
+        url = "https://registry.npmjs.org/@swc-node/sourcemap-support/-/sourcemap-support-0.5.1.tgz";
+        sha512 = "JxIvIo/Hrpv0JCHSyRpetAdQ6lB27oFYhv0PKCNf1g2gUXOjpeR1exrXccRxLMuAV5WAmGFBwRnNOJqN38+qtg==";
       };
     };
-    "@swc/core-1.5.29" = {
+    "@swc/core-1.7.1" = {
       name = "_at_swc_slash_core";
       packageName = "@swc/core";
-      version = "1.5.29";
+      version = "1.7.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@swc/core/-/core-1.5.29.tgz";
-        sha512 = "nvTtHJI43DUSOAf3h9XsqYg8YXKc0/N4il9y4j0xAkO0ekgDNo+3+jbw6MInawjKJF9uulyr+f5bAutTsOKVlw==";
+        url = "https://registry.npmjs.org/@swc/core/-/core-1.7.1.tgz";
+        sha512 = "M4gxJcvzZCH+QQJGVJDF3kT46C05IUPTFcA1wA65WAdg87MDzpr1mwtB/FmPsdcRFRbJIxET6uCsWgubn+KnJQ==";
       };
     };
     "@swc/counter-0.1.3" = {
@@ -10192,31 +10093,31 @@ let
         sha512 = "e2BR4lsJkkRlKZ/qCHPw9ZaSxc0MVUd7gtbtaB7aMvHeJVYe8sOB8DBZkP2DtISHGSku9sCK6T6cnY0CtXrOCQ==";
       };
     };
-    "@swc/helpers-0.5.11" = {
+    "@swc/helpers-0.5.12" = {
       name = "_at_swc_slash_helpers";
       packageName = "@swc/helpers";
-      version = "0.5.11";
+      version = "0.5.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.11.tgz";
-        sha512 = "YNlnKRWF2sVojTpIyzwou9XoTNbzbzONwRhOoniEioF1AtaitTvVZblaQRrAzChWQ1bLYyYSWzM18y4WwgzJ+A==";
+        url = "https://registry.npmjs.org/@swc/helpers/-/helpers-0.5.12.tgz";
+        sha512 = "KMZNXiGibsW9kvZAO1Pam2JPTDBm+KSHMMHWdsyI/1DbIZjT2A6Gy3hblVXUMEDvUAKq+e0vL0X0o54owWji7g==";
       };
     };
-    "@swc/types-0.1.8" = {
+    "@swc/types-0.1.12" = {
       name = "_at_swc_slash_types";
       packageName = "@swc/types";
-      version = "0.1.8";
+      version = "0.1.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@swc/types/-/types-0.1.8.tgz";
-        sha512 = "RNFA3+7OJFNYY78x0FYwi1Ow+iF1eF5WvmfY1nXPOEH4R2p/D4Cr1vzje7dNAI2aLFqpv8Wyz4oKSWqIZArpQA==";
+        url = "https://registry.npmjs.org/@swc/types/-/types-0.1.12.tgz";
+        sha512 = "wBJA+SdtkbFhHjTMYH+dEH1y4VpfGdAc2Kw/LK09i9bXd/K6j6PkDcFCEzb6iVfZMkPRrl/q0e3toqTAJdkIVA==";
       };
     };
-    "@swc/wasm-1.5.29" = {
+    "@swc/wasm-1.7.1" = {
       name = "_at_swc_slash_wasm";
       packageName = "@swc/wasm";
-      version = "1.5.29";
+      version = "1.7.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@swc/wasm/-/wasm-1.5.29.tgz";
-        sha512 = "uCvf2Sm9lGcwtqAoeB8Huh9POeM1tZqoMRwkQrdhUwaysNaeQJhCAU0zx5KeDjVna8W8/ELjgZW7HHZSw8Ifhw==";
+        url = "https://registry.npmjs.org/@swc/wasm/-/wasm-1.7.1.tgz";
+        sha512 = "K+o9bzvz6VhPr3E4je1Paz7p8zwNM6QBSlvwhGMFgxGXSb0X3yz0dihU/DUzqHwBmc1QLmN1yE6o7jqMtCJgmg==";
       };
     };
     "@szmarczak/http-timer-1.1.2" = {
@@ -10273,67 +10174,67 @@ let
         sha512 = "/FcGQVvXAslhiC9aMG5gxKXJctg8N7XLZrP+wYrFTFccWEPZd/Xon5y7jUXpKOVSOFEA1MOKZKbPuK4ET5/T8Q==";
       };
     };
-    "@thaunknown/idb-chunk-store-1.0.2" = {
+    "@thaunknown/idb-chunk-store-1.0.4" = {
       name = "_at_thaunknown_slash_idb-chunk-store";
       packageName = "@thaunknown/idb-chunk-store";
-      version = "1.0.2";
+      version = "1.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@thaunknown/idb-chunk-store/-/idb-chunk-store-1.0.2.tgz";
-        sha512 = "UdKshbKdHDP+p0XPdv55QiU/scdB9TzvovGFSgXThf+7Yd3noLeYp6KpkYyc1jzUXvI3/8+TemPeASOimrOXvw==";
+        url = "https://registry.npmjs.org/@thaunknown/idb-chunk-store/-/idb-chunk-store-1.0.4.tgz";
+        sha512 = "4/XDQZHKHyJCGeqnVjHyqeAXClZJ9l90rRvoTslUiuvwTGAUpIb3poL0LfGJEdSuWV+zzGdDjIm/3L4x6crwbg==";
       };
     };
-    "@thaunknown/simple-peer-10.0.7" = {
+    "@thaunknown/simple-peer-10.0.10" = {
       name = "_at_thaunknown_slash_simple-peer";
       packageName = "@thaunknown/simple-peer";
-      version = "10.0.7";
+      version = "10.0.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@thaunknown/simple-peer/-/simple-peer-10.0.7.tgz";
-        sha512 = "b4oPNaJEWk9UT/ADV8IFWcAyow+gOPLa73SptuOqm6IdMDr4zlsqGsdl4LQmvgMKMgWAOHdVViw/RYF5qYvkCg==";
+        url = "https://registry.npmjs.org/@thaunknown/simple-peer/-/simple-peer-10.0.10.tgz";
+        sha512 = "RtoYQChP5clkbh+crUhv0LD/fdzgNO/Ah/SBdcSqla6xY6GK50ukNhq39H4vzAKoYqvDu01Hc+JSD9DxCdoBOw==";
       };
     };
-    "@thaunknown/simple-websocket-9.1.1" = {
+    "@thaunknown/simple-websocket-9.1.3" = {
       name = "_at_thaunknown_slash_simple-websocket";
       packageName = "@thaunknown/simple-websocket";
-      version = "9.1.1";
+      version = "9.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@thaunknown/simple-websocket/-/simple-websocket-9.1.1.tgz";
-        sha512 = "vzQloFWRodRZqZhpxMpBljFtISesY8TihA8T5uKwCYdj2I1ImMhE/gAeTCPsCGOtxJfGKu3hw/is6MXauWLjOg==";
+        url = "https://registry.npmjs.org/@thaunknown/simple-websocket/-/simple-websocket-9.1.3.tgz";
+        sha512 = "pf/FCJsgWtLJiJmIpiSI7acOZVq3bIQCpnNo222UFc8Ph1lOUOTpe6LoYhhiOSKB9GUaWJEVUtZ+sK1/aBgU5Q==";
       };
     };
-    "@thaunknown/thirty-two-1.0.3" = {
+    "@thaunknown/thirty-two-1.0.5" = {
       name = "_at_thaunknown_slash_thirty-two";
       packageName = "@thaunknown/thirty-two";
-      version = "1.0.3";
+      version = "1.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@thaunknown/thirty-two/-/thirty-two-1.0.3.tgz";
-        sha512 = "bD6PvWbaf53JC04O7WnGDjqZBDgja/KT2Jd/6I2vJBIy+DLmQfQJZZ/G+16nAkVq1yGTIkO4rfc4RlH0DmEEqA==";
+        url = "https://registry.npmjs.org/@thaunknown/thirty-two/-/thirty-two-1.0.5.tgz";
+        sha512 = "Q53KyCXweV1CS62EfqtPDqfpksn5keQ59PGqzzkK+g8Vif1jB4inoBCcs/BUSdsqddhE3G+2Fn+4RX3S6RqT0A==";
       };
     };
-    "@tinyhttp/accepts-2.2.1" = {
+    "@tinyhttp/accepts-2.2.2" = {
       name = "_at_tinyhttp_slash_accepts";
       packageName = "@tinyhttp/accepts";
-      version = "2.2.1";
+      version = "2.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@tinyhttp/accepts/-/accepts-2.2.1.tgz";
-        sha512 = "2DHJLSJX1gqR5F6nKuu7+hyCNoPRNOxvnQ11m0X8klkSVoBFBO2HMf3bJ8P+fmNv1e6RjHzHF+G+hJ3dxXIQXQ==";
+        url = "https://registry.npmjs.org/@tinyhttp/accepts/-/accepts-2.2.2.tgz";
+        sha512 = "DmngnwOaPgNUGgTpX1UdlNrXaGG6k5rHFzslcYlvSQIg7s0PI6bF86U0fYq3q+yhJhKbnwzFez0wU1lAP+bKvA==";
       };
     };
-    "@tinyhttp/app-2.2.3" = {
+    "@tinyhttp/app-2.3.0" = {
       name = "_at_tinyhttp_slash_app";
       packageName = "@tinyhttp/app";
-      version = "2.2.3";
+      version = "2.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@tinyhttp/app/-/app-2.2.3.tgz";
-        sha512 = "njr499Tx9BwlnIGfJjTuqfPwaUSTsjhUeRq/jVtHJpS95UgWECH7kiq8+bEx6TFRXiNKpARZ6KJUemlMyV+iCg==";
+        url = "https://registry.npmjs.org/@tinyhttp/app/-/app-2.3.0.tgz";
+        sha512 = "2jGV5Er72wywjM8HBjYszECOiIzgNcRrO/kq1gHQqOQvrLa1KzIpUD1CCvPALUXiko7ZK2zKq5WyL+yRPC50uw==";
       };
     };
-    "@tinyhttp/content-disposition-2.2.0" = {
+    "@tinyhttp/content-disposition-2.2.1" = {
       name = "_at_tinyhttp_slash_content-disposition";
       packageName = "@tinyhttp/content-disposition";
-      version = "2.2.0";
+      version = "2.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@tinyhttp/content-disposition/-/content-disposition-2.2.0.tgz";
-        sha512 = "w1dJaSAtcCinOlT/YQg35RnFCOBbCHBGDVhH4yLoiJVtecRAJ2cYMf5HP+UhfbXURa38GC8fkRXO0vODDTjmeg==";
+        url = "https://registry.npmjs.org/@tinyhttp/content-disposition/-/content-disposition-2.2.1.tgz";
+        sha512 = "PQ5IWdOn7arScqTV+usIDJvwbanoAXtaopzgxjMS9y7TFwLSIelCblihRBEVIPIkIpsdhSJFH3RF+Daosyj+Aw==";
       };
     };
     "@tinyhttp/content-type-0.1.4" = {
@@ -10345,31 +10246,31 @@ let
         sha512 = "dl6f3SHIJPYbhsW1oXdrqOmLSQF/Ctlv3JnNfXAE22kIP7FosqJHxkz/qj2gv465prG8ODKH5KEyhBkvwrueKQ==";
       };
     };
-    "@tinyhttp/cookie-2.1.0" = {
+    "@tinyhttp/cookie-2.1.1" = {
       name = "_at_tinyhttp_slash_cookie";
       packageName = "@tinyhttp/cookie";
-      version = "2.1.0";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@tinyhttp/cookie/-/cookie-2.1.0.tgz";
-        sha512 = "o56utxXvIuLTCtPm66r8lcyUufpw0RkO+u4wQrTbc6snyyGZZ9hHzGRxPyko0ks90ctOkLh0mNKn7YZaTWlvfw==";
+        url = "https://registry.npmjs.org/@tinyhttp/cookie/-/cookie-2.1.1.tgz";
+        sha512 = "h/kL9jY0e0Dvad+/QU3efKZww0aTvZJslaHj3JTPmIPC9Oan9+kYqmh3M6L5JUQRuTJYFK2nzgL2iJtH2S+6dA==";
       };
     };
-    "@tinyhttp/cookie-signature-2.1.0" = {
+    "@tinyhttp/cookie-signature-2.1.1" = {
       name = "_at_tinyhttp_slash_cookie-signature";
       packageName = "@tinyhttp/cookie-signature";
-      version = "2.1.0";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@tinyhttp/cookie-signature/-/cookie-signature-2.1.0.tgz";
-        sha512 = "bpOXBGf9rKoajtEG75O7xjwW+u2I/NNPkJWJTDdr6j7Vx0lG5R9Hnl3ty80Af4jwyo90ywXVpZIxKLubPK6RzA==";
+        url = "https://registry.npmjs.org/@tinyhttp/cookie-signature/-/cookie-signature-2.1.1.tgz";
+        sha512 = "VDsSMY5OJfQJIAtUgeQYhqMPSZptehFSfvEEtxr+4nldPA8IImlp3QVcOVuK985g4AFR4Hl1sCbWCXoqBnVWnw==";
       };
     };
-    "@tinyhttp/cors-2.0.0" = {
+    "@tinyhttp/cors-2.0.1" = {
       name = "_at_tinyhttp_slash_cors";
       packageName = "@tinyhttp/cors";
-      version = "2.0.0";
+      version = "2.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@tinyhttp/cors/-/cors-2.0.0.tgz";
-        sha512 = "IwQsPBnK+gRrhTsPA4FPOfbNzZZt8cVsOIMNFb6HzoScaiWcoLEogL0Bz/aBSm8KM13uieVXoVT6udMqhqUS2A==";
+        url = "https://registry.npmjs.org/@tinyhttp/cors/-/cors-2.0.1.tgz";
+        sha512 = "qrmo6WJuaiCzKWagv2yA/kw6hIISfF/hOqPWwmI6w0o8apeTMmRN3DoCFvQ/wNVuWVdU5J4KU7OX8aaSOEq51A==";
       };
     };
     "@tinyhttp/encode-url-2.1.1" = {
@@ -10381,49 +10282,49 @@ let
         sha512 = "AhY+JqdZ56qV77tzrBm0qThXORbsVjs/IOPgGCS7x/wWnsa/Bx30zDUU/jPAUcSzNOzt860x9fhdGpzdqbUeUw==";
       };
     };
-    "@tinyhttp/etag-2.1.1" = {
+    "@tinyhttp/etag-2.1.2" = {
       name = "_at_tinyhttp_slash_etag";
       packageName = "@tinyhttp/etag";
-      version = "2.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@tinyhttp/etag/-/etag-2.1.1.tgz";
-        sha512 = "AcHGK1nMlKIHmlbg8bb8UY/KhiaAX17SAn3/6wlgwwdX4UizA8HETDfCH3KLdu2ZASokynuwVFNDJCo1DAawGw==";
-      };
-    };
-    "@tinyhttp/forwarded-2.1.2" = {
-      name = "_at_tinyhttp_slash_forwarded";
-      packageName = "@tinyhttp/forwarded";
       version = "2.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@tinyhttp/forwarded/-/forwarded-2.1.2.tgz";
-        sha512 = "9H/eulJ68ElY/+zYpTpNhZ7vxGV+cnwaR6+oQSm7bVgZMyuQfgROW/qvZuhmgDTIxnGMXst+Ba4ij6w6Krcs3w==";
+        url = "https://registry.npmjs.org/@tinyhttp/etag/-/etag-2.1.2.tgz";
+        sha512 = "j80fPKimGqdmMh6962y+BtQsnYPVCzZfJw0HXjyH70VaJBHLKGF+iYhcKqzI3yef6QBNa8DKIPsbEYpuwApXTw==";
       };
     };
-    "@tinyhttp/proxy-addr-2.1.3" = {
+    "@tinyhttp/forwarded-2.1.1" = {
+      name = "_at_tinyhttp_slash_forwarded";
+      packageName = "@tinyhttp/forwarded";
+      version = "2.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@tinyhttp/forwarded/-/forwarded-2.1.1.tgz";
+        sha512 = "nO3kq0R1LRl2+CAMlnggm22zE6sT8gfvGbNvSitV6F9eaUSurHP0A8YZFMihSkugHxK+uIegh1TKrqgD8+lyGQ==";
+      };
+    };
+    "@tinyhttp/proxy-addr-2.2.0" = {
       name = "_at_tinyhttp_slash_proxy-addr";
       packageName = "@tinyhttp/proxy-addr";
-      version = "2.1.3";
+      version = "2.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@tinyhttp/proxy-addr/-/proxy-addr-2.1.3.tgz";
-        sha512 = "Z0Q/0wEJpvall7LlBezXDy96CXLzPZb6xJawwEgsMXXQhmjb+r3EkpCBwMrWm2GlbJFL/UxKxpdumiNW3Ne06g==";
+        url = "https://registry.npmjs.org/@tinyhttp/proxy-addr/-/proxy-addr-2.2.0.tgz";
+        sha512 = "WM/PPL9xNvrs7/8Om5nhKbke5FHrP3EfjOOR+wBnjgESfibqn0K7wdUTnzSLp1lBmemr88os1XvzwymSgaibyA==";
       };
     };
-    "@tinyhttp/req-2.2.2" = {
+    "@tinyhttp/req-2.2.3" = {
       name = "_at_tinyhttp_slash_req";
       packageName = "@tinyhttp/req";
-      version = "2.2.2";
+      version = "2.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@tinyhttp/req/-/req-2.2.2.tgz";
-        sha512 = "LaL/RFRro0qjOQ0g3vxE6i9bWl9hhv9en7opykzLU4NimFPg2C8wl7Qkoyc0mDuoRMQmWpq730PDWXSUmLiT2A==";
+        url = "https://registry.npmjs.org/@tinyhttp/req/-/req-2.2.3.tgz";
+        sha512 = "HtIa4Gaa8QFTlmsvoif/B7yMK5H0WBUegH2kKW6scNwOpFXyxEk+VsctrIVgORrP5lybXAIRXlRhGuBBAMlVhw==";
       };
     };
-    "@tinyhttp/res-2.2.2" = {
+    "@tinyhttp/res-2.2.3" = {
       name = "_at_tinyhttp_slash_res";
       packageName = "@tinyhttp/res";
-      version = "2.2.2";
+      version = "2.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@tinyhttp/res/-/res-2.2.2.tgz";
-        sha512 = "YeEYFwozag2qO5xoTj1Df+d5l6MXUefxz3xbcJD6ASVqUQytTEYtOC0FjhQKLpTLjMJKlS4mkKmeIdDLFO9btg==";
+        url = "https://registry.npmjs.org/@tinyhttp/res/-/res-2.2.3.tgz";
+        sha512 = "PGl88OOdmMcOuKZaTbhGKAWPoJJf3+EfKIad8ydzjdenVjrTZZjIYJtmwYiUBeEice+YkOCO67qCIekVO5mHlw==";
       };
     };
     "@tinyhttp/router-2.2.2" = {
@@ -10435,22 +10336,22 @@ let
         sha512 = "i+1ouhPyTqcuJuOsKqmo7i+YD++0RF2lQLhBpcTnsaegD2gTEa3xW2Pcz7spYQGo7K8PQYtOrL7m9b14+BEXqg==";
       };
     };
-    "@tinyhttp/send-2.2.1" = {
+    "@tinyhttp/send-2.2.2" = {
       name = "_at_tinyhttp_slash_send";
       packageName = "@tinyhttp/send";
-      version = "2.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@tinyhttp/send/-/send-2.2.1.tgz";
-        sha512 = "uFW0fxmYIPpB5RKP2vpL8QuafjUrCBmBWxZMIhFb7uBQky87t7x1QdpRB0vc+w11a2kok+Nc8ClD5kc6CRJCFg==";
-      };
-    };
-    "@tinyhttp/type-is-2.2.2" = {
-      name = "_at_tinyhttp_slash_type-is";
-      packageName = "@tinyhttp/type-is";
       version = "2.2.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@tinyhttp/type-is/-/type-is-2.2.2.tgz";
-        sha512 = "DmTm0MkdrUxEPI2WBBoYJT0bitWx6+xeUd3lya1NGbKmYArzyUE+KVro/9y/h6Bxh+RaAKNeTCF4H/ksbe/ULQ==";
+        url = "https://registry.npmjs.org/@tinyhttp/send/-/send-2.2.2.tgz";
+        sha512 = "TZkGy9EdGk+vwYWQnjArQftaXAUIgp/fFlgaxlpamsCZKy7o+CNJ75xty4H3SaY3ZPgN47wv8rnJ50rDRQdFFQ==";
+      };
+    };
+    "@tinyhttp/type-is-2.2.3" = {
+      name = "_at_tinyhttp_slash_type-is";
+      packageName = "@tinyhttp/type-is";
+      version = "2.2.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@tinyhttp/type-is/-/type-is-2.2.3.tgz";
+        sha512 = "RsZ4+or5xI+wrTlrd+/cLZELoJDMd1HSp+1P23VOZSu1xPAsO1XLf1FgluO8GbEW9Ll/l2yC7mO6diKzjc06HA==";
       };
     };
     "@tinyhttp/url-2.1.1" = {
@@ -10588,15 +10489,6 @@ let
         sha512 = "ec4tjL2Rr0pkZ5hww65c+EEPYwxOi4Ryv+0MtjeaSQRJyq322Q27eOQiFbuNgw2hpL4hB1/W/HBGk3VKS43osg==";
       };
     };
-    "@tufjs/canonical-json-1.0.0" = {
-      name = "_at_tufjs_slash_canonical-json";
-      packageName = "@tufjs/canonical-json";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@tufjs/canonical-json/-/canonical-json-1.0.0.tgz";
-        sha512 = "QTnf++uxunWvG2z3UFNzAoQPHxnSXOwtaI3iJ+AohhV+5vONuArPjJE7aPXPVXfXJsqrVbZBu9b81AJoSd09IQ==";
-      };
-    };
     "@tufjs/canonical-json-2.0.0" = {
       name = "_at_tufjs_slash_canonical-json";
       packageName = "@tufjs/canonical-json";
@@ -10606,15 +10498,6 @@ let
         sha512 = "yVtV8zsdo8qFHe+/3kw81dSLyF7D576A5cCFCi4X7B39tWT7SekaEFUnvnWJHz+9qO7qJTah1JbrDjWKqFtdWA==";
       };
     };
-    "@tufjs/models-1.0.4" = {
-      name = "_at_tufjs_slash_models";
-      packageName = "@tufjs/models";
-      version = "1.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@tufjs/models/-/models-1.0.4.tgz";
-        sha512 = "qaGV9ltJP0EO25YfFUPhxRVK0evXFIAGicsVXuRim4Ed9cjPxYhNnNJ49SFmbeLgtxpslIkX317IgpfcHPVj/A==";
-      };
-    };
     "@tufjs/models-2.0.1" = {
       name = "_at_tufjs_slash_models";
       packageName = "@tufjs/models";
@@ -10642,6 +10525,15 @@ let
         sha512 = "qLOvfmlG2vCVw5fo/oz8WAZYlpe5a5OurgTj3diIxJCdjRHpapC+vQCz3er9LV79Vcat+DifBjeAhOAdmndtDQ==";
       };
     };
+    "@tybys/wasm-util-0.9.0" = {
+      name = "_at_tybys_slash_wasm-util";
+      packageName = "@tybys/wasm-util";
+      version = "0.9.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.9.0.tgz";
+        sha512 = "6+7nlbMVX/PVDCwaIQ8nTOPveOcFLSt8GcXdx8hD0bt39uWxYT88uXzqTd4fTvqta7oeUJqudepapKNt2DYJFw==";
+      };
+    };
     "@types/acorn-4.0.6" = {
       name = "_at_types_slash_acorn";
       packageName = "@types/acorn";
@@ -10714,13 +10606,13 @@ let
         sha512 = "IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw==";
       };
     };
-    "@types/cli-progress-3.11.5" = {
+    "@types/cli-progress-3.11.6" = {
       name = "_at_types_slash_cli-progress";
       packageName = "@types/cli-progress";
-      version = "3.11.5";
+      version = "3.11.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/cli-progress/-/cli-progress-3.11.5.tgz";
-        sha512 = "D4PbNRbviKyppS5ivBGyFO29POlySLmA2HyUFE4p5QGazAMM3CwkKWcvTl8gvElSuxRh6FPKL8XmidX873ou4g==";
+        url = "https://registry.npmjs.org/@types/cli-progress/-/cli-progress-3.11.6.tgz";
+        sha512 = "cE3+jb9WRlu+uOSAugewNpITJDt1VF8dHOopPO4IABFc3SXYL5WE/+PTz/FCdZRRfIujiWW3n3aMbv1eIGVRWA==";
       };
     };
     "@types/commander-2.12.2" = {
@@ -10858,13 +10750,22 @@ let
         sha512 = "qJ7LIFp06h1QE1aVxbVd+zJP2wdaugYXYfd6JxsyRMrYHaxb6itXPogW2tz+ylUJ1n1b+JF1PHyYCfYHm0dvUg==";
       };
     };
-    "@types/eslint-8.56.10" = {
+    "@types/eslint-8.56.11" = {
       name = "_at_types_slash_eslint";
       packageName = "@types/eslint";
-      version = "8.56.10";
+      version = "8.56.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/eslint/-/eslint-8.56.10.tgz";
-        sha512 = "Shavhk87gCtY2fhXDctcfS3e6FdxWkCx1iUZ9eEUbh7rTqlZT0/IzOkCOVt0fCjcFuZ9FPYfuezTBImfHCDBGQ==";
+        url = "https://registry.npmjs.org/@types/eslint/-/eslint-8.56.11.tgz";
+        sha512 = "sVBpJMf7UPo/wGecYOpk2aQya2VUGeHhe38WG7/mN5FufNSubf5VT9Uh9Uyp8/eLJpu1/tuhJ/qTo4mhSB4V4Q==";
+      };
+    };
+    "@types/eslint-9.6.0" = {
+      name = "_at_types_slash_eslint";
+      packageName = "@types/eslint";
+      version = "9.6.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/eslint/-/eslint-9.6.0.tgz";
+        sha512 = "gi6WQJ7cHRgZxtkQEoyHMppPjq9Kxo5Tjn2prSKDSmZrCz8TZ3jSRCeTJm+WoM+oB0WG37bRqLzaaU3q7JypGg==";
       };
     };
     "@types/eslint-scope-3.7.7" = {
@@ -10903,13 +10804,13 @@ let
         sha512 = "ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ==";
       };
     };
-    "@types/express-serve-static-core-4.19.3" = {
+    "@types/express-serve-static-core-4.19.5" = {
       name = "_at_types_slash_express-serve-static-core";
       packageName = "@types/express-serve-static-core";
-      version = "4.19.3";
+      version = "4.19.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.19.3.tgz";
-        sha512 = "KOzM7MhcBFlmnlr/fzISFF5vGWVSvN6fTd4T+ExOt08bA/dA5kpSzY52nMsI1KDFmUREpJelPYyuslLRSjjgCg==";
+        url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.19.5.tgz";
+        sha512 = "y6W03tvrACO72aijJ5uF02FRq5cgDR9lUxddQ8vyF+GvmjJQqbzDcJngEjURc+ZsG31VI3hODNZJ2URj86pzmg==";
       };
     };
     "@types/geojson-7946.0.4" = {
@@ -11083,13 +10984,13 @@ let
         sha512 = "sVDA58zAw4eWAffKOaQH5/5j3XeayukzDk+ewSsnv3p4yJEZHCCzMDiZM8e0OUrRvmpGZ85jf4yDHkHsgBNr9Q==";
       };
     };
-    "@types/lodash-4.17.5" = {
+    "@types/lodash-4.17.7" = {
       name = "_at_types_slash_lodash";
       packageName = "@types/lodash";
-      version = "4.17.5";
+      version = "4.17.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.5.tgz";
-        sha512 = "MBIOHVZqVqgfro1euRDWX7OO0fBVUUMrN6Pwm8LQsz8cWhEpihlvR70ENj3f40j58TNxZaWv2ndSkInykNBBJw==";
+        url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.7.tgz";
+        sha512 = "8wTvZawATi/lsmNu10/j2hk1KEP0IvjubqPE3cu1Xz7xfXXt5oCq3SNUz4fMIP4XGF9Ky+Ue2tBA3hcS7LSBlA==";
       };
     };
     "@types/lru-cache-5.1.1" = {
@@ -11101,13 +11002,13 @@ let
         sha512 = "ssE3Vlrys7sdIzs5LOxCzTVMsU7i9oa/IaW92wF32JFb3CVczqOkru2xspuKczHEbG3nvmPY7IFqVmGGHdNbYw==";
       };
     };
-    "@types/markdown-it-14.1.1" = {
+    "@types/markdown-it-14.1.2" = {
       name = "_at_types_slash_markdown-it";
       packageName = "@types/markdown-it";
-      version = "14.1.1";
+      version = "14.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/markdown-it/-/markdown-it-14.1.1.tgz";
-        sha512 = "4NpsnpYl2Gt1ljyBGrKMxFYAYvpqbnnkgP/i/g+NLpjEUa3obn1XJCur9YbEXKDAkaXqsR1LbDnGEJ0MmKFxfg==";
+        url = "https://registry.npmjs.org/@types/markdown-it/-/markdown-it-14.1.2.tgz";
+        sha512 = "promo4eFwuiW+TfGxhi+0x3czqTYJkG8qB17ZUJiVF10Xm7NLVRSLUsfRTU/6h1e24VvRnXCx+hG7li58lkzog==";
       };
     };
     "@types/mdast-3.0.15" = {
@@ -11236,6 +11137,15 @@ let
         sha512 = "JkRpuVz3xCNCWaeQ5EHLR/6woMbHZz/jZ7Kmc63AkU+1HxnoUugzSWMck7dsR4DvNYX8jp9wTi9K7WvnxOIQZQ==";
       };
     };
+    "@types/node-16.18.104" = {
+      name = "_at_types_slash_node";
+      packageName = "@types/node";
+      version = "16.18.104";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/node/-/node-16.18.104.tgz";
+        sha512 = "OF3keVCbfPlkzxnnDBUZJn1RiCJzKeadjiW0xTEb0G1SUJ5gDVb3qnzZr2T4uIFvsbKJbXy1v2DN7e2zaEY7jQ==";
+      };
+    };
     "@types/node-16.18.11" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
@@ -11245,15 +11155,6 @@ let
         sha512 = "3oJbGBUWuS6ahSnEq1eN2XrCyf4YsWI8OyCvo7c64zQJNplk3mO84t53o8lfTk+2ji59g5ycfc6qQ3fdHliHuA==";
       };
     };
-    "@types/node-16.18.98" = {
-      name = "_at_types_slash_node";
-      packageName = "@types/node";
-      version = "16.18.98";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-16.18.98.tgz";
-        sha512 = "fpiC20NvLpTLAzo3oVBKIqBGR6Fx/8oAK/SSf7G+fydnXMY1x4x9RZ6sBXhqKlCU21g2QapUsbLlhv3+a7wS+Q==";
-      };
-    };
     "@types/node-16.9.1" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
@@ -11263,15 +11164,6 @@ let
         sha512 = "QpLcX9ZSsq3YYUUnD3nFDY8H7wctAhQj/TFKL8Ya8v5fMm3CFXxo8zStsLAl780ltoYoo1WvKUVGBQK+1ifr7g==";
       };
     };
-    "@types/node-18.19.30" = {
-      name = "_at_types_slash_node";
-      packageName = "@types/node";
-      version = "18.19.30";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-18.19.30.tgz";
-        sha512 = "453z1zPuJLVDbyahaa1sSD5C2sht6ZpHp5rgJNs+H8YGqhluCXcuOUmBYsAo0Tos0cHySJ3lVUGbGgLlqIkpyg==";
-      };
-    };
     "@types/node-18.19.34" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
@@ -11281,13 +11173,22 @@ let
         sha512 = "eXF4pfBNV5DAMKGbI02NnDtWrQ40hAN558/2vvS4gMpMIxaf6JmD7YjnZbq0Q9TDSSkKBamime8ewRoomHdt4g==";
       };
     };
-    "@types/node-20.14.2" = {
+    "@types/node-18.19.42" = {
       name = "_at_types_slash_node";
       packageName = "@types/node";
-      version = "20.14.2";
+      version = "18.19.42";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/node/-/node-20.14.2.tgz";
-        sha512 = "xyu6WAMVwv6AKFLB+e/7ySZVr/0zLCzOa7rSpq6jNwpqOrUbcACDWC+53d4n2QHOnDou0fbIsg8wZu/sxrnI4Q==";
+        url = "https://registry.npmjs.org/@types/node/-/node-18.19.42.tgz";
+        sha512 = "d2ZFc/3lnK2YCYhos8iaNIYu9Vfhr92nHiyJHRltXWjXUBjEE+A4I58Tdbnw4VhggSW+2j5y5gTrLs4biNnubg==";
+      };
+    };
+    "@types/node-20.14.12" = {
+      name = "_at_types_slash_node";
+      packageName = "@types/node";
+      version = "20.14.12";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/node/-/node-20.14.12.tgz";
+        sha512 = "r7wNXakLeSsGT0H1AU863vS2wa5wBOK4bWMjZz2wj+8nBx+m5PeIn0k8AloSLpRuiwdRQZwarZqHE4FNArPuJQ==";
       };
     };
     "@types/node-6.14.13" = {
@@ -11389,6 +11290,15 @@ let
         sha512 = "hti/R0pS0q1/xx+TsI73XIqk26eBsISZ2R0wUijXIngRK9R/e7Xw/cXVxQK7R5JjW+SV4zGcn5hXjudkN/pLIw==";
       };
     };
+    "@types/readable-stream-4.0.15" = {
+      name = "_at_types_slash_readable-stream";
+      packageName = "@types/readable-stream";
+      version = "4.0.15";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/@types/readable-stream/-/readable-stream-4.0.15.tgz";
+        sha512 = "oAZ3kw+kJFkEqyh7xORZOku1YAKvsFTogRY8kVl4vHpEKiDkfnSA/My8haRE7fvmix5Zyy+1pwzOi7yycGLBJw==";
+      };
+    };
     "@types/responselike-1.0.3" = {
       name = "_at_types_slash_responselike";
       packageName = "@types/responselike";
@@ -11470,13 +11380,13 @@ let
         sha512 = "W8Ym+h8nhuRwaKPaDw34QUkwsGi6Rc4yYqvKFo5rm2FUEhCFbzVWrxXUxuKK8TASjWsysJY0nsmNCGhCOIsrOw==";
       };
     };
-    "@types/shimmer-1.0.5" = {
+    "@types/shimmer-1.2.0" = {
       name = "_at_types_slash_shimmer";
       packageName = "@types/shimmer";
-      version = "1.0.5";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/shimmer/-/shimmer-1.0.5.tgz";
-        sha512 = "9Hp0ObzwwO57DpLFF0InUjUm/II8GmKAvzbefxQTihCb7KI6yc9yzf0nLc4mVdby5N4DRCgQM2wCup9KTieeww==";
+        url = "https://registry.npmjs.org/@types/shimmer/-/shimmer-1.2.0.tgz";
+        sha512 = "UE7oxhQLLd9gub6JKIAhDq06T0F6FnztwMNRvYgjeQSBeMc1ZG/tA47EwfduvkuQS8apbkM/lpLpWsaCeYsXVg==";
       };
     };
     "@types/sizzle-2.3.8" = {
@@ -11596,13 +11506,13 @@ let
         sha512 = "ltIpx+kM7g/MLRZfkbL7EsCEjfzCcScLpkg37eXEtx5kmrAKBkTJwd1GIAjDSL8wTpM6Hzn5YO4pSb91BEwu1g==";
       };
     };
-    "@types/ws-8.5.10" = {
+    "@types/ws-8.5.11" = {
       name = "_at_types_slash_ws";
       packageName = "@types/ws";
-      version = "8.5.10";
+      version = "8.5.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@types/ws/-/ws-8.5.10.tgz";
-        sha512 = "vmQSUcfalpIq0R9q7uTo2lXs6eGIpt9wtnLdMv9LVpIjCA/+ufZRozlVoVelIYixx1ugCBKDhn89vnsEGOCx9A==";
+        url = "https://registry.npmjs.org/@types/ws/-/ws-8.5.11.tgz";
+        sha512 = "4+q7P5h3SpJxaBft0Dzpbr6lmMaqh0Jr2tbhJZ/luAwvD7ohSCniYkwz/pLxuT2h0EOa6QADgJj1Ko+TzRfZ+w==";
       };
     };
     "@types/yargs-15.0.19" = {
@@ -11767,13 +11677,13 @@ let
         sha512 = "1O/biKiVhhn0EtvDF4UOvz325K4RrLupfL8rHcmqD2TBLv4qVDWQuzx4JGa1FfqjjRb+C9TNZ6w19f32Mq85Ug==";
       };
     };
-    "@vercel/build-utils-8.2.2" = {
+    "@vercel/build-utils-8.3.5" = {
       name = "_at_vercel_slash_build-utils";
       packageName = "@vercel/build-utils";
-      version = "8.2.2";
+      version = "8.3.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@vercel/build-utils/-/build-utils-8.2.2.tgz";
-        sha512 = "+Nf/Yk3GeMI47L/g5KYEvsj7yqVkhb6vZqjxavUBRVPSsgJ7fuNVfYvvpFj/Y0BYysEF8XNUxKFuwGROiop/ow==";
+        url = "https://registry.npmjs.org/@vercel/build-utils/-/build-utils-8.3.5.tgz";
+        sha512 = "lJNcA1XKMbQg6npC8grQBEVg11w8BSBr8bXUSZokYmvtNXheL/5cKGAD01Uba9x1P/ae9lJ9zDorpoSq4AWSfw==";
       };
     };
     "@vercel/error-utils-2.0.2" = {
@@ -11803,13 +11713,13 @@ let
         sha512 = "iTEA0vY6RBPuEzkwUTVzSHDATo1aF6bdLLspI68mQ/BTbi5UQEGjpjyzdKOVcSYApDtFU6M6vypZ1t4vIEnHvw==";
       };
     };
-    "@vercel/gatsby-plugin-vercel-builder-2.0.33" = {
+    "@vercel/gatsby-plugin-vercel-builder-2.0.39" = {
       name = "_at_vercel_slash_gatsby-plugin-vercel-builder";
       packageName = "@vercel/gatsby-plugin-vercel-builder";
-      version = "2.0.33";
+      version = "2.0.39";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@vercel/gatsby-plugin-vercel-builder/-/gatsby-plugin-vercel-builder-2.0.33.tgz";
-        sha512 = "fJFRZaQfaaNdun8u/QepzKVrGnTW/9pXls322la5pP5xHAbaWPTTNoFtG/odZUXiv0oNV1qVWnTI4bnqFh6Icw==";
+        url = "https://registry.npmjs.org/@vercel/gatsby-plugin-vercel-builder/-/gatsby-plugin-vercel-builder-2.0.39.tgz";
+        sha512 = "rvShSeoiUvw1JoQ5r9EJBwELmA6lZDH2agG9KCBgKowd8YQZIm7r3DddvWPJ8s2x7P4kv0eCbr5e89Z2wsiygw==";
       };
     };
     "@vercel/go-3.1.1" = {
@@ -11821,40 +11731,40 @@ let
         sha512 = "mrzomNYltxkjvtUmaYry5YEyvwTz6c/QQHE5Gr/pPGRIniUiP6T6OFOJ49RBN7e6pRXaNzHPVuidiuBhvHh5+Q==";
       };
     };
-    "@vercel/hydrogen-1.0.2" = {
+    "@vercel/hydrogen-1.0.4" = {
       name = "_at_vercel_slash_hydrogen";
       packageName = "@vercel/hydrogen";
-      version = "1.0.2";
+      version = "1.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@vercel/hydrogen/-/hydrogen-1.0.2.tgz";
-        sha512 = "/Q2MKk1GfOuZAnkE9jQexjtUQqanbY65R+xtJWd9yKIgwcfRI1hxiNH3uXyVM5AvLoY+fxxULkSuxDtUKpkJpQ==";
+        url = "https://registry.npmjs.org/@vercel/hydrogen/-/hydrogen-1.0.4.tgz";
+        sha512 = "Sc0lpmI/J6O3o2cL75k8klL7ir2gi6kYI92O5+MrR3hh4fwz/atUIL9UWsTGuFjKTm69VAoJrmn3VKf0/0SGLw==";
       };
     };
-    "@vercel/next-4.2.17" = {
+    "@vercel/next-4.3.6" = {
       name = "_at_vercel_slash_next";
       packageName = "@vercel/next";
-      version = "4.2.17";
+      version = "4.3.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@vercel/next/-/next-4.2.17.tgz";
-        sha512 = "b1ZwH/3sL4+CrrIjncZLAqjd+ts0KyVGL0HEOWU340OI3hXmQQAN+2k0MWlqm8Vu8rFGfk9VEQ9yJG/pmPx6mg==";
+        url = "https://registry.npmjs.org/@vercel/next/-/next-4.3.6.tgz";
+        sha512 = "qUHp79xX07qYtz7DGSogyWgEMrf+eu/IGV/92YnVA1xzDBogIFc8XFvMlN8QwDrsWWsR+I2eMSiGD+P8znlsaA==";
       };
     };
-    "@vercel/nft-0.27.2" = {
+    "@vercel/nft-0.27.3" = {
       name = "_at_vercel_slash_nft";
       packageName = "@vercel/nft";
-      version = "0.27.2";
+      version = "0.27.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@vercel/nft/-/nft-0.27.2.tgz";
-        sha512 = "7LeioS1yE5hwPpQfD3DdH04tuugKjo5KrJk3yK5kAI3Lh76iSsK/ezoFQfzuT08X3ZASQOd1y9ePjLNI9+TxTQ==";
+        url = "https://registry.npmjs.org/@vercel/nft/-/nft-0.27.3.tgz";
+        sha512 = "oySTdDSzUAFDXpsSLk9Q943o+/Yu/+TCFxnehpFQEf/3khi2stMpTHPVNwFdvZq/Z4Ky93lE+MGHpXCRpMkSCA==";
       };
     };
-    "@vercel/node-3.1.7" = {
+    "@vercel/node-3.2.7" = {
       name = "_at_vercel_slash_node";
       packageName = "@vercel/node";
-      version = "3.1.7";
+      version = "3.2.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@vercel/node/-/node-3.1.7.tgz";
-        sha512 = "EYSHEt0Up70cOlawkSzb5CFHyHoOMuJG9Q/hWU+4zIpnXefZSanR/oaZMd+UFoaAKDVryBz35FVV7gNo6HxX9A==";
+        url = "https://registry.npmjs.org/@vercel/node/-/node-3.2.7.tgz";
+        sha512 = "/eWXgkkjBm1Es6oRmltw5m0SLT8tnOdlSKYpQhPfpJlWVzLb8h3cWhTS+cSsnn3gZ0c6w4XSjiZBbGKQJevxoQ==";
       };
     };
     "@vercel/python-4.3.0" = {
@@ -11866,22 +11776,22 @@ let
         sha512 = "tj6ffEh+ligmQoo/ONOg7DNX0VGKJt9FyswyOIIp6lZufs5oGzHAfan4+5QzF/2INxvXobN0aMYgcbFHJ81ZKg==";
       };
     };
-    "@vercel/redwood-2.0.10" = {
+    "@vercel/redwood-2.1.3" = {
       name = "_at_vercel_slash_redwood";
       packageName = "@vercel/redwood";
-      version = "2.0.10";
+      version = "2.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@vercel/redwood/-/redwood-2.0.10.tgz";
-        sha512 = "vZmjOtiUQOdQHVIRrlPY/pSVuwn5GSuq5ihg530Rq51pYIHf0PSP/BnF6zventlG0bKe53MarxE+mmBUb0LDxw==";
+        url = "https://registry.npmjs.org/@vercel/redwood/-/redwood-2.1.3.tgz";
+        sha512 = "lpsdQSHS2hvSX29/rJNm4q38dVXKstS4MVg875KE6zyXpACwviXuet0Cadyv0E60w7f2B6Ra+nJMpwKz6oJ5xg==";
       };
     };
-    "@vercel/remix-builder-2.1.7" = {
+    "@vercel/remix-builder-2.2.1" = {
       name = "_at_vercel_slash_remix-builder";
       packageName = "@vercel/remix-builder";
-      version = "2.1.7";
+      version = "2.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@vercel/remix-builder/-/remix-builder-2.1.7.tgz";
-        sha512 = "OGd7aod8wz3uMabGGzmDtNQaSz5+8ZJOmUzhMPxqHwmkTOYntIEPCXhAsi26kf+IuDP7Zj2Md7gUAJGsq5QNSg==";
+        url = "https://registry.npmjs.org/@vercel/remix-builder/-/remix-builder-2.2.1.tgz";
+        sha512 = "3mM8XNWEo5HmPv/FT2pseGk6MIHcRcLgNHwVQxWe+CSgEXt4QcNQYtwF6v9pb4HDTt09Y1rRkSED5HXvMO38/A==";
       };
     };
     "@vercel/routing-utils-3.1.0" = {
@@ -11902,13 +11812,13 @@ let
         sha512 = "UZYwlSEEfVnfzTmgkD+kxex9/gkZGt7unOWNyWFN7V/ZnZSsGBUgv6hXLnwejdRi3EztgRQEBd1kUKlXdIeC0Q==";
       };
     };
-    "@vercel/static-build-2.5.11" = {
+    "@vercel/static-build-2.5.17" = {
       name = "_at_vercel_slash_static-build";
       packageName = "@vercel/static-build";
-      version = "2.5.11";
+      version = "2.5.17";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@vercel/static-build/-/static-build-2.5.11.tgz";
-        sha512 = "CUZInKro8CqNH4ZyNccRSfy8cF4KBklIiGOwWVjjjVQLtIGdC55iVADIHAsCmA5yEJVsjenIi+943/JcR0bw2Q==";
+        url = "https://registry.npmjs.org/@vercel/static-build/-/static-build-2.5.17.tgz";
+        sha512 = "i7fp4wCUgNvZIv06qlQFtFhZJ5WZcwOyg7KmWWhLBsyx/U+LBzUKP80lWAedqB6xmZ7zvNnruGUArzJvI+DnjA==";
       };
     };
     "@vercel/static-config-3.0.0" = {
@@ -11920,67 +11830,67 @@ let
         sha512 = "2qtvcBJ1bGY0dYGYh3iM7yGKkk971FujLEDXzuW5wcZsPr1GSEjO/w2iSr3qve6nDDtBImsGoDEnus5FI4+fIw==";
       };
     };
-    "@volar/kit-2.2.5" = {
+    "@volar/kit-2.4.0-alpha.18" = {
       name = "_at_volar_slash_kit";
       packageName = "@volar/kit";
-      version = "2.2.5";
+      version = "2.4.0-alpha.18";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@volar/kit/-/kit-2.2.5.tgz";
-        sha512 = "Bmn0UCaT43xUGGRwcmFG9lKhiCCLjRT4ScSLLPn5C9ltUcSGnIFFDlbZZa1PreHYHq25/4zkXt9Ap32klAh17w==";
+        url = "https://registry.npmjs.org/@volar/kit/-/kit-2.4.0-alpha.18.tgz";
+        sha512 = "dZMSNhesh23lhd61ax2l04IgIcYofAjm8M+5BKAmX47ROweyc8RrrslszCFUJynlmXx6JS1PoHqvo8+E0aAYQQ==";
       };
     };
-    "@volar/language-core-2.2.5" = {
+    "@volar/language-core-2.4.0-alpha.18" = {
       name = "_at_volar_slash_language-core";
       packageName = "@volar/language-core";
-      version = "2.2.5";
+      version = "2.4.0-alpha.18";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@volar/language-core/-/language-core-2.2.5.tgz";
-        sha512 = "2htyAuxRrAgETmFeUhT4XLELk3LiEcqoW/B8YUXMF6BrGWLMwIR09MFaZYvrA2UhbdAeSyeQ726HaWSWkexUcQ==";
+        url = "https://registry.npmjs.org/@volar/language-core/-/language-core-2.4.0-alpha.18.tgz";
+        sha512 = "JAYeJvYQQROmVRtSBIczaPjP3DX4QW1fOqW1Ebs0d3Y3EwSNRglz03dSv0Dm61dzd0Yx3WgTW3hndDnTQqgmyg==";
       };
     };
-    "@volar/language-server-2.2.5" = {
+    "@volar/language-server-2.4.0-alpha.18" = {
       name = "_at_volar_slash_language-server";
       packageName = "@volar/language-server";
-      version = "2.2.5";
+      version = "2.4.0-alpha.18";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@volar/language-server/-/language-server-2.2.5.tgz";
-        sha512 = "PV/jkUkI+m72HTXwnY7hsGqLY3VNi96ZRoWFRzVC9QG/853bixxjveXPJIiydMJ9I739lO3kcj3hnGrF5Sm+HA==";
+        url = "https://registry.npmjs.org/@volar/language-server/-/language-server-2.4.0-alpha.18.tgz";
+        sha512 = "dciHEE/R5kzI0bY71QfkoCVQ3cQI6g9MHfA4oIP6UhnJy0CdleUalWSygOXoD3Nq7Yk6wn2BRrb1PP5MsadY/Q==";
       };
     };
-    "@volar/language-service-2.2.5" = {
+    "@volar/language-service-2.4.0-alpha.18" = {
       name = "_at_volar_slash_language-service";
       packageName = "@volar/language-service";
-      version = "2.2.5";
+      version = "2.4.0-alpha.18";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@volar/language-service/-/language-service-2.2.5.tgz";
-        sha512 = "a97e/0uCe+uSu23F4zvgvldqJtZe6jugQeEHWjTfhgOEO8+Be0t5CZNNVItQqmPyAsD8eElg0S/cP6uxvCmCSQ==";
+        url = "https://registry.npmjs.org/@volar/language-service/-/language-service-2.4.0-alpha.18.tgz";
+        sha512 = "EuetrtbEtudi9buinWAG5U3Jam5dY27zXd/7GYnx542kBwanWOBM8i4DAQd0z7M11fOxXgybxPA933uaSyaOog==";
       };
     };
-    "@volar/snapshot-document-2.2.5" = {
+    "@volar/snapshot-document-2.4.0-alpha.18" = {
       name = "_at_volar_slash_snapshot-document";
       packageName = "@volar/snapshot-document";
-      version = "2.2.5";
+      version = "2.4.0-alpha.18";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@volar/snapshot-document/-/snapshot-document-2.2.5.tgz";
-        sha512 = "MTOvWVKxM7ugKO3Amffkv2pND03fe2JtfygYaputqjVFML7YxtTXj8SPnI2pODLeSwOKzDYL6Q8r5j6Y5AgUzQ==";
+        url = "https://registry.npmjs.org/@volar/snapshot-document/-/snapshot-document-2.4.0-alpha.18.tgz";
+        sha512 = "JAeclEly/wnILhR4Pu9MpgBLInZJH49O1zoy8fU+pk5I+zpv7JIEby5z2UFAS60+sIDnxBdAGd7rZ5VibE70vg==";
       };
     };
-    "@volar/source-map-2.2.5" = {
+    "@volar/source-map-2.4.0-alpha.18" = {
       name = "_at_volar_slash_source-map";
       packageName = "@volar/source-map";
-      version = "2.2.5";
+      version = "2.4.0-alpha.18";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@volar/source-map/-/source-map-2.2.5.tgz";
-        sha512 = "wrOEIiZNf4E+PWB0AxyM4tfhkfldPsb3bxg8N6FHrxJH2ohar7aGu48e98bp3pR9HUA7P/pR9VrLmkTrgCCnWQ==";
+        url = "https://registry.npmjs.org/@volar/source-map/-/source-map-2.4.0-alpha.18.tgz";
+        sha512 = "MTeCV9MUwwsH0sNFiZwKtFrrVZUK6p8ioZs3xFzHc2cvDXHWlYN3bChdQtwKX+FY2HG6H3CfAu1pKijolzIQ8g==";
       };
     };
-    "@volar/typescript-2.2.5" = {
+    "@volar/typescript-2.4.0-alpha.18" = {
       name = "_at_volar_slash_typescript";
       packageName = "@volar/typescript";
-      version = "2.2.5";
+      version = "2.4.0-alpha.18";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@volar/typescript/-/typescript-2.2.5.tgz";
-        sha512 = "eSV/n75+ppfEVugMC/salZsI44nXDPAyL6+iTYCNLtiLHGJsnMv9GwiDMujrvAUj/aLQyqRJgYtXRoxop2clCw==";
+        url = "https://registry.npmjs.org/@volar/typescript/-/typescript-2.4.0-alpha.18.tgz";
+        sha512 = "sXh5Y8sqGUkgxpMWUGvRXggxYHAVxg0Pa1C42lQZuPDrW6vHJPR0VCK8Sr7WJsAW530HuNQT/ZIskmXtxjybMQ==";
       };
     };
     "@vscode/emmet-helper-2.9.3" = {
@@ -11992,15 +11902,6 @@ let
         sha512 = "rB39LHWWPQYYlYfpv9qCoZOVioPCftKXXqrsyqN1mTWZM6dTnONT63Db+03vgrBbHzJN45IrgS/AGxw9iiqfEw==";
       };
     };
-    "@vscode/l10n-0.0.16" = {
-      name = "_at_vscode_slash_l10n";
-      packageName = "@vscode/l10n";
-      version = "0.0.16";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@vscode/l10n/-/l10n-0.0.16.tgz";
-        sha512 = "JT5CvrIYYCrmB+dCana8sUqJEcGB1ZDXNLMQ2+42bW995WmNoenijWMUdZfwmuQUTQcEVVIa2OecZzTYWUW9Cg==";
-      };
-    };
     "@vscode/l10n-0.0.18" = {
       name = "_at_vscode_slash_l10n";
       packageName = "@vscode/l10n";
@@ -12010,22 +11911,22 @@ let
         sha512 = "KYSIHVmslkaCDyw013pphY+d7x1qV8IZupYfeIfzNA+nsaWHbn5uPuQRvdRFsa9zFzGeudPuoGoZ1Op4jrJXIQ==";
       };
     };
-    "@vscode/test-electron-2.4.0" = {
+    "@vscode/test-electron-2.4.1" = {
       name = "_at_vscode_slash_test-electron";
       packageName = "@vscode/test-electron";
-      version = "2.4.0";
+      version = "2.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@vscode/test-electron/-/test-electron-2.4.0.tgz";
-        sha512 = "yojuDFEjohx6Jb+x949JRNtSn6Wk2FAh4MldLE3ck9cfvCqzwxF32QsNy1T9Oe4oT+ZfFcg0uPUCajJzOmPlTA==";
+        url = "https://registry.npmjs.org/@vscode/test-electron/-/test-electron-2.4.1.tgz";
+        sha512 = "Gc6EdaLANdktQ1t+zozoBVRynfIsMKMc94Svu1QreOBC8y76x4tvaK32TljrLi1LI2+PK58sDVbL7ALdqf3VRQ==";
       };
     };
-    "@vscode/vsce-2.27.0" = {
+    "@vscode/vsce-2.31.1" = {
       name = "_at_vscode_slash_vsce";
       packageName = "@vscode/vsce";
-      version = "2.27.0";
+      version = "2.31.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@vscode/vsce/-/vsce-2.27.0.tgz";
-        sha512 = "FFUMBVSyyjjJpWszwqk7d4U3YllY8FdWslbUDMRki1x4ZjA3Z0hmRMfypWrjP9sptbSR9nyPFU4uqjhy2qRB/w==";
+        url = "https://registry.npmjs.org/@vscode/vsce/-/vsce-2.31.1.tgz";
+        sha512 = "LwEQFKXV21C4/brvGPH/9+7ZOUM5cbK7oJ4fVmy0YG75NIy1HV8eMSoBZrl+u23NxpAhor62Cu1aI+JFtCtjSg==";
       };
     };
     "@vscode/vsce-sign-2.0.4" = {
@@ -12118,49 +12019,49 @@ let
         sha512 = "pAiRN6qSAhDM5SVOIxgx+2xnoVUePHbRNC7OD2aOR3WltTKxxF25OfpK8h8UQ7A0BuRkSgREbB59DBlFk4iAeg==";
       };
     };
-    "@vue/compiler-core-3.4.29" = {
+    "@vue/compiler-core-3.4.34" = {
       name = "_at_vue_slash_compiler-core";
       packageName = "@vue/compiler-core";
-      version = "3.4.29";
+      version = "3.4.34";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.4.29.tgz";
-        sha512 = "TFKiRkKKsRCKvg/jTSSKK7mYLJEQdUiUfykbG49rubC9SfDyvT2JrzTReopWlz2MxqeLyxh9UZhvxEIBgAhtrg==";
+        url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.4.34.tgz";
+        sha512 = "Z0izUf32+wAnQewjHu+pQf1yw00EGOmevl1kE+ljjjMe7oEfpQ+BI3/JNK7yMB4IrUsqLDmPecUrpj3mCP+yJQ==";
       };
     };
-    "@vue/compiler-dom-3.4.29" = {
+    "@vue/compiler-dom-3.4.34" = {
       name = "_at_vue_slash_compiler-dom";
       packageName = "@vue/compiler-dom";
-      version = "3.4.29";
+      version = "3.4.34";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.4.29.tgz";
-        sha512 = "A6+iZ2fKIEGnfPJejdB7b1FlJzgiD+Y/sxxKwJWg1EbJu6ZPgzaPQQ51ESGNv0CP6jm6Z7/pO6Ia8Ze6IKrX7w==";
+        url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.4.34.tgz";
+        sha512 = "3PUOTS1h5cskdOJMExCu2TInXuM0j60DRPpSCJDqOCupCfUZCJoyQmKtRmA8EgDNZ5kcEE7vketamRZfrEuVDw==";
       };
     };
-    "@vue/compiler-sfc-3.4.29" = {
+    "@vue/compiler-sfc-3.4.34" = {
       name = "_at_vue_slash_compiler-sfc";
       packageName = "@vue/compiler-sfc";
-      version = "3.4.29";
+      version = "3.4.34";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.4.29.tgz";
-        sha512 = "zygDcEtn8ZimDlrEQyLUovoWgKQic6aEQqRXce2WXBvSeHbEbcAsXyCk9oG33ZkyWH4sl9D3tkYc1idoOkdqZQ==";
+        url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.4.34.tgz";
+        sha512 = "x6lm0UrM03jjDXTPZgD9Ad8bIVD1ifWNit2EaWQIZB5CULr46+FbLQ5RpK7AXtDHGjx9rmvC7QRCTjsiGkAwRw==";
       };
     };
-    "@vue/compiler-ssr-3.4.29" = {
+    "@vue/compiler-ssr-3.4.34" = {
       name = "_at_vue_slash_compiler-ssr";
       packageName = "@vue/compiler-ssr";
-      version = "3.4.29";
+      version = "3.4.34";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.4.29.tgz";
-        sha512 = "rFbwCmxJ16tDp3N8XCx5xSQzjhidYjXllvEcqX/lopkoznlNPz3jyy0WGJCyhAaVQK677WWFt3YO/WUEkMMUFQ==";
+        url = "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.4.34.tgz";
+        sha512 = "8TDBcLaTrFm5rnF+Qm4BlliaopJgqJ28Nsrc80qazynm5aJO+Emu7y0RWw34L8dNnTRdcVBpWzJxhGYzsoVu4g==";
       };
     };
-    "@vue/shared-3.4.29" = {
+    "@vue/shared-3.4.34" = {
       name = "_at_vue_slash_shared";
       packageName = "@vue/shared";
-      version = "3.4.29";
+      version = "3.4.34";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@vue/shared/-/shared-3.4.29.tgz";
-        sha512 = "hQ2gAQcBO/CDpC82DCrinJNgOHI2v+FA7BDW4lMSPeBpQ7sRe2OLHWe5cph1s7D8DUQAwRt18dBDfJJ220APEA==";
+        url = "https://registry.npmjs.org/@vue/shared/-/shared-3.4.34.tgz";
+        sha512 = "x5LmiRLpRsd9KTjAB8MPKf0CDPMcuItjP0gbNqFCIgL1I8iYp4zglhj9w9FPCdIbHG2M91RVeIbArFfFTz9I3A==";
       };
     };
     "@webassemblyjs/ast-1.11.1" = {
@@ -12640,13 +12541,13 @@ let
         sha512 = "hqoz6StCW+AjV/3N+vg0s1ah82ptdVUb9nH2ttj3UbySOXUvytWw2yqy8c1cKzyRk6mDD00G47qS3fZI9/gMjg==";
       };
     };
-    "@whatwg-node/node-fetch-0.5.11" = {
+    "@whatwg-node/node-fetch-0.5.14" = {
       name = "_at_whatwg-node_slash_node-fetch";
       packageName = "@whatwg-node/node-fetch";
-      version = "0.5.11";
+      version = "0.5.14";
       src = fetchurl {
-        url = "https://registry.npmjs.org/@whatwg-node/node-fetch/-/node-fetch-0.5.11.tgz";
-        sha512 = "LS8tSomZa3YHnntpWt3PP43iFEEl6YeIsvDakczHBKlay5LdkXFr8w7v8H6akpG5nRrzydyB0k1iE2eoL6aKIQ==";
+        url = "https://registry.npmjs.org/@whatwg-node/node-fetch/-/node-fetch-0.5.14.tgz";
+        sha512 = "J/IQ0Hrb56sMPb3G42Wzrm9fu8+bHnb8lk7DkJ0XX7JCkSxvPEn1MmkLy7zntdbXs1gohYW42mDck0LzcjrMig==";
       };
     };
     "@xmldom/xmldom-0.7.13" = {
@@ -13180,22 +13081,22 @@ let
         sha512 = "nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==";
       };
     };
-    "acorn-8.12.0" = {
+    "acorn-8.11.3" = {
       name = "acorn";
       packageName = "acorn";
-      version = "8.12.0";
+      version = "8.11.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/acorn/-/acorn-8.12.0.tgz";
-        sha512 = "RTvkC4w+KNXrM39/lWCUaG0IbRkWdCv7W/IOW9oU6SawyxulvkQy5HQPVTKxEjczcUvapcrw3cFx/60VN/NRNw==";
+        url = "https://registry.npmjs.org/acorn/-/acorn-8.11.3.tgz";
+        sha512 = "Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==";
       };
     };
-    "acorn-8.8.2" = {
+    "acorn-8.12.1" = {
       name = "acorn";
       packageName = "acorn";
-      version = "8.8.2";
+      version = "8.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/acorn/-/acorn-8.8.2.tgz";
-        sha512 = "xjIYgE8HBrkpd/sJqOGNspf8uHG+NOHGOw6a/Urj8taM2EXfdNAH2oFcPeIFfsv3+kz/mJrS5VuMqbNLjCa2vw==";
+        url = "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz";
+        sha512 = "tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==";
       };
     };
     "acorn-globals-4.3.4" = {
@@ -13297,13 +13198,13 @@ let
         sha512 = "OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==";
       };
     };
-    "acorn-walk-8.2.0" = {
+    "acorn-walk-8.3.2" = {
       name = "acorn-walk";
       packageName = "acorn-walk";
-      version = "8.2.0";
+      version = "8.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz";
-        sha512 = "k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==";
+        url = "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.2.tgz";
+        sha512 = "cjkyv4OtNCIeqhHrfS81QWXoCBPExR/J62oyEqepVw8WaQeSqpW2uhuLPh1m9eWhDuOo/jUXVTlifvesOWp/4A==";
       };
     };
     "acorn-walk-8.3.3" = {
@@ -13495,6 +13396,15 @@ let
         sha512 = "PRA911Blj99jR5RMeTunVbNXMF6Lp4vZXnk5GQjcnUWUTsrXtekg/pnmFFI2u/I36Y/2bITGS30GZCXei6uNkA==";
       };
     };
+    "ajv-8.14.0" = {
+      name = "ajv";
+      packageName = "ajv";
+      version = "8.14.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ajv/-/ajv-8.14.0.tgz";
+        sha512 = "oYs1UUtO97ZO2lJ4bwnWeQW8/zvOIQLGKcvPTsWmvc2SYgBb+upuNS5NxoLaMU4h8Ju3Nbj6Cq8mD2LQoqVKFA==";
+      };
+    };
     "ajv-8.16.0" = {
       name = "ajv";
       packageName = "ajv";
@@ -13504,6 +13414,15 @@ let
         sha512 = "F0twR8U1ZU67JIEtekUcLkXkoO5mMMmgGD8sK/xUFzJ805jxHQl92hImFAqqXMyMYjSPOyUPAwHYhB72g5sTXw==";
       };
     };
+    "ajv-8.17.1" = {
+      name = "ajv";
+      packageName = "ajv";
+      version = "8.17.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz";
+        sha512 = "B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==";
+      };
+    };
     "ajv-8.6.3" = {
       name = "ajv";
       packageName = "ajv";
@@ -13630,15 +13549,6 @@ let
         sha512 = "IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w==";
       };
     };
-    "ansi-colors-4.1.1" = {
-      name = "ansi-colors";
-      packageName = "ansi-colors";
-      version = "4.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz";
-        sha512 = "JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==";
-      };
-    };
     "ansi-colors-4.1.3" = {
       name = "ansi-colors";
       packageName = "ansi-colors";
@@ -13972,13 +13882,13 @@ let
         sha512 = "JY8+kTEkjbA+kAVNWDtpfW2lqsrDALfDXuxOs74KLPu2y13fy/9WB52V4LfYVTVcW1/jYOXjTxNS2gPZIDh1iw==";
       };
     };
-    "applicationinsights-native-metrics-0.0.10" = {
+    "applicationinsights-native-metrics-0.0.11" = {
       name = "applicationinsights-native-metrics";
       packageName = "applicationinsights-native-metrics";
-      version = "0.0.10";
+      version = "0.0.11";
       src = fetchurl {
-        url = "https://registry.npmjs.org/applicationinsights-native-metrics/-/applicationinsights-native-metrics-0.0.10.tgz";
-        sha512 = "uruIWFcc/sEowcRvNz0mKMWMsPs2trSzegjCtjTqsSBk8EbnctTNMJtPdye7w46say+BwosNHRW3zYiBmY8CIg==";
+        url = "https://registry.npmjs.org/applicationinsights-native-metrics/-/applicationinsights-native-metrics-0.0.11.tgz";
+        sha512 = "NxzsyeFj5iwhSEzkHluIoNYb1DcMtlttQZjJCJ8QQroZ5H9nCDS77Y9BpfphR5tqMcfNNjuQuiRcdPhQk75QRw==";
       };
     };
     "aproba-1.2.0" = {
@@ -14440,15 +14350,6 @@ let
         sha512 = "tLkvA81vQG/XqE2mjDkGQHoOINtMHtysSnemrmoGe6PydDPMRbVugqyk4A6V/WDWEfm3l+0d8anA9r8cv/5Jaw==";
       };
     };
-    "as-table-1.0.55" = {
-      name = "as-table";
-      packageName = "as-table";
-      version = "1.0.55";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/as-table/-/as-table-1.0.55.tgz";
-        sha512 = "xvsWESUJn0JN421Xb9MQw6AsMHRCUknCe0Wjlxvjud80mU4E6hQf1A6NzQKcYNmYw62MfzEtXc+badstZP3JpQ==";
-      };
-    };
     "asap-2.0.6" = {
       name = "asap";
       packageName = "asap";
@@ -14512,13 +14413,13 @@ let
         sha512 = "zzw1uCAgLbsKwBfFc8CX78DDg+xZeBksSO3vwVIDDN5i94eOrPsSSyiVhmsSABFDM/OcpE2aagCat9dnWQLG1A==";
       };
     };
-    "assert-never-1.2.1" = {
+    "assert-never-1.3.0" = {
       name = "assert-never";
       packageName = "assert-never";
-      version = "1.2.1";
+      version = "1.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/assert-never/-/assert-never-1.2.1.tgz";
-        sha512 = "TaTivMB6pYI1kXwrFlEhLeGfOqoDNdTxjCdwRfFFkEA30Eu+k48W34nlok2EYWJfFFzqaEmichdNM7th6M5HNw==";
+        url = "https://registry.npmjs.org/assert-never/-/assert-never-1.3.0.tgz";
+        sha512 = "9Z3vxQ+berkL/JJo0dK+EY3Lp0s3NtSnP3VCLsh5HDcZPrh0M+KQRK5sWhUeyPPH+/RCxZqOxLMR+YC6vlviEQ==";
       };
     };
     "assert-plus-0.1.2" = {
@@ -14782,15 +14683,6 @@ let
         sha512 = "gpuo6xOyF4D5DE5WvyqZdPA3NGhiT6Qf07l7DCB0wwDEsLvDIbCr6j9S5aj5Ch96dLace5tXVzWBZkxU/c5ohw==";
       };
     };
-    "async-mutex-0.4.0" = {
-      name = "async-mutex";
-      packageName = "async-mutex";
-      version = "0.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/async-mutex/-/async-mutex-0.4.0.tgz";
-        sha512 = "eJFZ1YhRR8UN8eBLoNzcDPcy/jqjsg6I1AP+KvWQX80BqOSW1oJPJXDylPUEeMr2ZQvHgnQ//Lp6f3RQ1zI7HA==";
-      };
-    };
     "async-mutex-0.4.1" = {
       name = "async-mutex";
       packageName = "async-mutex";
@@ -14800,6 +14692,15 @@ let
         sha512 = "WfoBo4E/TbCX1G95XTjbWTE3X2XLG0m1Xbv2cwOtuPdyH9CZvnaA5nCt1ucjaKEgW2A5IF71hxrRhr83Je5xjA==";
       };
     };
+    "async-mutex-0.5.0" = {
+      name = "async-mutex";
+      packageName = "async-mutex";
+      version = "0.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/async-mutex/-/async-mutex-0.5.0.tgz";
+        sha512 = "1A94B18jkJ3DYq284ohPxoXbfTA5HsQ7/Mf4DEhcyLx3Bz27Rh59iScbB6EPiP+B+joue6YCxcMXSbFC1tZKwA==";
+      };
+    };
     "async-sema-3.1.1" = {
       name = "async-sema";
       packageName = "async-sema";
@@ -15007,13 +14908,13 @@ let
         sha512 = "2A8QhOMrbomlDuiLeK9XibIBzuHeRcqqNOHp0Cyp5EoJ1IFDh+XZH3A6BkXtv0K4gFGCI0Y4BM7B1wOEi0Rmgw==";
       };
     };
-    "axobject-query-4.0.0" = {
+    "axobject-query-4.1.0" = {
       name = "axobject-query";
       packageName = "axobject-query";
-      version = "4.0.0";
+      version = "4.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/axobject-query/-/axobject-query-4.0.0.tgz";
-        sha512 = "+60uv1hiVFhHZeO+Lz0RYzsVHy5Wr1ayX0mwda9KPDVLNJgZ1T9Ny7VmFbLDzxsH0D87I86vgj3gFrjTJUYznw==";
+        url = "https://registry.npmjs.org/axobject-query/-/axobject-query-4.1.0.tgz";
+        sha512 = "qIj0G9wZbMGNLjLmg1PT6v2mE9AH2zlnADJD/2tC6E00hgmhUOfEB6greHPAfLRSufHqROIUTkw6E+M3lH0PTQ==";
       };
     };
     "azure-devops-node-api-12.5.0" = {
@@ -15043,15 +14944,6 @@ let
         sha512 = "XqYMR2dfdGMW+hd0IUZ2PwK+fGeFkOxZJ0wY+JaQAHzt1Zx8LcvpiZD2NiGkEG8qx0CfkAOr5xt76d1e8vG90g==";
       };
     };
-    "babel-core-7.0.0-bridge.0" = {
-      name = "babel-core";
-      packageName = "babel-core";
-      version = "7.0.0-bridge.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/babel-core/-/babel-core-7.0.0-bridge.0.tgz";
-        sha512 = "poPX9mZH/5CSanm50Q+1toVci6pv5KSRv/5TWCwtzQS5XEwn40BcCrgIeMFWP9CKKIniKXNxoIOnOq4VVlGXhg==";
-      };
-    };
     "babel-loader-8.3.0" = {
       name = "babel-loader";
       packageName = "babel-loader";
@@ -15070,6 +14962,15 @@ let
         sha512 = "+qeGXSbHZwinZzO6R3wP+6XDKup83Pgg2B3TQt2zwfDdgC7NqT9Kd3ws7iqk53zAO/8iOIRU6VUyUzt2LDE3Eg==";
       };
     };
+    "babel-plugin-macros-3.1.0" = {
+      name = "babel-plugin-macros";
+      packageName = "babel-plugin-macros";
+      version = "3.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/babel-plugin-macros/-/babel-plugin-macros-3.1.0.tgz";
+        sha512 = "Cg7TFGpIr01vOQNODXOOaGz2NpCU5gl8x1qJFbb6hbZxR7XrcE2vtbAsTAbJ7/xwJtUuJEw8K8Zr/AE0LHlesg==";
+      };
+    };
     "babel-plugin-module-resolver-4.1.0" = {
       name = "babel-plugin-module-resolver";
       packageName = "babel-plugin-module-resolver";
@@ -15250,13 +15151,13 @@ let
         sha512 = "kwDPIFCGx0NZHog36dj+tHiwP4QMzsZ3AgMViUBKI0+V5n4U0ufTCUMhnQ04diaRI8EX/QcPfql7zlhZ7j4zgg==";
       };
     };
-    "base-x-3.0.9" = {
+    "base-x-3.0.10" = {
       name = "base-x";
       packageName = "base-x";
-      version = "3.0.9";
+      version = "3.0.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/base-x/-/base-x-3.0.9.tgz";
-        sha512 = "H7JU6iBHTal1gp56aKoaa//YUxEaAOUiydvrV/pILqIHXTtqxSkATOnDA2u+jZ/61sD+L/412+7kzXRtWukhpQ==";
+        url = "https://registry.npmjs.org/base-x/-/base-x-3.0.10.tgz";
+        sha512 = "7d0s06rR9rYaIWHkpfLIFICM/tkSVdoPC9qYAQRpxn9DdKNWNsKC0uk++akckyLq16Tx2WIinnZ6WRriAt6njQ==";
       };
     };
     "base64-arraybuffer-0.1.2" = {
@@ -15376,15 +15277,6 @@ let
         sha512 = "x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw==";
       };
     };
-    "bcrypt-5.1.0" = {
-      name = "bcrypt";
-      packageName = "bcrypt";
-      version = "5.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/bcrypt/-/bcrypt-5.1.0.tgz";
-        sha512 = "RHBS7HI5N5tEnGTmtR/pppX0mmDSBpQ4aCBsj7CEQfYXDcO74A8sIBYcJMuCsis2E81zDxeENYhv66oZwLiA+Q==";
-      };
-    };
     "bcrypt-nodejs-0.0.3" = {
       name = "bcrypt-nodejs";
       packageName = "bcrypt-nodejs";
@@ -15556,6 +15448,15 @@ let
         sha512 = "vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==";
       };
     };
+    "bin-links-4.0.4" = {
+      name = "bin-links";
+      packageName = "bin-links";
+      version = "4.0.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/bin-links/-/bin-links-4.0.4.tgz";
+        sha512 = "cMtq4W5ZsEwcutJrVId+a/tjt8GSbS+h0oNkdl6+6rBuEv8Ot33Bevj5KPm40t309zuhVic8NjpuL42QCiJWWA==";
+      };
+    };
     "binary-0.3.0" = {
       name = "binary";
       packageName = "binary";
@@ -15673,22 +15574,22 @@ let
         sha512 = "VyLcUjVMEOdSpHaCG/7odvCdLbAB1y3l9A2V6WIje24uV7FkJPrQrH/RrlFmKxP89pFVDEnE+YlHaFujlFIZsg==";
       };
     };
-    "bittorrent-protocol-4.1.12" = {
+    "bittorrent-protocol-4.1.13" = {
       name = "bittorrent-protocol";
       packageName = "bittorrent-protocol";
-      version = "4.1.12";
+      version = "4.1.13";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bittorrent-protocol/-/bittorrent-protocol-4.1.12.tgz";
-        sha512 = "peyUDP5NQaiPSau24jCpPhLfDFCCK1DUE0N5xlJSPVIkgQmsVLi62N/Lm++pUNrBenfnhf6WKQo0nyN6x5dufQ==";
+        url = "https://registry.npmjs.org/bittorrent-protocol/-/bittorrent-protocol-4.1.13.tgz";
+        sha512 = "tUF8HBy/CwexDgEiFmmgWx7RCXC02gc72ZEoFxdRnqraZBUVFN611hYLfB/zArlhFeaUErfJZOa8CWtrDeXQsA==";
       };
     };
-    "bittorrent-tracker-11.1.0" = {
+    "bittorrent-tracker-11.1.1" = {
       name = "bittorrent-tracker";
       packageName = "bittorrent-tracker";
-      version = "11.1.0";
+      version = "11.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/bittorrent-tracker/-/bittorrent-tracker-11.1.0.tgz";
-        sha512 = "WKIIy1wVxFiKro5noDldW8W4C4xCjl8gHvZcG0LWM40J6VZOf7gXdrdB2/GI55+JAgrph8NGsZUeusbyzlbiQQ==";
+        url = "https://registry.npmjs.org/bittorrent-tracker/-/bittorrent-tracker-11.1.1.tgz";
+        sha512 = "j5IMK80wWB44S/3TE+HwIRLYBmY00KvIoI/s7e37mVe5raBNPVTxXgXlOcvECMJvjhk1igta31d+JHTbM8c51A==";
       };
     };
     "bittorrent-tracker-7.7.0" = {
@@ -15700,15 +15601,6 @@ let
         sha512 = "YFgPTVRhUMncZr8tM3ige7gnViMGhKoGF23qaiISRG8xtYebTGHrMSMXsTXo6O1KbtdEI+4jzvGY1K/wdT9GUA==";
       };
     };
-    "bitwise-xor-0.0.0" = {
-      name = "bitwise-xor";
-      packageName = "bitwise-xor";
-      version = "0.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/bitwise-xor/-/bitwise-xor-0.0.0.tgz";
-        sha512 = "3eOkZMBO04dRBn7551o6+IX9Ua7V+B/IubS7sffoa/VC3jdBM4YbuD+LjUNFojY7H+gptMUdTaQgHWTce4L3kw==";
-      };
-    };
     "bl-1.2.3" = {
       name = "bl";
       packageName = "bl";
@@ -15736,13 +15628,13 @@ let
         sha512 = "tv1ZJHLfTDnXE6tMHv73YgSJaWR2AFuPwMntBe7XL/GBFHnT0CLnsHMogfk5+GzCDC5ZWarSCYaIGATZt9dNsQ==";
       };
     };
-    "blake3-wasm-2.1.5" = {
-      name = "blake3-wasm";
-      packageName = "blake3-wasm";
-      version = "2.1.5";
+    "bl-6.0.14" = {
+      name = "bl";
+      packageName = "bl";
+      version = "6.0.14";
       src = fetchurl {
-        url = "https://registry.npmjs.org/blake3-wasm/-/blake3-wasm-2.1.5.tgz";
-        sha512 = "F1+K8EbfOZE49dtoPtmxUQrpXaBIl3ICvasLh+nJta0xkz+9kF/7uet9fLnwKqhDrmj6g+6K3Tw9yQPUg2ka5g==";
+        url = "https://registry.npmjs.org/bl/-/bl-6.0.14.tgz";
+        sha512 = "TJfbvGdL7KFGxTsEbsED7avqpFdY56q9IW0/aiytyheJzxST/+Io6cx/4Qx0K2/u0BPRDs65mjaQzYvMZeNocQ==";
       };
     };
     "blob-0.0.2" = {
@@ -15898,15 +15790,6 @@ let
         sha512 = "SAAwOxgoCKMGs9uUAUFHygfLAyaniaoun6I8mFY9pRAJL9+Kec34aU+oIjDhTycub1jozEfEwx1W1IuOYxVSFw==";
       };
     };
-    "body-parser-1.20.0" = {
-      name = "body-parser";
-      packageName = "body-parser";
-      version = "1.20.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/body-parser/-/body-parser-1.20.0.tgz";
-        sha512 = "DfJ+q6EPcGKZD1QWUjSpqp+Q7bDQTsQIF4zfUAtZ6qk+H/3/QRhg9CEp39ss+/T2vw0+HaidC0ecJj/DRLIaKg==";
-      };
-    };
     "body-parser-1.20.2" = {
       name = "body-parser";
       packageName = "body-parser";
@@ -15943,15 +15826,6 @@ let
         sha512 = "JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==";
       };
     };
-    "boolean-3.2.0" = {
-      name = "boolean";
-      packageName = "boolean";
-      version = "3.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/boolean/-/boolean-3.2.0.tgz";
-        sha512 = "d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw==";
-      };
-    };
     "bower-1.8.14" = {
       name = "bower";
       packageName = "bower";
@@ -16285,13 +16159,13 @@ let
         sha512 = "Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==";
       };
     };
-    "browserslist-4.23.1" = {
+    "browserslist-4.23.2" = {
       name = "browserslist";
       packageName = "browserslist";
-      version = "4.23.1";
+      version = "4.23.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/browserslist/-/browserslist-4.23.1.tgz";
-        sha512 = "TUfofFo/KsK/bWZ9TWQ5O26tsWW4Uhmt8IYklbnUa70udB6P2wA7w7o4PY4muaEPBQaAX+CEnmmIA41NVHtPVw==";
+        url = "https://registry.npmjs.org/browserslist/-/browserslist-4.23.2.tgz";
+        sha512 = "qkqSyistMYdxAcw+CzbZwlBy8AGmS/eEWs+sEV5TnLRGDOL+C5M2EnH6tlZyg0YoAxGJAFKh61En9BR941GnHA==";
       };
     };
     "brq-0.1.10" = {
@@ -16627,15 +16501,6 @@ let
         sha512 = "uYBjakWipfaO/bXI7E8rq6kpwHRZK5cNYrUv2OzZSI/FvmdMyXJ2tG9dKcjEC5YHmHpUAwsargWIZNWdxb/bnQ==";
       };
     };
-    "builtins-5.1.0" = {
-      name = "builtins";
-      packageName = "builtins";
-      version = "5.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/builtins/-/builtins-5.1.0.tgz";
-        sha512 = "SW9lzGTLvWTP1AY8xeAMZimqDrIaSdLQUcVr9DMef51niJ022Ri87SwRRKYm4A6iHfkPaiVUu/Duw2Wc4J7kKg==";
-      };
-    };
     "bundle-name-4.1.0" = {
       name = "bundle-name";
       packageName = "bundle-name";
@@ -16762,22 +16627,13 @@ let
         sha512 = "/+Emcj9DAXxX4cwlLmRI9c166RuL3w30zp4R7Joiv2cQTtTtA+jeuCAjH3ZlGnYS3tKENSrKhAzVVP9GVyzeYQ==";
       };
     };
-    "cacache-17.1.4" = {
+    "cacache-18.0.4" = {
       name = "cacache";
       packageName = "cacache";
-      version = "17.1.4";
+      version = "18.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cacache/-/cacache-17.1.4.tgz";
-        sha512 = "/aJwG2l3ZMJ1xNAnqbMpA40of9dj/pIH3QfiuQSqjfPJF747VR0J/bHn+/KdNnHKc6XQcWt/AfRSBft82W1d2A==";
-      };
-    };
-    "cacache-18.0.3" = {
-      name = "cacache";
-      packageName = "cacache";
-      version = "18.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cacache/-/cacache-18.0.3.tgz";
-        sha512 = "qXCd4rh6I07cnDqh8V48/94Tc/WSfj+o3Gn6NZ0aZovS255bUx8O13uKxRFd2eWG0xgsco7+YItQNPaa5E85hg==";
+        url = "https://registry.npmjs.org/cacache/-/cacache-18.0.4.tgz";
+        sha512 = "B+L5iIa9mgcjLbliir2th36yEwPftrzteHYujzsx3dFP/31GCHcIeS8f5MGd80odLOjaOvSpU3EEAmRQptkxLQ==";
       };
     };
     "cache-base-1.0.1" = {
@@ -17077,13 +16933,13 @@ let
         sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==";
       };
     };
-    "caniuse-lite-1.0.30001634" = {
+    "caniuse-lite-1.0.30001643" = {
       name = "caniuse-lite";
       packageName = "caniuse-lite";
-      version = "1.0.30001634";
+      version = "1.0.30001643";
       src = fetchurl {
-        url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001634.tgz";
-        sha512 = "fbBYXQ9q3+yp1q1gBk86tOFs4pyn/yxFm5ZNP18OXJDfA3txImOY9PhfxVggZ4vRHDqoU8NrKU81eN0OtzOgRA==";
+        url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001643.tgz";
+        sha512 = "ERgWGNleEilSrHM6iUz/zJNSQTP8Mr21wDWpdgvRwcTXGAq6jMtOUPP4dqFPTdKqZ2wKTdtB+uucZ3MRpAUSmg==";
       };
     };
     "canvas-2.11.2" = {
@@ -17095,15 +16951,6 @@ let
         sha512 = "ItanGBMrmRV7Py2Z+Xhs7cT+FNt5K0vPL4p9EZ/UX/Mu7hFbkxSjKF2KVtPwX7UYWp7dRKnrTvReflgrItJbdw==";
       };
     };
-    "capnp-ts-0.7.0" = {
-      name = "capnp-ts";
-      packageName = "capnp-ts";
-      version = "0.7.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/capnp-ts/-/capnp-ts-0.7.0.tgz";
-        sha512 = "XKxXAC3HVPv7r674zP0VC3RTXz+/JKhfyw94ljvF80yynK6VkTnqE3jMuN8b3dUVmmc43TjyxjW4KTsmB3c86g==";
-      };
-    };
     "capture-stack-trace-1.0.2" = {
       name = "capture-stack-trace";
       packageName = "capture-stack-trace";
@@ -17176,13 +17023,13 @@ let
         sha512 = "eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg==";
       };
     };
-    "cdk8s-2.68.79" = {
+    "cdk8s-2.68.87" = {
       name = "cdk8s";
       packageName = "cdk8s";
-      version = "2.68.79";
+      version = "2.68.87";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cdk8s/-/cdk8s-2.68.79.tgz";
-        sha512 = "aXYFGZU6FflDDz/Ywu2PJ/FHN2mLQbdbQjmzHjKypOk8P99iUcDq3rfWAUxAQGeErQlbyPCilKFfVEa1qqrRwg==";
+        url = "https://registry.npmjs.org/cdk8s/-/cdk8s-2.68.87.tgz";
+        sha512 = "bJ+sT8q8uS+Y8qFqgZFpGZwcCQB6cx4A76iaKk+Xsh/HherhZ4x40NyATjR4BerljueC2JR0Tq9ZSahyWaZxQQ==";
       };
     };
     "cdk8s-plus-25-2.22.79" = {
@@ -17194,13 +17041,13 @@ let
         sha512 = "QSxCBAbLvDJvC3lqt7lO2x8Il84kCsrwIdfAVFxUiwh4wHQxi18ENI9JI16tEhS/2gxv1YyeUNBM1ucH6q9oJA==";
       };
     };
-    "cdktf-0.20.7" = {
+    "cdktf-0.20.8" = {
       name = "cdktf";
       packageName = "cdktf";
-      version = "0.20.7";
+      version = "0.20.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cdktf/-/cdktf-0.20.7.tgz";
-        sha512 = "7za8QQYM1G0/6JUCYY+5smwNfNfbiZVPCMD7SeX2rTYmOLaGEkHZtMvuUTEKSqsE56fKudnfVd2J2edz2CETFg==";
+        url = "https://registry.npmjs.org/cdktf/-/cdktf-0.20.8.tgz";
+        sha512 = "O4O5h0b1E6scc/tqq9EUIQGDbPmdrCQpdkPdbDtUHHzhZGtmFpIMc5MgP1SgB+EzAutnG2oUDefjCqWMnhDe9A==";
       };
     };
     "center-align-0.1.3" = {
@@ -17212,6 +17059,15 @@ let
         sha512 = "Baz3aNe2gd2LP2qk5U+sDk/m4oSuwSDcBfayTCTBoWpfIGO5XFxPmjILQII4NGiZjD6DoDI6kf7gKaxkf7s3VQ==";
       };
     };
+    "centra-2.7.0" = {
+      name = "centra";
+      packageName = "centra";
+      version = "2.7.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/centra/-/centra-2.7.0.tgz";
+        sha512 = "PbFMgMSrmgx6uxCdm57RUos9Tc3fclMvhLSATYN39XsDV29B89zZ3KA89jmY0vwSGazyU+uerqwa6t+KaodPcg==";
+      };
+    };
     "chainsaw-0.1.0" = {
       name = "chainsaw";
       packageName = "chainsaw";
@@ -17527,15 +17383,6 @@ let
         sha512 = "4QYCEWOcK3OJrxwvyyAOxFuhpvOVCYkr33LPfFNBjAD/w3sEzWsp2BUOkI4l9bHvWioAd0rc6NlHUOEaWkTeqg==";
       };
     };
-    "chokidar-3.5.3" = {
-      name = "chokidar";
-      packageName = "chokidar";
-      version = "3.5.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz";
-        sha512 = "Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==";
-      };
-    };
     "chokidar-3.6.0" = {
       name = "chokidar";
       packageName = "chokidar";
@@ -17563,6 +17410,15 @@ let
         sha512 = "bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==";
       };
     };
+    "chownr-3.0.0" = {
+      name = "chownr";
+      packageName = "chownr";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/chownr/-/chownr-3.0.0.tgz";
+        sha512 = "+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g==";
+      };
+    };
     "chroma-js-2.4.2" = {
       name = "chroma-js";
       packageName = "chroma-js";
@@ -17608,13 +17464,13 @@ let
         sha512 = "rNjApaLzuwaOTjCiT8lSDdGN1APCiqkChLMJxJPWLunPAt5fy8xgU9/jNOchV84wfIxrA0lRQB7oCT8jrn/wrQ==";
       };
     };
-    "chromium-bidi-0.5.23" = {
+    "chromium-bidi-0.6.2" = {
       name = "chromium-bidi";
       packageName = "chromium-bidi";
-      version = "0.5.23";
+      version = "0.6.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/chromium-bidi/-/chromium-bidi-0.5.23.tgz";
-        sha512 = "1o/gLU9wDqbN5nL2MtfjykjOuighGXc3/hnWueO1haiEoFgX8h5vbvcA4tgdQfjw1mkZ1OEF4x/+HVeqEX6NoA==";
+        url = "https://registry.npmjs.org/chromium-bidi/-/chromium-bidi-0.6.2.tgz";
+        sha512 = "4WVBa6ijmUTVr9cZD4eicQD8Mdy/HCX3bzEIYYpmk0glqYLoWH+LqQEvV9RpDRzoQSbY1KJHloYXbDMXMbDPhg==";
       };
     };
     "chunk-store-iterator-1.0.3" = {
@@ -17716,15 +17572,6 @@ let
         sha512 = "qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==";
       };
     };
-    "clean-css-3.4.28" = {
-      name = "clean-css";
-      packageName = "clean-css";
-      version = "3.4.28";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/clean-css/-/clean-css-3.4.28.tgz";
-        sha512 = "aTWyttSdI2mYi07kWqHi24NUU9YlELFKGOAgFzZjDN1064DMAOy2FBuoyGmkKRlXkbpXd0EVHmiVkbKhKoirTw==";
-      };
-    };
     "clean-css-4.2.4" = {
       name = "clean-css";
       packageName = "clean-css";
@@ -18229,13 +18076,13 @@ let
         sha512 = "A5C0Cyf2H8sKsHqX0tvIWRXw5/PK++3Dc0lDbsugr90nOECLLuSPahVQBG8pgmgiXgm/TzBWMqI2rWdZwHduAw==";
       };
     };
-    "cmd-shim-6.0.1" = {
+    "cmd-shim-6.0.3" = {
       name = "cmd-shim";
       packageName = "cmd-shim";
-      version = "6.0.1";
+      version = "6.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cmd-shim/-/cmd-shim-6.0.1.tgz";
-        sha512 = "S9iI9y0nKR4hwEQsVWpyxld/6kRfGepGfzff83FcaiEBpmvlbA2nnGe7Cylgrx2f/p1P5S5wpRm9oL8z1PbS3Q==";
+        url = "https://registry.npmjs.org/cmd-shim/-/cmd-shim-6.0.3.tgz";
+        sha512 = "FMabTRlc5t5zjdenF6mS0MBeFZm0XqHqeOkcskKFb/LYCcRQ5fVgLOHVc4Lq9CqABd9zhjwPjMBCJvMCziSVtA==";
       };
     };
     "cmdln-3.2.1" = {
@@ -18283,13 +18130,13 @@ let
         sha512 = "tge3BeOtehBouqo8sdrjRuQxsAWuwUxWJN1pTttZ8HpV+fe2fxmBE9lqrzzOlRIysBvgsZr7D0FdNfrwRwpK8A==";
       };
     };
-    "cockatiel-3.1.3" = {
+    "cockatiel-3.2.1" = {
       name = "cockatiel";
       packageName = "cockatiel";
-      version = "3.1.3";
+      version = "3.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cockatiel/-/cockatiel-3.1.3.tgz";
-        sha512 = "xC759TpZ69d7HhfDp8m2WkRwEUiCkxY8Ee2OQH/3H6zmy2D/5Sm+zSTbPRa+V2QyjDtpMvjOIAOVjA2gp6N1kQ==";
+        url = "https://registry.npmjs.org/cockatiel/-/cockatiel-3.2.1.tgz";
+        sha512 = "gfrHV6ZPkquExvMh9IOkKsBzNDk6sDuZ6DdBGUBkvFnTCqCxzpuq48RySgP0AnaqQkw2zynOFj9yly6T1Q2G5Q==";
       };
     };
     "code-block-writer-10.1.1" = {
@@ -18337,22 +18184,22 @@ let
         sha512 = "7qJWqItLA8/VPVlKJlFXU+NBlo/qyfs39aJcuMT/2ere32ZqvF5OSxgdM5xOfJJ7O429gg2HM47y8v9P+9wrNw==";
       };
     };
-    "codemaker-1.100.0" = {
+    "codemaker-1.101.0" = {
       name = "codemaker";
       packageName = "codemaker";
-      version = "1.100.0";
+      version = "1.101.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/codemaker/-/codemaker-1.100.0.tgz";
-        sha512 = "EVKV5v2HZf/a2nuRZJ3pMo1BImN6MX/9O22Yo1gQn+DeFbU2TqKnpCu16pTOVg4b4CakbFckeimVzQIqmFGquQ==";
+        url = "https://registry.npmjs.org/codemaker/-/codemaker-1.101.0.tgz";
+        sha512 = "bAg+N4PA8mniJrCpTYFdaFmJA+3fE1Vjgf4o1EnPc07nw6qRcJsr/D9ZZoutEsvw7UM8OmZp4qZxVzpCqRhhQQ==";
       };
     };
-    "codemaker-1.95.0" = {
+    "codemaker-1.98.0" = {
       name = "codemaker";
       packageName = "codemaker";
-      version = "1.95.0";
+      version = "1.98.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/codemaker/-/codemaker-1.95.0.tgz";
-        sha512 = "q/U2NeZSaKnVMarOi+BR8MbaHEFKVmBefTSSXj/0W4OBarw/uUT2qCPojYF16gJtfFz7qCkJeuP+zYDq+xNEpg==";
+        url = "https://registry.npmjs.org/codemaker/-/codemaker-1.98.0.tgz";
+        sha512 = "UAeICTmY7lJXf4OPnDTwKWg/DU87u67nyxuTjMON+vO8yo8C+EcPWnmmOmWtZm3wWLPsPuxyYIQxIIi/4OZ9TA==";
       };
     };
     "coffeescript-2.7.0" = {
@@ -18652,15 +18499,6 @@ let
         sha512 = "GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==";
       };
     };
-    "commander-2.8.1" = {
-      name = "commander";
-      packageName = "commander";
-      version = "2.8.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz";
-        sha512 = "+pJLBFVk+9ZZdlAOB5WuIElVPPth47hILFkmGym57aq8kwxsowvByvB0DHs1vQAhyMZzdcpTtF0VDKGkSDR4ZQ==";
-      };
-    };
     "commander-3.0.2" = {
       name = "commander";
       packageName = "commander";
@@ -18751,13 +18589,13 @@ let
         sha512 = "gGSHSON1HdpFDb3WpU6C1tdksZV0lpfzoihXK+CD0l4xQ2TvHbVuiZy8Dg414ZqbeRxt2sU8d9kC0srpM2+RzQ==";
       };
     };
-    "comment-json-4.2.3" = {
+    "comment-json-4.2.4" = {
       name = "comment-json";
       packageName = "comment-json";
-      version = "4.2.3";
+      version = "4.2.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/comment-json/-/comment-json-4.2.3.tgz";
-        sha512 = "SsxdiOf064DWoZLH799Ata6u7iV658A11PlWtZATDlXPpKGJnbJZ5Z24ybixAi+LUUqJ/GKowAejtC5GFUG7Tw==";
+        url = "https://registry.npmjs.org/comment-json/-/comment-json-4.2.4.tgz";
+        sha512 = "E5AjpSW+O+N5T2GsOQMHLLsJvrYw6G/AFt9GvU6NguEAfzKShh7hRiLtVo6S9KbRpFMGqE5ojo0/hE+sdteWvQ==";
       };
     };
     "commist-1.1.0" = {
@@ -18769,6 +18607,24 @@ let
         sha512 = "rraC8NXWOEjhADbZe9QBNzLAN5Q3fsTPQtBV+fEVj6xKIgDgNiEVE6ZNfHpZOqfQ21YUzfVNUXLOEZquYvQPPg==";
       };
     };
+    "commist-3.2.0" = {
+      name = "commist";
+      packageName = "commist";
+      version = "3.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/commist/-/commist-3.2.0.tgz";
+        sha512 = "4PIMoPniho+LqXmpS5d3NuGYncG6XWlkBSVGiWycL22dd42OYdUGil2CWuzklaJoNxyxUSpO4MKIBU94viWNAw==";
+      };
+    };
+    "common-ancestor-path-1.0.1" = {
+      name = "common-ancestor-path";
+      packageName = "common-ancestor-path";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/common-ancestor-path/-/common-ancestor-path-1.0.1.tgz";
+        sha512 = "L3sHRo1pXXEqX8VU28kfgUY+YGsk09hPqZiZmLacNib6XNTCM8ubYeT7ryXQw8asB1sKgcU5lkB7ONug08aB8w==";
+      };
+    };
     "common-tags-1.8.2" = {
       name = "common-tags";
       packageName = "common-tags";
@@ -18850,6 +18706,15 @@ let
         sha512 = "LNZQXhqUvqUTotpZ00qLSaify3b4VFD588aRr8MKFw4CMUr98ytzCW5wDH5qx/DEY5kCDXcbcRuCqL0szEf2tg==";
       };
     };
+    "compare-versions-6.1.1" = {
+      name = "compare-versions";
+      packageName = "compare-versions";
+      version = "6.1.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/compare-versions/-/compare-versions-6.1.1.tgz";
+        sha512 = "4hm4VPpIecmlg59CHXnRDnqGplJFrbLG4aFEl5vl6cK1u76ws3LLvX7ikFnTDl5vo39sjWD6AaDPYodJp/NNHg==";
+      };
+    };
     "component-bind-1.0.0" = {
       name = "component-bind";
       packageName = "component-bind";
@@ -19111,22 +18976,13 @@ let
         sha512 = "a1gSWQBQD73krFXdUEYJom2RTFrWUL3YvXDCRkyv//GVXc79cdW9MngtRuN9ih4FDKBtfJAJId+BbDuX+1rh2w==";
       };
     };
-    "connect-redis-7.1.0" = {
+    "connect-redis-7.1.1" = {
       name = "connect-redis";
       packageName = "connect-redis";
-      version = "7.1.0";
+      version = "7.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/connect-redis/-/connect-redis-7.1.0.tgz";
-        sha512 = "UaqO1EirWjON2ENsyau7N5lbkrdYBpS6mYlXSeff/OYXsd6EGZ+SXSmNPoljL2PSua8fgjAEaldSA73PMZQ9Eg==";
-      };
-    };
-    "consola-3.2.3" = {
-      name = "consola";
-      packageName = "consola";
-      version = "3.2.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/consola/-/consola-3.2.3.tgz";
-        sha512 = "I5qxpzLv+sJhTVEoLYNcTW+bThDCPsit0vLNKShZx6rLtpilNpmmeTPaeqJb9ZE9dV3DGaeby6Vuhrw38WjeyQ==";
+        url = "https://registry.npmjs.org/connect-redis/-/connect-redis-7.1.1.tgz";
+        sha512 = "M+z7alnCJiuzKa8/1qAYdGUXHYfDnLolOGAUjOioB07pP39qxjG+X9ibsud7qUBc4jMV5Mcy3ugGv8eFcgamJQ==";
       };
     };
     "console-browserify-1.1.0" = {
@@ -19174,15 +19030,6 @@ let
         sha512 = "xFxOwqIzR/e1k1gLiWEophSCMqXcwVHIH7akf7b/vxcUeGunlj3hvZaaqxwHsTgn+IndtkQJgSztIDWeumWJDQ==";
       };
     };
-    "constructs-10.1.167" = {
-      name = "constructs";
-      packageName = "constructs";
-      version = "10.1.167";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/constructs/-/constructs-10.1.167.tgz";
-        sha512 = "zGt88EmcJUtWbd/sTM9GKcHRjYWzEx5jzMYuK69vl25Dj01sJAc7uF6AEJgZBtlLAc3VnRUvzgitHwmJkS9BFw==";
-      };
-    };
     "constructs-10.3.0" = {
       name = "constructs";
       packageName = "constructs";
@@ -19571,15 +19418,6 @@ let
         sha512 = "aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==";
       };
     };
-    "cookie-0.5.0" = {
-      name = "cookie";
-      packageName = "cookie";
-      version = "0.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz";
-        sha512 = "YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==";
-      };
-    };
     "cookie-0.6.0" = {
       name = "cookie";
       packageName = "cookie";
@@ -19607,13 +19445,13 @@ let
         sha512 = "QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==";
       };
     };
-    "cookie-signature-1.2.1" = {
+    "cookie-signature-1.0.7" = {
       name = "cookie-signature";
       packageName = "cookie-signature";
-      version = "1.2.1";
+      version = "1.0.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.2.1.tgz";
-        sha512 = "78KWk9T26NhzXtuL26cIJ8/qNHANyJ/ZYrmEXFzUmhZdjpBv+DlWlOANRTGBt48YcyslsLrj0bMLFTmXvLRCOw==";
+        url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.7.tgz";
+        sha512 = "NXdYc3dLr47pBkpUCHtKSwIOQXLVn8dZEuywboCOJY/osA0wFSLlSawr3KN8qXJEyX66FcONTH8EIlVuK0yyFA==";
       };
     };
     "cookiejar-2.1.4" = {
@@ -19724,15 +19562,6 @@ let
         sha512 = "s9whTXInMSgAp/NVXVNuVxVKzGH2qck3aQlVHxDCdAEPgtMKwc4Wq6/QKhgdEdgbLSi9rBTAcPoRa6JpiG4ksg==";
       };
     };
-    "cose-base-2.2.0" = {
-      name = "cose-base";
-      packageName = "cose-base";
-      version = "2.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cose-base/-/cose-base-2.2.0.tgz";
-        sha512 = "AzlgcsCbUMymkADOJtQm3wO9S3ltPfYOFD5033keQn9NJzIbtnZj+UdBJe7DYml/8TdbtHJW3j58SOnKhWY/5g==";
-      };
-    };
     "cosmiconfig-6.0.0" = {
       name = "cosmiconfig";
       packageName = "cosmiconfig";
@@ -19931,22 +19760,22 @@ let
         sha512 = "dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==";
       };
     };
-    "create-torrent-6.0.17" = {
+    "create-torrent-6.0.18" = {
       name = "create-torrent";
       packageName = "create-torrent";
-      version = "6.0.17";
+      version = "6.0.18";
       src = fetchurl {
-        url = "https://registry.npmjs.org/create-torrent/-/create-torrent-6.0.17.tgz";
-        sha512 = "GGrNP1mu3WSyJHyo+x6AnJlQWW7bbyUfoEDFfo/U2kpeTVYRCgWdQC4/sq4oreltpMTEP8UUB3U3niHIgLU/gQ==";
+        url = "https://registry.npmjs.org/create-torrent/-/create-torrent-6.0.18.tgz";
+        sha512 = "rN1y6A0pnM/ijMcUfbcmAGFGjegtc76TpVsleOWLxxm6hkjbx2q2F0zN4u3LDweAzd6hM6sQySNgFEGZA1geCQ==";
       };
     };
-    "cron-parser-3.5.0" = {
+    "cron-parser-4.9.0" = {
       name = "cron-parser";
       packageName = "cron-parser";
-      version = "3.5.0";
+      version = "4.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cron-parser/-/cron-parser-3.5.0.tgz";
-        sha512 = "wyVZtbRs6qDfFd8ap457w3XVntdvqcwBGxBoTvJQH9KGVKL/fB+h2k3C8AqiVxvUQKN1Ps/Ns46CNViOpVDhfQ==";
+        url = "https://registry.npmjs.org/cron-parser/-/cron-parser-4.9.0.tgz";
+        sha512 = "p0SaNjrHOnQeR8/VnfGbmg9te2kfyYSQ7Sc/j/6DtPL3JQvKxmjO9TSjNFpujqV3vEYYBvNNvXSxzyksBWAx1Q==";
       };
     };
     "cronosjs-1.7.1" = {
@@ -20093,13 +19922,13 @@ let
         sha512 = "x8dy3RnvYdlUcPOjkEHqozhiwzKNSq7GcPuXFbnyMOCHxX8V3OgIg/pYuabl2sbUPfIJaeAQB7PMOK8DFIdoRA==";
       };
     };
-    "cspell-config-lib-8.8.4" = {
+    "cspell-config-lib-8.12.1" = {
       name = "cspell-config-lib";
       packageName = "cspell-config-lib";
-      version = "8.8.4";
+      version = "8.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cspell-config-lib/-/cspell-config-lib-8.8.4.tgz";
-        sha512 = "Xf+aL669Cm+MYZTZULVWRQXB7sRWx9qs0hPrgqxeaWabLUISK57/qwcI24TPVdYakUCoud9Nv+woGi5FcqV5ZQ==";
+        url = "https://registry.npmjs.org/cspell-config-lib/-/cspell-config-lib-8.12.1.tgz";
+        sha512 = "xEoKdb8hyturyiUXFdRgQotYegYe3OZS+Yc7JHnB75Ykt+Co2gtnu2M/Yb0yoqaHCXflVO6MITrKNaxricgqVw==";
       };
     };
     "cspell-dict-vimlang-1.0.1" = {
@@ -20111,22 +19940,22 @@ let
         sha512 = "pP2W2BvLrRKggS1fUk8qQw2FG8PhyV969dlwF3M0jAg/HH83n76H+KGdzGsmEut6VJFlJYQkd1ZZskjaeVWnrA==";
       };
     };
-    "cspell-dictionary-8.8.4" = {
+    "cspell-dictionary-8.12.1" = {
       name = "cspell-dictionary";
       packageName = "cspell-dictionary";
-      version = "8.8.4";
+      version = "8.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cspell-dictionary/-/cspell-dictionary-8.8.4.tgz";
-        sha512 = "eDi61MDDZycS5EASz5FiYKJykLEyBT0mCvkYEUCsGVoqw8T9gWuWybwwqde3CMq9TOwns5pxGcFs2v9RYgtN5A==";
+        url = "https://registry.npmjs.org/cspell-dictionary/-/cspell-dictionary-8.12.1.tgz";
+        sha512 = "jYHEA48on6pBQYVUEzXV63wy5Ulx/QNUZcoiG3C0OmYIKjACTaEg02AMDOr+Eaj34E5v4pGEShzot4Qtt/aiNQ==";
       };
     };
-    "cspell-gitignore-8.8.4" = {
+    "cspell-gitignore-8.12.1" = {
       name = "cspell-gitignore";
       packageName = "cspell-gitignore";
-      version = "8.8.4";
+      version = "8.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cspell-gitignore/-/cspell-gitignore-8.8.4.tgz";
-        sha512 = "rLdxpBh0kp0scwqNBZaWVnxEVmSK3UWyVSZmyEL4jmmjusHYM9IggfedOhO4EfGCIdQ32j21TevE0tTslyc4iA==";
+        url = "https://registry.npmjs.org/cspell-gitignore/-/cspell-gitignore-8.12.1.tgz";
+        sha512 = "XlO87rdrab3VKU8e7+RGEfqEtYqo7ObgfZeYEAdJlwUXvqYxBzA11jDZAovDz/5jv0YfRMx6ch5t6+1zfSeBbQ==";
       };
     };
     "cspell-glob-0.1.25" = {
@@ -20138,22 +19967,22 @@ let
         sha512 = "/XaSHrGBpMJa+duFz3GKOWfrijrfdHT7a/XGgIcq3cymCSpOH+DPho42sl0jLI/hjM+8yv2m8aEoxRT8yVSnlg==";
       };
     };
-    "cspell-glob-8.8.4" = {
+    "cspell-glob-8.12.1" = {
       name = "cspell-glob";
       packageName = "cspell-glob";
-      version = "8.8.4";
+      version = "8.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cspell-glob/-/cspell-glob-8.8.4.tgz";
-        sha512 = "+tRrOfTSbF/44uNl4idMZVPNfNM6WTmra4ZL44nx23iw1ikNhqZ+m0PC1oCVSlURNBEn8faFXjC/oT2BfgxoUQ==";
+        url = "https://registry.npmjs.org/cspell-glob/-/cspell-glob-8.12.1.tgz";
+        sha512 = "ZplEPLlNwj7luEKu/VudIaV+cGTQHExihGvAUxlIVMFURiAFMT5eH0UsQoCEpSevIEueO+slLUDy7rxwTwAGdQ==";
       };
     };
-    "cspell-grammar-8.8.4" = {
+    "cspell-grammar-8.12.1" = {
       name = "cspell-grammar";
       packageName = "cspell-grammar";
-      version = "8.8.4";
+      version = "8.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cspell-grammar/-/cspell-grammar-8.8.4.tgz";
-        sha512 = "UxDO517iW6vs/8l4OhLpdMR7Bp+tkquvtld1gWz8WYQiDwORyf0v5a3nMh4ILYZGoolOSnDuI9UjWOLI6L/vvQ==";
+        url = "https://registry.npmjs.org/cspell-grammar/-/cspell-grammar-8.12.1.tgz";
+        sha512 = "IAES553M5nuB/wtiWYayDX2/5OmDu2VmEcnV6SXNze8oop0oodSqr3h46rLy+m1EOOD8nenMa295N/dRPqTB/g==";
       };
     };
     "cspell-io-4.1.7" = {
@@ -20165,13 +19994,13 @@ let
         sha512 = "V0/tUu9FnIS3v+vAvDT6NNa14Nc/zUNX8+YUUOfFAiDJJTdqefmvcWjOJBIMYBf3wIk9iWLmLbMM+bNHqr7DSQ==";
       };
     };
-    "cspell-io-8.8.4" = {
+    "cspell-io-8.12.1" = {
       name = "cspell-io";
       packageName = "cspell-io";
-      version = "8.8.4";
+      version = "8.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cspell-io/-/cspell-io-8.8.4.tgz";
-        sha512 = "aqB/QMx+xns46QSyPEqi05uguCSxvqRnh2S/ZOhhjPlKma/7hK9niPRcwKwJXJEtNzdiZZkkC1uZt9aJe/7FTA==";
+        url = "https://registry.npmjs.org/cspell-io/-/cspell-io-8.12.1.tgz";
+        sha512 = "uPjYQP/OKmA8B1XbJunUTBingtrb6IKkp7enyljsZEbtPRKSudP16QPacgyZLLb5rCVQXyexebGfQ182jmq7dg==";
       };
     };
     "cspell-lib-4.3.12" = {
@@ -20183,13 +20012,13 @@ let
         sha512 = "yCCb6MoW1K8Tsr/WVEQoO4dfYhH9bCsjQayccb8MlyDaNNuWJHuX+gUGHsZSXSuChSh8PrTWKXJzs13/uM977g==";
       };
     };
-    "cspell-lib-8.8.4" = {
+    "cspell-lib-8.12.1" = {
       name = "cspell-lib";
       packageName = "cspell-lib";
-      version = "8.8.4";
+      version = "8.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cspell-lib/-/cspell-lib-8.8.4.tgz";
-        sha512 = "hK8gYtdQ9Lh86c8cEHITt5SaoJbfvXoY/wtpR4k393YR+eAxKziyv8ihQyFE/Z/FwuqtNvDrSntP9NLwTivd3g==";
+        url = "https://registry.npmjs.org/cspell-lib/-/cspell-lib-8.12.1.tgz";
+        sha512 = "z2aZXnrip76zbH0j0ibTGux3mA71TMHtoEAd+n66so7Tx3QydUDAI0u7tzfbP3JyqL9ZWPlclQAfbutMUuzMBQ==";
       };
     };
     "cspell-trie-lib-4.2.8" = {
@@ -20201,13 +20030,13 @@ let
         sha512 = "Nt3c0gxOYXIc3/yhALDukpje1BgR6guvlUKWQO2zb0r7qRWpwUw2j2YM4dWbHQeH/3Hx5ei4Braa6cMaiJ5YBw==";
       };
     };
-    "cspell-trie-lib-8.8.4" = {
+    "cspell-trie-lib-8.12.1" = {
       name = "cspell-trie-lib";
       packageName = "cspell-trie-lib";
-      version = "8.8.4";
+      version = "8.12.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cspell-trie-lib/-/cspell-trie-lib-8.8.4.tgz";
-        sha512 = "yCld4ZL+pFa5DL+Arfvmkv3cCQUOfdRlxElOzdkRZqWyO6h/UmO8xZb21ixVYHiqhJGZmwc3BG9Xuw4go+RLig==";
+        url = "https://registry.npmjs.org/cspell-trie-lib/-/cspell-trie-lib-8.12.1.tgz";
+        sha512 = "a9QmGGUhparM9v184YsB+D0lSdzVgWDlLFEBjVLQJyvp43HErZjvcTPUojUypNQUEjxvksX0/C4pO5Wq8YUD8w==";
       };
     };
     "cspell-util-bundle-4.1.11" = {
@@ -20381,13 +20210,13 @@ let
         sha512 = "j+BKgDcLDQA+eDifLx0EO4XSA56b7uut3BQFH+wbSaSTuGLuiyTa/wbRYthUXX8LC9mLg+WWKe8h+qJuwTAbHw==";
       };
     };
-    "cssnano-7.0.2" = {
+    "cssnano-7.0.4" = {
       name = "cssnano";
       packageName = "cssnano";
-      version = "7.0.2";
+      version = "7.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cssnano/-/cssnano-7.0.2.tgz";
-        sha512 = "LXm/Xx6TNLzfHM2lBaIQHfvtdW5QfdbyLzfJAWZrclCAb47yVa0/yJG69+amcw3Lq0YZ+kyU40rbsMPLcMt9aw==";
+        url = "https://registry.npmjs.org/cssnano/-/cssnano-7.0.4.tgz";
+        sha512 = "rQgpZra72iFjiheNreXn77q1haS2GEy69zCMbu4cpXCFPMQF+D4Ik5V7ktMzUF/sA7xCIgcqHwGPnCD+0a1vHg==";
       };
     };
     "cssnano-preset-default-5.2.14" = {
@@ -20399,13 +20228,13 @@ let
         sha512 = "t0SFesj/ZV2OTylqQVOrFgEh5uanxbO6ZAdeCrNsUQ6fVuXwYTxJPNAGvGTxHbD68ldIJNec7PyYZDBrfDQ+6A==";
       };
     };
-    "cssnano-preset-default-7.0.2" = {
+    "cssnano-preset-default-7.0.4" = {
       name = "cssnano-preset-default";
       packageName = "cssnano-preset-default";
-      version = "7.0.2";
+      version = "7.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-7.0.2.tgz";
-        sha512 = "z95kGKZx8VWHfERj7LFzuiTxylbvEp07ZEYaFu+t6bFyNOXLd/+3oPyNaY7ISwcrfHFCkt8OfRo4IZxVRJZ7dg==";
+        url = "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-7.0.4.tgz";
+        sha512 = "jQ6zY9GAomQX7/YNLibMEsRZguqMUGuupXcEk2zZ+p3GUxwCAsobqPYE62VrJ9qZ0l9ltrv2rgjwZPBIFIjYtw==";
       };
     };
     "cssnano-utils-3.1.0" = {
@@ -20633,13 +20462,13 @@ let
         sha512 = "w8a8nQk9YSCkMmH2wDbFqpH1XMz7l409mSvWnnG6Iu6D0Ydhvq61XASE7QIaA46FxfG2Ag524ZuGgAy2cXPfsw==";
       };
     };
-    "cytoscape-3.29.2" = {
+    "cytoscape-3.30.1" = {
       name = "cytoscape";
       packageName = "cytoscape";
-      version = "3.29.2";
+      version = "3.30.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/cytoscape/-/cytoscape-3.29.2.tgz";
-        sha512 = "2G1ycU28Nh7OHT9rkXRLpCDP30MKH1dXJORZuBhtEhEW7pKwgPi77ImqlCWinouyE1PNepIOGZBOrE84DG7LyQ==";
+        url = "https://registry.npmjs.org/cytoscape/-/cytoscape-3.30.1.tgz";
+        sha512 = "TRJc3HbBPkHd50u9YfJh2FxD1lDLZ+JXnJoyBn5LkncoeuT7fapO/Hq/Ed8TdFclaKshzInge2i30bg7VKeoPQ==";
       };
     };
     "cytoscape-cose-bilkent-4.1.0" = {
@@ -20651,15 +20480,6 @@ let
         sha512 = "wgQlVIUJF13Quxiv5e1gstZ08rnZj2XaLHGoFMYXz7SkNfCDOOteKBE6SYRfA9WxxI/iBc3ajfDoc6hb/MRAHQ==";
       };
     };
-    "cytoscape-fcose-2.2.0" = {
-      name = "cytoscape-fcose";
-      packageName = "cytoscape-fcose";
-      version = "2.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cytoscape-fcose/-/cytoscape-fcose-2.2.0.tgz";
-        sha512 = "ki1/VuRIHFCzxWNrsshHYPs6L7TvLu3DL+TyIGEsRcvVERmxokbf5Gdk7mFxZnTdiGtnA4cfSmjZJMviqSuZrQ==";
-      };
-    };
     "d-1.0.2" = {
       name = "d";
       packageName = "d";
@@ -21074,15 +20894,6 @@ let
         sha512 = "NxuWFXR3+HJULO6F6VprWnUQbx0MXgfEuOfz3m+pw8LYZV06SHRjcaBVvVlwH132xJq12mljySVDLcbMcFM7EA==";
       };
     };
-    "data-uri-to-buffer-2.0.2" = {
-      name = "data-uri-to-buffer";
-      packageName = "data-uri-to-buffer";
-      version = "2.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-2.0.2.tgz";
-        sha512 = "ND9qDTLc6diwj+Xe5cdAgVTbLVdXbtxTJRXRhli8Mowuaan+0EJOtdqJ0QCHNSSPyoXGx9HX2/VMnKeC34AChA==";
-      };
-    };
     "data-uri-to-buffer-4.0.1" = {
       name = "data-uri-to-buffer";
       packageName = "data-uri-to-buffer";
@@ -21119,13 +20930,13 @@ let
         sha512 = "X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==";
       };
     };
-    "data-urls-4.0.0" = {
+    "data-urls-5.0.0" = {
       name = "data-urls";
       packageName = "data-urls";
-      version = "4.0.0";
+      version = "5.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/data-urls/-/data-urls-4.0.0.tgz";
-        sha512 = "/mMTei/JXPqvFqQtfyTowxmJVwr2PVAeCcDxyFf6LhoOu/09TX2OX3kb2wzi4DMXcfj4OItwDOnhl5oziPnT6g==";
+        url = "https://registry.npmjs.org/data-urls/-/data-urls-5.0.0.tgz";
+        sha512 = "ZYP5VBHshaDAiVZxjbRVcFJpc+4xGgT0bK3vzy1HLN8jTO975HEbuYzZJcHoQEY5K1a0z8YayJkyVETa08eNTg==";
       };
     };
     "data-view-buffer-1.0.1" = {
@@ -21245,13 +21056,13 @@ let
         sha512 = "2P0p0pFGzHS5EMnhdxQi7aJN+iMheud0UhG4dlE1DLAlvL8JHjJJTX/CSm4JXwV0Ka5nGk3zC5mcb5bUQUxxMA==";
       };
     };
-    "dayjs-1.11.11" = {
+    "dayjs-1.11.12" = {
       name = "dayjs";
       packageName = "dayjs";
-      version = "1.11.11";
+      version = "1.11.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dayjs/-/dayjs-1.11.11.tgz";
-        sha512 = "okzr3f11N6WuqYtZSvm+F776mB41wRZMhKP+hc34YdW+KmtYYK9iqvHSwo2k9FEH3fhGXvOPV6yz2IcSrfRUDg==";
+        url = "https://registry.npmjs.org/dayjs/-/dayjs-1.11.12.tgz";
+        sha512 = "Rt2g+nTbLlDWZTwwrIXjy9MeiZmSDI375FvZs72ngxx8PDC6YXOeR3q5LAuPzjZQxhiWdRKac7RKV+YyQYfYIg==";
       };
     };
     "deasync-0.1.20" = {
@@ -21362,15 +21173,6 @@ let
         sha512 = "mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==";
       };
     };
-    "debug-4.3.4" = {
-      name = "debug";
-      packageName = "debug";
-      version = "4.3.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz";
-        sha512 = "PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==";
-      };
-    };
     "debug-4.3.5" = {
       name = "debug";
       packageName = "debug";
@@ -21560,6 +21362,15 @@ let
         sha512 = "Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==";
       };
     };
+    "dedent-1.5.3" = {
+      name = "dedent";
+      packageName = "dedent";
+      version = "1.5.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/dedent/-/dedent-1.5.3.tgz";
+        sha512 = "NHQtfOOW68WD8lgypbLA5oT+Bt0xXJhiYvoR6SmmNXZfpzOGXwdKWmcwG8N7PwVVWV3eF/68nmD9BaJSsTBhyQ==";
+      };
+    };
     "dedent-js-1.0.1" = {
       name = "dedent-js";
       packageName = "dedent-js";
@@ -21776,15 +21587,6 @@ let
         sha512 = "hsBd2qSVCRE+5PmNdHt1uzyrFu5d3RwmFDKzyNZMFq/EwDNJF7Ee5+D5oEKF0hU6LhtoUF1macFvOe4AskQC1Q==";
       };
     };
-    "defu-6.1.4" = {
-      name = "defu";
-      packageName = "defu";
-      version = "6.1.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/defu/-/defu-6.1.4.tgz";
-        sha512 = "mEQCMmwJu317oSz8CwdIOdwf3xMif1ttiM8LTufzc3g6kR+9Pe236twL8j3IYT1F7GfRgGcW6MWxzZjLIkuHIg==";
-      };
-    };
     "degenerator-5.0.1" = {
       name = "degenerator";
       packageName = "degenerator";
@@ -22037,13 +21839,13 @@ let
         sha512 = "T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==";
       };
     };
-    "detect-port-1.5.1" = {
+    "detect-port-1.6.1" = {
       name = "detect-port";
       packageName = "detect-port";
-      version = "1.5.1";
+      version = "1.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/detect-port/-/detect-port-1.5.1.tgz";
-        sha512 = "aBzdj76lueB6uUst5iAs7+0H/oOjqI5D16XUWxlWMIMROhcM0rfsNVk93zTngq1dDNpoXRr++Sus7ETAExppAQ==";
+        url = "https://registry.npmjs.org/detect-port/-/detect-port-1.6.1.tgz";
+        sha512 = "CmnVc+Hek2egPx1PeTFVta2W78xy2K/9Rkf6cC4T59S50tVnzKj+tnx5mmx5lwvCkujZ4uRrpRSuV+IVs3f90Q==";
       };
     };
     "detective-5.2.1" = {
@@ -22073,13 +21875,13 @@ let
         sha512 = "RWmIqhcFf1lRYBvNmr7qTNuyCt/7/ns2jbpp1+PalgE/rDQcBT0fioSMUpJ93irlUhC5hrg4cYqe6U+0ImW0rA==";
       };
     };
-    "devtools-protocol-0.0.1299070" = {
+    "devtools-protocol-0.0.1312386" = {
       name = "devtools-protocol";
       packageName = "devtools-protocol";
-      version = "0.0.1299070";
+      version = "0.0.1312386";
       src = fetchurl {
-        url = "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1299070.tgz";
-        sha512 = "+qtL3eX50qsJ7c+qVyagqi7AWMoQCBGNfoyJZMwm/NSXVqLYbuitrWEEIzxfUmTNy7//Xe8yhMmQ+elj3uAqSg==";
+        url = "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.1312386.tgz";
+        sha512 = "DPnhUXvmvKT2dFA/j7B+riVLUt9Q6RKJlcppojL5CoRywJJKLDYnRlw0gTFKfgDPHP5E04UoB71SxoJlVZy8FA==";
       };
     };
     "dezalgo-1.0.4" = {
@@ -22154,15 +21956,6 @@ let
         sha512 = "58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==";
       };
     };
-    "diff-5.0.0" = {
-      name = "diff";
-      packageName = "diff";
-      version = "5.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz";
-        sha512 = "/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==";
-      };
-    };
     "diff-5.1.0" = {
       name = "diff";
       packageName = "diff";
@@ -22523,15 +22316,6 @@ let
         sha512 = "yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==";
       };
     };
-    "domexception-4.0.0" = {
-      name = "domexception";
-      packageName = "domexception";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/domexception/-/domexception-4.0.0.tgz";
-        sha512 = "A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw==";
-      };
-    };
     "domhandler-2.2.1" = {
       name = "domhandler";
       packageName = "domhandler";
@@ -22586,13 +22370,13 @@ let
         sha512 = "3VdM/SXBZX2omc9JF9nOPCtDaYQ67BGp5CoLpIQlO2KCAPETs8TcDHacF26jXadGbvUteZzRTeos2fhID5+ucQ==";
       };
     };
-    "dompurify-3.1.5" = {
+    "dompurify-3.1.6" = {
       name = "dompurify";
       packageName = "dompurify";
-      version = "3.1.5";
+      version = "3.1.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dompurify/-/dompurify-3.1.5.tgz";
-        sha512 = "lwG+n5h8QNpxtyrJW/gJWckL+1/DQiYMX8f7t8Z2AZTPw1esVrqjI63i7Zc2Gz0aKzLVMYC1V1PL/ky+aY/NgA==";
+        url = "https://registry.npmjs.org/dompurify/-/dompurify-3.1.6.tgz";
+        sha512 = "cTOAhc36AalkjtBpfG6O8JimdTMWNXjiePT2xQH/ppBGi/4uIpmj8eKyIkMJErXWARyINV/sB38yf8JCLF5pbQ==";
       };
     };
     "domutils-1.4.3" = {
@@ -22721,15 +22505,6 @@ let
         sha512 = "IPzF4w4/Rd94bA9imS68tZBaYyBWSCE47V1RGuMrB94iyTOIEwRmVL2x/4An+6mETpLrKJ5hQkB8W4kFAadeIQ==";
       };
     };
-    "dotenv-16.3.2" = {
-      name = "dotenv";
-      packageName = "dotenv";
-      version = "16.3.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/dotenv/-/dotenv-16.3.2.tgz";
-        sha512 = "HTlk5nmhkm8F6JcdXvHIzaorzCoziNQT9mGxLPVXW8wJF1TiGSL60ZGB4gHWabHOaMmWmhvk2/lPHfnBiT78AQ==";
-      };
-    };
     "dotenv-16.4.5" = {
       name = "dotenv";
       packageName = "dotenv";
@@ -22757,13 +22532,13 @@ let
         sha512 = "IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g==";
       };
     };
-    "dotenv-expand-10.0.0" = {
+    "dotenv-expand-11.0.6" = {
       name = "dotenv-expand";
       packageName = "dotenv-expand";
-      version = "10.0.0";
+      version = "11.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-10.0.0.tgz";
-        sha512 = "GopVGCpVS1UKH75VKHGuQFqS1Gusej0z4FyQkPdwjil2gNIv+LNsqBlboOzpJFZKVT95GkCyWJbBSdFEFUWI2A==";
+        url = "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-11.0.6.tgz";
+        sha512 = "8NHi73otpWsZGBSZwwknTXS5pqMOrk9+Ssrna8xCaxkzEpU9OTf9R5ArQGVw03//Zmk9MOwLPng9WwndvpAJ5g==";
       };
     };
     "dotenv-expand-5.1.0" = {
@@ -23009,13 +22784,13 @@ let
         sha512 = "UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==";
       };
     };
-    "electron-to-chromium-1.4.802" = {
+    "electron-to-chromium-1.5.1" = {
       name = "electron-to-chromium";
       packageName = "electron-to-chromium";
-      version = "1.4.802";
+      version = "1.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.802.tgz";
-        sha512 = "TnTMUATbgNdPXVSHsxvNVSG0uEd6cSZsANjm8c9HbvflZVVn1yTRcmVXYT1Ma95/ssB/Dcd30AHweH2TE+dNpA==";
+        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.1.tgz";
+        sha512 = "FKbOCOQ5QRB3VlIbl1LZQefWIYwszlBloaXcY2rbfpu9ioJnNh3TK03YtIDKDo3WKBi8u+YV4+Fn2CkEozgf4w==";
       };
     };
     "elegant-spinner-1.0.1" = {
@@ -23036,22 +22811,22 @@ let
         sha512 = "wkgGT6kugeQk/P6VZ/f4T+4HB41BVgNBq5CDIZVbQ02nvTVqAiVTbskxxu3eA/X96lMlfYOwnLQpN2v5E1zDEg==";
       };
     };
-    "elkjs-0.8.2" = {
+    "elkjs-0.9.3" = {
       name = "elkjs";
       packageName = "elkjs";
-      version = "0.8.2";
+      version = "0.9.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/elkjs/-/elkjs-0.8.2.tgz";
-        sha512 = "L6uRgvZTH+4OF5NE/MBbzQx/WYpru1xCBE9respNj6qznEewGUIfhzmm7horWWxbNO2M0WckQypGctR8lH79xQ==";
+        url = "https://registry.npmjs.org/elkjs/-/elkjs-0.9.3.tgz";
+        sha512 = "f/ZeWvW/BCXbhGEf1Ujp29EASo/lk1FDnETgNKwJrsVvGZhUWCZyg3xLJjAsxfOmt8KjswHmI5EwCQcPMpOYhQ==";
       };
     };
-    "elliptic-6.5.5" = {
+    "elliptic-6.5.6" = {
       name = "elliptic";
       packageName = "elliptic";
-      version = "6.5.5";
+      version = "6.5.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/elliptic/-/elliptic-6.5.5.tgz";
-        sha512 = "7EjbcmUm17NQFu4Pmgmq2olYMj8nwMnpcddByChSUjArp8F5DQWcIcpriwO4ZToLNAJig0yiyjswfyGNje/ixw==";
+        url = "https://registry.npmjs.org/elliptic/-/elliptic-6.5.6.tgz";
+        sha512 = "mpzdtpeCLuS3BmE3pO3Cpp5bbjlOPY2Q0PgoF+Od1XZrHLYI28Xe3ossCmYCQt11FQKEYd9+PF8jymTvtWJSHQ==";
       };
     };
     "emitter-http://github.com/component/emitter/archive/1.0.1.tar.gz" = {
@@ -23244,13 +23019,13 @@ let
         sha512 = "b4Q85dFkGw+TqgytGPrGgACRUhsdKc9S9ErRAXpPGy/CXKs4tYoHDkvIRdsseAF7NjfVwjRFIn6KTnbw7LwJZg==";
       };
     };
-    "engine.io-3.6.1" = {
+    "engine.io-3.6.2" = {
       name = "engine.io";
       packageName = "engine.io";
-      version = "3.6.1";
+      version = "3.6.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/engine.io/-/engine.io-3.6.1.tgz";
-        sha512 = "dfs8EVg/i7QjFsXxn7cCRQ+Wai1G1TlEvHhdYEi80fxn5R1vZ2K661O6v/rezj1FP234SZ14r9CmJke99iYDGg==";
+        url = "https://registry.npmjs.org/engine.io/-/engine.io-3.6.2.tgz";
+        sha512 = "C4JjGQZLY3kWlIDx0BQNKizbrfpb7NahxDztGdN5jrPK2ghmXiNDN+E/t0JzDeNRZxPVaszxEng42Pmj27X/0w==";
       };
     };
     "engine.io-6.4.2" = {
@@ -23262,13 +23037,13 @@ let
         sha512 = "FKn/3oMiJjrOEOeUub2WCox6JhxBXq/Zn3fZOMCBxKnNYtsdKjxhl7yR3fZhM9PV+rdE75SU5SYMc+2PGzo+Tg==";
       };
     };
-    "engine.io-6.5.4" = {
+    "engine.io-6.5.5" = {
       name = "engine.io";
       packageName = "engine.io";
-      version = "6.5.4";
+      version = "6.5.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/engine.io/-/engine.io-6.5.4.tgz";
-        sha512 = "KdVSDKhVKyOi+r5uEabrDLZw2qXStVvCsEB/LN3mw4WFi6Gx50jTyuxYVCwAAC0U46FdnzP/ScKRBTXb/NiEOg==";
+        url = "https://registry.npmjs.org/engine.io/-/engine.io-6.5.5.tgz";
+        sha512 = "C5Pn8Wk+1vKBoHghJODM63yk8MvrO9EWZUfkAt5HAqIgPE4/8FF0PEGHXtEd40l223+cE5ABWuPzm38PHFXfMA==";
       };
     };
     "engine.io-client-1.3.1" = {
@@ -23289,22 +23064,22 @@ let
         sha512 = "iU4CRr38Fecj8HoZEnFtm2EiKGbYZcPn3cHxqNGl/tmdWRf60KhK+9vE0JeSjgnlS/0oynEfLgKbT9ALpim0sQ==";
       };
     };
-    "engine.io-client-3.5.3" = {
+    "engine.io-client-3.5.4" = {
       name = "engine.io-client";
       packageName = "engine.io-client";
-      version = "3.5.3";
+      version = "3.5.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.5.3.tgz";
-        sha512 = "qsgyc/CEhJ6cgMUwxRRtOndGVhIu5hpL5tR4umSpmX/MvkFoIxUTM7oFMDQumHNzlNLwSVy6qhstFPoWTf7dOw==";
+        url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.5.4.tgz";
+        sha512 = "ydc8uuMMDxC5KCKNJN3zZKYJk2sgyTuTZQ7Aj1DJSsLKAcizA/PzWivw8fZMIjJVBo2CJOYzntv4FSjY/Lr//g==";
       };
     };
-    "engine.io-client-6.5.3" = {
+    "engine.io-client-6.5.4" = {
       name = "engine.io-client";
       packageName = "engine.io-client";
-      version = "6.5.3";
+      version = "6.5.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-6.5.3.tgz";
-        sha512 = "9Z0qLB0NIisTRt1DZ/8U2k12RJn8yls/nXMZLn+/N8hANT3TcYjKFKcwbw5zFQiN4NTde3TSY9zb79e1ij6j9Q==";
+        url = "https://registry.npmjs.org/engine.io-client/-/engine.io-client-6.5.4.tgz";
+        sha512 = "GeZeeRjpD2qf49cZQ0Wvh/8NJNfeXkXXcoGh+F77oEAgo9gUHwT1fCRxSNU+YEEaysOJTnsFHmM5oAcPy4ntvQ==";
       };
     };
     "engine.io-parser-1.0.6" = {
@@ -23334,13 +23109,13 @@ let
         sha512 = "P+jDFbvK6lE3n1OL+q9KuzdOFWkkZ/cMV9gol/SbVfpyqfvrfrFTOFJ6fQm2VC3PZHlU3QPhVwmbsCnauHF2MQ==";
       };
     };
-    "engine.io-parser-5.2.2" = {
+    "engine.io-parser-5.2.3" = {
       name = "engine.io-parser";
       packageName = "engine.io-parser";
-      version = "5.2.2";
+      version = "5.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.2.2.tgz";
-        sha512 = "RcyUFKA93/CXH20l4SoVvzZfrSDMOTUS3bWVpTt2FuFP+XYrL8i8oonHP7WInRyVHXh0n/ORtoeiE1os+8qkSw==";
+        url = "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.2.3.tgz";
+        sha512 = "HqD3yTBfnBxIrbnM1DoD6Pcq8NECnh8d4As1Qgh0z5Gg3jRRIqijury0CL3ghu/edArpUYiYqQiDUQBIs4np3Q==";
       };
     };
     "enhanced-resolve-2.3.0" = {
@@ -23352,13 +23127,13 @@ let
         sha512 = "n6e4bsCpzsP0OB76X+vEWhySUQI8GHPVFVK+3QkX35tbryy2WoeGeK5kQ+oxzgDVHjIZyz5fyS60Mi3EpQLc0Q==";
       };
     };
-    "enhanced-resolve-5.17.0" = {
+    "enhanced-resolve-5.17.1" = {
       name = "enhanced-resolve";
       packageName = "enhanced-resolve";
-      version = "5.17.0";
+      version = "5.17.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.17.0.tgz";
-        sha512 = "dwDPwZL0dmye8Txp2gzFmA6sxALaSvdRDjPH0viLcKrtlOL3tw62nWWweVD1SdILDTJrbrL6tdWVN58Wo6U3eA==";
+        url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz";
+        sha512 = "LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==";
       };
     };
     "enquirer-2.3.6" = {
@@ -23505,15 +23280,6 @@ let
         sha512 = "cvcaMr7KqXVh4nyzGTVqTum+gAiL265x5jUWQIDLq//zOGbW+gSW/C+OWLleY/rs9Qole6AZLMXPbtIFQbqu+Q==";
       };
     };
-    "envinfo-7.8.1" = {
-      name = "envinfo";
-      packageName = "envinfo";
-      version = "7.8.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/envinfo/-/envinfo-7.8.1.tgz";
-        sha512 = "/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw==";
-      };
-    };
     "environment-1.1.0" = {
       name = "environment";
       packageName = "environment";
@@ -23649,13 +23415,13 @@ let
         sha512 = "cXLGjP0c4T3flZJKQSuziYoq7MlT+rnvfZjfp7h+I7K9BNX54kP9nyWvdbwjQ4u1iWbOL4u96fgeZLToQlZC7w==";
       };
     };
-    "es-module-lexer-1.5.3" = {
+    "es-module-lexer-1.5.4" = {
       name = "es-module-lexer";
       packageName = "es-module-lexer";
-      version = "1.5.3";
+      version = "1.5.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.5.3.tgz";
-        sha512 = "i1gCgmR9dCl6Vil6UKPI/trA69s08g/syhiDK9TG0Nf1RJjjFI+AzoWW7sPufzkgYAn861skuCwJa0pIIHYxvg==";
+        url = "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.5.4.tgz";
+        sha512 = "MVNK56NiMrOwitFB7cqDwq0CQutbw+0BvLshJSse0MUNU+y1FC3bUS/AQg7oUng+/wKrrki7JfmwtVHkVfPLlw==";
       };
     };
     "es-object-atoms-1.0.0" = {
@@ -23685,15 +23451,6 @@ let
         sha512 = "QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==";
       };
     };
-    "es-vary-0.1.2" = {
-      name = "es-vary";
-      packageName = "es-vary";
-      version = "0.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/es-vary/-/es-vary-0.1.2.tgz";
-        sha512 = "pLqqZoOutAXQXyBJrUYVNM5fZngiOJYi1Xl4svQMrluTsqDUOQlBMw9EYgLrsWL6niDYn/Yd1y2Pj6GC+j/yjA==";
-      };
-    };
     "es5-ext-0.10.64" = {
       name = "es5-ext";
       packageName = "es5-ext";
@@ -23703,15 +23460,6 @@ let
         sha512 = "p2snDhiLaXe6dahss1LddxqEm+SkuDvV8dnIQG0MWjyHpcMNfXKPE+/Cc0y+PhxJX3A4xGNeFCj5oc0BUh6deg==";
       };
     };
-    "es6-error-4.1.1" = {
-      name = "es6-error";
-      packageName = "es6-error";
-      version = "4.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz";
-        sha512 = "Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==";
-      };
-    };
     "es6-iterator-2.0.3" = {
       name = "es6-iterator";
       packageName = "es6-iterator";
@@ -23757,15 +23505,6 @@ let
         sha512 = "HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==";
       };
     };
-    "es6-promise-pool-2.5.0" = {
-      name = "es6-promise-pool";
-      packageName = "es6-promise-pool";
-      version = "2.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/es6-promise-pool/-/es6-promise-pool-2.5.0.tgz";
-        sha512 = "VHErXfzR/6r/+yyzPKeBvO0lgjfC5cbDCQWjWwMZWSb6YU39TGIl51OUmCfWCq4ylMdJSB8zkz2vIuIeIxXApA==";
-      };
-    };
     "es6-promisify-5.0.0" = {
       name = "es6-promisify";
       packageName = "es6-promisify";
@@ -23811,15 +23550,6 @@ let
         sha512 = "wI4ZiIfFxpkuxB8ju4MHrGwGLyp1+awEHAHVpx6w7a+1pmYIq8T9FGEVVwFo0iFierDoMj++Xq69GXWYn2EiwA==";
       };
     };
-    "esbuild-0.17.19" = {
-      name = "esbuild";
-      packageName = "esbuild";
-      version = "0.17.19";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/esbuild/-/esbuild-0.17.19.tgz";
-        sha512 = "XQ0jAPFkK/u3LcVRcvVHQcTIqD6E2H1fvZMA5dQPSOWb3suUbWbfbRf94pjc0bNzRYLfIrDRQXr7X+LHIm5oHw==";
-      };
-    };
     "esbuild-0.19.12" = {
       name = "esbuild";
       packageName = "esbuild";
@@ -24180,13 +23910,13 @@ let
         sha512 = "dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==";
       };
     };
-    "eslint-9.5.0" = {
+    "eslint-9.7.0" = {
       name = "eslint";
       packageName = "eslint";
-      version = "9.5.0";
+      version = "9.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/eslint/-/eslint-9.5.0.tgz";
-        sha512 = "+NAOZFrW/jFTS3dASCGBxX1pkFD0/fsO+hfAkJ4TyYKwgsXZbqzrw+seCYFCcPCYXvnD67tAnglU7GQTz6kcVw==";
+        url = "https://registry.npmjs.org/eslint/-/eslint-9.7.0.tgz";
+        sha512 = "FzJ9D/0nGiCGBf8UXO/IGLTgLVzIxze1zpfA8Ton2mjLovXdAPlYDv+MQDcqj3TmrhAGYfOpz9RfR+ent0AgAw==";
       };
     };
     "eslint-config-prettier-8.10.0" = {
@@ -24216,13 +23946,13 @@ let
         sha512 = "oVNDqzBC9h3GO+NTgWeLMhhGigy6/bQaQbHS+0z7C4YEu/qK/yxHvca/2PTZtGNPsCrHwOTgKMrwu02A9iPBmw==";
       };
     };
-    "eslint-plugin-vue-9.26.0" = {
+    "eslint-plugin-vue-9.27.0" = {
       name = "eslint-plugin-vue";
       packageName = "eslint-plugin-vue";
-      version = "9.26.0";
+      version = "9.27.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-9.26.0.tgz";
-        sha512 = "eTvlxXgd4ijE1cdur850G6KalZqk65k1JKoOI2d1kT3hr8sPD07j1q98FRFdNnpxBELGPWxZmInxeHGF/GxtqQ==";
+        url = "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-9.27.0.tgz";
+        sha512 = "5Dw3yxEyuBSXTzT5/Ge1X5kIkRTQ3nvBn/VwPwInNiZBSJOO/timWMUaflONnFBzU6NhB68lxnCda7ULV5N7LA==";
       };
     };
     "eslint-rule-docs-1.1.235" = {
@@ -24252,13 +23982,13 @@ let
         sha512 = "dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==";
       };
     };
-    "eslint-scope-8.0.1" = {
+    "eslint-scope-8.0.2" = {
       name = "eslint-scope";
       packageName = "eslint-scope";
-      version = "8.0.1";
+      version = "8.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.0.1.tgz";
-        sha512 = "pL8XjgP4ZOmmwfFE8mEhSxA7ZY4C+LWyqjQ3o4yWkkmD0qcMT9kkW3zWHOczhWcjTSgqycYAgwSlXvZltv65og==";
+        url = "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.0.2.tgz";
+        sha512 = "6E4xmrTw5wtxnLA5wYL3WDfhZ/1bUBGOXV0zQvVRDOtrR8D0p6W7fs3JweNYhwRYeGvd/1CKX2se0/2s7Q/nJA==";
       };
     };
     "eslint-utils-2.1.0" = {
@@ -24324,13 +24054,13 @@ let
         sha512 = "kTUIGKQ/mDPFoJ0oVfcmyJn4iBDRptjNVIzwIFR7tqWXdVI9xfA2RMwY/gbSpJG3lkdWNEjLap/NqVHZiJsdfg==";
       };
     };
-    "espree-10.0.1" = {
+    "espree-10.1.0" = {
       name = "espree";
       packageName = "espree";
-      version = "10.0.1";
+      version = "10.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/espree/-/espree-10.0.1.tgz";
-        sha512 = "MWkrWZbJsL2UwnjxTX3gG8FneachS/Mwg7tdGXce011sJd5b0JG54vat5KHnfSBODZ3Wvzd2WnjxyzsRoVv+ww==";
+        url = "https://registry.npmjs.org/espree/-/espree-10.1.0.tgz";
+        sha512 = "M1M6CpiE6ffoigIOWYO9UDP8TMUw9kqb21tf+08IgDYjCsOvCuDt4jQcZmoYxx+w7zlKw9/N0KXfto+I8/FrXA==";
       };
     };
     "espree-3.5.4" = {
@@ -24387,13 +24117,13 @@ let
         sha512 = "eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==";
       };
     };
-    "esquery-1.5.0" = {
+    "esquery-1.6.0" = {
       name = "esquery";
       packageName = "esquery";
-      version = "1.5.0";
+      version = "1.6.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz";
-        sha512 = "YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==";
+        url = "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz";
+        sha512 = "ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==";
       };
     };
     "esrap-1.2.2" = {
@@ -24450,15 +24180,6 @@ let
         sha512 = "xbgqcrkIVbIG+lI/gzbvd9SGTJL4zqJKBFttUl5pP27KhAjtMKbX/mQXJ7qgyXpMgVy/zvpm0xoQQaGL8OloOw==";
       };
     };
-    "estree-walker-0.6.1" = {
-      name = "estree-walker";
-      packageName = "estree-walker";
-      version = "0.6.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/estree-walker/-/estree-walker-0.6.1.tgz";
-        sha512 = "SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w==";
-      };
-    };
     "estree-walker-2.0.2" = {
       name = "estree-walker";
       packageName = "estree-walker";
@@ -24513,13 +24234,13 @@ let
         sha512 = "J1gDRkLpuGNvWYzWslBQR9cDV4nd4kfvVTE/Wy4Kkm4yb3EYRSlyi0eB/inTsSTTVyA0+HyzHgbr95Fn/Z1fSw==";
       };
     };
-    "ethereum-cryptography-2.2.0" = {
+    "ethereum-cryptography-2.2.1" = {
       name = "ethereum-cryptography";
       packageName = "ethereum-cryptography";
-      version = "2.2.0";
+      version = "2.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ethereum-cryptography/-/ethereum-cryptography-2.2.0.tgz";
-        sha512 = "hsm9JhfytIf8QME/3B7j4bc8V+VdTU+Vas1aJlvIS96ffoNAosudXvGoEvWmc7QZYdkC8mrMJz9r0fcbw7GyCA==";
+        url = "https://registry.npmjs.org/ethereum-cryptography/-/ethereum-cryptography-2.2.1.tgz";
+        sha512 = "r/W8lkHSiTLxUxW8Rf3u4HGB0xQweG2RyETjywylKZSzLWoWAijRz8WCuOtJ6wah+avllXBqZuk29HCCvhEIRg==";
       };
     };
     "ethjs-unit-0.1.6" = {
@@ -24711,15 +24432,6 @@ let
         sha512 = "kJJfVbI/lZE1PZYDI5VPxp8zXPO9rtxOkhpZ0jMKha56AI9y2gGVC6bkukStQf0ka5Rh15BA5m7cCCH4jmHqkw==";
       };
     };
-    "execa-3.4.0" = {
-      name = "execa";
-      packageName = "execa";
-      version = "3.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/execa/-/execa-3.4.0.tgz";
-        sha512 = "r9vdGQk4bmCuK1yKQu1KTwcT2zwfWdbdaXfCtAh+5nU/4fSX+JAb7vZGvI5naJrQlvONrEB20jeruESI69530g==";
-      };
-    };
     "execa-5.0.0" = {
       name = "execa";
       packageName = "execa";
@@ -24756,13 +24468,13 @@ let
         sha512 = "VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg==";
       };
     };
-    "execa-9.2.0" = {
+    "execa-9.3.0" = {
       name = "execa";
       packageName = "execa";
-      version = "9.2.0";
+      version = "9.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/execa/-/execa-9.2.0.tgz";
-        sha512 = "vpOyYg7UAVKLAWWtRS2gAdgkT7oJbCn0me3gmUmxZih4kd3MF/oo8kNTBTIbkO3yuuF5uB4ZCZfn8BOolITYhg==";
+        url = "https://registry.npmjs.org/execa/-/execa-9.3.0.tgz";
+        sha512 = "l6JFbqnHEadBoVAVpN5dl2yCyfX28WoBAGaoQcNmLLSedOxTxcn2Qa83s8I/PA5i56vWru2OHOtrwF7Om2vqlg==";
       };
     };
     "execall-2.0.0" = {
@@ -24801,15 +24513,6 @@ let
         sha512 = "MsG3prOVw1WtLXAZbM3KiYtooKR1LvxHh3VHsVtIy0uiUu8usxgB/94DP2HxtD/661lLdB6yzQ09lGJSQr6nkg==";
       };
     };
-    "exit-hook-2.2.1" = {
-      name = "exit-hook";
-      packageName = "exit-hook";
-      version = "2.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/exit-hook/-/exit-hook-2.2.1.tgz";
-        sha512 = "eNTPlAD67BmP31LDINZ3U7HSF8l57TxOY2PmBJ1shpCvpnxBF93mWCE8YHBnXs8qiUZJc9WDcWIeC3a2HIAMfw==";
-      };
-    };
     "exit-hook-4.0.0" = {
       name = "exit-hook";
       packageName = "exit-hook";
@@ -25062,31 +24765,22 @@ let
         sha512 = "fCbcJv8ZwabDg0M/3PmHUxfr/WKHGMpAicR9TfGdhANV4M1GBDSrBTenHIK3aegyRN5S6eDwlvyNFiLynnc19w==";
       };
     };
-    "express-prom-bundle-6.5.0" = {
+    "express-prom-bundle-7.0.0" = {
       name = "express-prom-bundle";
       packageName = "express-prom-bundle";
-      version = "6.5.0";
+      version = "7.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/express-prom-bundle/-/express-prom-bundle-6.5.0.tgz";
-        sha512 = "paFAm0FK7TV1Ln6Blh9edDt2mJ4Pk6Py/fjhZDMcoMHENYryBjCpnXDXuCu8NE1kkvp58IrPcAAkNeNqdvZnnw==";
+        url = "https://registry.npmjs.org/express-prom-bundle/-/express-prom-bundle-7.0.0.tgz";
+        sha512 = "VwVaCyGBGHkHdecpTqRdW1Jm2fXK8weCUKjGjNWorc9g4M+cZ3xoj+N9uQzfRWfIPXJG5QOaiAziOIalQzMwgA==";
       };
     };
-    "express-request-id-1.4.1" = {
-      name = "express-request-id";
-      packageName = "express-request-id";
-      version = "1.4.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/express-request-id/-/express-request-id-1.4.1.tgz";
-        sha512 = "qpxK6XhDYtdx9FvxwCHkUeZVWtkGbWR87hBAzGECfwYF/QQCPXEwwB2/9NGkOR1tT7/aLs9mma3CT0vjSzuZVw==";
-      };
-    };
-    "express-session-1.17.3" = {
+    "express-session-1.18.0" = {
       name = "express-session";
       packageName = "express-session";
-      version = "1.17.3";
+      version = "1.18.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/express-session/-/express-session-1.17.3.tgz";
-        sha512 = "4+otWXlShYlG1Ma+2Jnn+xgKUZTMJ5QD3YvfilX3AcocOAbIkVylSWEklzALe/+Pu4qV6TYBj5GwOBFfdKqLBw==";
+        url = "https://registry.npmjs.org/express-session/-/express-session-1.18.0.tgz";
+        sha512 = "m93QLWr0ju+rOwApSsyso838LQwgfs44QtOP/WBiwtAgPIo/SAh1a5c6nn2BR6mFNZehTpqKDESzP+fRHVbxwQ==";
       };
     };
     "express-validator-6.15.0" = {
@@ -25440,6 +25134,24 @@ let
         sha512 = "VhXlQgj9ioXCqGstD37E/HBeqEGV/qOD/kmbVG8h5xKBYvM1L3lR1Zn4555cQ8GkYbJa8aJSipLPndE1k6zK2w==";
       };
     };
+    "fast-unique-numbers-8.0.13" = {
+      name = "fast-unique-numbers";
+      packageName = "fast-unique-numbers";
+      version = "8.0.13";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fast-unique-numbers/-/fast-unique-numbers-8.0.13.tgz";
+        sha512 = "7OnTFAVPefgw2eBJ1xj2PGGR9FwYzSUso9decayHgCDX4sJkHLdcsYTytTg+tYv+wKF3U8gJuSBz2jJpQV4u/g==";
+      };
+    };
+    "fast-uri-3.0.1" = {
+      name = "fast-uri";
+      packageName = "fast-uri";
+      version = "3.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.1.tgz";
+        sha512 = "MWipKbbYiYI0UC7cl8m/i/IWTqfC8YXsqjzybjddLsFjStroQzsHXkc73JutMvBiXmOvapk+axIl79ig5t55Bw==";
+      };
+    };
     "fast-url-parser-1.1.3" = {
       name = "fast-url-parser";
       packageName = "fast-url-parser";
@@ -25701,6 +25413,15 @@ let
         sha512 = "XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==";
       };
     };
+    "file-entry-cache-9.0.0" = {
+      name = "file-entry-cache";
+      packageName = "file-entry-cache";
+      version = "9.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-9.0.0.tgz";
+        sha512 = "6MgEugi8p2tiUhqO7GnPsmbCCzj0YRCwwaTbpGRyKZesjRSzkqkAE9fPp7V2yMs5hwfgbQLgdvSSkGNg1s5Uvw==";
+      };
+    };
     "file-or-stdin-1.0.2" = {
       name = "file-or-stdin";
       packageName = "file-or-stdin";
@@ -26169,6 +25890,15 @@ let
         sha512 = "f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==";
       };
     };
+    "flat-cache-5.0.0" = {
+      name = "flat-cache";
+      packageName = "flat-cache";
+      version = "5.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/flat-cache/-/flat-cache-5.0.0.tgz";
+        sha512 = "JrqFmyUl2PnPi1OvLyTVHnQvwQ0S+e6lGSwu8OkAZlSaNIZciTY2H/cOOROxsBA1m/LZNHDsqAgDZt6akWcjsQ==";
+      };
+    };
     "flatiron-0.4.3" = {
       name = "flatiron";
       packageName = "flatiron";
@@ -26232,15 +25962,6 @@ let
         sha512 = "GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw==";
       };
     };
-    "follow-redirects-1.15.5" = {
-      name = "follow-redirects";
-      packageName = "follow-redirects";
-      version = "1.15.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.5.tgz";
-        sha512 = "vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw==";
-      };
-    };
     "follow-redirects-1.15.6" = {
       name = "follow-redirects";
       packageName = "follow-redirects";
@@ -26340,13 +26061,13 @@ let
         sha512 = "J+ler7Ta54FwwNcx6wQRDhTIbNeyDcARMkOcguEqnEdtm0jKvN3Li3PDAb2Du3ubJYEWfYL83XMROXdsXAXycw==";
       };
     };
-    "foreground-child-3.2.0" = {
+    "foreground-child-3.2.1" = {
       name = "foreground-child";
       packageName = "foreground-child";
-      version = "3.2.0";
+      version = "3.2.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/foreground-child/-/foreground-child-3.2.0.tgz";
-        sha512 = "CrWQNaEl1/6WeZoarcM9LHupTo3RpZO2Pdk1vktwzPiQTsJnAKJmm3TACKeG5UZbWDfaH2AbvYxzP96y0MT7fA==";
+        url = "https://registry.npmjs.org/foreground-child/-/foreground-child-3.2.1.tgz";
+        sha512 = "PXUUyLqrR2XCWICfv6ukppP96sdFwWbNEnfEMt7jNsISjMsvaLNinAHNDYyvkyU+SZG2BTSbT5NjG+vZslfGTA==";
       };
     };
     "forever-agent-0.6.1" = {
@@ -26475,13 +26196,13 @@ let
         sha512 = "buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==";
       };
     };
-    "fp-ts-2.16.6" = {
+    "fp-ts-2.16.8" = {
       name = "fp-ts";
       packageName = "fp-ts";
-      version = "2.16.6";
+      version = "2.16.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/fp-ts/-/fp-ts-2.16.6.tgz";
-        sha512 = "v7w209VPj4L6pPn/ftFRJu31Oa8QagwcVw7BZmLCUWU4AQoc954rX9ogSIahDf67Pg+GjPbkW/Kn9XWnlWJG0g==";
+        url = "https://registry.npmjs.org/fp-ts/-/fp-ts-2.16.8.tgz";
+        sha512 = "nmDtNqmMZkOxu0M5hkrS9YA15/KPkYkILb6Axg9XBAoUoYEtzg+LFmVWqZrl9FNttsW0qIUpx9RCA9INbv+Bxw==";
       };
     };
     "fragment-cache-0.2.1" = {
@@ -26799,15 +26520,6 @@ let
         sha512 = "xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==";
       };
     };
-    "fsevents-2.3.3" = {
-      name = "fsevents";
-      packageName = "fsevents";
-      version = "2.3.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz";
-        sha512 = "5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==";
-      };
-    };
     "fstream-1.0.12" = {
       name = "fstream";
       packageName = "fstream";
@@ -26988,15 +26700,6 @@ let
         sha512 = "H7cUpwCQSiJmAHM4c/aFu6fUfrhWXW1ncyh8ftxEPMu6AiYkHw9K8br720TGPZJbk5eOH2bynjZD1yPvdDAmag==";
       };
     };
-    "generic-pool-3.9.0" = {
-      name = "generic-pool";
-      packageName = "generic-pool";
-      version = "3.9.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/generic-pool/-/generic-pool-3.9.0.tgz";
-        sha512 = "hymDOu5B53XvN4QT9dBmZxPX4CWhBPPLguTZ9MMFeFa/Kg0xWVfylOVNlJji/E7yTZWFd/q9GO5TxDLq156D7g==";
-      };
-    };
     "gensequence-2.3.0" = {
       name = "gensequence";
       packageName = "gensequence";
@@ -27168,15 +26871,6 @@ let
         sha512 = "zmZIaQTWnNQb4R4fJUEp/FC51eZsc6EkErspy3xtIYStaq8EB/hDIWipxsal+E8rz0qD7f2sL/NA9Xee4RInJw==";
       };
     };
-    "get-source-2.0.12" = {
-      name = "get-source";
-      packageName = "get-source";
-      version = "2.0.12";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/get-source/-/get-source-2.0.12.tgz";
-        sha512 = "X5+4+iD+HoSeEED+uwrQ07BOQr0kEDFMVqqpBuI+RaZBpBpHCuXxo70bjar6f0b0u/DQJsJ7ssurpP0V60Az+w==";
-      };
-    };
     "get-stdin-4.0.1" = {
       name = "get-stdin";
       packageName = "get-stdin";
@@ -27303,13 +26997,13 @@ let
         sha512 = "g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==";
       };
     };
-    "get-tsconfig-4.7.5" = {
+    "get-tsconfig-4.7.6" = {
       name = "get-tsconfig";
       packageName = "get-tsconfig";
-      version = "4.7.5";
+      version = "4.7.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.7.5.tgz";
-        sha512 = "ZCuZCnlqNzjb4QprAzXKdpp/gh6KTxSJuw3IBsPnV/7fV4NxC9ckB+vPTt8w7fJA0TaSD7c55BR47JD6MEDyDw==";
+        url = "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.7.6.tgz";
+        sha512 = "ZAqrLlu18NbDdRaHq+AKXzAmqIUPswPWKUchfytdAjiRFnCe5ojG2bstg6mRiZabkKfCoL/e98pbBELIV/YCeA==";
       };
     };
     "get-uri-6.0.3" = {
@@ -27456,13 +27150,13 @@ let
         sha512 = "ONdIrbBCFusq1Oy0sC71F5azx8bVkvtZtMJAsv+a6lz5YAmbNnLD6HAB4gptHZVLPR8S2/kVN6Gab7lryq5+lQ==";
       };
     };
-    "git-url-parse-13.1.0" = {
+    "git-url-parse-14.0.0" = {
       name = "git-url-parse";
       packageName = "git-url-parse";
-      version = "13.1.0";
+      version = "14.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/git-url-parse/-/git-url-parse-13.1.0.tgz";
-        sha512 = "5FvPJP/70WkIprlUZ33bm4UAaFdjcLkJLpWft1BeZKqwR0uhhNGoKwlUaPtVb4LxCSQ++erHapRak9kWGj+FCA==";
+        url = "https://registry.npmjs.org/git-url-parse/-/git-url-parse-14.0.0.tgz";
+        sha512 = "NnLweV+2A4nCvn4U/m2AoYu0pPKlsmhK9cknG7IMwsjFY1S2jxM+mAhsDxyxfCIGfGaD+dozsyX4b6vkYc83yQ==";
       };
     };
     "gitconfiglocal-1.0.0" = {
@@ -27537,15 +27231,6 @@ let
         sha512 = "fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==";
       };
     };
-    "glob-10.3.12" = {
-      name = "glob";
-      packageName = "glob";
-      version = "10.3.12";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/glob/-/glob-10.3.12.tgz";
-        sha512 = "TCNv8vJ+xz4QiqTpfOJA7HvYv+tNIRHKfUWw/q+v2jdgN4ebz+KY9tGx5J4rHP0o84mNP+ApH66HRX8us3Khqg==";
-      };
-    };
     "glob-10.4.1" = {
       name = "glob";
       packageName = "glob";
@@ -27555,6 +27240,24 @@ let
         sha512 = "2jelhlq3E4ho74ZyVLN03oKdAZVUa6UDZzFLVH1H7dnoax+y9qyaq8zBkfDIggjniU19z0wU18y16jMB2eyVIw==";
       };
     };
+    "glob-10.4.5" = {
+      name = "glob";
+      packageName = "glob";
+      version = "10.4.5";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz";
+        sha512 = "7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==";
+      };
+    };
+    "glob-11.0.0" = {
+      name = "glob";
+      packageName = "glob";
+      version = "11.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/glob/-/glob-11.0.0.tgz";
+        sha512 = "9UiX/Bl6J2yaBbxKoEBRm4Cipxgok8kQYcOPEhScPwebu2I0HoQOuYdIO6S3hLuWoZgpDpwQZMzTFxgpkyT76g==";
+      };
+    };
     "glob-6.0.4" = {
       name = "glob";
       packageName = "glob";
@@ -27708,15 +27411,6 @@ let
         sha512 = "wv/LAoHdRE3BeTGz53FAamhGlPLhlssK45usmGFThIi4XqnBmjKQ16u+RNbP7WvigRZDxUsM0J3gcQ5yicaL0w==";
       };
     };
-    "global-agent-3.0.0" = {
-      name = "global-agent";
-      packageName = "global-agent";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/global-agent/-/global-agent-3.0.0.tgz";
-        sha512 = "PT6XReJ+D07JvGoxQMkT6qji/jVNfX/h364XHZOWeRzy64sSFr+xJ5OX7LI3b4MPQzdL4H8Y8M0xzPpsVMwA8Q==";
-      };
-    };
     "global-directory-4.0.1" = {
       name = "global-directory";
       packageName = "global-directory";
@@ -27880,13 +27574,13 @@ let
         sha512 = "Y1zNGV+pzQdh7H39l9zgB4PJqjRNqydvdYCDG4HFXM4XuvSaQQlEc91IU1yALL8gUTDomgBAfz3XJdmUS+oo0w==";
       };
     };
-    "globby-14.0.1" = {
+    "globby-14.0.2" = {
       name = "globby";
       packageName = "globby";
-      version = "14.0.1";
+      version = "14.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/globby/-/globby-14.0.1.tgz";
-        sha512 = "jOMLD2Z7MAhyG8aJpNOpmziMOP4rPLcc95oQPKXBazW82z+CEgPFBQvEpRUa1KeIMUJo4Wsm+q6uzO/Q/4BksQ==";
+        url = "https://registry.npmjs.org/globby/-/globby-14.0.2.tgz";
+        sha512 = "s3Fq41ZVh7vbbe2PN3nrW7yC7U7MFVc5c98/iTl9c2GawNMKx/J648KQRW6WKkuU8GIbbh2IXfIRQjOZnXcTnw==";
       };
     };
     "globby-6.1.0" = {
@@ -28105,15 +27799,6 @@ let
         sha512 = "WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==";
       };
     };
-    "graceful-readlink-1.0.1" = {
-      name = "graceful-readlink";
-      packageName = "graceful-readlink";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz";
-        sha512 = "8tLu60LgxF6XpdbK8OW3FA+IfTNBn1ZHGHKF4KQbEeSkajYw5PlYJcKluntgegDPTg8UkHjpet1T82vk6TQ68w==";
-      };
-    };
     "gradle-to-js-2.0.1" = {
       name = "gradle-to-js";
       packageName = "gradle-to-js";
@@ -28123,22 +27808,13 @@ let
         sha512 = "is3hDn9zb8XXnjbEeAEIqxTpLHUiGBqjegLmXPuyMBfKAggpadWFku4/AP8iYAGBX6qR9/5UIUIp47V0XI3aMw==";
       };
     };
-    "grammarly-richtext-encoder-0.0.0" = {
-      name = "grammarly-richtext-encoder";
-      packageName = "grammarly-richtext-encoder";
-      version = "0.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/grammarly-richtext-encoder/-/grammarly-richtext-encoder-0.0.0.tgz";
-        sha512 = "vH2bsdjoJLQ33sZCquG1GyiFyK+Qk8n04NzqHLWTnY9l8lg08AGUyA8ZgeZHdi3I81nrdcGO13V9qYyP6sdshw==";
-      };
-    };
-    "grant-5.4.21" = {
+    "grant-5.4.22" = {
       name = "grant";
       packageName = "grant";
-      version = "5.4.21";
+      version = "5.4.22";
       src = fetchurl {
-        url = "https://registry.npmjs.org/grant/-/grant-5.4.21.tgz";
-        sha512 = "QaoZudI9Gmh2W415gd71Iul6gpVH9sG1SkjfnGHtqYZopQDQ5PUVxRol5zFCrwGi9S0EbExbelHlZScgdChg2w==";
+        url = "https://registry.npmjs.org/grant/-/grant-5.4.22.tgz";
+        sha512 = "DEi+/JjXT84mmFYhSmv+SX14v+3Z7vuCIYAMwtdPCTXHMSLhWqSYqWAMXDUQZuV7yaJv2d84AYnkCFNooLKBsA==";
       };
     };
     "grapheme-splitter-1.0.4" = {
@@ -28204,6 +27880,15 @@ let
         sha512 = "5gghUc24tP9HRznNpV2+FIoq3xKkj5dTQqf4v0CpdPbFVwFkWoxOM+o+2OC9ZSvjEMTjfmG9QT+gcvggTwW1zw==";
       };
     };
+    "graphql-15.9.0" = {
+      name = "graphql";
+      packageName = "graphql";
+      version = "15.9.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/graphql/-/graphql-15.9.0.tgz";
+        sha512 = "GCOQdvm7XxV1S4U4CGrsdlEN37245eC8P9zaYCMr6K1BG0IPGy5lUwmJsEOGyl1GD6HXjOtl2keCP9asRBwNvA==";
+      };
+    };
     "graphql-16.8.1" = {
       name = "graphql";
       packageName = "graphql";
@@ -28213,13 +27898,13 @@ let
         sha512 = "59LZHPdGZVh695Ud9lRzPBVTtlX9ZCV150Er2W43ro37wVof0ctenSaskPPjN7lVTIN8mSZt8PHUNKZuNQUuxw==";
       };
     };
-    "graphql-16.8.2" = {
+    "graphql-16.9.0" = {
       name = "graphql";
       packageName = "graphql";
-      version = "16.8.2";
+      version = "16.9.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/graphql/-/graphql-16.8.2.tgz";
-        sha512 = "cvVIBILwuoSyD54U4cF/UXDh5yAobhNV/tPygI4lZhgOIJQE/WLWC4waBRb4I6bDVYb3OVx3lfHbaQOEoUD5sg==";
+        url = "https://registry.npmjs.org/graphql/-/graphql-16.9.0.tgz";
+        sha512 = "GGTKBX4SD7Wdb8mqeDLni2oaRGYQWjWHGKPQ24ZMnUtKfcsVoiv4uX8+LJr1K6U5VW2Lu1BwJnj7uiori0YtRw==";
       };
     };
     "graphql-config-3.0.3" = {
@@ -28249,13 +27934,13 @@ let
         sha512 = "8ewD6otGO43vg2TiEGjoLz3CweTwfaf4ZnqfNREqZXS2JSJGXtsRBOMMknCxMfFVh4x14ql3jyDrXcyAAtbmkQ==";
       };
     };
-    "graphql-language-service-server-2.13.0" = {
+    "graphql-language-service-server-2.13.1" = {
       name = "graphql-language-service-server";
       packageName = "graphql-language-service-server";
-      version = "2.13.0";
+      version = "2.13.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/graphql-language-service-server/-/graphql-language-service-server-2.13.0.tgz";
-        sha512 = "/bvH7NPmWrc8rOCgV/Y1HVuKhjdZRMDkGQGEoWJFcGWDaLIp9LcffTLmeZA66NVS7pDmMeriKa2tH8LfPXH6OA==";
+        url = "https://registry.npmjs.org/graphql-language-service-server/-/graphql-language-service-server-2.13.1.tgz";
+        sha512 = "Bmkf+qW61XSV49P55U0K8ceG2++ctjhrefe62G5Iwm72RtvMlB41FUpv5KA/P79nxLNPPH1Fa+07whfxLylbHw==";
       };
     };
     "graphql-subscriptions-1.2.1" = {
@@ -28861,13 +28546,13 @@ let
         sha512 = "n8aSFscI9r3gfhOcAECAtXFaQ1uy4QSke6bnaL+iymYZ/dWs9cqDqHM+rALfsHUwukUbxsdlECZ0pKmJdQ/4OA==";
       };
     };
-    "helmet-4.6.0" = {
+    "helmet-7.1.0" = {
       name = "helmet";
       packageName = "helmet";
-      version = "4.6.0";
+      version = "7.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/helmet/-/helmet-4.6.0.tgz";
-        sha512 = "HVqALKZlR95ROkrnesdhbbZJFi/rIVSoNq6f3jA/9u6MIbTsPh3xZwihjeI5+DO/2sOV6HMHooXcEOuwskHpTg==";
+        url = "https://registry.npmjs.org/helmet/-/helmet-7.1.0.tgz";
+        sha512 = "g+HZqgfbpXdCkme/Cd/mZkV0aV3BZZZSugecH03kl38m/Kmdx8jKjBikpDj2cr+Iynv4KpYEviojNdTJActJAg==";
       };
     };
     "help-me-3.0.0" = {
@@ -28879,6 +28564,15 @@ let
         sha512 = "hx73jClhyk910sidBB7ERlnhMlFsJJIBqSVMFDwPN8o2v9nmp5KgLq1Xz1Bf1fCMMZ6mPrX159iG0VLy/fPMtQ==";
       };
     };
+    "help-me-5.0.0" = {
+      name = "help-me";
+      packageName = "help-me";
+      version = "5.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/help-me/-/help-me-5.0.0.tgz";
+        sha512 = "7xgomUX6ADmcYzFik0HzAxh/73YlKR9bmFzf51CZwR+b6YtzU2m0u49hQCqV6SvlqIqsaxovfwdvbnsw3b/zpg==";
+      };
+    };
     "hexoid-1.0.0" = {
       name = "hexoid";
       packageName = "hexoid";
@@ -28978,15 +28672,6 @@ let
         sha512 = "xIcQYMnhcx2Nr4JTjsFmwwnr9vldugPy9uVm0o87bjqqWMv9GaqsTeT+i99wTl0mk1uLxJtHxLb8kymqTENQsw==";
       };
     };
-    "hosted-git-info-6.1.1" = {
-      name = "hosted-git-info";
-      packageName = "hosted-git-info";
-      version = "6.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-6.1.1.tgz";
-        sha512 = "r0EI+HBMcXadMrugk0GCQ+6BQV39PiWAZVfq7oIckeGiN7sjRGyQxPdft3nQekFTCQbYxLBH+/axZMeH8UX6+w==";
-      };
-    };
     "hosted-git-info-7.0.2" = {
       name = "hosted-git-info";
       packageName = "hosted-git-info";
@@ -29041,13 +28726,13 @@ let
         sha512 = "D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==";
       };
     };
-    "html-encoding-sniffer-3.0.0" = {
+    "html-encoding-sniffer-4.0.0" = {
       name = "html-encoding-sniffer";
       packageName = "html-encoding-sniffer";
-      version = "3.0.0";
+      version = "4.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz";
-        sha512 = "oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==";
+        url = "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-4.0.0.tgz";
+        sha512 = "Y22oTqIU4uuPgEemfz7NDJz6OeKf12Lsu+QC+s3BVpda64lTiMYCyGwg5ki4vFxkMwQdeZDl2adZoqUgdFuTgQ==";
       };
     };
     "html-entities-1.4.0" = {
@@ -29482,13 +29167,13 @@ let
         sha512 = "dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==";
       };
     };
-    "https-proxy-agent-7.0.4" = {
+    "https-proxy-agent-7.0.5" = {
       name = "https-proxy-agent";
       packageName = "https-proxy-agent";
-      version = "7.0.4";
+      version = "7.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.4.tgz";
-        sha512 = "wlwpilI7YdjSkWaQ/7omYBMTliDcmCN8OLihO6I9B86g06lMyAoqgoDpV0XqoaPOKj+0DIdAvnsWfyAAhmimcg==";
+        url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.5.tgz";
+        sha512 = "1e4Wqeblerz+tMKPIq2EMGiiWW1dIjZOksyHWSUm1rmuvw/how9hBHZ38lAGj5ID4Ik6EdkOw7NmWPy6LAwalw==";
       };
     };
     "human-signals-1.1.1" = {
@@ -29545,13 +29230,13 @@ let
         sha512 = "Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==";
       };
     };
-    "hybrid-chunk-store-1.2.4" = {
+    "hybrid-chunk-store-1.2.6" = {
       name = "hybrid-chunk-store";
       packageName = "hybrid-chunk-store";
-      version = "1.2.4";
+      version = "1.2.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/hybrid-chunk-store/-/hybrid-chunk-store-1.2.4.tgz";
-        sha512 = "wLVIU7rDAz0bQ9sOVwqNWV44A+yAitm+yw66vilkIhZ7V1lVQtiZBQ98YF4vr8rmbqnysgW+pW/PZ1UQtnQCCA==";
+        url = "https://registry.npmjs.org/hybrid-chunk-store/-/hybrid-chunk-store-1.2.6.tgz";
+        sha512 = "D8DkY6FT+exjw4b6uQ8z5QfUokcIb0YYPHaa/zpBdFIoS1CS7mjM4wnd2mGoo2XUeM5Y10C23AXOQRExoifPbA==";
       };
     };
     "hyperdyperid-1.2.0" = {
@@ -29626,22 +29311,13 @@ let
         sha512 = "soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==";
       };
     };
-    "idb-6.1.5" = {
+    "idb-7.1.1" = {
       name = "idb";
       packageName = "idb";
-      version = "6.1.5";
+      version = "7.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/idb/-/idb-6.1.5.tgz";
-        sha512 = "IJtugpKkiVXQn5Y+LteyBCNk1N8xpGV3wWZk9EVtZWH8DYkjBn0bX1XnGP9RkyZF0sAcywa6unHqSWKe7q4LGw==";
-      };
-    };
-    "idb-keyval-6.2.1" = {
-      name = "idb-keyval";
-      packageName = "idb-keyval";
-      version = "6.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/idb-keyval/-/idb-keyval-6.2.1.tgz";
-        sha512 = "8Sb3veuYCyrZL+VBt9LJfZjLUPWVvqn8tG28VqYNFCo43KHcKuq+b4EiXGeuaLAQWL2YmyDgMp2aSpH9JHsEQg==";
+        url = "https://registry.npmjs.org/idb/-/idb-7.1.1.tgz";
+        sha512 = "gchesWBzyvGHRO9W8tzUWFDycow5gwjvFKfyV9FF32Y7F50yZMp7mP+T2mJIWFx49zicqyC4uefHM17o6xKIVQ==";
       };
     };
     "ieee754-1.1.13" = {
@@ -29716,15 +29392,6 @@ let
         sha512 = "PY6Ii8o1jMRA1z4F2hRkH/xN59ox43DavKvD3oDpfurRlOJyAHpifIwpbdv1n4jt4ov0jSpw3kQ4GhJnpBL6WQ==";
       };
     };
-    "ignore-walk-5.0.1" = {
-      name = "ignore-walk";
-      packageName = "ignore-walk";
-      version = "5.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ignore-walk/-/ignore-walk-5.0.1.tgz";
-        sha512 = "yemi4pMf51WKT7khInJqAvsIGzoqYXblnsz0ql8tM+yi1EKYTY1evX4NAbJrLL/Aanr2HyZeluqU+Oi7MGHokw==";
-      };
-    };
     "ignore-walk-6.0.5" = {
       name = "ignore-walk";
       packageName = "ignore-walk";
@@ -29842,13 +29509,13 @@ let
         sha512 = "15gZoQ38eYjEjxkorfbcgBKBL6R7T459OuK+CpcWt7O3KF4uPCx2tD0uFETlUDIyo+1789crbMhTvQBSR5yBMg==";
       };
     };
-    "immutable-4.3.6" = {
+    "immutable-4.3.7" = {
       name = "immutable";
       packageName = "immutable";
-      version = "4.3.6";
+      version = "4.3.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/immutable/-/immutable-4.3.6.tgz";
-        sha512 = "Ju0+lEMyzMVZarkTn/gqRpdqd5dOPaz1mCZ0SH3JV6iFw81PldE/PEB1hWVEA288HPt4WXW8O7AWxB10M+03QQ==";
+        url = "https://registry.npmjs.org/immutable/-/immutable-4.3.7.tgz";
+        sha512 = "1hqclzwYwjRDFLjcFxOM5AYkkG0rpFPpr1RLPMEuGczoS7YA8gLhy8SWXYRAA/XwfEHpfo3cw5JGioS32fnMRw==";
       };
     };
     "import-fresh-3.3.0" = {
@@ -29914,6 +29581,15 @@ let
         sha512 = "ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==";
       };
     };
+    "import-local-3.2.0" = {
+      name = "import-local";
+      packageName = "import-local";
+      version = "3.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/import-local/-/import-local-3.2.0.tgz";
+        sha512 = "2SPlun1JUPWoM6t3F0dw0FkCF/jWY8kttcY4f599GLTSjh2OCuuhdTkJQsEcZzBqbXZGKMK2OqW1oZsjtf/gQA==";
+      };
+    };
     "import-meta-resolve-2.2.2" = {
       name = "import-meta-resolve";
       packageName = "import-meta-resolve";
@@ -30103,15 +29779,6 @@ let
         sha512 = "QQnnxNyfvmHFIsj7gkPcYymR8Jdw/o7mp5ZFihxn6h8Ci6fh3Dx4E1gPjpQEpIuPo9XVNY/ZUwh4BPMjGyL01g==";
       };
     };
-    "ini-4.1.2" = {
-      name = "ini";
-      packageName = "ini";
-      version = "4.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ini/-/ini-4.1.2.tgz";
-        sha512 = "AMB1mvwR1pyBFY/nSevUX6y8nJWS63/SzUKD3JyQn97s4xgIdgQPT75IRouIiBAN4yLQBUShNYVW0+UG25daCw==";
-      };
-    };
     "ini-4.1.3" = {
       name = "ini";
       packageName = "ini";
@@ -30121,13 +29788,13 @@ let
         sha512 = "X7rqawQBvfdjS10YU1y1YVreA3SsLrW9dX2CewP2EbBJM4ypVNLDkO5y04gejPwKIY9lR+7r9gn3rFPt/kmWFg==";
       };
     };
-    "init-package-json-5.0.0" = {
+    "init-package-json-6.0.3" = {
       name = "init-package-json";
       packageName = "init-package-json";
-      version = "5.0.0";
+      version = "6.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/init-package-json/-/init-package-json-5.0.0.tgz";
-        sha512 = "kBhlSheBfYmq3e0L1ii+VKe3zBTLL5lDCDWR+f9dLmEGSB3MqLlMlsolubSsyI88Bg6EA+BIMlomAnQ1SwgQBw==";
+        url = "https://registry.npmjs.org/init-package-json/-/init-package-json-6.0.3.tgz";
+        sha512 = "Zfeb5ol+H+eqJWHTaGca9BovufyGeIfr4zaaBorPmJBMrJ+KBnN+kQx2ZtXdsotUTgldHmHQV44xvUWOUA7E2w==";
       };
     };
     "ink-2.7.1" = {
@@ -30292,22 +29959,13 @@ let
         sha512 = "M1WuAmb7pn9zdFRtQYk26ZBoY043Sse0wVDdk4Bppr+JOXyQYybdtvK+l9wUibhtjdjvtoiNy8tk+EgsYIUqKg==";
       };
     };
-    "inquirer-9.2.22" = {
+    "inquirer-9.3.6" = {
       name = "inquirer";
       packageName = "inquirer";
-      version = "9.2.22";
+      version = "9.3.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/inquirer/-/inquirer-9.2.22.tgz";
-        sha512 = "SqLLa/Oe5rZUagTR9z+Zd6izyatHglbmbvVofo1KzuVB54YHleWzeHNLoR7FOICGOeQSqeLh1cordb3MzhGcEw==";
-      };
-    };
-    "inquirer-9.2.23" = {
-      name = "inquirer";
-      packageName = "inquirer";
-      version = "9.2.23";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/inquirer/-/inquirer-9.2.23.tgz";
-        sha512 = "kod5s+FBPIDM2xiy9fu+6wdU/SkK5le5GS9lh4FEBjBHqiMgD9lLFbCbuqFNAjNL2ZOy9Wd9F694IOzN9pZHBA==";
+        url = "https://registry.npmjs.org/inquirer/-/inquirer-9.3.6.tgz";
+        sha512 = "riK/iQB2ctwkpWYgjjWIRv3MBLt2gzb2Sj0JNQNbyTXgyXsLWcDPJ5WS5ZDTCx7BRFnJsARtYh+58fjP5M2Y0Q==";
       };
     };
     "inquirer-autocomplete-prompt-3.0.1" = {
@@ -30517,15 +30175,6 @@ let
         sha512 = "j8grHGDzv1v+8T1sAQ+3boTCntFPfvxLCkNcxB1J8qA0lUN+fAlSyYd+RXKvaPRL4AGyPxViutBEJHNXOyUdFQ==";
       };
     };
-    "inversify-6.0.2" = {
-      name = "inversify";
-      packageName = "inversify";
-      version = "6.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/inversify/-/inversify-6.0.2.tgz";
-        sha512 = "i9m8j/7YIv4mDuYXUAcrpKPSaju/CIly9AHK5jvCBeoiM/2KEsuCQTTP+rzSWWpLYWRukdXFSl6ZTk2/uumbiA==";
-      };
-    };
     "invert-kv-1.0.0" = {
       name = "invert-kv";
       packageName = "invert-kv";
@@ -30535,6 +30184,15 @@ let
         sha512 = "xgs2NH9AE66ucSq4cNG1nhSFghr5l6tdL15Pk+jl46bmmBapgoaY/AacXyaDznAqmGL99TiLSQgO/XazFSKYeQ==";
       };
     };
+    "ioredis-5.4.1" = {
+      name = "ioredis";
+      packageName = "ioredis";
+      version = "5.4.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/ioredis/-/ioredis-5.4.1.tgz";
+        sha512 = "2YZsvl7jopIa1gaePkeMtd9rAcSjOOjPtpcLlOeusyO+XH2SK5ZcT+UCrElPP+WVIInh2TzeI4XW9ENaSLVVHA==";
+      };
+    };
     "iota-array-1.0.0" = {
       name = "iota-array";
       packageName = "iota-array";
@@ -30886,13 +30544,13 @@ let
         sha512 = "ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ==";
       };
     };
-    "is-core-module-2.13.1" = {
+    "is-core-module-2.15.0" = {
       name = "is-core-module";
       packageName = "is-core-module";
-      version = "2.13.1";
+      version = "2.15.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.13.1.tgz";
-        sha512 = "hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==";
+        url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.0.tgz";
+        sha512 = "Dd+Lb2/zvk9SKy1TGCt1wFJFo/MWBPMX5x7KcvLajWTGuomczdQX61PvY5yK6SVACwpoexWo81IfFyoKY2QnTA==";
       };
     };
     "is-core-module-2.9.0" = {
@@ -31336,15 +30994,6 @@ let
         sha512 = "1JQwulVNjx8UqkPE/bqDaxtH4PXCe/2VRh/y3p99heOV87HG4Id5/VfDswd+YiAfHcRTfDlWgISycnHuhZq1aw==";
       };
     };
-    "is-nan-1.3.2" = {
-      name = "is-nan";
-      packageName = "is-nan";
-      version = "1.3.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-nan/-/is-nan-1.3.2.tgz";
-        sha512 = "E+zBKpQ2t6MEo1VsonYmluk9NxGrbzpeeLC2xIViuO2EjU2xsXsBPwTr3Ykv9l08UYEVEdWeRZNouaZqF6RN0w==";
-      };
-    };
     "is-natural-number-4.0.1" = {
       name = "is-natural-number";
       packageName = "is-natural-number";
@@ -32272,13 +31921,22 @@ let
         sha512 = "N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==";
       };
     };
-    "jackspeak-3.4.0" = {
+    "jackspeak-3.4.3" = {
       name = "jackspeak";
       packageName = "jackspeak";
-      version = "3.4.0";
+      version = "3.4.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.0.tgz";
-        sha512 = "JVYhQnN59LVPFCEcVa2C3CrEKYacvjRfqIQl+h8oi91aLYQVWRYbxjPcv1bUiUy/kLmQaANrYfNMCO3kuEDHfw==";
+        url = "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz";
+        sha512 = "OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==";
+      };
+    };
+    "jackspeak-4.0.1" = {
+      name = "jackspeak";
+      packageName = "jackspeak";
+      version = "4.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/jackspeak/-/jackspeak-4.0.1.tgz";
+        sha512 = "cub8rahkh0Q/bw1+GxP7aeSe29hHHn2V4m29nnDlvCdlgU+3UGxkZp7Z53jLUdpX3jdTO0nJZUDl3xvbWc2Xog==";
       };
     };
     "jade-0.27.0" = {
@@ -32290,13 +31948,13 @@ let
         sha512 = "VPrAZm2V9+0tqISXjca7ipt2LPMpLwnFZFM+1VG7q2LmiUQp1imCa++FgSqWxIs4W5gUTp/xlrUlx5xyFHYE6w==";
       };
     };
-    "jake-10.9.1" = {
+    "jake-10.9.2" = {
       name = "jake";
       packageName = "jake";
-      version = "10.9.1";
+      version = "10.9.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jake/-/jake-10.9.1.tgz";
-        sha512 = "61btcOHNnLnsOdtLgA5efqQWjnSi/vow5HbI7HMdKKWqvrKR1bLK3BPlJn9gcSaP2ewuamUSMB5XEy76KUIS2w==";
+        url = "https://registry.npmjs.org/jake/-/jake-10.9.2.tgz";
+        sha512 = "2P4SQ0HrLQ+fw6llpLnOaGAvN2Zu6778SJMrCUwns4fOoG9ayrTiZk3VV8sCPkVZF8ab0zksVpS8FDY5pRCNBA==";
       };
     };
     "jest-diff-29.7.0" = {
@@ -32407,13 +32065,13 @@ let
         sha512 = "NgB+lZLNoqISVy1rZocE9PZI36bL/77ie924Ri43yEvi9GUUMPeyVIr8KdFTMUlby1p0PBYMk9spIxEUQYqrJQ==";
       };
     };
-    "joi-17.13.1" = {
+    "joi-17.13.3" = {
       name = "joi";
       packageName = "joi";
-      version = "17.13.1";
+      version = "17.13.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/joi/-/joi-17.13.1.tgz";
-        sha512 = "vaBlIKCyo4FCUtCm7Eu4QZd/q02bWcxfUO6YSXAZOWF6gzcLBeba8kwotUdYJjDLW8Cz8RywsSOqiNJZW0mNvg==";
+        url = "https://registry.npmjs.org/joi/-/joi-17.13.3.tgz";
+        sha512 = "otDA4ldcIx+ZXsKHWmp0YizCweVRZG96J10b0FevjfuncLO1oX59THoAmHkNubYJ+9gWsYsp5k8v4ib6oDv1fA==";
       };
     };
     "join-async-iterator-1.1.1" = {
@@ -32461,13 +32119,13 @@ let
         sha512 = "m4avr8yL8kmFN8psrbFFFmB/If14iN5o9nw/NgnnM+kybDJpRsAynV2BsfpTYrTRysYUdADVD7CkUUizgkpLfg==";
       };
     };
-    "jquery.terminal-2.42.0" = {
+    "jquery.terminal-2.42.2" = {
       name = "jquery.terminal";
       packageName = "jquery.terminal";
-      version = "2.42.0";
+      version = "2.42.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.42.0.tgz";
-        sha512 = "poZX1qYCWRUXR12ex/SAh1U3chFCbZ81iN1ajUVbNAidQEGIqyPmHZd5FoSkjPs5jV6ckZLF3t4R6bao12g2Ag==";
+        url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.42.2.tgz";
+        sha512 = "TC3jRvCly1ZohSsy3m2UQjyOEYyZSl7YZQDUeF07nrQX1HAes+AznykYdhEPRHh2viYVp9GW0c1W+pm2eibLAw==";
       };
     };
     "js-base64-2.6.3" = {
@@ -32641,22 +32299,22 @@ let
         sha512 = "u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw==";
       };
     };
-    "jsdom-22.1.0" = {
+    "jsdom-23.0.1" = {
       name = "jsdom";
       packageName = "jsdom";
-      version = "22.1.0";
+      version = "23.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jsdom/-/jsdom-22.1.0.tgz";
-        sha512 = "/9AVW7xNbsBv6GfWho4TTNjEo9fe6Zhf9O7s0Fhhr3u+awPwAJMKwAMXnkk5vBxflqLW9hTHX/0cs+P3gW+cQw==";
+        url = "https://registry.npmjs.org/jsdom/-/jsdom-23.0.1.tgz";
+        sha512 = "2i27vgvlUsGEBO9+/kJQRbtqtm+191b5zAZrU/UezVmnC2dlDAFLgDYJvAEi94T4kjsRKkezEtLQTgsNEsW2lQ==";
       };
     };
-    "jsep-1.3.8" = {
+    "jsep-1.3.9" = {
       name = "jsep";
       packageName = "jsep";
-      version = "1.3.8";
+      version = "1.3.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jsep/-/jsep-1.3.8.tgz";
-        sha512 = "qofGylTGgYj9gZFsHuyWAN4jr35eJ66qJCK4eKDnldohuUoQFbU3iZn2zjvEbd9wOAhP9Wx5DsAAduTyE1PSWQ==";
+        url = "https://registry.npmjs.org/jsep/-/jsep-1.3.9.tgz";
+        sha512 = "i1rBX5N7VPl0eYb6+mHNp52sEuaS2Wi8CDYx1X5sn9naevL78+265XJqy1qENEk7mRKwS06NHpUqiBwR7qeodw==";
       };
     };
     "jsesc-0.5.0" = {
@@ -32677,103 +32335,76 @@ let
         sha512 = "OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==";
       };
     };
-    "jsii-1.100.0" = {
+    "jsii-5.4.12" = {
       name = "jsii";
       packageName = "jsii";
-      version = "1.100.0";
+      version = "5.4.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jsii/-/jsii-1.100.0.tgz";
-        sha512 = "DUTvq90XyyIRE+O/CAIHXZwBsxVy9ZkFDGkDjUknYV84VyzlMnBkdptQq0oJj8LRPTMJl2yiiPPMsJCvuv01Xg==";
+        url = "https://registry.npmjs.org/jsii/-/jsii-5.4.12.tgz";
+        sha512 = "/6Mw+iSS8c/s1n2qH3TO1Bqd1YUY/aR0TZ2qTfOKN2UmmU4fwhZzSxrGRerPFQbhUm8v+8RS7kWEhSOv+eGQ9Q==";
       };
     };
-    "jsii-5.3.29" = {
+    "jsii-5.4.26" = {
       name = "jsii";
       packageName = "jsii";
-      version = "5.3.29";
+      version = "5.4.26";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jsii/-/jsii-5.3.29.tgz";
-        sha512 = "vEEOtjD8s/C8ORHvN87Bt9jHcY1diJoC1sS+TVnCkeb4V9q5fOEVr4gl/FsU5ea8dSWZHdd7VqCtr0jYAwKleg==";
+        url = "https://registry.npmjs.org/jsii/-/jsii-5.4.26.tgz";
+        sha512 = "vb1k7wsVfgYysXagV6ASStC7I+uEFRttSxpVSlz3HTNaoQYgQwiShkpqhRLlzYw9Pl5jERs+457QTVSj7Ze+zg==";
       };
     };
-    "jsii-5.4.21" = {
-      name = "jsii";
-      packageName = "jsii";
-      version = "5.4.21";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/jsii/-/jsii-5.4.21.tgz";
-        sha512 = "uCruIDzEEFHBwZRT5PiRSd2/KdsZWwHq8VWS5o8p5tngUGpz4BYdEG/jmOKYyjVz+ScVx+Ur/eN2zieTP6Ge2Q==";
-      };
-    };
-    "jsii-pacmak-1.100.0" = {
+    "jsii-pacmak-1.101.0" = {
       name = "jsii-pacmak";
       packageName = "jsii-pacmak";
-      version = "1.100.0";
+      version = "1.101.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.100.0.tgz";
-        sha512 = "MxB4UYwpRjxZ/2y+LPy5HVkBciubU4T8d3A3mnj6Pj5lQfe3VZ9pStYHNTsv0q5J8xg4uIcc8/RhFHj1mzk2oA==";
+        url = "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.101.0.tgz";
+        sha512 = "07a04KtOj+Kmx+5XQVD1JG6QOh6JNqFWh4bbzMDKiFx7JoHhQnLq07b/OlUpCuP7J7Q9WaXXYM59EUQpXO07wg==";
       };
     };
-    "jsii-pacmak-1.95.0" = {
+    "jsii-pacmak-1.98.0" = {
       name = "jsii-pacmak";
       packageName = "jsii-pacmak";
-      version = "1.95.0";
+      version = "1.98.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.95.0.tgz";
-        sha512 = "h/eo3p3jG4/Wtb9WdavvcgXzyN5QXZck3k0xvIWp5SKxFLorQ+TWhY7BHG0e+VXl+mxcni6BuQ5wFLavq65RQQ==";
+        url = "https://registry.npmjs.org/jsii-pacmak/-/jsii-pacmak-1.98.0.tgz";
+        sha512 = "p2H8IbiI3RNIUg+oRcJ9Xu1I7CgJUxCMpUl5IPzWAjz1qzhIKOzlkaAMGJfJZJQtib5kWI2OmZ6xBZScWg16+Q==";
       };
     };
-    "jsii-reflect-1.100.0" = {
+    "jsii-reflect-1.101.0" = {
       name = "jsii-reflect";
       packageName = "jsii-reflect";
-      version = "1.100.0";
+      version = "1.101.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.100.0.tgz";
-        sha512 = "4hicwZirzhSqFRpX/USpvy6RewDi5mCkDESLjBSNpnGWhc3oVByX3x/KJyKQdjEfjVkflHWxSGJEA0qEMoXFUw==";
+        url = "https://registry.npmjs.org/jsii-reflect/-/jsii-reflect-1.101.0.tgz";
+        sha512 = "ZCFb+laktj/ekNadUYksf+jLZq4fjoQeNe344GwslJOaemGjgAeqy0atV2H8nvTYU8ubszFApUPpdoRvtxgdPw==";
       };
     };
-    "jsii-rosetta-1.100.0" = {
+    "jsii-rosetta-5.4.14" = {
       name = "jsii-rosetta";
       packageName = "jsii-rosetta";
-      version = "1.100.0";
+      version = "5.4.14";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-1.100.0.tgz";
-        sha512 = "JeVS7twbDM48Z6IE9OJ24DzBs9scpeWa9XmI00bggMWV0xcP2GCTkz2c8cqEZU4DPggcygS1H+TWhQiSkol4gQ==";
+        url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-5.4.14.tgz";
+        sha512 = "SIaqWpzk33Tqr+x4M4umt9Z9CSxcr6i48pN6aTe7nzT3ELmBABsWzHHpnoCDUlLzx5OG+PKMfVdxoh7z3TX0lQ==";
       };
     };
-    "jsii-rosetta-5.3.28" = {
+    "jsii-rosetta-5.4.25" = {
       name = "jsii-rosetta";
       packageName = "jsii-rosetta";
-      version = "5.3.28";
+      version = "5.4.25";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-5.3.28.tgz";
-        sha512 = "pvfaaMYJhsGz9BXmQenlC+aey2HTRiPwlTr7FcH4wr0THkKbIwChPpS26YWSGyNLmTqDZUvmQv+xDtMx5qFXGg==";
+        url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-5.4.25.tgz";
+        sha512 = "tXVABsWJMknMNhUpGkbOWaqHYv45vRSxO2ZLY+s+Eiti1R/G2XeGWJd/a9MJDauLaOVODpzN6z1GQ+WYZjZlIw==";
       };
     };
-    "jsii-rosetta-5.4.21" = {
-      name = "jsii-rosetta";
-      packageName = "jsii-rosetta";
-      version = "5.4.21";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/jsii-rosetta/-/jsii-rosetta-5.4.21.tgz";
-        sha512 = "g7E935trSNQ8rbs+VYQiDBbeoaqS0sO7HuJ+bz27x7pvKBri5Uk9w+aLtmFI8UhHX7JgZ6mUxruY0zRW4AqCyQ==";
-      };
-    };
-    "jsii-srcmak-0.1.1039" = {
+    "jsii-srcmak-0.1.1193" = {
       name = "jsii-srcmak";
       packageName = "jsii-srcmak";
-      version = "0.1.1039";
+      version = "0.1.1193";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.1039.tgz";
-        sha512 = "3lBjyxBy5UpPGK8bXFmVRzaoK6caDQ5DO40Qbyv3LOWtrsuUQmuVI2/5wRwNtfg6sFzOFD3+kE3LZuNXo7QE/Q==";
-      };
-    };
-    "jsii-srcmak-0.1.1154" = {
-      name = "jsii-srcmak";
-      packageName = "jsii-srcmak";
-      version = "0.1.1154";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.1154.tgz";
-        sha512 = "x2iOuiUAg4xhk3dEz67ElrbSdMk+KSHCOV9CT82PWrmehXg+kZ4pudoAk8/4KLiS9UR0ZLtugZQQPMIZp6E67w==";
+        url = "https://registry.npmjs.org/jsii-srcmak/-/jsii-srcmak-0.1.1193.tgz";
+        sha512 = "q3pEUmudzgl75ZXqHXWB6m7CMil9rAcY1Ln7hsWHgpf4DPeS7YEvUa+jOQ5YY4T3ljN8Q0G08jJIPutQ1osqaA==";
       };
     };
     "json-buffer-3.0.0" = {
@@ -32965,6 +32596,15 @@ let
         sha512 = "Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==";
       };
     };
+    "json-stringify-nice-1.1.4" = {
+      name = "json-stringify-nice";
+      packageName = "json-stringify-nice";
+      version = "1.1.4";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/json-stringify-nice/-/json-stringify-nice-1.1.4.tgz";
+        sha512 = "5Z5RFW63yxReJ7vANgW6eZFGWaQvnPE3WNmZoOJrSkGju2etKA2L5rrOa1sm877TVTFt57A80BH1bArcmlLfPw==";
+      };
+    };
     "json-stringify-pretty-compact-3.0.0" = {
       name = "json-stringify-pretty-compact";
       packageName = "json-stringify-pretty-compact";
@@ -33019,13 +32659,13 @@ let
         sha512 = "XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==";
       };
     };
-    "jsonata-1.8.7" = {
+    "jsonata-2.0.5" = {
       name = "jsonata";
       packageName = "jsonata";
-      version = "1.8.7";
+      version = "2.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jsonata/-/jsonata-1.8.7.tgz";
-        sha512 = "tOW2/hZ+nR2bcQZs+0T62LVe5CHaNa3laFFWb/262r39utN6whJGBF7IR2Wq1QXrDbhftolk5gggW8uUJYlBTQ==";
+        url = "https://registry.npmjs.org/jsonata/-/jsonata-2.0.5.tgz";
+        sha512 = "wEse9+QLIIU5IaCgtJCPsFi/H4F3qcikWzF4bAELZiRz08ohfx3Q6CjDRf4ZPF5P/92RI3KIHtb7u3jqPaHXdQ==";
       };
     };
     "jsonc-parser-1.0.3" = {
@@ -33064,13 +32704,13 @@ let
         sha512 = "gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==";
       };
     };
-    "jsonc-parser-3.2.1" = {
+    "jsonc-parser-3.3.1" = {
       name = "jsonc-parser";
       packageName = "jsonc-parser";
-      version = "3.2.1";
+      version = "3.3.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.1.tgz";
-        sha512 = "AilxAyFOAcK5wA1+LeaySVBrHsGQvUFCDWXKpZjzaL0PqW+xfBOttn8GNtWKFWqneyMZj41MWF9Kl6iPWLwgOA==";
+        url = "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.3.1.tgz";
+        sha512 = "HUgH65KyejrUFPvHFPbqOY0rsFip3Bo5wb4ngvdi1EpCYWUQDC5V+Y7mZws+DLkr4M//zQJoanu1SP+87Dv1oQ==";
       };
     };
     "jsonfile-1.0.1" = {
@@ -33271,6 +32911,24 @@ let
         sha512 = "Qush0uP+G8ZScpGMZvHUiRfI0YBWuB3gVBYlI0v0vvOJt5FLicco+IkP0a50LqTTQhmts/m6tP5SWE+USyIvcQ==";
       };
     };
+    "just-diff-6.0.2" = {
+      name = "just-diff";
+      packageName = "just-diff";
+      version = "6.0.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/just-diff/-/just-diff-6.0.2.tgz";
+        sha512 = "S59eriX5u3/QhMNq3v/gm8Kd0w8OS6Tz2FS1NG4blv+z0MuQcBRJyFWjdovM0Rad4/P4aUPFtnkNjMjyMlMSYA==";
+      };
+    };
+    "just-diff-apply-5.5.0" = {
+      name = "just-diff-apply";
+      packageName = "just-diff-apply";
+      version = "5.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/just-diff-apply/-/just-diff-apply-5.5.0.tgz";
+        sha512 = "OYTthRfSh55WOItVqwpefPtNt2VdKsq5AnAK6apdtR6yCH8pr0CmSr710J0Mf+WdQy7K/OzMy7K2MgAfdQURDw==";
+      };
+    };
     "jwa-1.4.1" = {
       name = "jwa";
       packageName = "jwa";
@@ -33289,15 +32947,6 @@ let
         sha512 = "jrZ2Qx916EA+fq9cEAeCROWPTfCwi1IVHqT2tapuqLEVVDKFDENFw1oL+MwrTvH6msKxsd1YTDVw6uKEcsrLEA==";
       };
     };
-    "jwk-to-pem-2.0.5" = {
-      name = "jwk-to-pem";
-      packageName = "jwk-to-pem";
-      version = "2.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/jwk-to-pem/-/jwk-to-pem-2.0.5.tgz";
-        sha512 = "L90jwellhO8jRKYwbssU9ifaMVqajzj3fpRjDKcsDzrslU9syRbFqfkXtT4B89HYAap+xsxNcxgBSB09ig+a7A==";
-      };
-    };
     "jws-3.2.2" = {
       name = "jws";
       packageName = "jws";
@@ -33406,13 +33055,13 @@ let
         sha512 = "fwGvRXWjaSzMed8iQHkZH41wvaoq+3tIhuIbkqBBYFuuJtWoDWqgCYTADGPqLyaLX4Ct8aP5NtAxCaxk4cfcCg==";
       };
     };
-    "katex-0.16.9" = {
+    "katex-0.16.10" = {
       name = "katex";
       packageName = "katex";
-      version = "0.16.9";
+      version = "0.16.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/katex/-/katex-0.16.9.tgz";
-        sha512 = "fsSYjWS0EEOwvy81j3vRA8TEAhQhKiqO+FQaKWp0m39qwOzHVBgAUBIXWj1pB+O2W3fIpNa6Y9KSKCVbfPhyAQ==";
+        url = "https://registry.npmjs.org/katex/-/katex-0.16.10.tgz";
+        sha512 = "ZiqaC04tp2O5utMsl2TEZTXxa6WSC4yo0fv5ML++D3QZv/vx2Mct0mTlRx3O+uUkjfuAgOkzsCmq5MiUEsDDdA==";
       };
     };
     "keep-alive-agent-0.0.1" = {
@@ -33604,13 +33253,13 @@ let
         sha512 = "Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A==";
       };
     };
-    "ky-1.3.0" = {
+    "ky-1.4.0" = {
       name = "ky";
       packageName = "ky";
-      version = "1.3.0";
+      version = "1.4.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ky/-/ky-1.3.0.tgz";
-        sha512 = "QUViPXlgP6NKA57IAPff/aZSmRA6qs9wKxlEpayBorwRZG+x2LG7jD4kXh8lnH3q/gkUr64NyZ7kwErUEZJmlw==";
+        url = "https://registry.npmjs.org/ky/-/ky-1.4.0.tgz";
+        sha512 = "tPhhoGUiEiU/WXR4rt8klIoLdnTtyu+9jVKHd/wauEjYud32jyn63mzKWQweaQrHWxBQtYoVtdcEnYX1LosnFQ==";
       };
     };
     "labeled-stream-splicer-2.0.2" = {
@@ -33676,13 +33325,22 @@ let
         sha512 = "KvNT4XqAMzdcL6ka6Tl3i2lYeFDgXNCuIX+xNx6ZMVR1dFq+idXd9FLKNMOIx0t9mJ9/HudyX4oZWXZQ0UJHeg==";
       };
     };
-    "launch-editor-2.6.1" = {
+    "latest-version-9.0.0" = {
+      name = "latest-version";
+      packageName = "latest-version";
+      version = "9.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/latest-version/-/latest-version-9.0.0.tgz";
+        sha512 = "7W0vV3rqv5tokqkBAFV1LbR7HPOWzXQDpDgEuib/aJ1jsZZx6x3c2mBI+TJhJzOhkGeaLbCKEHXEXLfirtG2JA==";
+      };
+    };
+    "launch-editor-2.8.0" = {
       name = "launch-editor";
       packageName = "launch-editor";
-      version = "2.6.1";
+      version = "2.8.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/launch-editor/-/launch-editor-2.6.1.tgz";
-        sha512 = "eB/uXmFVpY4zezmGp5XtU21kwo7GBbKB+EQ+UZeWtGb9yAM5xt/Evk+lYH3eRNAtId+ej4u7TYPFZ07w4s7rRw==";
+        url = "https://registry.npmjs.org/launch-editor/-/launch-editor-2.8.0.tgz";
+        sha512 = "vJranOAJrI/llyWGRQqiDM+adrw+k83fvmmx3+nV47g3+36xM15jE+zyZ6Ffel02+xSvuM0b2GDRosXZkbb6wA==";
       };
     };
     "layout-base-1.0.2" = {
@@ -33694,15 +33352,6 @@ let
         sha512 = "8h2oVEZNktL4BH2JCOI90iD1yXwL6iNW7KcCKT2QZgQJR2vbqDsldCTPRU9NifTCqHZci57XvQQ15YTu+sTYPg==";
       };
     };
-    "layout-base-2.0.1" = {
-      name = "layout-base";
-      packageName = "layout-base";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/layout-base/-/layout-base-2.0.1.tgz";
-        sha512 = "dp3s92+uNI1hWIpPGH3jK2kxE2lMjdXdr+DH8ynZHpd6PUlH6x6cbuXnoMmiNumznqaNO31xu9e79F0uuZ0JFg==";
-      };
-    };
     "lazy-1.0.11" = {
       name = "lazy";
       packageName = "lazy";
@@ -33901,22 +33550,22 @@ let
         sha512 = "+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==";
       };
     };
-    "libnpmaccess-7.0.2" = {
+    "libnpmaccess-8.0.6" = {
       name = "libnpmaccess";
       packageName = "libnpmaccess";
-      version = "7.0.2";
+      version = "8.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/libnpmaccess/-/libnpmaccess-7.0.2.tgz";
-        sha512 = "vHBVMw1JFMTgEk15zRsJuSAg7QtGGHpUSEfnbcRL1/gTBag9iEfJbyjpDmdJmwMhvpoLoNBtdAUCdGnaP32hhw==";
+        url = "https://registry.npmjs.org/libnpmaccess/-/libnpmaccess-8.0.6.tgz";
+        sha512 = "uM8DHDEfYG6G5gVivVl+yQd4pH3uRclHC59lzIbSvy7b5FEwR+mU49Zq1jEyRtRFv7+M99mUW9S0wL/4laT4lw==";
       };
     };
-    "libnpmpublish-7.3.0" = {
+    "libnpmpublish-9.0.9" = {
       name = "libnpmpublish";
       packageName = "libnpmpublish";
-      version = "7.3.0";
+      version = "9.0.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/libnpmpublish/-/libnpmpublish-7.3.0.tgz";
-        sha512 = "fHUxw5VJhZCNSls0KLNEG0mCD2PN1i14gH5elGOgiVnU3VgTcRahagYP2LKI1m0tFCJ+XrAm0zVYyF5RCbXzcg==";
+        url = "https://registry.npmjs.org/libnpmpublish/-/libnpmpublish-9.0.9.tgz";
+        sha512 = "26zzwoBNAvX9AWOPiqqF6FG4HrSCPsHFkQm7nT+xU1ggAujL/eae81RnCv4CJ2In9q9fh10B88sYSzKCUh/Ghg==";
       };
     };
     "lie-3.1.1" = {
@@ -34153,6 +33802,15 @@ let
         sha512 = "rJysbR9GKIalhTbVL2tYbF2hVyDnrf7pFUZBwjPaMIdadYHmeT+EVi/Bu3qd7ETQPahTotg2WRCatXwRBW554g==";
       };
     };
+    "listr2-8.2.3" = {
+      name = "listr2";
+      packageName = "listr2";
+      version = "8.2.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/listr2/-/listr2-8.2.3.tgz";
+        sha512 = "Lllokma2mtoniUOS94CcOErHWAug5iu7HOmDrvWgpw8jyQH2fomgB+7lZS4HWZxytUuQwkGOwe49FvwVaA85Xw==";
+      };
+    };
     "lmdb-2.5.3" = {
       name = "lmdb";
       packageName = "lmdb";
@@ -34171,13 +33829,13 @@ let
         sha512 = "9bMdFfc80S+vSldBmG3HOuLVHnxRdNTlpzR6QDnzqCQtCzGUEAGTzBKYMeIM+I/sU4oZfgbcbS7X7F65/z/oxQ==";
       };
     };
-    "load-bmfont-1.4.1" = {
+    "load-bmfont-1.4.2" = {
       name = "load-bmfont";
       packageName = "load-bmfont";
-      version = "1.4.1";
+      version = "1.4.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/load-bmfont/-/load-bmfont-1.4.1.tgz";
-        sha512 = "8UyQoYmdRDy81Brz6aLAUhfZLwr5zV0L3taTQ4hju7m6biuwiWiJXjPhBJxbUQJA8PrkvJ/7Enqmwk2sM14soA==";
+        url = "https://registry.npmjs.org/load-bmfont/-/load-bmfont-1.4.2.tgz";
+        sha512 = "qElWkmjW9Oq1F9EI5Gt7aD9zcdHb9spJCW1L/dmPf7KzCCEJxq8nhHz5eCgI9aMf7vrG/wyaCqdsI+Iy9ZTlog==";
       };
     };
     "load-ip-set-3.0.1" = {
@@ -35332,6 +34990,15 @@ let
         sha512 = "5UtUDQ/6edw4ofyljDNcOVJQ4c7OjDro4h3y8e1GQL5iYElYclVHJ3zeWchylvMaKnDbDilC8irOVyexnA/Slw==";
       };
     };
+    "log-update-6.0.0" = {
+      name = "log-update";
+      packageName = "log-update";
+      version = "6.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/log-update/-/log-update-6.0.0.tgz";
+        sha512 = "niTvB4gqvtof056rRIrTZvjNYE4rCUzO6X/X+kYjd7WFxXeJ0NwEFnRxX6ehkvv3jTwrXnNdtAak5XYZuIyPFw==";
+      };
+    };
     "log4js-6.9.1" = {
       name = "log4js";
       packageName = "log4js";
@@ -35341,13 +35008,13 @@ let
         sha512 = "1somDdy9sChrr9/f4UlzhdaGfDR2c/SaD2a4T7qEkG4jTS57/B3qmnjLYePwQ8cqWnUHZI0iAKxMBpCZICiZ2g==";
       };
     };
-    "logform-2.6.0" = {
+    "logform-2.6.1" = {
       name = "logform";
       packageName = "logform";
-      version = "2.6.0";
+      version = "2.6.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/logform/-/logform-2.6.0.tgz";
-        sha512 = "1ulHeNPp6k/LD8H91o7VYFBng5i1BDE7HoKxVbZiGFidS1Rj65qcywLxX+pVfAPoQJEjRdvKcusKwOupHCVOVQ==";
+        url = "https://registry.npmjs.org/logform/-/logform-2.6.1.tgz";
+        sha512 = "CdaO738xRapbKIMVn2m4F6KTj4j7ooJ8POVnebSgKo3KBz5axNXRAL7ZdRjIV6NOr2Uf4vjtRkxrFETOioCqSA==";
       };
     };
     "logidrom-0.3.1" = {
@@ -35539,15 +35206,6 @@ let
         sha512 = "5OUtoiVIGU4VXBOshidmtOsvBIvcQR6FD/RzWSvaeHyxCGB+PCUCu+52lqMfdc0h/2CLvHhZS4TwUmMQrrMbBQ==";
       };
     };
-    "lru-cache-10.0.3" = {
-      name = "lru-cache";
-      packageName = "lru-cache";
-      version = "10.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lru-cache/-/lru-cache-10.0.3.tgz";
-        sha512 = "B7gr+F6MkqB3uzINHXNctGieGsRTMwIBgxkp0yq/5BwcuDzD4A8wQpHQW6vDAm1uKSLQghmRdD9sKqf2vJ1cEg==";
-      };
-    };
     "lru-cache-10.2.2" = {
       name = "lru-cache";
       packageName = "lru-cache";
@@ -35557,6 +35215,24 @@ let
         sha512 = "9hp3Vp2/hFQUiIwKo8XCeFVnrg8Pk3TYNPIR7tJADKi5YfcF7vEaK7avFHTlSy3kOKYaJQaalfEo6YuXdceBOQ==";
       };
     };
+    "lru-cache-10.4.3" = {
+      name = "lru-cache";
+      packageName = "lru-cache";
+      version = "10.4.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz";
+        sha512 = "JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==";
+      };
+    };
+    "lru-cache-11.0.0" = {
+      name = "lru-cache";
+      packageName = "lru-cache";
+      version = "11.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/lru-cache/-/lru-cache-11.0.0.tgz";
+        sha512 = "Qv32eSV1RSCfhY3fpPE2GNZ8jgM9X7rdAfemLWqTUxwiyIC4jJ6Sy0fZ8H+oLWevO6i4/bizg7c8d8i6bxrzbA==";
+      };
+    };
     "lru-cache-2.2.0" = {
       name = "lru-cache";
       packageName = "lru-cache";
@@ -35639,22 +35315,13 @@ let
         sha256 = "f813d671f8f8088d70d29f7a7770bdd5ed41ed97240ae9346d7ced0c094ee049";
       };
     };
-    "luxon-1.28.1" = {
+    "luxon-3.4.4" = {
       name = "luxon";
       packageName = "luxon";
-      version = "1.28.1";
+      version = "3.4.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/luxon/-/luxon-1.28.1.tgz";
-        sha512 = "gYHAa180mKrNIUJCbwpmD0aTu9kV0dREDrwNnuyFAsO1Wt0EVYSZelPnJlbj9HplzXX/YWXHFTL45kvZ53M0pw==";
-      };
-    };
-    "magic-string-0.25.9" = {
-      name = "magic-string";
-      packageName = "magic-string";
-      version = "0.25.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/magic-string/-/magic-string-0.25.9.tgz";
-        sha512 = "RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==";
+        url = "https://registry.npmjs.org/luxon/-/luxon-3.4.4.tgz";
+        sha512 = "zobTr7akeGHnv7eBOXcRgMeCP6+uyYsczwmeRCauvpvaAltgNyTbLH/+VaEAPUeWBT+1GuNmz4wC/6jtQzbbVA==";
       };
     };
     "magic-string-0.30.10" = {
@@ -35783,15 +35450,6 @@ let
         sha512 = "NgOPbRiaQM10DYXvN3/hhGVI2M5MtITFryzBGxHM5p4wnFxsVCbxkrBrDsk+EZ5OB4jEOT7AjDxtdF+KVEFT7w==";
       };
     };
-    "make-fetch-happen-11.1.1" = {
-      name = "make-fetch-happen";
-      packageName = "make-fetch-happen";
-      version = "11.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-11.1.1.tgz";
-        sha512 = "rLWS7GCSTcEujjVBs2YqG7Y4643u8ucvCJeSRqiLYhesrDuzeuFIk37xREzAsfQaqzl8b9rNCE4m6J8tvX4Q8w==";
-      };
-    };
     "make-fetch-happen-13.0.1" = {
       name = "make-fetch-happen";
       packageName = "make-fetch-happen";
@@ -36098,15 +35756,6 @@ let
         sha512 = "h1S0f3HzPtaNTaIBXu/3PVsXhKgZGk9DYrqp+bNZwp1wjYhJnEKggossj+DCCQ72+2y3Kcd7fNP2cEkp9jK6Ig==";
       };
     };
-    "matcher-3.0.0" = {
-      name = "matcher";
-      packageName = "matcher";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/matcher/-/matcher-3.0.0.tgz";
-        sha512 = "OkeDaAZ/bQCxeFAozM55PKcKU0yJMPGifLwV4Qgjitu+5MoAfSQN4lsLJeXZ1b8w0x+/Emda6MZgXS1jvsapng==";
-      };
-    };
     "math-random-1.0.4" = {
       name = "math-random";
       packageName = "math-random";
@@ -36593,13 +36242,13 @@ let
         sha512 = "EGowvkkgbMcIChjMTMkESFDbZeSh8xZ7kNSF0hAiAN4Jh6jgHCRS0Ga/+C8y6Au+oqpezRHCfPsmJ2+DwAgiwQ==";
       };
     };
-    "memfs-4.9.2" = {
+    "memfs-4.9.4" = {
       name = "memfs";
       packageName = "memfs";
-      version = "4.9.2";
+      version = "4.9.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/memfs/-/memfs-4.9.2.tgz";
-        sha512 = "f16coDZlTG1jskq3mxarwB+fGRrd0uXWt+o1WIhRfOwbXQZqUDsTVxQBFK9JjRQHblg8eAG2JSbprDXKjc7ijQ==";
+        url = "https://registry.npmjs.org/memfs/-/memfs-4.9.4.tgz";
+        sha512 = "Xlj8b2rU11nM6+KU6wC7cuWcHQhVINWCUgdPS4Ar9nPxLaOya3RghqK7ALyDW2QtGebYAYs6uEdEVnwPVT942A==";
       };
     };
     "memory-cache-0.2.0" = {
@@ -36746,13 +36395,13 @@ let
         sha512 = "8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==";
       };
     };
-    "mermaid-10.6.1" = {
+    "mermaid-10.9.1" = {
       name = "mermaid";
       packageName = "mermaid";
-      version = "10.6.1";
+      version = "10.9.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/mermaid/-/mermaid-10.6.1.tgz";
-        sha512 = "Hky0/RpOw/1il9X8AvzOEChfJtVvmXm+y7JML5C//ePYMy0/9jCEmW1E1g86x9oDfW9+iVEdTV/i+M6KWRNs4A==";
+        url = "https://registry.npmjs.org/mermaid/-/mermaid-10.9.1.tgz";
+        sha512 = "Mx45Obds5W1UkW1nv/7dHRsbfMM1aOKA2+Pxs/IGHNonygDHwmng8xTHyS9z4KWVi0rbko8gjiBmuwwXQ7tiNA==";
       };
     };
     "meros-1.1.4" = {
@@ -37457,6 +37106,15 @@ let
         sha512 = "jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A==";
       };
     };
+    "mime-4.0.0-beta.1" = {
+      name = "mime";
+      packageName = "mime";
+      version = "4.0.0-beta.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mime/-/mime-4.0.0-beta.1.tgz";
+        sha512 = "8/p99P1RV17prytee/A6D+8shNqdDzyvGJ/CVfiuXwh4cTsv3P3qGyaYSx2hdqnqbKKqYUfTC5zAjCtcd1BShw==";
+      };
+    };
     "mime-4.0.1" = {
       name = "mime";
       packageName = "mime";
@@ -37511,6 +37169,15 @@ let
         sha512 = "sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==";
       };
     };
+    "mime-db-1.53.0" = {
+      name = "mime-db";
+      packageName = "mime-db";
+      version = "1.53.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mime-db/-/mime-db-1.53.0.tgz";
+        sha512 = "oHlN/w+3MQ3rba9rqFr6V/ypF10LSkdwUysQL7GkXoTgIWeV+tcXGA852TBxH+gsh8UWoyhR1hKcoMJTuWflpg==";
+      };
+    };
     "mime-types-2.1.18" = {
       name = "mime-types";
       packageName = "mime-types";
@@ -37682,15 +37349,6 @@ let
         sha512 = "r9deDe9p5FJUPZAk3A59wGH7Ii9YrjjWw0jmw/liSbHl2CHiyXj6FcDXDu2K3TjVAXqiJdaw3xxwlZZr9E6nHg==";
       };
     };
-    "miniflare-3.20240610.0" = {
-      name = "miniflare";
-      packageName = "miniflare";
-      version = "3.20240610.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/miniflare/-/miniflare-3.20240610.0.tgz";
-        sha512 = "J6aXmkII5gcq+kC4TurxKiR4rC++apPST/K8P/YjqoQQgrJ+NRPacBhf6iVh8R3ujnXYXaq+Ae+gm+LM0XHK/w==";
-      };
-    };
     "minimalistic-assert-1.0.1" = {
       name = "minimalistic-assert";
       packageName = "minimalistic-assert";
@@ -37709,6 +37367,15 @@ let
         sha512 = "JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg==";
       };
     };
+    "minimatch-10.0.1" = {
+      name = "minimatch";
+      packageName = "minimatch";
+      version = "10.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/minimatch/-/minimatch-10.0.1.tgz";
+        sha512 = "ethXTt3SGGR+95gudmqJ1eNhRO7eGEGIgYA9vnPatK4/etz2MEVDno5GMCibdMTuBMyElzIlgxMna3K94XDIDQ==";
+      };
+    };
     "minimatch-3.0.4" = {
       name = "minimatch";
       packageName = "minimatch";
@@ -37754,15 +37421,6 @@ let
         sha512 = "lIUdtK5hdofgCTu3aT0sOaHsYR37viUuIc0rwnnDXImbwFRcumyLMeZaM0t0I/fgxS6s6JMfu0rLD1Wz9pv1ng==";
       };
     };
-    "minimatch-5.0.1" = {
-      name = "minimatch";
-      packageName = "minimatch";
-      version = "5.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/minimatch/-/minimatch-5.0.1.tgz";
-        sha512 = "nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g==";
-      };
-    };
     "minimatch-5.1.2" = {
       name = "minimatch";
       packageName = "minimatch";
@@ -37835,13 +37493,13 @@ let
         sha512 = "RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==";
       };
     };
-    "minimatch-9.0.4" = {
+    "minimatch-9.0.5" = {
       name = "minimatch";
       packageName = "minimatch";
-      version = "9.0.4";
+      version = "9.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/minimatch/-/minimatch-9.0.4.tgz";
-        sha512 = "KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw==";
+        url = "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz";
+        sha512 = "G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==";
       };
     };
     "minimist-0.0.10" = {
@@ -37988,15 +37646,6 @@ let
         sha512 = "JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==";
       };
     };
-    "minipass-json-stream-1.0.1" = {
-      name = "minipass-json-stream";
-      packageName = "minipass-json-stream";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/minipass-json-stream/-/minipass-json-stream-1.0.1.tgz";
-        sha512 = "ODqY18UZt/I8k+b7rl2AENgbWE8IDYam+undIJONvigAz8KR5GWblsFTEfQs0WODsjbSXWlm+JHEv8Gr6Tfdbg==";
-      };
-    };
     "minipass-pipeline-1.2.4" = {
       name = "minipass-pipeline";
       packageName = "minipass-pipeline";
@@ -38033,6 +37682,15 @@ let
         sha512 = "bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==";
       };
     };
+    "minizlib-3.0.1" = {
+      name = "minizlib";
+      packageName = "minizlib";
+      version = "3.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/minizlib/-/minizlib-3.0.1.tgz";
+        sha512 = "umcy022ILvb5/3Djuu8LWeqUa8D68JaBzlttKeMWen48SjabqS3iY5w/vzeMzMUNhLDifyhbOwKDSznB1vvrwg==";
+      };
+    };
     "mitt-1.2.0" = {
       name = "mitt";
       packageName = "mitt";
@@ -38096,6 +37754,15 @@ let
         sha512 = "vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==";
       };
     };
+    "mkdirp-3.0.1" = {
+      name = "mkdirp";
+      packageName = "mkdirp";
+      version = "3.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mkdirp/-/mkdirp-3.0.1.tgz";
+        sha512 = "+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==";
+      };
+    };
     "mkdirp-classic-0.5.3" = {
       name = "mkdirp-classic";
       packageName = "mkdirp-classic";
@@ -38159,15 +37826,6 @@ let
         sha512 = "oPowVpTm8p3jsK2AKI+NzoS6TBKv7gWY/Hj4ZNh5YWiB3S4eP54y8vSEEgVUdrqgTbjwEzIunNAVQJGRW0bakQ==";
       };
     };
-    "moment-2.29.4" = {
-      name = "moment";
-      packageName = "moment";
-      version = "2.29.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz";
-        sha512 = "5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==";
-      };
-    };
     "moment-2.30.1" = {
       name = "moment";
       packageName = "moment";
@@ -38186,15 +37844,6 @@ let
         sha512 = "zp8slBaeHVn8VOr7aTVzXYYayoVtEF3XI9gmgimyR3PBZsBk4JlXlFgxmcKxRjBZ1voh9ao77u/qwMGSZVZ9+A==";
       };
     };
-    "moment-timezone-0.5.43" = {
-      name = "moment-timezone";
-      packageName = "moment-timezone";
-      version = "0.5.43";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.43.tgz";
-        sha512 = "72j3aNyuIsDxdF1i7CEgV2FfxM1r6aaqJyLB2vwb33mXYyoyLly+F1zbWqhA3/bVIoJ4szlUoMbUnVdid32NUQ==";
-      };
-    };
     "moment-timezone-0.5.45" = {
       name = "moment-timezone";
       packageName = "moment-timezone";
@@ -38240,15 +37889,6 @@ let
         sha512 = "4aE3U7CCBWgrQlQDMq8da4woBWDGHioJFiOZ8Ie6Yq2uwYQ9V2kGhTz4x3u6Wc+OU17nw0yc3rJ/lQ4jIiPe3A==";
       };
     };
-    "mqtt-4.3.7" = {
-      name = "mqtt";
-      packageName = "mqtt";
-      version = "4.3.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mqtt/-/mqtt-4.3.7.tgz";
-        sha512 = "ew3qwG/TJRorTz47eW46vZ5oBw5MEYbQZVaEji44j5lAUSQSqIEoul7Kua/BatBW0H0kKQcC9kwUHa1qzaWHSw==";
-      };
-    };
     "mqtt-4.3.8" = {
       name = "mqtt";
       packageName = "mqtt";
@@ -38258,6 +37898,15 @@ let
         sha512 = "2xT75uYa0kiPEF/PE0VPdavmEkoBzMT/UL9moid0rAvlCtV48qBwxD62m7Ld/4j8tSkIO1E/iqRl/S72SEOhOw==";
       };
     };
+    "mqtt-5.7.0" = {
+      name = "mqtt";
+      packageName = "mqtt";
+      version = "5.7.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mqtt/-/mqtt-5.7.0.tgz";
+        sha512 = "/o0CBYSjZzddmQDV2iglCafsA0xWKpqnS62tGbOLOliubBxszpXO1DAQPyfI7ZcPDG0b9ni7QITn+5FW1E2UTg==";
+      };
+    };
     "mqtt-packet-6.10.0" = {
       name = "mqtt-packet";
       packageName = "mqtt-packet";
@@ -38267,6 +37916,15 @@ let
         sha512 = "ja8+mFKIHdB1Tpl6vac+sktqy3gA8t9Mduom1BA75cI+R9AHnZOiaBQwpGiWnaVJLDGRdNhQmFaAqd7tkKSMGA==";
       };
     };
+    "mqtt-packet-9.0.0" = {
+      name = "mqtt-packet";
+      packageName = "mqtt-packet";
+      version = "9.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/mqtt-packet/-/mqtt-packet-9.0.0.tgz";
+        sha512 = "8v+HkX+fwbodsWAZIZTI074XIoxVBOmPeggQuDFCGg1SqNcC+uoRMWu7J6QlJPqIUIJXmjNYYHxBBLr1Y/Df4w==";
+      };
+    };
     "mri-1.2.0" = {
       name = "mri";
       packageName = "mri";
@@ -38339,13 +37997,13 @@ let
         sha512 = "VoY2AaoowHZLLKyEb5FRzuhdSzXn5quGjcMKJOJHJPxp9baYZx5t6jiHUhp5aNRlqqlt+5GXQGovMLNKsrm1hg==";
       };
     };
-    "msgpackr-1.10.2" = {
+    "msgpackr-1.11.0" = {
       name = "msgpackr";
       packageName = "msgpackr";
-      version = "1.10.2";
+      version = "1.11.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/msgpackr/-/msgpackr-1.10.2.tgz";
-        sha512 = "L60rsPynBvNE+8BWipKKZ9jHcSGbtyJYIwjRq0VrIvQ08cRjntGXJYW/tmciZ2IHWIY8WEW32Qa2xbh5+SKBZA==";
+        url = "https://registry.npmjs.org/msgpackr/-/msgpackr-1.11.0.tgz";
+        sha512 = "I8qXuuALqJe5laEBYoFykChhSXLikZmUhccjGsPuSJ/7uPip2TJ7lwdIQwWSAi0jGZDXv4WOP8Qg65QZRuXxXw==";
       };
     };
     "muggle-string-0.4.1" = {
@@ -38943,15 +38601,6 @@ let
         sha512 = "73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ==";
       };
     };
-    "node-addon-api-5.1.0" = {
-      name = "node-addon-api";
-      packageName = "node-addon-api";
-      version = "5.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node-addon-api/-/node-addon-api-5.1.0.tgz";
-        sha512 = "eh0GgfEkpnoWDq+VY8OyvYhFEzBk6jIYbRKdIlyTiAXIVJ8PyBaKb0rp7oDtoddbdoHWhq8wwr+XZ81F1rpNdA==";
-      };
-    };
     "node-addon-api-6.1.0" = {
       name = "node-addon-api";
       packageName = "node-addon-api";
@@ -38961,13 +38610,13 @@ let
         sha512 = "+eawOlIgy680F0kBzPUNFhMZGtJ1YmqM6l4+Crf4IkImjYrO/mqPwRMh352g23uIaQKFItcQ64I7KMaJxHgAVA==";
       };
     };
-    "node-addon-api-7.1.0" = {
+    "node-addon-api-7.1.1" = {
       name = "node-addon-api";
       packageName = "node-addon-api";
-      version = "7.1.0";
+      version = "7.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.0.tgz";
-        sha512 = "mNcltoe1R8o7STTegSOHdnJNN7s5EUvhoS7ShnTHDyOSd+8H+UdWODq6qSv67PjC8Zc5JRT8+oLAMCr0SIXw7g==";
+        url = "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.1.tgz";
+        sha512 = "5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==";
       };
     };
     "node-api-version-0.2.0" = {
@@ -38997,13 +38646,13 @@ let
         sha512 = "h66cRVEWnPQFxh5Y1hk9MNs6jvlB26CjT727ZztkIkPN+eyRI2c9powQrBJ9pty2Kj7IBySDnYHig7QElmU4Pg==";
       };
     };
-    "node-datachannel-0.9.1" = {
+    "node-datachannel-0.10.1" = {
       name = "node-datachannel";
       packageName = "node-datachannel";
-      version = "0.9.1";
+      version = "0.10.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-datachannel/-/node-datachannel-0.9.1.tgz";
-        sha512 = "b6Uc6YN5We2/aZA6QGicxSdWUDSwlR+vcO/Dn44BY5gieF3AOwsL/zPD+Ril+1KvYDwVJkVbRIovbG76E4PpwA==";
+        url = "https://registry.npmjs.org/node-datachannel/-/node-datachannel-0.10.1.tgz";
+        sha512 = "rhxb1iQgbFLY6HMt3W6Xcs8Q1k4jIMgI7KduXcYvIn2UMKYK6e/eegya2caF/+XYAqTeo1743gOr11CXvJ/DJA==";
       };
     };
     "node-domexception-1.0.0" = {
@@ -39123,15 +38772,6 @@ let
         sha512 = "ofRW94Ab0T4AOh5Fk8t0h8OBWrmjb0SSB20xh1H8YnPV9EJ+f5AMoYSUQ2zgJ4Iq2HAK0I2l5/Nequ8YzFS3Hg==";
       };
     };
-    "node-fetch-native-1.6.4" = {
-      name = "node-fetch-native";
-      packageName = "node-fetch-native";
-      version = "1.6.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node-fetch-native/-/node-fetch-native-1.6.4.tgz";
-        sha512 = "IhOigYzAKHd244OC0JIMIUrjzctirCmPkaIfhDeGcEETWof5zKYUW7e7MYvChGWh/4CJeXEgsRyGzuF334rOOQ==";
-      };
-    };
     "node-forge-0.10.0" = {
       name = "node-forge";
       packageName = "node-forge";
@@ -39168,13 +38808,13 @@ let
         sha512 = "dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==";
       };
     };
-    "node-gyp-10.1.0" = {
+    "node-gyp-10.2.0" = {
       name = "node-gyp";
       packageName = "node-gyp";
-      version = "10.1.0";
+      version = "10.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-gyp/-/node-gyp-10.1.0.tgz";
-        sha512 = "B4J5M1cABxPc5PwfjhbV5hoy2DP9p8lFXASnEN6hugXOa61416tnTZ29x9sSwAd0o99XNIcpvDDy1swAExsVKA==";
+        url = "https://registry.npmjs.org/node-gyp/-/node-gyp-10.2.0.tgz";
+        sha512 = "sp3FonBAaFe4aYTcFdZUn2NYkbP7xroPGYvQmP4Nl5PxamznItBnNCgjrVTKrEfQynInMsJvZrdmqUnysCJ8rw==";
       };
     };
     "node-gyp-3.8.0" = {
@@ -39303,22 +38943,22 @@ let
         sha512 = "SU00ZarexNlE4Rjdm83vglt5Y9yiQ+XI1XpflWlb7q7UTN1JUItm69xMeiQCTxtTfnzt+83T8Cx+vI2ED++VDA==";
       };
     };
-    "node-red-admin-3.1.3" = {
+    "node-red-admin-4.0.0" = {
       name = "node-red-admin";
       packageName = "node-red-admin";
-      version = "3.1.3";
+      version = "4.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-red-admin/-/node-red-admin-3.1.3.tgz";
-        sha512 = "RRkjwLjriCKW3bqiU21y3j+wpZ4bDf2EH3IEqxwP6hT4ccIwEK8Nt9dPZRWD6NyWGbEVDSTM5H0/whaRdFCqSw==";
+        url = "https://registry.npmjs.org/node-red-admin/-/node-red-admin-4.0.0.tgz";
+        sha512 = "OP2IE/5r+TCeZBj5x+8MfslEjsxqGc1Er5rI5IMG3D/A3++3r0EkW+tlc0pKnX8lmKs1batgAtMIQbh4XkMY3w==";
       };
     };
-    "node-releases-2.0.14" = {
+    "node-releases-2.0.18" = {
       name = "node-releases";
       packageName = "node-releases";
-      version = "2.0.14";
+      version = "2.0.18";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-releases/-/node-releases-2.0.14.tgz";
-        sha512 = "y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==";
+        url = "https://registry.npmjs.org/node-releases/-/node-releases-2.0.18.tgz";
+        sha512 = "d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==";
       };
     };
     "node-rsa-1.1.1" = {
@@ -39330,13 +38970,13 @@ let
         sha512 = "Jd4cvbJMryN21r5HgxQOpMEqv+ooke/korixNNK3mGqfGJmy0M77WDDzo/05969+OkMy3XW1UuZsSmW9KQm7Fw==";
       };
     };
-    "node-schedule-2.1.0" = {
+    "node-schedule-2.1.1" = {
       name = "node-schedule";
       packageName = "node-schedule";
-      version = "2.1.0";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-schedule/-/node-schedule-2.1.0.tgz";
-        sha512 = "nl4JTiZ7ZQDc97MmpTq9BQjYhq7gOtoh7SiPH069gBFBj0PzD8HI7zyFs6rzqL8Y5tTiEEYLxgtbx034YPrbyQ==";
+        url = "https://registry.npmjs.org/node-schedule/-/node-schedule-2.1.1.tgz";
+        sha512 = "OXdegQq03OmXEjt2hZP33W2YPs/E5BcFQks46+G2gAxs4gHOIVD1u7EqlYLYSKsaIpyKCK9Gbk0ta1/gjRSMRQ==";
       };
     };
     "node-ssdp-2.9.1" = {
@@ -39510,22 +39150,13 @@ let
         sha512 = "EBk5QKKuocMJhB3BILuKhmaPjI8vNRSpIfO9woLC6NyHVkKKdVEdAO1mrT0ZfxNR1lKwCcTkuZfmGIFdizZ8Pg==";
       };
     };
-    "normalize-package-data-5.0.0" = {
+    "normalize-package-data-6.0.2" = {
       name = "normalize-package-data";
       packageName = "normalize-package-data";
-      version = "5.0.0";
+      version = "6.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-5.0.0.tgz";
-        sha512 = "h9iPVIfrVZ9wVYQnxFgtw1ugSvGEMOlyPWWtm8BMJhnwyEL/FLbYbTY3V3PpjI/BUK67n9PEWDu6eHzu1fB15Q==";
-      };
-    };
-    "normalize-package-data-6.0.1" = {
-      name = "normalize-package-data";
-      packageName = "normalize-package-data";
-      version = "6.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-6.0.1.tgz";
-        sha512 = "6rvCfeRW+OEZagAB4lMLSNuTNYZWLVtKccK79VSTf//yTY5VOCgcpH80O+bZK8Neps7pUnd5G+QlMg1yV/2iZQ==";
+        url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-6.0.2.tgz";
+        sha512 = "V6gygoYb/5EmNI+MEGrWkC+e6+Rr7mTmfHrxDbLzxQogBkgzo76rkok0Am6thgSF7Mv2nLOajAJj5vDJZEFn7g==";
       };
     };
     "normalize-path-2.1.1" = {
@@ -39681,15 +39312,6 @@ let
         sha512 = "dMxCf+zZ+3zeQZXKxmyuCKlIDPGuv8EF940xbkC4kQVDTtqoh6rJFO+JTKSA6/Rwi0getWmtuy4Itup0AMcaDQ==";
       };
     };
-    "npm-package-arg-10.1.0" = {
-      name = "npm-package-arg";
-      packageName = "npm-package-arg";
-      version = "10.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-10.1.0.tgz";
-        sha512 = "uFyyCEmgBfZTtrKk/5xDfHp6+MdrqGotX/VoOyEEl3mBwiEE5FlBaePanazJSVMPT7vKepcjYBY2ztg9A3yPIA==";
-      };
-    };
     "npm-package-arg-11.0.2" = {
       name = "npm-package-arg";
       packageName = "npm-package-arg";
@@ -39699,6 +39321,15 @@ let
         sha512 = "IGN0IAwmhDJwy13Wc8k+4PEbTPhpJnMtfR53ZbOyjkvmEcLS4nCwp6mvMWjS5sUjeiW3mpx6cHmuhKEu9XmcQw==";
       };
     };
+    "npm-package-arg-11.0.3" = {
+      name = "npm-package-arg";
+      packageName = "npm-package-arg";
+      version = "11.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-11.0.3.tgz";
+        sha512 = "sHGJy8sOC1YraBywpzQlIKBE4pBbGbiF95U6Auspzyem956E0+FtDtsx1ZxlOJkQCZ1AFXAY/yuvtFYrOxF+Bw==";
+      };
+    };
     "npm-package-arg-6.1.0" = {
       name = "npm-package-arg";
       packageName = "npm-package-arg";
@@ -39726,15 +39357,6 @@ let
         sha512 = "xXxr8y5U0kl8dVkz2oK7yZjPBvqM2fwaO5l3Yg13p03v8+E3qQcD0JNhHzjL1vyGgxcKkD0cco+NLR72iuPk3g==";
       };
     };
-    "npm-package-arg-8.1.1" = {
-      name = "npm-package-arg";
-      packageName = "npm-package-arg";
-      version = "8.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-8.1.1.tgz";
-        sha512 = "CsP95FhWQDwNqiYS+Q0mZ7FAEDytDZAkNxQqea6IaAFJTAY9Lhhqyl0irU/6PMc7BGfUmnsbHcqxJD7XuVM/rg==";
-      };
-    };
     "npm-packlist-1.4.8" = {
       name = "npm-packlist";
       packageName = "npm-packlist";
@@ -39762,15 +39384,6 @@ let
         sha512 = "Jt01acDvJRhJGthnUJVF/w6gumWOZxO7IkpY/lsX9//zqQgnF7OJaxgQXcerd4uQOLu7W5bkb4mChL9mdfm+Zg==";
       };
     };
-    "npm-packlist-5.1.1" = {
-      name = "npm-packlist";
-      packageName = "npm-packlist";
-      version = "5.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-5.1.1.tgz";
-        sha512 = "UfpSvQ5YKwctmodvPPkK6Fwk603aoVsf8AEbmVKAEECrfvL8SSe1A2YIwrJ6xmTHAITKPwwZsWo7WwEbNk0kxw==";
-      };
-    };
     "npm-packlist-8.0.2" = {
       name = "npm-packlist";
       packageName = "npm-packlist";
@@ -39789,6 +39402,15 @@ let
         sha512 = "Udm1f0l2nXb3wxDpKjfohwgdFUSV50UVwzEIpDXVsbDMXVIEF81a/i0UhuQbhrPMMmdiq3+YMFLFIRVLs3hxQw==";
       };
     };
+    "npm-pick-manifest-9.1.0" = {
+      name = "npm-pick-manifest";
+      packageName = "npm-pick-manifest";
+      version = "9.1.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-9.1.0.tgz";
+        sha512 = "nkc+3pIIhqHVQr085X9d2JzPzLyjzQS96zbruppqC9aZRm/x8xx6xhI98gHtsfELP2bE+loHq8ZaHFHhe+NauA==";
+      };
+    };
     "npm-registry-client-8.6.0" = {
       name = "npm-registry-client";
       packageName = "npm-registry-client";
@@ -39798,24 +39420,6 @@ let
         sha512 = "Qs6P6nnopig+Y8gbzpeN/dkt+n7IyVd8f45NTMotGk6Qo7GfBmzwYx6jRLoOOgKiMnaQfYxsuyQlD8Mc3guBhg==";
       };
     };
-    "npm-registry-fetch-14.0.5" = {
-      name = "npm-registry-fetch";
-      packageName = "npm-registry-fetch";
-      version = "14.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-14.0.5.tgz";
-        sha512 = "kIDMIo4aBm6xg7jOttupWZamsZRkAqMqwqqbVXnUqstY5+tapvv6bkH/qMR76jdgV+YljEUCyWx3hRYMrJiAgA==";
-      };
-    };
-    "npm-registry-fetch-16.2.1" = {
-      name = "npm-registry-fetch";
-      packageName = "npm-registry-fetch";
-      version = "16.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-16.2.1.tgz";
-        sha512 = "8l+7jxhim55S85fjiDGJ1rZXBWGtRLi1OSb4Z3BPLObPuIaeKRlPRiYMSHU4/81ck3t71Z+UwDDl47gcpmfQQA==";
-      };
-    };
     "npm-registry-fetch-17.1.0" = {
       name = "npm-registry-fetch";
       packageName = "npm-registry-fetch";
@@ -39987,22 +39591,22 @@ let
         sha512 = "qaKRmtYPZ5qdw4jWJD6bxEf1FJEqllJrwxCLIm0sQU/A7v2/czigzOb+C2uSiFsa9lBUzeH7M1oK+Q+OLxL3kA==";
       };
     };
-    "nwsapi-2.2.10" = {
+    "nwsapi-2.2.12" = {
       name = "nwsapi";
       packageName = "nwsapi";
-      version = "2.2.10";
+      version = "2.2.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.10.tgz";
-        sha512 = "QK0sRs7MKv0tKe1+5uZIQk/C8XGza4DAnztJG8iD+TpJIORARrCxczA738awHrZoHeTjSSoHqao2teO0dC/gFQ==";
+        url = "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.12.tgz";
+        sha512 = "qXDmcVlZV4XRtKFzddidpfVP4oMSGhga+xdMc25mv8kaLUHtgzCDhUxkrN8exkGdTlLNaXj7CV3GtON7zuGZ+w==";
       };
     };
-    "nx-19.3.0" = {
+    "nx-19.5.3" = {
       name = "nx";
       packageName = "nx";
-      version = "19.3.0";
+      version = "19.5.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/nx/-/nx-19.3.0.tgz";
-        sha512 = "WILWiROUkZWwuPJ12tP24Z0NULPEhxFN9i55/fECuVXYaFtkg6FvEne9C4d4bRqhZPcbrz6WhHnzE3NhdjH7XQ==";
+        url = "https://registry.npmjs.org/nx/-/nx-19.5.3.tgz";
+        sha512 = "ZUrnRwPdRWXeo8IuLj16Oo9IfiDjd8C6xKWC4F6wcTNZ9ZS7ZErrfqaQr04zdO89ASF9brbkqm0UkMyDPc6kPQ==";
       };
     };
     "oas-kit-common-1.0.8" = {
@@ -40068,13 +39672,13 @@ let
         sha512 = "fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==";
       };
     };
-    "oauth2orize-1.11.1" = {
+    "oauth2orize-1.12.0" = {
       name = "oauth2orize";
       packageName = "oauth2orize";
-      version = "1.11.1";
+      version = "1.12.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/oauth2orize/-/oauth2orize-1.11.1.tgz";
-        sha512 = "9dSx/Gwm0J2Rvj4RH9+h7iXVnRXZ6biwWRgb2dCeQhCosODS0nYdM9I/G7BUGsjbgn0pHjGcn1zcCRtzj2SlRA==";
+        url = "https://registry.npmjs.org/oauth2orize/-/oauth2orize-1.12.0.tgz";
+        sha512 = "j4XtFDQUBsvUHPjUmvmNDUDMYed2MphMIJBhyxVVe8hGCjkuYnjIsW+D9qk8c5ciXRdnk6x6tEbiO6PLeOZdCQ==";
       };
     };
     "object-assign-3.0.0" = {
@@ -40131,13 +39735,13 @@ let
         sha512 = "RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==";
       };
     };
-    "object-inspect-1.13.1" = {
+    "object-inspect-1.13.2" = {
       name = "object-inspect";
       packageName = "object-inspect";
-      version = "1.13.1";
+      version = "1.13.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz";
-        sha512 = "5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==";
+        url = "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.2.tgz";
+        sha512 = "IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==";
       };
     };
     "object-is-1.1.6" = {
@@ -40401,13 +40005,13 @@ let
         sha512 = "fvaSZRzprpwLFge/mcwE0CItfniNisVNamDdMK1FQUjh4ArQZ8ZWSkDaJbZc3XaANKZHq0xIa8NJpZ2HSe3oXA==";
       };
     };
-    "oo-ascii-tree-1.100.0" = {
+    "oo-ascii-tree-1.101.0" = {
       name = "oo-ascii-tree";
       packageName = "oo-ascii-tree";
-      version = "1.100.0";
+      version = "1.101.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.100.0.tgz";
-        sha512 = "Y/C4AN9IVjsIyNQ1iK4x65xe2AV9q0MtXlYAOKZLA2ZscOzZJbRNi0BzcpmeMb/DSIAFm9M5kaxLqdAKpETbHg==";
+        url = "https://registry.npmjs.org/oo-ascii-tree/-/oo-ascii-tree-1.101.0.tgz";
+        sha512 = "hNE9Nfvo4HLa9/dAiaiXUm64KHUvgBa7jPftsb8gZdTv1G1wSMMnd9j7SMcRzaMbDEqi+0cfgeBSIcsKy+k0vA==";
       };
     };
     "open-0.0.2" = {
@@ -40491,13 +40095,13 @@ let
         sha512 = "+9g4actZKeb3czfi9gVQ4Br2Ju3KwhCAQJBNaKgye5KggqcBLIhFHH+nIkcm0BUX00TrAJl6dH4JWgM4G4JWrw==";
       };
     };
-    "openpgp-5.11.1" = {
+    "openpgp-5.11.2" = {
       name = "openpgp";
       packageName = "openpgp";
-      version = "5.11.1";
+      version = "5.11.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/openpgp/-/openpgp-5.11.1.tgz";
-        sha512 = "TynUBPuaSI7dN0gP+A38CjNRLxkOkkptefNanalDQ71BFAKKm+dLbksymSW5bUrB7RcAneMySL/Y+r/TbLpOnQ==";
+        url = "https://registry.npmjs.org/openpgp/-/openpgp-5.11.2.tgz";
+        sha512 = "f8dJFVLwdkvPvW3VPFs6q9Vs2+HNhdvwls7a/MIFcQUB+XiQzRe7alfa3RtwfGJU7oUDDMAWPZ0nYsHa23Az+A==";
       };
     };
     "opentracing-0.14.7" = {
@@ -40743,6 +40347,15 @@ let
         sha512 = "RMtGSVNM4NWSF9uVWCUqaYiA7ID8Vqm/rSk2W37eYVrDLOI/3do2IRY7rQYkvJqb6sS6LAnALODBkD50tIM1kw==";
       };
     };
+    "oxc-resolver-1.10.2" = {
+      name = "oxc-resolver";
+      packageName = "oxc-resolver";
+      version = "1.10.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/oxc-resolver/-/oxc-resolver-1.10.2.tgz";
+        sha512 = "NIbwVqoU8Bhl7PVtItHCg+VFFokIDwBgIgFUwFG2Y8ePhxftFh5xG+KLar5PLWXlCP4WunPIuXD3jr3v6/MfRw==";
+      };
+    };
     "p-any-2.1.0" = {
       name = "p-any";
       packageName = "p-any";
@@ -41148,13 +40761,13 @@ let
         sha512 = "RRTnDb2TBG/epPRI2yYXsimO0v3BXC8Yd3ogr1545IaqKK17VGhbWVeGGN+XfCm/08OK8635nH31c8bATkHuSw==";
       };
     };
-    "pac-proxy-agent-7.0.1" = {
+    "pac-proxy-agent-7.0.2" = {
       name = "pac-proxy-agent";
       packageName = "pac-proxy-agent";
-      version = "7.0.1";
+      version = "7.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-7.0.1.tgz";
-        sha512 = "ASV8yU4LLKBAjqIPMbrgtaKIvxQri/yh2OpI+S6hVa9JRkUI3Y3NPFbfngDtY7oFtSMD3w31Xns89mDa3Feo5A==";
+        url = "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-7.0.2.tgz";
+        sha512 = "BFi3vZnO9X5Qt6NRz7ZOaPja3ic0PhlsmCRYLOpN11+mWBCR6XJDqW5RF3j8jm4WGGQZtBA+bTfxYzeKW73eHg==";
       };
     };
     "pac-resolver-7.0.1" = {
@@ -41175,6 +40788,15 @@ let
         sha512 = "knDtirWWqKVJrLY3gEBLflVvueTMpyjbAwX/9j/EKi2DsjNemp5voS8cyKyGh57SNaMJNhNRZbIaWdneOcLU1g==";
       };
     };
+    "package-json-10.0.1" = {
+      name = "package-json";
+      packageName = "package-json";
+      version = "10.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/package-json/-/package-json-10.0.1.tgz";
+        sha512 = "ua1L4OgXSBdsu1FPb7F3tYH0F48a6kxvod4pLUlGY9COeJAJQNX/sNH2IiEmsxw7lqYiAwrdHMjz1FctOsyDQg==";
+      };
+    };
     "package-json-2.4.0" = {
       name = "package-json";
       packageName = "package-json";
@@ -41220,13 +40842,13 @@ let
         sha512 = "cbH9IAIJHNj9uXi196JVsRlt7cHKak6u/e6AkL/bkRelZ7rlL3X1YKxsZwa36xipOEKAsdtmaG6aAJoM1fx2zA==";
       };
     };
-    "pacote-17.0.7" = {
-      name = "pacote";
-      packageName = "pacote";
-      version = "17.0.7";
+    "package-json-from-dist-1.0.0" = {
+      name = "package-json-from-dist";
+      packageName = "package-json-from-dist";
+      version = "1.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pacote/-/pacote-17.0.7.tgz";
-        sha512 = "sgvnoUMlkv9xHwDUKjKQFXVyUi8dtJGKp3vg6sYy+TxbDic5RjZCHF3ygv0EJgNRZ2GfRONjlKPUfokJ9lDpwQ==";
+        url = "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.0.tgz";
+        sha512 = "dATvCeZN/8wQsGywez1mzHtTlP22H8OEfPrVMLNr4/eGa+ijtLn/6M5f0dY8UKNrC2O9UCU6SSoG3qRKnt7STw==";
       };
     };
     "pacote-18.0.6" = {
@@ -41337,6 +40959,15 @@ let
         sha512 = "0cEliVMZEhrFDwMh4SxIyVJpqYoOWDJ9P895tFuS+XuNzI5UBmBk5U5O4KuJdTnZpSBI4LFA2+ZiJaiwfSwlMA==";
       };
     };
+    "parse-conflict-json-3.0.1" = {
+      name = "parse-conflict-json";
+      packageName = "parse-conflict-json";
+      version = "3.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/parse-conflict-json/-/parse-conflict-json-3.0.1.tgz";
+        sha512 = "01TvEktc68vwbJOtWZluyWeVGWjP+bZwXtPDMQVbBKzbJ/vZBif0L69KH1+cHv1SZ6e0FKLvjyHe8mqsIqYOmw==";
+      };
+    };
     "parse-english-5.0.0" = {
       name = "parse-english";
       packageName = "parse-english";
@@ -41382,6 +41013,15 @@ let
         sha512 = "kgBf6avCbO3Cn6+RnzRGLkUsv4ZVqv/VfAYkRsyBcgkshNvVBkRn1FEZcW0Jb+npXQWm2vHPnnOqFteZxRRGNw==";
       };
     };
+    "parse-github-url-1.0.3" = {
+      name = "parse-github-url";
+      packageName = "parse-github-url";
+      version = "1.0.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/parse-github-url/-/parse-github-url-1.0.3.tgz";
+        sha512 = "tfalY5/4SqGaV/GIGzWyHnFjlpTPTNpENR9Ea2lLldSJ8EWXMsvacWucqY3m3I4YPtas15IxTLQVQ5NSYXPrww==";
+      };
+    };
     "parse-gitignore-1.0.1" = {
       name = "parse-gitignore";
       packageName = "parse-gitignore";
@@ -41535,13 +41175,13 @@ let
         sha512 = "Eg1OuNntBMH0ojvEKSrvDSnwLmvVuUOSdylH/pSCPNMIspLlweJyIWXCE+k/5hm3cj/EBUYwmWkjhBALNP4LXQ==";
       };
     };
-    "parse-torrent-11.0.16" = {
+    "parse-torrent-11.0.17" = {
       name = "parse-torrent";
       packageName = "parse-torrent";
-      version = "11.0.16";
+      version = "11.0.17";
       src = fetchurl {
-        url = "https://registry.npmjs.org/parse-torrent/-/parse-torrent-11.0.16.tgz";
-        sha512 = "5GoOdmW0HpiB78aQpBz8/5V3V1LjBRDNiL7DOs33pKeCLOzFnfMrsRD6CYmaUBT5Vi/dXE0hfePsjDGJSMF48w==";
+        url = "https://registry.npmjs.org/parse-torrent/-/parse-torrent-11.0.17.tgz";
+        sha512 = "bkfEtrqIMT4+bSWs+m7+Ktd7LSJsDefA9qfJQ3UFwOeBqipiQ+347guu79zX++nRwMnrdvRecLmgaRcdiYjE4w==";
       };
     };
     "parse-torrent-4.1.0" = {
@@ -41751,13 +41391,13 @@ let
         sha512 = "XHXfu/yOQRy9vYOtUDVMN60OEJjW013GoObG1o+xwQTpB9eYJX/BjXMsdW13ZDPruFhYYn0AG22w0xgQMwl3Nw==";
       };
     };
-    "passport-0.6.0" = {
+    "passport-0.7.0" = {
       name = "passport";
       packageName = "passport";
-      version = "0.6.0";
+      version = "0.7.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/passport/-/passport-0.6.0.tgz";
-        sha512 = "0fe+p3ZnrWRW74fe8+SvCyf4a3Pb2/h7gFkQ8yTJpAO50gDzlfjZUZTO1k5Eg9kUct22OxHLqDZoKUWRHOh9ug==";
+        url = "https://registry.npmjs.org/passport/-/passport-0.7.0.tgz";
+        sha512 = "cPLl+qZpSc+ireUvt+IzqbED1cHHkDoVYMo30jbJIdOOjQ1MQYZBPiNvmi8UM6lJuOpTPXJGZQk0DtC4y61MYQ==";
       };
     };
     "passport-http-bearer-1.0.1" = {
@@ -41994,6 +41634,15 @@ let
         sha512 = "Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==";
       };
     };
+    "path-scurry-2.0.0" = {
+      name = "path-scurry";
+      packageName = "path-scurry";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/path-scurry/-/path-scurry-2.0.0.tgz";
+        sha512 = "ypGJsmGtdXUOeM5u93TyeIEfEhM6s+ljAhrk5vAvSx8uyY/02OvrZnA0YNGUrPXfpJMgI1ODd3nwz8Npx4O4cg==";
+      };
+    };
     "path-to-regexp-0.1.7" = {
       name = "path-to-regexp";
       packageName = "path-to-regexp";
@@ -42039,15 +41688,6 @@ let
         sha512 = "JLyh7xT1kizaEvcaXOQwOc2/Yhw6KZOvPf1S8401UyLk86CU79LN3vl7ztXGm/pZ+YjoyAJ4rxmHwbkBXJX+yw==";
       };
     };
-    "path-to-regexp-6.2.2" = {
-      name = "path-to-regexp";
-      packageName = "path-to-regexp";
-      version = "6.2.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.2.2.tgz";
-        sha512 = "GQX3SSMokngb36+whdpRXE+3f9V8UzyAorlYvOGx87ufGHehNTn5lCxrKtLyZ4Yl/wEKnNnr98ZzOwwDZV5ogw==";
-      };
-    };
     "path-type-1.1.0" = {
       name = "path-type";
       packageName = "path-type";
@@ -42093,15 +41733,6 @@ let
         sha512 = "5HviZNaZcfqP95rwpv+1HDgUamezbqdSYTyzjTvwtJSnIH+3vnbmWsItli8OFEndS984VT55M3jduxZbX351gg==";
       };
     };
-    "pathe-1.1.2" = {
-      name = "pathe";
-      packageName = "pathe";
-      version = "1.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pathe/-/pathe-1.1.2.tgz";
-        sha512 = "whLdWMYL2TwI08hn8/ZqAbrVemu0LNaNNJZX73O6qaIdCTfXutsLhMkjdENX0qhsQ9uIimo4/aQOmXkoon2nDQ==";
-      };
-    };
     "pause-0.0.1" = {
       name = "pause";
       packageName = "pause";
@@ -42210,6 +41841,15 @@ let
         sha512 = "CzFr90qM24ju5f88quFC/6qohjC144rehe5n6DH900lgXmUe86+xCKc10ev56gRKC4/BkHUoG4uSiQgBiIXwDA==";
       };
     };
+    "phin-3.7.1" = {
+      name = "phin";
+      packageName = "phin";
+      version = "3.7.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/phin/-/phin-3.7.1.tgz";
+        sha512 = "GEazpTWwTZaEQ9RhL7Nyz0WwqilbqgLahDM3D0hxWwmVDI52nXEybHqiN6/elwpkJBhcuj+WbBu+QfT0uhPGfQ==";
+      };
+    };
     "picocolors-0.2.1" = {
       name = "picocolors";
       packageName = "picocolors";
@@ -42561,13 +42201,13 @@ let
         sha512 = "LKWqWJRhstyYo9pGvgor/ivk2w94eSjE3RGVuzLGlr3NmD8bf7RcYGze1mNdEHRP6TRP6rMuDHk5t44hnTRyow==";
       };
     };
-    "pnpm-sync-lib-0.2.6" = {
+    "pnpm-sync-lib-0.2.9" = {
       name = "pnpm-sync-lib";
       packageName = "pnpm-sync-lib";
-      version = "0.2.6";
+      version = "0.2.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pnpm-sync-lib/-/pnpm-sync-lib-0.2.6.tgz";
-        sha512 = "6bEpWpEo2AJnUeMy6j1+3xm71C/h4LtHDmaBVyNgnsErgJ8uiB8ekWvgheVHsUxz038oFy2tAXPMHrr59VLbdA==";
+        url = "https://registry.npmjs.org/pnpm-sync-lib/-/pnpm-sync-lib-0.2.9.tgz";
+        sha512 = "qd2/crPxmpEXAWHlotOQfxQZ3a1fZIG4u73CiSPwPYDtd7Ithx7O3gtqzQb/0LXDEvk1NpL7u4xf7yEiUCqg3Q==";
       };
     };
     "pony-cause-1.1.1" = {
@@ -42588,15 +42228,6 @@ let
         sha512 = "HmfV88y4tmtR9JsLzdtNwJea+cQdGt+ozeDWdlxHbCiPcoG+/iSAnJ1mEAYdOqITgCoFIT67o3VdY684Ed3FWA==";
       };
     };
-    "portfinder-1.0.32" = {
-      name = "portfinder";
-      packageName = "portfinder";
-      version = "1.0.32";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/portfinder/-/portfinder-1.0.32.tgz";
-        sha512 = "on2ZJVVDXRADWE6jnQaX0ioEylzgBpQk8r55NE4wjXW1ZxO+BgDlY6DXwj20i0V8eB4SenDQ00WEaxfiIQPcxg==";
-      };
-    };
     "portscanner-2.2.0" = {
       name = "portscanner";
       packageName = "portscanner";
@@ -42633,13 +42264,13 @@ let
         sha512 = "yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==";
       };
     };
-    "postcss-8.4.38" = {
+    "postcss-8.4.40" = {
       name = "postcss";
       packageName = "postcss";
-      version = "8.4.38";
+      version = "8.4.40";
       src = fetchurl {
-        url = "https://registry.npmjs.org/postcss/-/postcss-8.4.38.tgz";
-        sha512 = "Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==";
+        url = "https://registry.npmjs.org/postcss/-/postcss-8.4.40.tgz";
+        sha512 = "YF2kKIUzAofPMpfH6hOi2cGnv/HrUlfucspc7pDyvv7kGdqXrfj8SCl/t8owkEgKEuu8ZcRjSOxFxVLqwChZ2Q==";
       };
     };
     "postcss-calc-10.0.0" = {
@@ -42669,13 +42300,13 @@ let
         sha512 = "UsWQG0AqTFQmpBegeLLc1+c3jIqBNB0zlDGRWR+dQ3pRKJL1oeMzyqmH3o2PIfn9MBdNrVPWhDbT769LxCTLJQ==";
       };
     };
-    "postcss-colormin-7.0.0" = {
+    "postcss-colormin-7.0.1" = {
       name = "postcss-colormin";
       packageName = "postcss-colormin";
-      version = "7.0.0";
+      version = "7.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-7.0.0.tgz";
-        sha512 = "5CN6fqtsEtEtwf3mFV3B4UaZnlYljPpzmGeDB4yCK067PnAtfLe9uX2aFZaEwxHE7HopG5rUkW8gyHrNAesHEg==";
+        url = "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-7.0.1.tgz";
+        sha512 = "uszdT0dULt3FQs47G5UHCduYK+FnkLYlpu1HpWu061eGsKZ7setoG7kA+WC9NQLsOJf69D5TxGHgnAdRgylnFQ==";
       };
     };
     "postcss-convert-values-5.1.3" = {
@@ -42687,13 +42318,13 @@ let
         sha512 = "82pC1xkJZtcJEfiLw6UXnXVXScgtBrjlO5CBmuDQc+dlb88ZYheFsjTn40+zBVi3DkfF7iezO0nJUPLcJK3pvA==";
       };
     };
-    "postcss-convert-values-7.0.0" = {
+    "postcss-convert-values-7.0.2" = {
       name = "postcss-convert-values";
       packageName = "postcss-convert-values";
-      version = "7.0.0";
+      version = "7.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-7.0.0.tgz";
-        sha512 = "bMuzDgXBbFbByPgj+/r6va8zNuIDUaIIbvAFgdO1t3zdgJZ77BZvu6dfWyd6gHEJnYzmeVr9ayUsAQL3/qLJ0w==";
+        url = "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-7.0.2.tgz";
+        sha512 = "MuZIF6HJ4izko07Q0TgW6pClalI4al6wHRNPkFzqQdwAwG7hPn0lA58VZdxyb2Vl5AYjJ1piO+jgF9EnTjQwQQ==";
       };
     };
     "postcss-discard-comments-5.1.2" = {
@@ -42705,13 +42336,13 @@ let
         sha512 = "+L8208OVbHVF2UQf1iDmRcbdjJkuBF6IS29yBDSiWUIzpYaAhtNl6JYnYm12FnkeCwQqF5LeklOu6rAqgfBZqQ==";
       };
     };
-    "postcss-discard-comments-7.0.0" = {
+    "postcss-discard-comments-7.0.1" = {
       name = "postcss-discard-comments";
       packageName = "postcss-discard-comments";
-      version = "7.0.0";
+      version = "7.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-7.0.0.tgz";
-        sha512 = "xpSdzRqYmy4YIVmjfGyYXKaI1SRnK6CTr+4Zmvyof8ANwvgfZgGdVtmgAvzh59gJm808mJCWQC9tFN0KF5dEXA==";
+        url = "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-7.0.1.tgz";
+        sha512 = "GVrQxUOhmle1W6jX2SvNLt4kmN+JYhV7mzI6BMnkAWR9DtVvg8e67rrV0NfdWhn7x1zxvzdWkMBPdBDCls+uwQ==";
       };
     };
     "postcss-discard-duplicates-5.1.0" = {
@@ -42840,13 +42471,13 @@ let
         sha512 = "YCI9gZB+PLNskrK0BB3/2OzPnGhPkBEwmwhfYk1ilBHYVAZB7/tkTHFBAnCrvBBOmeYyMYw3DMjT55SyxMBzjQ==";
       };
     };
-    "postcss-merge-longhand-7.0.1" = {
+    "postcss-merge-longhand-7.0.2" = {
       name = "postcss-merge-longhand";
       packageName = "postcss-merge-longhand";
-      version = "7.0.1";
+      version = "7.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-7.0.1.tgz";
-        sha512 = "qZlD26hnqSTMxSSOMS8+QCeRWtqOdMKeQHvHcBhjL3mJxKUs47cvO1Y1x3iTdYIk3ioMcRHTiy229TT0mEMH/A==";
+        url = "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-7.0.2.tgz";
+        sha512 = "06vrW6ZWi9qeP7KMS9fsa9QW56+tIMW55KYqF7X3Ccn+NI2pIgPV6gFfvXTMQ05H90Y5DvnCDPZ2IuHa30PMUg==";
       };
     };
     "postcss-merge-rules-5.1.4" = {
@@ -42858,13 +42489,13 @@ let
         sha512 = "0R2IuYpgU93y9lhVbO/OylTtKMVcHb67zjWIfCiKR9rWL3GUk1677LAqD/BcHizukdZEjT8Ru3oHRoAYoJy44g==";
       };
     };
-    "postcss-merge-rules-7.0.1" = {
+    "postcss-merge-rules-7.0.2" = {
       name = "postcss-merge-rules";
       packageName = "postcss-merge-rules";
-      version = "7.0.1";
+      version = "7.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-7.0.1.tgz";
-        sha512 = "bb8McYQbo2etgs0uVt6AfngajACK3FHSVP3sGLhprrjbtHJWgG03JZ4KKBlJ8/5Fb8/Rr+mMKaybMYeoYrAg0A==";
+        url = "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-7.0.2.tgz";
+        sha512 = "VAR47UNvRsdrTHLe7TV1CeEtF9SJYR5ukIB9U4GZyZOptgtsS20xSxy+k5wMrI3udST6O1XuIn7cjQkg7sDAAw==";
       };
     };
     "postcss-minify-font-values-5.1.0" = {
@@ -42912,13 +42543,13 @@ let
         sha512 = "+mePA3MgdmVmv6g+30rn57USjOGSAyuxUmkfiWpzalZ8aiBkdPYjXWtHuwJGm1v5Ojy0Z0LaSYhHaLJQB0P8Jw==";
       };
     };
-    "postcss-minify-params-7.0.0" = {
+    "postcss-minify-params-7.0.1" = {
       name = "postcss-minify-params";
       packageName = "postcss-minify-params";
-      version = "7.0.0";
+      version = "7.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-7.0.0.tgz";
-        sha512 = "XOJAuX8Q/9GT1sGxlUvaFEe2H9n50bniLZblXXsAT/BwSfFYvzSZeFG7uupwc0KbKpTnflnQ7aMwGzX6JUWliQ==";
+        url = "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-7.0.1.tgz";
+        sha512 = "e+Xt8xErSRPgSRFxHeBCSxMiO8B8xng7lh8E0A5ep1VfwYhY8FXhu4Q3APMjgx9YDDbSp53IBGENrzygbUvgUQ==";
       };
     };
     "postcss-minify-selectors-5.2.1" = {
@@ -42930,13 +42561,13 @@ let
         sha512 = "nPJu7OjZJTsVUmPdm2TcaiohIwxP+v8ha9NehQ2ye9szv4orirRU3SDdtUmKH+10nzn0bAyOXZ0UEr7OpvLehg==";
       };
     };
-    "postcss-minify-selectors-7.0.1" = {
+    "postcss-minify-selectors-7.0.2" = {
       name = "postcss-minify-selectors";
       packageName = "postcss-minify-selectors";
-      version = "7.0.1";
+      version = "7.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-7.0.1.tgz";
-        sha512 = "YfIbGtcgMFquPxV2L/ASs36ZS4DsgfcDX9tQ8cTEIvBTv+0GXFKtcvvpi9tCKto/+DWGWYKMCESFG3Pnan0Feg==";
+        url = "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-7.0.2.tgz";
+        sha512 = "dCzm04wqW1uqLmDZ41XYNBJfjgps3ZugDpogAmJXoCb5oCiTzIX4oPXXKxDpTvWOnKxQKR4EbV4ZawJBLcdXXA==";
       };
     };
     "postcss-modules-extract-imports-3.1.0" = {
@@ -42975,13 +42606,13 @@ let
         sha512 = "RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==";
       };
     };
-    "postcss-nested-6.0.1" = {
+    "postcss-nested-6.2.0" = {
       name = "postcss-nested";
       packageName = "postcss-nested";
-      version = "6.0.1";
+      version = "6.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/postcss-nested/-/postcss-nested-6.0.1.tgz";
-        sha512 = "mEp4xPMi5bSWiMbsgoPfcP74lsWLHkQbZc3sY+jWYd65CUwXrUaTp0fmNpa01ZcETKlIgUdFN/MpS2xZtqL9dQ==";
+        url = "https://registry.npmjs.org/postcss-nested/-/postcss-nested-6.2.0.tgz";
+        sha512 = "HQbt28KulC5AJzG+cZtj9kvKB93CFCdLvog1WFLf1D+xmMvPGlBstkpTEZfK5+AN9hfJocyBFCNiqyS48bpgzQ==";
       };
     };
     "postcss-normalize-charset-5.1.0" = {
@@ -43101,13 +42732,13 @@ let
         sha512 = "qnCL5jzkNUmKVhZoENp1mJiGNPcsJCs1aaRmURmeJGES23Z/ajaln+EPTD+rBeNkSryI+2WTdW+lwcVdOikrpA==";
       };
     };
-    "postcss-normalize-unicode-7.0.0" = {
+    "postcss-normalize-unicode-7.0.1" = {
       name = "postcss-normalize-unicode";
       packageName = "postcss-normalize-unicode";
-      version = "7.0.0";
+      version = "7.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-7.0.0.tgz";
-        sha512 = "OnKV52/VFFDAim4n0pdI+JAhsolLBdnCKxE6VV5lW5Q/JeVGFN8UM8ur6/A3EAMLsT1ZRm3fDHh/rBoBQpqi2w==";
+        url = "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-7.0.1.tgz";
+        sha512 = "PTPGdY9xAkTw+8ZZ71DUePb7M/Vtgkbbq+EoI33EuyQEzbKemEQMhe5QSr0VP5UfZlreANDPxSfcdSprENcbsg==";
       };
     };
     "postcss-normalize-url-5.1.0" = {
@@ -43155,13 +42786,13 @@ let
         sha512 = "9UO79VUhPwEkzbb3RNpqqghc6lcYej1aveQteWY+4POIwlqkYE21HKWaLDF6lWNuqCobEAyTovVhtI32Rbv2RQ==";
       };
     };
-    "postcss-ordered-values-7.0.0" = {
+    "postcss-ordered-values-7.0.1" = {
       name = "postcss-ordered-values";
       packageName = "postcss-ordered-values";
-      version = "7.0.0";
+      version = "7.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-7.0.0.tgz";
-        sha512 = "KROvC63A8UQW1eYDljQe1dtwc1E/M+mMwDT6z7khV/weHYLWTghaLRLunU7x1xw85lWFwVZOAGakxekYvKV+0w==";
+        url = "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-7.0.1.tgz";
+        sha512 = "irWScWRL6nRzYmBOXReIKch75RRhNS86UPUAxXdmW/l0FcAsg0lvAXQCby/1lymxn/o0gVa6Rv/0f03eJOwHxw==";
       };
     };
     "postcss-reduce-initial-5.1.2" = {
@@ -43173,13 +42804,13 @@ let
         sha512 = "dE/y2XRaqAi6OvjzD22pjTUQ8eOfc6m/natGHgKFBK9DxFmIm69YmaRVQrGgFlEfc1HePIurY0TmDeROK05rIg==";
       };
     };
-    "postcss-reduce-initial-7.0.0" = {
+    "postcss-reduce-initial-7.0.1" = {
       name = "postcss-reduce-initial";
       packageName = "postcss-reduce-initial";
-      version = "7.0.0";
+      version = "7.0.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-7.0.0.tgz";
-        sha512 = "iqGgmBxY9LrblZ0BKLjmrA1mC/cf9A/wYCCqSmD6tMi+xAyVl0+DfixZIHSVDMbCPRPjNmVF0DFGth/IDGelFQ==";
+        url = "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-7.0.1.tgz";
+        sha512 = "0JDUSV4bGB5FGM5g8MkS+rvqKukJZ7OTHw/lcKn7xPNqeaqJyQbUO8/dJpvyTpaVwPsd3Uc33+CfNzdVowp2WA==";
       };
     };
     "postcss-reduce-transforms-5.1.0" = {
@@ -43209,13 +42840,13 @@ let
         sha512 = "/eoEylGWyy6/DOiMP5lmFRdmDKThqgn7D6hP2dXKJI/0rJSO1ADFNngZfDzxL0YAxFvws+Rtpuji1YIHj4mySA==";
       };
     };
-    "postcss-resolve-nested-selector-0.1.1" = {
+    "postcss-resolve-nested-selector-0.1.4" = {
       name = "postcss-resolve-nested-selector";
       packageName = "postcss-resolve-nested-selector";
-      version = "0.1.1";
+      version = "0.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.1.tgz";
-        sha512 = "HvExULSwLqHLgUy1rl3ANIqCsvMS0WHss2UOsXhXnQaZ9VCc2oBvIpXrl00IUFT5ZDITME0o6oiXeiHr2SAIfw==";
+        url = "https://registry.npmjs.org/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.4.tgz";
+        sha512 = "R6vHqZWgVnTAPq0C+xjyHfEZqfIYboCBVSy24MjxEDm+tIh1BU4O6o7DP7AA7kHzf136d+Qc5duI4tlpHjixDw==";
       };
     };
     "postcss-safe-parser-4.0.2" = {
@@ -43263,13 +42894,13 @@ let
         sha512 = "36P2QR59jDTOAiIkqEprfJDsoNrvwFei3eCqKd1Y0tUsBimsq39BLp7RD+JWny3WgB1zGhJX8XVePwm9k4wdBg==";
       };
     };
-    "postcss-selector-parser-6.1.0" = {
+    "postcss-selector-parser-6.1.1" = {
       name = "postcss-selector-parser";
       packageName = "postcss-selector-parser";
-      version = "6.1.0";
+      version = "6.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.0.tgz";
-        sha512 = "UMz42UD0UY0EApS0ZL9o1XnLhSTtvvvLe5Dc2H2O56fvRZi+KulDyf5ctDhhtYJBGKStV2FL1fy6253cmLgqVQ==";
+        url = "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.1.tgz";
+        sha512 = "b4dlw/9V8A71rLIDsSwVmak9z2DuBUB7CA1/wSdelNEzqsjoSPeADTWNO09lpH49Diy3/JIZ2bSPB1dI3LJCHg==";
       };
     };
     "postcss-svgo-5.1.0" = {
@@ -43398,13 +43029,13 @@ let
         sha512 = "QCYG84SgGyGzqJ/vlMsxeXd/pgL/I94ixdNFyh1PusWmTCyVfPJjZ1K1jvHtsbfnXQs2TSkEP2fR7QiMZAnKFQ==";
       };
     };
-    "preferred-pm-3.1.3" = {
+    "preferred-pm-3.1.4" = {
       name = "preferred-pm";
       packageName = "preferred-pm";
-      version = "3.1.3";
+      version = "3.1.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/preferred-pm/-/preferred-pm-3.1.3.tgz";
-        sha512 = "MkXsENfftWSRpzCzImcp4FRsCc3y1opwB73CfCNWyzMqArju2CrlMHlqB7VexKiPEOjGMbttv1r9fSCn5S610w==";
+        url = "https://registry.npmjs.org/preferred-pm/-/preferred-pm-3.1.4.tgz";
+        sha512 = "lEHd+yEm22jXdCphDrkvIJQU66EuLojPPtvZkpKIkiD+l0DMThF/niqZKJSoU8Vl7iuvtmzyMhir9LdVy5WMnA==";
       };
     };
     "prelude-ls-1.1.2" = {
@@ -43479,13 +43110,13 @@ let
         sha512 = "tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==";
       };
     };
-    "prettier-3.3.2" = {
+    "prettier-3.3.3" = {
       name = "prettier";
       packageName = "prettier";
-      version = "3.3.2";
+      version = "3.3.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/prettier/-/prettier-3.3.2.tgz";
-        sha512 = "rAVeHYMcv8ATV5d508CFdn+8/pHPpXeIid1DdrPwXnaAdH7cqjVbpJaT5eq4yRAFU/lsbwYwSF/n5iNrdJHPQA==";
+        url = "https://registry.npmjs.org/prettier/-/prettier-3.3.3.tgz";
+        sha512 = "i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==";
       };
     };
     "prettier-bytes-1.0.4" = {
@@ -43497,13 +43128,13 @@ let
         sha512 = "dLbWOa4xBn+qeWeIF60qRoB6Pk2jX5P3DIVgOQyMyvBpu931Q+8dXz8X0snJiFkQdohDDLnZQECjzsAj75hgZQ==";
       };
     };
-    "prettier-plugin-astro-0.14.0" = {
+    "prettier-plugin-astro-0.14.1" = {
       name = "prettier-plugin-astro";
       packageName = "prettier-plugin-astro";
-      version = "0.14.0";
+      version = "0.14.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/prettier-plugin-astro/-/prettier-plugin-astro-0.14.0.tgz";
-        sha512 = "7jRGJsexaRIyUzTk8uzXlP45cw6DQ5Ci4bTe0xCBCcuO1Fff8jJy9oI+kRCQKSdDFTSAArMSg8GpvzlKBtSaZA==";
+        url = "https://registry.npmjs.org/prettier-plugin-astro/-/prettier-plugin-astro-0.14.1.tgz";
+        sha512 = "RiBETaaP9veVstE4vUwSIcdATj6dKmXljouXc/DDNwBSPTp8FRkLGDSGFClKsAFeeg+13SB0Z1JZvbD76bigJw==";
       };
     };
     "pretty-bytes-5.6.0" = {
@@ -43569,13 +43200,13 @@ let
         sha512 = "973driJZvxiGOQ5ONsFhOF/DtzPMOMtgC11kCpUrPGMTgqp2q/1gwzCquocrN33is0VZ5GFHXZYMM9l6h67v2Q==";
       };
     };
-    "pretty-ms-9.0.0" = {
+    "pretty-ms-9.1.0" = {
       name = "pretty-ms";
       packageName = "pretty-ms";
-      version = "9.0.0";
+      version = "9.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pretty-ms/-/pretty-ms-9.0.0.tgz";
-        sha512 = "E9e9HJ9R9NasGOgPaPE8VMeiPKAyWR5jcFpNnwIejslIhWqdqOrb2wShBsncMPUb+BcCd2OPYfh7p2W6oemTng==";
+        url = "https://registry.npmjs.org/pretty-ms/-/pretty-ms-9.1.0.tgz";
+        sha512 = "o1piW0n3tgKIKCwk2vpM/vOV13zjJzvP37Ioze54YlTHE06m4tjEbzg9WsKkvTuyYln2DHjo5pY4qrZGI0otpw==";
       };
     };
     "prettyjson-1.2.5" = {
@@ -43596,15 +43227,6 @@ let
         sha512 = "UCDQscAfQ1HArwvSUobJWbc3sTGLqGpYkRqXUpBZgf+zOWpOjz2dxnpRsOu+qxIj1K0n5UT1wgbCCgetsIwiug==";
       };
     };
-    "printable-characters-1.0.42" = {
-      name = "printable-characters";
-      packageName = "printable-characters";
-      version = "1.0.42";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/printable-characters/-/printable-characters-1.0.42.tgz";
-        sha512 = "dKp+C4iXWK4vVYZmYSd0KBH5F/h1HoZRsbJ82AVKRO3PEo8L4lBS/vLwhVtpwwuYcoIsVY+1JYKR268yn480uQ==";
-      };
-    };
     "printf-0.2.5" = {
       name = "printf";
       packageName = "printf";
@@ -43623,15 +43245,6 @@ let
         sha512 = "Kx/1w86q/epKcmte75LNrEoT+lX8pBpavuAbvJWRXar7Hz8jrtF+e3vY751p0R8H9HdArwaCTNDDzHg/ScJK1Q==";
       };
     };
-    "private-0.1.8" = {
-      name = "private";
-      packageName = "private";
-      version = "0.1.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/private/-/private-0.1.8.tgz";
-        sha512 = "VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==";
-      };
-    };
     "probe-image-size-6.0.0" = {
       name = "probe-image-size";
       packageName = "probe-image-size";
@@ -43677,15 +43290,6 @@ let
         sha512 = "cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==";
       };
     };
-    "process-exists-4.1.0" = {
-      name = "process-exists";
-      packageName = "process-exists";
-      version = "4.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/process-exists/-/process-exists-4.1.0.tgz";
-        sha512 = "BBJoiorUKoP2AuM5q/yKwIfT1YWRHsaxjW+Ayu9erLhqKOfnXzzVVML0XTYoQZuI1YvcWKmc1dh06DEy4+KzfA==";
-      };
-    };
     "process-exists-5.0.0" = {
       name = "process-exists";
       packageName = "process-exists";
@@ -43713,6 +43317,15 @@ let
         sha512 = "3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==";
       };
     };
+    "proggy-2.0.0" = {
+      name = "proggy";
+      packageName = "proggy";
+      version = "2.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/proggy/-/proggy-2.0.0.tgz";
+        sha512 = "69agxLtnI8xBs9gUGqEnK26UfiexpHy+KUpBQWabiytQjnn5wFY8rklAi7GRfABIuPNnQ/ik48+LGLkYYJcy4A==";
+      };
+    };
     "progress-1.1.8" = {
       name = "progress";
       packageName = "progress";
@@ -43740,13 +43353,13 @@ let
         sha512 = "iz22FmTbtkyL2vt0MdDFY+kWof+S9UB/NACxSn2aJcewtw+EERsen0urSkZ2WrHseNdydsvcxCTAnPcSMZZv4Q==";
       };
     };
-    "prom-client-14.0.1" = {
+    "prom-client-15.1.2" = {
       name = "prom-client";
       packageName = "prom-client";
-      version = "14.0.1";
+      version = "15.1.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/prom-client/-/prom-client-14.0.1.tgz";
-        sha512 = "HxTArb6fkOntQHoRGvv4qd/BkorjliiuO2uSWC2KC17MUTKYttWdDoXX/vxOhQdkoECEM9BBH0pj2l8G8kev6w==";
+        url = "https://registry.npmjs.org/prom-client/-/prom-client-15.1.2.tgz";
+        sha512 = "on3h1iXb04QFLLThrmVYg1SChBQ9N1c+nKAjebBjokBqipddH3uxmOUcEkTnzmJ8Jh/5TSUnUqS40i2QB2dJHQ==";
       };
     };
     "promise-7.3.1" = {
@@ -43767,6 +43380,24 @@ let
         sha512 = "rZPNPKTOYVNEEKFaq1HqTgOwZD+4/YHS5ukLzQCypkj+OkYx7iv0mA91lJlpPPZ8vMau3IIGj5Qlwrx+8iiSmg==";
       };
     };
+    "promise-all-reject-late-1.0.1" = {
+      name = "promise-all-reject-late";
+      packageName = "promise-all-reject-late";
+      version = "1.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/promise-all-reject-late/-/promise-all-reject-late-1.0.1.tgz";
+        sha512 = "vuf0Lf0lOxyQREH7GDIOUMLS7kz+gs8i6B+Yi8dC68a2sychGrHTJYghMBD6k7eUcH0H5P73EckCA48xijWqXw==";
+      };
+    };
+    "promise-call-limit-3.0.1" = {
+      name = "promise-call-limit";
+      packageName = "promise-call-limit";
+      version = "3.0.1";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/promise-call-limit/-/promise-call-limit-3.0.1.tgz";
+        sha512 = "utl+0x8gIDasV5X+PI5qWEPqH6fJS0pFtQ/4gZ95xfEFb/89dmh+/b895TbFDBLiafBvxD/PGTKfvxl4kH/pQg==";
+      };
+    };
     "promise-inflight-1.0.1" = {
       name = "promise-inflight";
       packageName = "promise-inflight";
@@ -43893,13 +43524,13 @@ let
         sha512 = "vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==";
       };
     };
-    "protobufjs-7.2.6" = {
+    "protobufjs-7.3.2" = {
       name = "protobufjs";
       packageName = "protobufjs";
-      version = "7.2.6";
+      version = "7.3.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/protobufjs/-/protobufjs-7.2.6.tgz";
-        sha512 = "dgJaEDDL6x8ASUZ1YqWciTRrdOuYNzoOf27oHNfdyvKqHr5i0FV7FSLU+aIeFjyFgVxrpTOtQUi0BLLBymZaBw==";
+        url = "https://registry.npmjs.org/protobufjs/-/protobufjs-7.3.2.tgz";
+        sha512 = "RXyHaACeqXeqAKGLDl68rQKbmObRsTIn4TYVUUug1KfS47YWCo5MacGITEryugIgZqORCvJWEk4l449POg5Txg==";
       };
     };
     "protocols-2.0.1" = {
@@ -43956,24 +43587,6 @@ let
         sha512 = "yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw==";
       };
     };
-    "ps-list-6.3.0" = {
-      name = "ps-list";
-      packageName = "ps-list";
-      version = "6.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ps-list/-/ps-list-6.3.0.tgz";
-        sha512 = "qau0czUSB0fzSlBOQt0bo+I2v6R+xiQdj78e1BR/Qjfl5OHWJ/urXi8+ilw1eHe+5hSeDI1wrwVTgDp2wst4oA==";
-      };
-    };
-    "ps-list-7.2.0" = {
-      name = "ps-list";
-      packageName = "ps-list";
-      version = "7.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ps-list/-/ps-list-7.2.0.tgz";
-        sha512 = "v4Bl6I3f2kJfr5o80ShABNHAokIgY+wFDTQfE+X3zWYgSGQOCBeYptLZUpoOALBqO5EawmDN/tjTldJesd0ujQ==";
-      };
-    };
     "ps-list-8.1.1" = {
       name = "ps-list";
       packageName = "ps-list";
@@ -44217,22 +43830,22 @@ let
         sha512 = "FLpr4flz5xZTSJxSeaheeMKN/EDzMdK7b8PTOC6a5PYFKTucWbdqjgqaEyH0shFiSJrVB1+Qqi4Tk19ccU6Aug==";
       };
     };
-    "puppeteer-22.11.0" = {
+    "puppeteer-22.14.0" = {
       name = "puppeteer";
       packageName = "puppeteer";
-      version = "22.11.0";
+      version = "22.14.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/puppeteer/-/puppeteer-22.11.0.tgz";
-        sha512 = "U5U0Dx5Tsd/ec39BmflhcSFIK9UnZxGQfyUzvQVHivt6gIi6RgJqYL9MJaU90OG6tTz65XqzN4wF0ZyDyY0NuA==";
+        url = "https://registry.npmjs.org/puppeteer/-/puppeteer-22.14.0.tgz";
+        sha512 = "MGTR6/pM8zmWbTdazb6FKnwIihzsSEXBPH49mFFU96DNZpQOevCAZMnjBZGlZRGRzRK6aADCavR6SQtrbv5dQw==";
       };
     };
-    "puppeteer-core-22.11.0" = {
+    "puppeteer-core-22.14.0" = {
       name = "puppeteer-core";
       packageName = "puppeteer-core";
-      version = "22.11.0";
+      version = "22.14.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-22.11.0.tgz";
-        sha512 = "57YUjhRoSpZWg9lCssWsgzM1/X/1jQnkKbbspbeW0bhZTt3TD4WdNXEYI7KrFFnSvx21tyHhfWW0zlxzbwYSAA==";
+        url = "https://registry.npmjs.org/puppeteer-core/-/puppeteer-core-22.14.0.tgz";
+        sha512 = "rl4tOY5LcA3e374GAlsGGHc05HL3eGNf5rZ+uxkl6id9zVZKcwcp1Z+Nd6byb6WPiPeecT/dwz8f/iUm+AZQSw==";
       };
     };
     "purgecss-6.0.0" = {
@@ -44262,13 +43875,13 @@ let
         sha512 = "pMpnA0qRdFp32b1sJl1wOJNxZLQ2cbQx+k6tjNtZ8CpvVhNqEPRgivZ2WOUev2YMajecdH7ctUPDvEe87nariQ==";
       };
     };
-    "pyright-1.1.367" = {
+    "pyright-1.1.373" = {
       name = "pyright";
       packageName = "pyright";
-      version = "1.1.367";
+      version = "1.1.373";
       src = fetchurl {
-        url = "https://registry.npmjs.org/pyright/-/pyright-1.1.367.tgz";
-        sha512 = "qw6PmU59P4OAonqPEsaJ4CYHIpkr3eBsyXRpVJnmBoXldEZEoM3qdXIeo9BlsPFE+hzdNKNgBjSNAXdiOixEuw==";
+        url = "https://registry.npmjs.org/pyright/-/pyright-1.1.373.tgz";
+        sha512 = "ZJSjqnHbeZowUnuAiojZqCLeY1XVzRIc2GvMFFNy/z6YSyJXwChPDQL5Jl2bavTvXNO0ITRmMBVvoKCRN7cc3g==";
       };
     };
     "q-1.5.1" = {
@@ -44316,15 +43929,6 @@ let
         sha512 = "nR5uYqNsm8CgBhfCpsYKz6iDhvKjf0xdFT4KanNlLP40COGwZEsjbLoDyL9VrTXyiICUGUbsiN3gBpLGZhSZWQ==";
       };
     };
-    "qs-6.10.3" = {
-      name = "qs";
-      packageName = "qs";
-      version = "6.10.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/qs/-/qs-6.10.3.tgz";
-        sha512 = "wr7M2E0OFRfIfJZjKGieI8lBKb7fRCH4Fv5KNPEs7gJ8jadvotdsS08PzOKR7opXhZ/Xkjtt3WF9g38drmyRqQ==";
-      };
-    };
     "qs-6.10.4" = {
       name = "qs";
       packageName = "qs";
@@ -44343,13 +43947,13 @@ let
         sha512 = "MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==";
       };
     };
-    "qs-6.12.1" = {
+    "qs-6.12.3" = {
       name = "qs";
       packageName = "qs";
-      version = "6.12.1";
+      version = "6.12.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/qs/-/qs-6.12.1.tgz";
-        sha512 = "zWmv4RSuB9r2mYQw3zxQuHWeU+42aKi1wWig/j4ele4ygELZ7PEO6MM7rim9oAQH2A5MWfsAVf/jPvTPgCbvUQ==";
+        url = "https://registry.npmjs.org/qs/-/qs-6.12.3.tgz";
+        sha512 = "AWJm14H1vVaO/iNZ4/hO+HyaTehuy9nRqVdkTqlJt0HWvBiBIEXFmb4C0DGeYo3Xes9rrEW+TxHsaigCbN5ICQ==";
       };
     };
     "qs-6.5.2" = {
@@ -44388,15 +43992,6 @@ let
         sha512 = "IhMFgUmuNpyRfxA90umL7ByLlgRXu6tIfKPpF5TmcfRLlLCckfP/g3IQmju6jjpu+Hh8rA+2p6A27ZSPOOHdKw==";
       };
     };
-    "query-string-5.1.1" = {
-      name = "query-string";
-      packageName = "query-string";
-      version = "5.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/query-string/-/query-string-5.1.1.tgz";
-        sha512 = "gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw==";
-      };
-    };
     "query-string-6.14.1" = {
       name = "query-string";
       packageName = "query-string";
@@ -44721,15 +44316,6 @@ let
         sha512 = "UlTNLIcu0uzb4D2f4WltY6cVjLi+/jEN4lgEUj3E04tpMDpUlkBo/eSn6zou9hum2VMNpCCUone0O0WeJim07g==";
       };
     };
-    "raw-body-2.5.1" = {
-      name = "raw-body";
-      packageName = "raw-body";
-      version = "2.5.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz";
-        sha512 = "qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==";
-      };
-    };
     "raw-body-2.5.2" = {
       name = "raw-body";
       packageName = "raw-body";
@@ -44910,15 +44496,6 @@ let
         sha512 = "rSOKNYUmaxy0om1BNjMN4ezNT6VKK+2xF4GBhc81mkH7L60i6dp8qPYrkndNLT3QPphoII3maL9PVC9XmhHwVQ==";
       };
     };
-    "read-2.1.0" = {
-      name = "read";
-      packageName = "read";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/read/-/read-2.1.0.tgz";
-        sha512 = "bvxi1QLJHcaywCAEsAk4DG3nVoqiY2Csps3qzWalhj5hFqRn1d/OixkFXtLO1PrgHUcAP0FNaSY/5GYNfENFFQ==";
-      };
-    };
     "read-3.0.1" = {
       name = "read";
       packageName = "read";
@@ -45009,24 +44586,6 @@ let
         sha512 = "D1KmuLQr6ZSJS0tW8hf3WGpRlwszJOXZ3E8Yd/DNRaM5d+1wVRZdHlpGBLAuovjr28LbWvjpWkBHMxpRGGjzNA==";
       };
     };
-    "read-package-json-6.0.4" = {
-      name = "read-package-json";
-      packageName = "read-package-json";
-      version = "6.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/read-package-json/-/read-package-json-6.0.4.tgz";
-        sha512 = "AEtWXYfopBj2z5N5PbkAOeNHRPUg5q+Nen7QLxV8M2zJq1ym6/lCz3fYNTCXe19puu2d06jfHhrP7v/S2PtMMw==";
-      };
-    };
-    "read-package-json-7.0.1" = {
-      name = "read-package-json";
-      packageName = "read-package-json";
-      version = "7.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/read-package-json/-/read-package-json-7.0.1.tgz";
-        sha512 = "8PcDiZ8DXUjLf687Ol4BR8Bpm2umR7vhoZOzNRt+uxD9GpBh/K+CAAALVIiYFknmvlmyg7hM7BSNUXPaCCqd0Q==";
-      };
-    };
     "read-package-json-fast-3.0.2" = {
       name = "read-package-json-fast";
       packageName = "read-package-json-fast";
@@ -45234,6 +44793,15 @@ let
         sha512 = "9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==";
       };
     };
+    "readable-stream-4.5.2" = {
+      name = "readable-stream";
+      packageName = "readable-stream";
+      version = "4.5.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/readable-stream/-/readable-stream-4.5.2.tgz";
+        sha512 = "yjavECdqeZ3GLXNgRXgeQEdz9fvDDkNKyHnbHRFtOr7/LcfgBcmct7t/ET+HaCTqfh06OzoAxrkN/IfjJBVe+g==";
+      };
+    };
     "readable-web-to-node-stream-2.0.0" = {
       name = "readable-web-to-node-stream";
       packageName = "readable-web-to-node-stream";
@@ -45315,15 +44883,6 @@ let
         sha512 = "8/td4MmwUB6PkZUbV25uKz7dfrmjYWxsW8DVfibWdlHRk/l/DfHKn4pU+dfcoGLFgWOdyGCzINRQD7jn+Bv+/g==";
       };
     };
-    "recast-0.20.5" = {
-      name = "recast";
-      packageName = "recast";
-      version = "0.20.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/recast/-/recast-0.20.5.tgz";
-        sha512 = "E5qICoPoNL4yU0H0NoBDntNB0Q5oMSNh9usFctYniLBluTthi3RsQVBXIJNbApOlvSwW/RGxIuokPcAc59J5fQ==";
-      };
-    };
     "rechoir-0.6.2" = {
       name = "rechoir";
       packageName = "rechoir";
@@ -45405,13 +44964,22 @@ let
         sha512 = "FNpGGo1DycYAdnrKFxCMmKYgo/mILAqtRYbkdQD8Ep/Hk2PQ5+aEAEx+IU713RTDmuBaH0c8P5ZozurNu5ObRQ==";
       };
     };
-    "redis-4.6.14" = {
-      name = "redis";
-      packageName = "redis";
-      version = "4.6.14";
+    "redis-errors-1.2.0" = {
+      name = "redis-errors";
+      packageName = "redis-errors";
+      version = "1.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/redis/-/redis-4.6.14.tgz";
-        sha512 = "GrNg/e33HtsQwNXL7kJT+iNFPSwE1IPmd7wzV3j4f2z0EYxZfZE7FVTmUysgAtqQQtg5NXF5SNLR9OdO/UHOfw==";
+        url = "https://registry.npmjs.org/redis-errors/-/redis-errors-1.2.0.tgz";
+        sha512 = "1qny3OExCf0UvUV/5wpYKf2YwPcOqXzkwKKSmKHiE6ZMQs5heeE/c8eXK+PNllPvmjgAbfnsbpkGZWy8cBpn9w==";
+      };
+    };
+    "redis-parser-3.0.0" = {
+      name = "redis-parser";
+      packageName = "redis-parser";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/redis-parser/-/redis-parser-3.0.0.tgz";
+        sha512 = "DJnGAeenTdpMEH6uAJRK/uiyEIH9WVsUmoLwzudwGJUwZPp80PDBWPHXSAGNPwNvIXAbe7MSUB1zQFugFml66A==";
       };
     };
     "reduce-flatten-1.0.1" = {
@@ -46359,15 +45927,6 @@ let
         sha512 = "S07L+2VbJB32WddD/o/PnYGKym63zLVbymygVWXvt8L79VAngcjAxhHaGuFOICLxEV90EasEPzqPKKHPspXP8w==";
       };
     };
-    "request-light-0.2.5" = {
-      name = "request-light";
-      packageName = "request-light";
-      version = "0.2.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/request-light/-/request-light-0.2.5.tgz";
-        sha512 = "eBEh+GzJAftUnex6tcL6eV2JCifY0+sZMIUpUPOVXbs2nV5hla4ZMmO3icYKGuGVuQ2zHE9evh4OrRcH4iyYYw==";
-      };
-    };
     "request-light-0.4.0" = {
       name = "request-light";
       packageName = "request-light";
@@ -46503,13 +46062,13 @@ let
         sha512 = "nYzyjnFcPNGR3lx9lwPPPnuQxv6JWEZd2Ci0u9opN7N5zUEPIhY/GbL3vMGOr2UXwEg9WwSyV9X9Y/kLFgPsOg==";
       };
     };
-    "requirejs-2.3.6" = {
+    "requirejs-2.3.7" = {
       name = "requirejs";
       packageName = "requirejs";
-      version = "2.3.6";
+      version = "2.3.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/requirejs/-/requirejs-2.3.6.tgz";
-        sha512 = "ipEzlWQe6RK3jkzikgCupiTbTvm4S0/CAU5GlgptkN5SO6F3u0UD0K18wy6ErDqiCyP4J4YYe1HuAShvsxePLg==";
+        url = "https://registry.npmjs.org/requirejs/-/requirejs-2.3.7.tgz";
+        sha512 = "DouTG8T1WanGok6Qjg2SXuCMzszOo0eHeH9hDZ5Y4x8Je+9JB38HdTLT4/VA8OaUhBa0JPVHJ0pyBkM1z+pDsw==";
       };
     };
     "requires-port-1.0.0" = {
@@ -46683,15 +46242,6 @@ let
         sha512 = "ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg==";
       };
     };
-    "resolve.exports-2.0.2" = {
-      name = "resolve.exports";
-      packageName = "resolve.exports";
-      version = "2.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.2.tgz";
-        sha512 = "X2UW6Nw3n/aMgDVy+0rSqgHlv39WZAlZrXCdnbyEiKm17DSqHX4MmQMaST3FbeWR5FTuRcUwYAziZajji0Y7mg==";
-      };
-    };
     "resp-modifier-6.0.2" = {
       name = "resp-modifier";
       packageName = "resp-modifier";
@@ -46953,13 +46503,13 @@ let
         sha512 = "Gk8NlF062+T9CqNGn6h4tls3k6T1+/nXdOcSZVikNVtlRdYpA7wRJJMoXmuvOnLW844rPjdQ7JgXCYM6PPC/og==";
       };
     };
-    "rimraf-5.0.7" = {
+    "rimraf-5.0.9" = {
       name = "rimraf";
       packageName = "rimraf";
-      version = "5.0.7";
+      version = "5.0.9";
       src = fetchurl {
-        url = "https://registry.npmjs.org/rimraf/-/rimraf-5.0.7.tgz";
-        sha512 = "nV6YcJo5wbLW77m+8KjH8aB/7/rxQy9SZ0HY5shnwULfS+9nmTtVXAJET5NdZmCzA4fPI/Hm1wo/Po/4mopOdg==";
+        url = "https://registry.npmjs.org/rimraf/-/rimraf-5.0.9.tgz";
+        sha512 = "3i7b8OcswU6CpU8Ej89quJD4O98id7TtVM5U4Mybh84zQXdrFmDLouWBEEaD/QfO3gDDfH+AGFCGsR7kngzQnA==";
       };
     };
     "ripemd160-2.0.2" = {
@@ -46980,15 +46530,6 @@ let
         sha512 = "nQptLCZeyyJfgbpf2x97k5YE8vzDn7bhwx9NlvODdhgbU0mL1ruh71X0HYdRaOEvWC7Cr+SfV0p5p+Ib5yOl7A==";
       };
     };
-    "roarr-2.15.4" = {
-      name = "roarr";
-      packageName = "roarr";
-      version = "2.15.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/roarr/-/roarr-2.15.4.tgz";
-        sha512 = "CHhPh+UNHD2GTXNYhPWLnU8ONHdI+5DI+4EYIAOaiD63rHeYlZvyh8P+in5999TTSFgUYuKUAjzRI4mdh/p+2A==";
-      };
-    };
     "robust-predicates-3.0.2" = {
       name = "robust-predicates";
       packageName = "robust-predicates";
@@ -46998,33 +46539,6 @@ let
         sha512 = "IXgzBWvWQwE6PrDI05OvmXUIruQTcoMDzRsOd5CDvHCVLcLHMTSYvOK5Cm46kWqlV3yAbuSpBZdJ5oP5OUoStg==";
       };
     };
-    "rollup-plugin-inject-3.0.2" = {
-      name = "rollup-plugin-inject";
-      packageName = "rollup-plugin-inject";
-      version = "3.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/rollup-plugin-inject/-/rollup-plugin-inject-3.0.2.tgz";
-        sha512 = "ptg9PQwzs3orn4jkgXJ74bfs5vYz1NCZlSQMBUA0wKcGp5i5pA1AO3fOUEte8enhGUC+iapTCzEWw2jEFFUO/w==";
-      };
-    };
-    "rollup-plugin-node-polyfills-0.2.1" = {
-      name = "rollup-plugin-node-polyfills";
-      packageName = "rollup-plugin-node-polyfills";
-      version = "0.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/rollup-plugin-node-polyfills/-/rollup-plugin-node-polyfills-0.2.1.tgz";
-        sha512 = "4kCrKPTJ6sK4/gLL/U5QzVT8cxJcofO0OU74tnB19F40cmuAKSzH5/siithxlofFEjwvw1YAhPmbvGNA6jEroA==";
-      };
-    };
-    "rollup-pluginutils-2.8.2" = {
-      name = "rollup-pluginutils";
-      packageName = "rollup-pluginutils";
-      version = "2.8.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.8.2.tgz";
-        sha512 = "EEp9NhnUkwY8aif6bxgovPHMoMoNr2FulJziTndpt5H9RdwC47GSGuII9XxpSdzVGM0GWrNPHV6ie1LTNJPaLQ==";
-      };
-    };
     "round-to-6.0.0" = {
       name = "round-to";
       packageName = "round-to";
@@ -47052,15 +46566,6 @@ let
         sha512 = "APM0Gt1KoXBz0iIkkdB/kfvGOwC4UuJFeG/c+yV7wSc7q96cG/kJ0HiYCnzivD9SB53cLV1MlHFNfOuPaadYSw==";
       };
     };
-    "rss-parser-3.13.0" = {
-      name = "rss-parser";
-      packageName = "rss-parser";
-      version = "3.13.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/rss-parser/-/rss-parser-3.13.0.tgz";
-        sha512 = "7jWUBV5yGN3rqMMj7CZufl/291QAhvrrGpDNE4k/02ZchL0npisiYYqULF71jCEKoIiHvK/Q2e6IkDwPziT7+w==";
-      };
-    };
     "rss-parser-3.7.1" = {
       name = "rss-parser";
       packageName = "rss-parser";
@@ -47385,13 +46890,13 @@ let
         sha512 = "X8mCSfR8y0NryTu0tuVyr4IS2jBunBgyG+3a0gEEkd0nlHGiyqJhlc4EIkzmSwaa7F8S4yo+LS6Cu5qxRkJrmg==";
       };
     };
-    "sasl-scram-sha-1-1.2.1" = {
+    "sasl-scram-sha-1-1.3.0" = {
       name = "sasl-scram-sha-1";
       packageName = "sasl-scram-sha-1";
-      version = "1.2.1";
+      version = "1.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sasl-scram-sha-1/-/sasl-scram-sha-1-1.2.1.tgz";
-        sha512 = "o63gNo+EGsk1ML0bNeUAjRomIIcG7VaUyA+ffhd9MME5BjqVEpp42YkmBBZqzz1KmJG3YqpRLE4PfUe7FjexaA==";
+        url = "https://registry.npmjs.org/sasl-scram-sha-1/-/sasl-scram-sha-1-1.3.0.tgz";
+        sha512 = "hJE3eUCEx0aK+9jwHu6VVrQwb9qxv8RMc3ZciGF/ZzXgxptCX9QbfJT45nloJGxrR9AfBU6GiVNYKA5mrqu2KQ==";
       };
     };
     "saslmechanisms-0.1.1" = {
@@ -47403,13 +46908,13 @@ let
         sha512 = "pVlvK5ysevz8MzybRnDIa2YMxn0OJ7b9lDiWhMoaKPoJ7YkAg/7YtNjUgaYzElkwHxsw8dBMhaEn7UP6zxEwPg==";
       };
     };
-    "sass-1.77.5" = {
+    "sass-1.77.8" = {
       name = "sass";
       packageName = "sass";
-      version = "1.77.5";
+      version = "1.77.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/sass/-/sass-1.77.5.tgz";
-        sha512 = "oDfX1mukIlxacPdQqNb6mV2tVCrnE+P3nVYioy72V5tlk56CPNcO4TCuFcaCRKKfJ1M3lH95CleRS+dVKL2qMg==";
+        url = "https://registry.npmjs.org/sass/-/sass-1.77.8.tgz";
+        sha512 = "4UHg6prsrycW20fqLGPShtEvo/WyHRVRHwOP4DzkUrObWoWI05QBSfzU71TVB7PFaL104TwNaHpjlWXAZbQiNQ==";
       };
     };
     "sass-formatter-0.7.9" = {
@@ -47682,15 +47187,6 @@ let
         sha512 = "1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==";
       };
     };
-    "semver-7.6.0" = {
-      name = "semver";
-      packageName = "semver";
-      version = "7.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz";
-        sha512 = "EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==";
-      };
-    };
     "semver-7.6.2" = {
       name = "semver";
       packageName = "semver";
@@ -47700,6 +47196,15 @@ let
         sha512 = "FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==";
       };
     };
+    "semver-7.6.3" = {
+      name = "semver";
+      packageName = "semver";
+      version = "7.6.3";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz";
+        sha512 = "oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==";
+      };
+    };
     "semver-compare-1.0.0" = {
       name = "semver-compare";
       packageName = "semver-compare";
@@ -47790,13 +47295,13 @@ let
         sha512 = "qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==";
       };
     };
-    "serialize-error-2.1.0" = {
+    "serialize-error-11.0.3" = {
       name = "serialize-error";
       packageName = "serialize-error";
-      version = "2.1.0";
+      version = "11.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/serialize-error/-/serialize-error-2.1.0.tgz";
-        sha512 = "ghgmKt5o4Tly5yEG/UJp8qTd0AN7Xalw4XBtDEKP655B699qMEtra1WlXeE6WIvdEG481JvRxULKsInq/iNysw==";
+        url = "https://registry.npmjs.org/serialize-error/-/serialize-error-11.0.3.tgz";
+        sha512 = "2G2y++21dhj2R7iHAdd0FIzjGwuKZld+7Pl/bTU6YIkrC2ZMbVUjm+luj6A6V34Rv9XfKJDKpTWu9W4Gse1D9g==";
       };
     };
     "serialize-error-6.0.0" = {
@@ -47808,24 +47313,6 @@ let
         sha512 = "3vmBkMZLQO+BR4RPHcyRGdE09XCF6cvxzk2N2qn8Er3F91cy8Qt7VvEbZBOpaL53qsBbe2cFOefU6tRY6WDelA==";
       };
     };
-    "serialize-error-7.0.1" = {
-      name = "serialize-error";
-      packageName = "serialize-error";
-      version = "7.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/serialize-error/-/serialize-error-7.0.1.tgz";
-        sha512 = "8I8TjW5KMOKsZQTvoxjuSIa7foAwPWGOts+6o7sgjz41/qMD9VQHEDxi6PBvK2l0MXUmqZyNpUK+T2tQaaElvw==";
-      };
-    };
-    "serialize-javascript-6.0.0" = {
-      name = "serialize-javascript";
-      packageName = "serialize-javascript";
-      version = "6.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.0.tgz";
-        sha512 = "Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==";
-      };
-    };
     "serialize-javascript-6.0.2" = {
       name = "serialize-javascript";
       packageName = "serialize-javascript";
@@ -48141,15 +47628,6 @@ let
         sha512 = "sQTKC1Re/rM6XyFM6fIAGHRPVGvyXfgzIDvzoq608vM+jeyVD0Tu1E6Np0Kc2zAIFWIj963V2800iF/9LPieQw==";
       };
     };
-    "shortid-2.2.16" = {
-      name = "shortid";
-      packageName = "shortid";
-      version = "2.2.16";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/shortid/-/shortid-2.2.16.tgz";
-        sha512 = "Ugt+GIZqvGXCIItnsL+lvFJOiN7RYqlGy7QE41O3YC1xbNSeDGIRO7xg2JJXIAj1cAGnOeC1r7/T9pgrtQbv4g==";
-      };
-    };
     "should-13.2.3" = {
       name = "should";
       packageName = "should";
@@ -48249,15 +47727,6 @@ let
         sha512 = "bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==";
       };
     };
-    "sigstore-1.9.0" = {
-      name = "sigstore";
-      packageName = "sigstore";
-      version = "1.9.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/sigstore/-/sigstore-1.9.0.tgz";
-        sha512 = "0Zjz0oe37d08VeOtBIuB6cRriqXse2e8w+7yIy2XSXjshRKxbc2KkhXjL229jXSxEm7UbcjS76wcJDGQddVI9A==";
-      };
-    };
     "sigstore-2.3.1" = {
       name = "sigstore";
       packageName = "sigstore";
@@ -48663,13 +48132,13 @@ let
         sha512 = "2A892lrj0GcgR/9Qk81EaY2gYhCBxurV0PfmmESO6p27QPrUK1J3zdns+5QPqvUYK2q657nSj0guoIil9+7eFg==";
       };
     };
-    "socket.io-2.5.0" = {
+    "socket.io-2.5.1" = {
       name = "socket.io";
       packageName = "socket.io";
-      version = "2.5.0";
+      version = "2.5.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io/-/socket.io-2.5.0.tgz";
-        sha512 = "gGunfS0od3VpwDBpGwVkzSZx6Aqo9uOcf1afJj2cKnKFAoyl16fvhpsUhmUFd4Ldbvl5JvRQed6eQw6oQp6n8w==";
+        url = "https://registry.npmjs.org/socket.io/-/socket.io-2.5.1.tgz";
+        sha512 = "eaTE4tBKRD6RFoetquMbxgvcpvoDtRyIlkIMI/SMK2bsKvbENTsDeeu4GJ/z9c90yOWxB7b/eC+yKLPbHnH6bA==";
       };
     };
     "socket.io-4.6.1" = {
@@ -48708,13 +48177,13 @@ let
         sha512 = "WzZRUj1kUjrTIrUKpZLEzFZ1OLj5FwLlAFQs9kuZJzJi5DKdU7FsWc36SNmA8iDOtwBQyT8FkrriRM8vXLYz8g==";
       };
     };
-    "socket.io-adapter-2.5.4" = {
+    "socket.io-adapter-2.5.5" = {
       name = "socket.io-adapter";
       packageName = "socket.io-adapter";
-      version = "2.5.4";
+      version = "2.5.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.5.4.tgz";
-        sha512 = "wDNHGXGewWAjQPt3pyeYBtpWSq9cLE5UW1ZUPL/2eGK9jtse/FpXib7epSTsz0Q0m+6sg6Y4KtcFTlah1bdOVg==";
+        url = "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.5.5.tgz";
+        sha512 = "eLDQas5dzPgOWCk9GuuJC2lBqItuhKI4uxGgo9aIV7MYbk2h9Q6uULEh8WBzThoI7l+qU9Ast9fVUmkqPP9wYg==";
       };
     };
     "socket.io-client-1.0.6" = {
@@ -48771,13 +48240,13 @@ let
         sha512 = "uW3UiLVibAyleKq8r/yZe1oPO51olhY18T6HtnN0iI6RLqJfYC0YiyAFlsPw1+8I0Z1qFd8jFLTRZo2vr6ISxA==";
       };
     };
-    "socket.io-parser-3.3.3" = {
+    "socket.io-parser-3.3.4" = {
       name = "socket.io-parser";
       packageName = "socket.io-parser";
-      version = "3.3.3";
+      version = "3.3.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.3.3.tgz";
-        sha512 = "qOg87q1PMWWTeO01768Yh9ogn7chB9zkKtQnya41Y355S0UmpXgpcrFwAgjYJxu9BdKug5r5e9YtVSeWhKBUZg==";
+        url = "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.3.4.tgz";
+        sha512 = "z/pFQB3x+EZldRRzORYW1vwVO8m/3ILkswtnpoeU6Ve3cbMWkmHEWDAVJn4QJtchiiFTo5j7UG2QvwxvaA9vow==";
       };
     };
     "socket.io-parser-3.4.3" = {
@@ -48834,13 +48303,13 @@ let
         sha512 = "Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww==";
       };
     };
-    "socks-proxy-agent-8.0.3" = {
+    "socks-proxy-agent-8.0.4" = {
       name = "socks-proxy-agent";
       packageName = "socks-proxy-agent";
-      version = "8.0.3";
+      version = "8.0.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.3.tgz";
-        sha512 = "VNegTZKhuGq5vSD6XNKlbqWhyt/40CgoEw8XxD6dhnm8Jq9IEa3nIa4HwnM8XOqU0CdB0BwWVXusqiFXfHB3+A==";
+        url = "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.4.tgz";
+        sha512 = "GNAq/eg8Udq2x0eNiFkr9gRg5bA7PXEWagQdeRX4cPSG+X/8V38v637gim9bjFptMk1QWsCTr0ttrJEiXbNnRw==";
       };
     };
     "socks5-client-1.2.8" = {
@@ -48879,15 +48348,6 @@ let
         sha512 = "tr2eBD+9sTck9c7y0GkX9n8r4WcuzACYMFAGIjQum/F/LpJUZ0MvR4S6wiCrzvrCiznekBdxeG+8vSBE6d9H7A==";
       };
     };
-    "sonic-forest-1.0.3" = {
-      name = "sonic-forest";
-      packageName = "sonic-forest";
-      version = "1.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/sonic-forest/-/sonic-forest-1.0.3.tgz";
-        sha512 = "dtwajos6IWMEWXdEbW1IkEkyL2gztCAgDplRIX+OT5aRKnEd5e7r7YCxRgXZdhRP1FBdOBf8axeTPhzDv8T4wQ==";
-      };
-    };
     "sorcery-0.10.0" = {
       name = "sorcery";
       packageName = "sorcery";
@@ -48987,15 +48447,6 @@ let
         sha512 = "qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==";
       };
     };
-    "source-map-0.4.4" = {
-      name = "source-map";
-      packageName = "source-map";
-      version = "0.4.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz";
-        sha512 = "Y8nIfcb1s/7DcobUz1yOO1GSp7gyL+D9zLHDehT7iRESqGSxjJ448Sg7rvfgsRJCnKLdSl11uGf0s9X80cH0/A==";
-      };
-    };
     "source-map-0.5.7" = {
       name = "source-map";
       packageName = "source-map";
@@ -49536,13 +48987,13 @@ let
         sha512 = "oeVtt7eWQS+Na6F//S4kJ2K2VbRlS9D43mAlMyVpVWovy9o+jfgH8O9agzANzaiLjclA0oYzUXEM4PurhSUChw==";
       };
     };
-    "stacktracey-2.1.8" = {
-      name = "stacktracey";
-      packageName = "stacktracey";
-      version = "2.1.8";
+    "standard-as-callback-2.1.0" = {
+      name = "standard-as-callback";
+      packageName = "standard-as-callback";
+      version = "2.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/stacktracey/-/stacktracey-2.1.8.tgz";
-        sha512 = "Kpij9riA+UNg7TnphqjH7/CzctQ/owJGNbFkfEeve4Z4uxT5+JapVLFXcsurIfN34gnTWZNJ/f7NMG0E8JDzTw==";
+        url = "https://registry.npmjs.org/standard-as-callback/-/standard-as-callback-2.1.0.tgz";
+        sha512 = "qoRRSyROncaz1z0mvYqIE4lCd9p2R90i6GxW3uZv5ucSu8tU7B5HXUP1gG8pVZsYNVaXjk8ClXHPttLyxAL48A==";
       };
     };
     "stat-mode-0.3.0" = {
@@ -49869,6 +49320,15 @@ let
         sha512 = "Mcc5wHehp9aXz1ax6bZUyY5afg9u2rv5cqQI3mRrYkGC8rW2hM02jWuwjtL++LS5qinSyhj2QfLyNsuc+VsExg==";
       };
     };
+    "streamx-2.17.0" = {
+      name = "streamx";
+      packageName = "streamx";
+      version = "2.17.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/streamx/-/streamx-2.17.0.tgz";
+        sha512 = "mzRXEeafEA0skX5XLiDht/zdIqEVs4kgayUTFHDoMjiaZ2kC7DoFsQDJVXRILI2Qme/kWXxLpuU6P0B+xcXpFA==";
+      };
+    };
     "streamx-2.18.0" = {
       name = "streamx";
       packageName = "streamx";
@@ -49878,15 +49338,6 @@ let
         sha512 = "LLUC1TWdjVdn1weXGcSxyTR3T4+acB6tVGXT95y0nGbca4t4o/ng1wKAGTljm9VicuCVLvRlqFYXYy5GwgM7sQ==";
       };
     };
-    "strict-uri-encode-1.1.0" = {
-      name = "strict-uri-encode";
-      packageName = "strict-uri-encode";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz";
-        sha512 = "R3f198pcvnB+5IpnBlRkphuE9n46WyVl8I39W/ZUTZLz4nqSP/oLYUrcnJrw462Ds8he4YKMov2efsTIw1BDGQ==";
-      };
-    };
     "strict-uri-encode-2.0.0" = {
       name = "strict-uri-encode";
       packageName = "strict-uri-encode";
@@ -49923,13 +49374,13 @@ let
         sha512 = "ATVmIpMrqxPFNiNQTnmEeXzt3743O6DubJWh2MiAQV1ifKd4PcCjBcybCdb0ENnPO1T6asORK9nOpygn1BATag==";
       };
     };
-    "string-kit-0.17.10" = {
+    "string-kit-0.18.3" = {
       name = "string-kit";
       packageName = "string-kit";
-      version = "0.17.10";
+      version = "0.18.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/string-kit/-/string-kit-0.17.10.tgz";
-        sha512 = "n3/2BeEJrlzztoxeBTt9DVh0dfHordBuZoFsSJs59tk1JoPVvtvNsvAgqu0Nlpj5Y/qoQbnT8jCnfuoHcsfGnw==";
+        url = "https://registry.npmjs.org/string-kit/-/string-kit-0.18.3.tgz";
+        sha512 = "G8cBS7wxxHhwQrKU0Y8SjZJRtCzZ61bMmMCO1bWm6N6y2obT0koGK8uWYloMOaVPPr8zk7Ic995uEd4Jw504AQ==";
       };
     };
     "string-length-1.0.1" = {
@@ -50022,13 +49473,13 @@ let
         sha512 = "k01swCJAgQmuADB0YIc+7TuatfNvTBVOoaUWJjTB9R4VJzR5vNWzf5t42ESVZFPS8xTySF7CAdV4t/aaIm3UnQ==";
       };
     };
-    "string-width-7.1.0" = {
+    "string-width-7.2.0" = {
       name = "string-width";
       packageName = "string-width";
-      version = "7.1.0";
+      version = "7.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/string-width/-/string-width-7.1.0.tgz";
-        sha512 = "SEIJCWiX7Kg4c129n48aDRwLbFb2LJmXXFrWBG4NGaRtMQ3myKPKbwrD1BKqQn74oCoNMBVrfDEr5M9YxCsrkw==";
+        url = "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz";
+        sha512 = "tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==";
       };
     };
     "string-width-cjs-4.2.3" = {
@@ -50436,13 +49887,13 @@ let
         sha512 = "sBpcd5Hx7G6seo7b1LkpttvTz7ikD0LlH5RmdcBNb6fFR0Fl7LQwHDFr300q4cwUqi+IYrFGmsIHieMBfnN/Bw==";
       };
     };
-    "stylehacks-7.0.1" = {
+    "stylehacks-7.0.2" = {
       name = "stylehacks";
       packageName = "stylehacks";
-      version = "7.0.1";
+      version = "7.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/stylehacks/-/stylehacks-7.0.1.tgz";
-        sha512 = "PnrT4HzajnxbjfChpeBKLSpSykilnGBlD+pIffCoT5KbLur9fcL8uKRQJJap85byR2wCYZl/4Otk5eq76qeZxQ==";
+        url = "https://registry.npmjs.org/stylehacks/-/stylehacks-7.0.2.tgz";
+        sha512 = "HdkWZS9b4gbgYTdMg4gJLmm7biAUug1qTqXjS+u8X+/pUd+9Px1E+520GnOW3rST9MNsVOVpsJG+mPHNosxjOQ==";
       };
     };
     "stylelint-13.13.1" = {
@@ -50481,15 +49932,6 @@ let
         sha512 = "RIrIdRY0X1xojthNcVtgT9sjpOGagEUKpZdgBUi054OEPFo282yg+zE+t1Rj3+RqKq2xStL7uUHhY+AjbC4BXg==";
       };
     };
-    "subscriptions-transport-ws-0.11.0" = {
-      name = "subscriptions-transport-ws";
-      packageName = "subscriptions-transport-ws";
-      version = "0.11.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/subscriptions-transport-ws/-/subscriptions-transport-ws-0.11.0.tgz";
-        sha512 = "8D4C6DIH5tGiAIpp5I0wD/xRlNiZAPGHygzCe7VzyzUoxHtawzjNAY9SUTXU05/EY2NMY9/9GF0ycizkXr1CWQ==";
-      };
-    };
     "subscriptions-transport-ws-0.9.19" = {
       name = "subscriptions-transport-ws";
       packageName = "subscriptions-transport-ws";
@@ -50679,13 +50121,13 @@ let
         sha512 = "d0FdzYIiAePqRJEb90WlJDkjUEx42xhivxN8muUBmfZnP+tzUgz12DJ2hRJi8sIHCME7jeK1PTMgKPSfTd8JrA==";
       };
     };
-    "svelte-5.0.0-next.155" = {
+    "svelte-5.0.0-next.198" = {
       name = "svelte";
       packageName = "svelte";
-      version = "5.0.0-next.155";
+      version = "5.0.0-next.198";
       src = fetchurl {
-        url = "https://registry.npmjs.org/svelte/-/svelte-5.0.0-next.155.tgz";
-        sha512 = "4a4EZuiTmg4eQJuQ6LTyK+DxRAZCYm4mXgqSWcZ7TellzLfaC1Je5nxBl1aZP3xdNhvPFIstQ8c7I6d+99FdZQ==";
+        url = "https://registry.npmjs.org/svelte/-/svelte-5.0.0-next.198.tgz";
+        sha512 = "1eyQplJR7Rg5dTuHZoDamLJfqyk4k6cB3h6TMybWKrS/MIL4++iNV+q+NP6EUBngZ2iRBup7gRt0jYUbPI0UMw==";
       };
     };
     "svelte-preprocess-5.1.4" = {
@@ -50697,13 +50139,13 @@ let
         sha512 = "IvnbQ6D6Ao3Gg6ftiM5tdbR6aAETwjhHV+UKGf5bHGYR69RQvF1ho0JKPcbUON4vy4R7zom13jPjgdOWCQ5hDA==";
       };
     };
-    "svelte2tsx-0.7.9" = {
+    "svelte2tsx-0.7.13" = {
       name = "svelte2tsx";
       packageName = "svelte2tsx";
-      version = "0.7.9";
+      version = "0.7.13";
       src = fetchurl {
-        url = "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.7.9.tgz";
-        sha512 = "Rm+0LAwg9wT4H2IsR8EaM9EWErTzi9LmuZKxkH5b1ua94XjQmwHstBP4VabLgA9AE6XmwBg+xK7Cjzwfm6ustQ==";
+        url = "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.7.13.tgz";
+        sha512 = "aObZ93/kGAiLXA/I/kP+x9FriZM+GboB/ReOIGmLNbVGEd2xC+aTCppm3mk1cc9I/z60VQf7b2QDxC3jOXu3yw==";
       };
     };
     "sver-1.8.4" = {
@@ -50823,13 +50265,13 @@ let
         sha512 = "dJp4qg+x4JwSEW1HibAuMi0IIrBI3wuQr2GimmqB7OXR50wmwzfdusG+p39R9w3R6aFtZ2mzvxvWKQ3Bd/vx3g==";
       };
     };
-    "synckit-0.9.0" = {
+    "synckit-0.9.1" = {
       name = "synckit";
       packageName = "synckit";
-      version = "0.9.0";
+      version = "0.9.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/synckit/-/synckit-0.9.0.tgz";
-        sha512 = "7RnqIMq572L8PeEzKeBINYEJDDxpcH8JEgLwUqBd3TkofhFRbkq4QLR0u+36avGAhCRbk2nnmjcW9SE531hPDg==";
+        url = "https://registry.npmjs.org/synckit/-/synckit-0.9.1.tgz";
+        sha512 = "7gr8p9TQP6RAHusBOSLs46F4564ZrjV8xFmw5zCmgmhGUcw2hxsShhJ6CEiHQMgPDwAQ1fWHPM0ypc4RMAig4A==";
       };
     };
     "syntax-error-1.4.0" = {
@@ -50886,13 +50328,13 @@ let
         sha512 = "zTvf0mcggrGeTe/2jJ6ECkJHAQPIYEwDoqsiqBjI24mvRmQbInK5jq33fyypaCBxX08hMkfmdOqj6haT33EqWw==";
       };
     };
-    "tailwindcss-3.4.4" = {
+    "tailwindcss-3.4.6" = {
       name = "tailwindcss";
       packageName = "tailwindcss";
-      version = "3.4.4";
+      version = "3.4.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.4.tgz";
-        sha512 = "ZoyXOdJjISB7/BcLTR6SEsLgKtDStYyYZVLsUtWChO4Ps20CBad7lfJKVDiejocV4ME1hLmyY0WJE3hSDcmQ2A==";
+        url = "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.6.tgz";
+        sha512 = "1uRHzPB+Vzu57ocybfZ4jh5Q3SdlH7XW23J5sQoM9LhE9eIOlzxer/3XPSsycvih3rboRsvt0QCmzSrqyOYUIA==";
       };
     };
     "tapable-0.2.9" = {
@@ -50976,6 +50418,15 @@ let
         sha512 = "DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==";
       };
     };
+    "tar-7.2.0" = {
+      name = "tar";
+      packageName = "tar";
+      version = "7.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/tar/-/tar-7.2.0.tgz";
+        sha512 = "hctwP0Nb4AB60bj8WQgRYaMOuJYRAPMGiQUAotms5igN8ppfQM+IvjQ5HcKu1MaZh2Wy2KWVTe563Yj8dfc14w==";
+      };
+    };
     "tar-fs-2.1.1" = {
       name = "tar-fs";
       packageName = "tar-fs";
@@ -50985,13 +50436,13 @@ let
         sha512 = "V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==";
       };
     };
-    "tar-fs-3.0.5" = {
+    "tar-fs-3.0.6" = {
       name = "tar-fs";
       packageName = "tar-fs";
-      version = "3.0.5";
+      version = "3.0.6";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tar-fs/-/tar-fs-3.0.5.tgz";
-        sha512 = "JOgGAmZyMgbqpLwct7ZV8VzkEB6pxXFBVErLtb+XCOqzc6w1xiWKI9GVd6bwk68EX7eJ4DWmfXVmq8K2ziZTGg==";
+        url = "https://registry.npmjs.org/tar-fs/-/tar-fs-3.0.6.tgz";
+        sha512 = "iokBDQQkUyeXhgPYaZxmczGPhnhXZ0CmrqI+MOb/WFGS9DW5wnfrLgtjUJBvz50vQ3qfRwJ62QVoCFu8mPVu5w==";
       };
     };
     "tar-stream-1.6.2" = {
@@ -51021,15 +50472,6 @@ let
         sha512 = "qJj60CXt7IU1Ffyc3NJMjh6EkuCFej46zUqJ4J7pqYlThyd9bO0XBTmcOIhSzZJVWfsLks0+nle/j538YAW9RQ==";
       };
     };
-    "taskkill-3.1.0" = {
-      name = "taskkill";
-      packageName = "taskkill";
-      version = "3.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/taskkill/-/taskkill-3.1.0.tgz";
-        sha512 = "5KcOFzPvd1nGFVrmB7H4+QAWVjYOf//+QTbOj0GpXbqtqbKGWVczG+rq6VhXAtdtlKLTs16NAmHRyF5vbggQ2w==";
-      };
-    };
     "taskkill-5.0.0" = {
       name = "taskkill";
       packageName = "taskkill";
@@ -51174,13 +50616,13 @@ let
         sha512 = "ehoNOk7xB/QBVX38P2kpoLip+s4Tlb6qYDBAoLg/rdRrrtRlDgs97a9MG0xU1IGq/Qpn47n1rwb5fWbM/Bprag==";
       };
     };
-    "terminal-kit-3.0.1" = {
+    "terminal-kit-3.0.2" = {
       name = "terminal-kit";
       packageName = "terminal-kit";
-      version = "3.0.1";
+      version = "3.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/terminal-kit/-/terminal-kit-3.0.1.tgz";
-        sha512 = "KvscEh/893Qza4+1wW9BOYAYFFS3uy8JfuMpyxNS1Rw+bw2Qx33RjVkjzPkfY2hfzAcTEw9KGko4XZuX2scsQw==";
+        url = "https://registry.npmjs.org/terminal-kit/-/terminal-kit-3.0.2.tgz";
+        sha512 = "0xWCHPIs8Zo72OCgntgieACWuYnNlNY66xwG9Cw7jsLnzMsl7C4YGpzZc/xECIV3BezJcchOC6IpfRap333m4w==";
       };
     };
     "terminal-link-2.1.1" = {
@@ -51201,13 +50643,13 @@ let
         sha512 = "flFL3m4wuixmf6IfhFJd1YPiLiMuxEc8uHRM1buzIeZPm22Au2pDqBJQgdo7n1WfPU1ONFGv7YDwpFBmHGF6lg==";
       };
     };
-    "terser-5.31.1" = {
+    "terser-5.31.3" = {
       name = "terser";
       packageName = "terser";
-      version = "5.31.1";
+      version = "5.31.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/terser/-/terser-5.31.1.tgz";
-        sha512 = "37upzU1+viGvuFtBo9NPufCb9dwM0+l9hMxYyWfBA+fbwrPqNJAhbZ6W47bBFnZHKHTUBnMvi87434qq+qnxOg==";
+        url = "https://registry.npmjs.org/terser/-/terser-5.31.3.tgz";
+        sha512 = "pAfYn3NIZLyZpa83ZKigvj6Rn9c/vd5KfYGX7cN1mnzqgDcxWvrU5ZtAfIKhEXz9nRecw4z3LXkjaq96/qZqAA==";
       };
     };
     "terser-webpack-plugin-5.3.10" = {
@@ -51219,13 +50661,13 @@ let
         sha512 = "BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w==";
       };
     };
-    "text-decoder-1.1.0" = {
+    "text-decoder-1.1.1" = {
       name = "text-decoder";
       packageName = "text-decoder";
-      version = "1.1.0";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/text-decoder/-/text-decoder-1.1.0.tgz";
-        sha512 = "TmLJNj6UgX8xcUZo4UDStGQtDiTzF7BzWlzn9g7UWrjkpHr5uJTK1ld16wZ3LXb2vb6jH8qU89dW5whuMdXYdw==";
+        url = "https://registry.npmjs.org/text-decoder/-/text-decoder-1.1.1.tgz";
+        sha512 = "8zll7REEv4GDD3x4/0pW+ppIxSNs7H1J10IKFZsuOMscumCdM2a+toDGLPA3T+1+fLBql4zbt5z83GEQGGV5VA==";
       };
     };
     "text-decoding-1.0.0" = {
@@ -51768,13 +51210,13 @@ let
         sha512 = "605uxS6bcYxGXw9qi62XyrV6Q3xwbndjachmNxu8HWTtVPxZfEJN9fd/SZS1Q54Sn2y0TMyMxFj/cJINqGHrKw==";
       };
     };
-    "torrent-discovery-11.0.6" = {
+    "torrent-discovery-11.0.7" = {
       name = "torrent-discovery";
       packageName = "torrent-discovery";
-      version = "11.0.6";
+      version = "11.0.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/torrent-discovery/-/torrent-discovery-11.0.6.tgz";
-        sha512 = "9gnsBZLuOzbWlTIv0lx3pjmZ2Bj4WZfY06iO9AXKiNxA7/k508CWIE80PojYsgsR9SyjDkIVfnHLyJOgnDycvQ==";
+        url = "https://registry.npmjs.org/torrent-discovery/-/torrent-discovery-11.0.7.tgz";
+        sha512 = "JRG3Ko3YPrNbd3agqijOwqdyV0+m+8X7kkWDYu4zCMZxnyK87Mc6Bd1glXxOevY10GwBf2wQ+DToBOXYbvcA0Q==";
       };
     };
     "torrent-discovery-5.4.0" = {
@@ -51840,15 +51282,6 @@ let
         sha512 = "nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==";
       };
     };
-    "tough-cookie-4.1.3" = {
-      name = "tough-cookie";
-      packageName = "tough-cookie";
-      version = "4.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.3.tgz";
-        sha512 = "aX/y5pVRkfRnfmuX+OdbSdXvPe6ieKX/G2s7e98f4poJHnqH3281gDPm/metm6E/WRamfx7WC4HUqkWHfQHprw==";
-      };
-    };
     "tough-cookie-4.1.4" = {
       name = "tough-cookie";
       packageName = "tough-cookie";
@@ -51885,13 +51318,13 @@ let
         sha512 = "15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==";
       };
     };
-    "tr46-4.1.1" = {
+    "tr46-5.0.0" = {
       name = "tr46";
       packageName = "tr46";
-      version = "4.1.1";
+      version = "5.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tr46/-/tr46-4.1.1.tgz";
-        sha512 = "2lv/66T7e5yNyhAAC4NaKe5nVavzuGJQVVtRYLyQ2OI8tsJ61PMLlelehb0wi2Hx6+hT/OJUWZcw8MjlSRnxvw==";
+        url = "https://registry.npmjs.org/tr46/-/tr46-5.0.0.tgz";
+        sha512 = "tk2G5R2KRwBd+ZN0zaEXpmzdKyOYksXwywulIX95MBODjSzMIuQnQ3m8JxgbhnL1LeVo7lqQKsYa1O3Htl7K5g==";
       };
     };
     "trash-8.1.1" = {
@@ -51921,13 +51354,13 @@ let
         sha512 = "7bBrcF+/LQzSgFmT0X5YclVqQxtv7TDJ1f8Wj7ibBu/U6BMLeOpUxuZjV7rMc44UtKxlnMFigdhFAIszSX1DMg==";
       };
     };
-    "tree-dump-1.0.1" = {
+    "tree-dump-1.0.2" = {
       name = "tree-dump";
       packageName = "tree-dump";
-      version = "1.0.1";
+      version = "1.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tree-dump/-/tree-dump-1.0.1.tgz";
-        sha512 = "WCkcRBVPSlHHq1dc/px9iOfqklvzCbdRwvlNfxGZsrHqf6aZttfPrd7DJTt6oR10dwUfpFFQeVTkPbBIZxX/YA==";
+        url = "https://registry.npmjs.org/tree-dump/-/tree-dump-1.0.2.tgz";
+        sha512 = "dpev9ABuLWdEubk+cIaI9cHwRNNDjkBBLXTwI4UCUFdQ5xXKqNXoK4FEciw/vxf+NQ7Cb7sGUyeUtORvHIdRXQ==";
       };
     };
     "tree-kill-1.2.2" = {
@@ -51966,6 +51399,15 @@ let
         sha512 = "1m4RA7xVAJrSGrrXGs0L3YTwyvBs2S8PbRHaLZAkFw7JR8oIFwYtysxlBZhYIa7xSyiYJKZ3iGrrk55cGA3i9A==";
       };
     };
+    "treeverse-3.0.0" = {
+      name = "treeverse";
+      packageName = "treeverse";
+      version = "3.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/treeverse/-/treeverse-3.0.0.tgz";
+        sha512 = "gcANaAnd2QDZFmHFEOF4k7uc1J/6a6z3DJMd/QwEyxLoKGiptJRwid582r7QIsFlFMIZ3SnxfS52S4hm2DHkuQ==";
+      };
+    };
     "trim-newlines-1.0.0" = {
       name = "trim-newlines";
       packageName = "trim-newlines";
@@ -52245,13 +51687,13 @@ let
         sha512 = "g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==";
       };
     };
-    "tsx-4.15.4" = {
+    "tsx-4.16.2" = {
       name = "tsx";
       packageName = "tsx";
-      version = "4.15.4";
+      version = "4.16.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tsx/-/tsx-4.15.4.tgz";
-        sha512 = "d++FLCwJLrXaBFtRcqdPBzu6FiVOJ2j+UsvUZPtoTrnYtCGU5CEW7iHXtNZfA2fcRTvJFWPqA6SWBuB0GSva9w==";
+        url = "https://registry.npmjs.org/tsx/-/tsx-4.16.2.tgz";
+        sha512 = "C1uWweJDgdtX2x600HjaFaucXTilT7tgUZHbOE4+ypskZ1OP8CRCSDkCxG6Vya9EwaFIVagWwpaVAn5wzypaqQ==";
       };
     };
     "tty-browserify-0.0.1" = {
@@ -52263,15 +51705,6 @@ let
         sha512 = "C3TaO7K81YvjCgQH9Q1S3R3P3BtN3RIM8n+OvX4il1K1zgE8ZhI0op7kClgkxtutIE8hQrcrHBXvIheqKUUCxw==";
       };
     };
-    "tuf-js-1.1.7" = {
-      name = "tuf-js";
-      packageName = "tuf-js";
-      version = "1.1.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tuf-js/-/tuf-js-1.1.7.tgz";
-        sha512 = "i3P9Kgw3ytjELUfpuKVDNBJvk4u5bXL6gskv572mcevPbSKCV3zt3djhmlEQ65yERjIbOSncy7U4cQJaB1CBCg==";
-      };
-    };
     "tuf-js-2.2.1" = {
       name = "tuf-js";
       packageName = "tuf-js";
@@ -52344,6 +51777,15 @@ let
         sha512 = "Z3/iJ6IWh8VBiACWQJaA5ulPQE5E1QwvBHj00uGzdQxdRnd8fh1DPqNOJqzQDu6DkOstORrtXzf/9adB+vMtEA==";
       };
     };
+    "turndown-7.2.0" = {
+      name = "turndown";
+      packageName = "turndown";
+      version = "7.2.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/turndown/-/turndown-7.2.0.tgz";
+        sha512 = "eCZGBN4nNNqM9Owkv9HAtWRYfLA4h909E/WGAWWBpmB275ehNhZyk87/Tpvjbp0jjNl9XwCsbe6bm6CqFsgD+A==";
+      };
+    };
     "turndown-plugin-gfm-1.0.2" = {
       name = "turndown-plugin-gfm";
       packageName = "turndown-plugin-gfm";
@@ -52353,13 +51795,13 @@ let
         sha512 = "vwz9tfvF7XN/jE0dGoBei3FXWuvll78ohzCZQuOb+ZjWrs3a0XhQVomJEb2Qh4VHTPNRO4GPZh0V7VRbiWwkRg==";
       };
     };
-    "tus-js-client-3.1.3" = {
+    "tus-js-client-4.1.0" = {
       name = "tus-js-client";
       packageName = "tus-js-client";
-      version = "3.1.3";
+      version = "4.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/tus-js-client/-/tus-js-client-3.1.3.tgz";
-        sha512 = "n9k6rI/nPOuP2TaqPG6Ogz3a3V1cSH9en7N0VH4gh95jmG8JA58TJzLms2lBfb7aKVb3fdUunqYEG3WnQnZRvQ==";
+        url = "https://registry.npmjs.org/tus-js-client/-/tus-js-client-4.1.0.tgz";
+        sha512 = "e/nC/kJahvNYBcnwcqzuhFIvVELMMpbVXIoOOKdUn74SdQCvJd2JjqV2jZLv2EFOVbV4qLiO0lV7BxBXF21b6Q==";
       };
     };
     "tweetnacl-0.14.5" = {
@@ -52416,15 +51858,6 @@ let
         sha512 = "53RyidyjvkGpnWPMF9bQgFtWp+Sl8O2Rp13VavmJgfAP9WWG6q6TkrKU8iyJdnwnfgHI6k2hTlgqH4aSdjoTbg==";
       };
     };
-    "type-fest-0.13.1" = {
-      name = "type-fest";
-      packageName = "type-fest";
-      version = "0.13.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/type-fest/-/type-fest-0.13.1.tgz";
-        sha512 = "34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==";
-      };
-    };
     "type-fest-0.16.0" = {
       name = "type-fest";
       packageName = "type-fest";
@@ -52524,13 +51957,13 @@ let
         sha512 = "tLq3bSNx+xSpwvAJnzrK0Ep5CLNWjvFTOp71URMaAEWBfRb9nnJiBoUe0tF8bI4ZFO3omgBR6NvnbzVUT3Ly4g==";
       };
     };
-    "type-fest-4.20.0" = {
+    "type-fest-4.23.0" = {
       name = "type-fest";
       packageName = "type-fest";
-      version = "4.20.0";
+      version = "4.23.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/type-fest/-/type-fest-4.20.0.tgz";
-        sha512 = "MBh+PHUHHisjXf4tlx0CFWoMdjx8zCMLJHOjnV1prABYZFHqtFOyauCIK2/7w4oIfwkF8iNhLtnJEfVY2vn3iw==";
+        url = "https://registry.npmjs.org/type-fest/-/type-fest-4.23.0.tgz";
+        sha512 = "ZiBujro2ohr5+Z/hZWHESLz3g08BBdrdLMieYFULJO+tWc437sn8kQsWLJoZErY8alNhxre9K4p3GURAG11n+w==";
       };
     };
     "type-is-1.6.18" = {
@@ -52623,15 +52056,6 @@ let
         sha512 = "OJabfkAg1WLZSqJAJ0Z6Sdt3utnbzr/jh+NAHoyWHJe8CMSy79Gm085094M9nvTPy22KzTVn5Zq5mbapCI/hPA==";
       };
     };
-    "typescript-2.9.2" = {
-      name = "typescript";
-      packageName = "typescript";
-      version = "2.9.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/typescript/-/typescript-2.9.2.tgz";
-        sha512 = "Gr4p6nFNaoufRIY4NMdpQRNmgxVIGMs4Fcu/ujdYk3nAZqk7supzBE9idmvfZIlH/Cuj//dvi+019qEue9lV0w==";
-      };
-    };
     "typescript-3.9.10" = {
       name = "typescript";
       packageName = "typescript";
@@ -52650,15 +52074,6 @@ let
         sha512 = "1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==";
       };
     };
-    "typescript-5.3.3" = {
-      name = "typescript";
-      packageName = "typescript";
-      version = "5.3.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/typescript/-/typescript-5.3.3.tgz";
-        sha512 = "pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==";
-      };
-    };
     "typescript-5.4.5" = {
       name = "typescript";
       packageName = "typescript";
@@ -52668,22 +52083,31 @@ let
         sha512 = "vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==";
       };
     };
-    "typescript-5.6.0-dev.20240614" = {
+    "typescript-5.5.4" = {
       name = "typescript";
       packageName = "typescript";
-      version = "5.6.0-dev.20240614";
+      version = "5.5.4";
       src = fetchurl {
-        url = "https://registry.npmjs.org/typescript/-/typescript-5.6.0-dev.20240614.tgz";
-        sha512 = "ZyRthucrT5pvqNRBtPTNixd1dnpzyf0WIK6WoTkLRIzMiI0IWM+jjI5DfNuokEx+7C8pXQDF+Zi8HPYg5ZLS+A==";
+        url = "https://registry.npmjs.org/typescript/-/typescript-5.5.4.tgz";
+        sha512 = "Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q==";
       };
     };
-    "typescript-auto-import-cache-0.3.2" = {
+    "typescript-5.6.0-dev.20240725" = {
+      name = "typescript";
+      packageName = "typescript";
+      version = "5.6.0-dev.20240725";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/typescript/-/typescript-5.6.0-dev.20240725.tgz";
+        sha512 = "kgUK4mJogTfm3+NjdYSb7LIerXpAG8lyYSdPHdfGPaJyBRhMJARPENf0TeUxhEOrGRuxHTrIPKdrSOQX5xTsuw==";
+      };
+    };
+    "typescript-auto-import-cache-0.3.3" = {
       name = "typescript-auto-import-cache";
       packageName = "typescript-auto-import-cache";
-      version = "0.3.2";
+      version = "0.3.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/typescript-auto-import-cache/-/typescript-auto-import-cache-0.3.2.tgz";
-        sha512 = "+laqe5SFL1vN62FPOOJSUDTZxtgsoOXjneYOXIpx5rQ4UMiN89NAtJLpqLqyebv9fgQ/IMeeTX+mQyRnwvJzvg==";
+        url = "https://registry.npmjs.org/typescript-auto-import-cache/-/typescript-auto-import-cache-0.3.3.tgz";
+        sha512 = "ojEC7+Ci1ij9eE6hp8Jl9VUNnsEKzztktP5gtYNRMrTmfXVwA1PITYYAkpxCvvupdSYa/Re51B6KMcv1CTZEUA==";
       };
     };
     "typescript-tslint-plugin-0.5.4" = {
@@ -52758,15 +52182,6 @@ let
         sha512 = "ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A==";
       };
     };
-    "ufo-1.5.3" = {
-      name = "ufo";
-      packageName = "ufo";
-      version = "1.5.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ufo/-/ufo-1.5.3.tgz";
-        sha512 = "Y7HYmWaFwPUmkoQCUIAYpKqkOf+SbVj/2fJJZ4RJMCfZp0rTGwRbzQD+HghfnhKOjL9E01okqz+ncJskGYfBNw==";
-      };
-    };
     "uglify-js-2.8.29" = {
       name = "uglify-js";
       packageName = "uglify-js";
@@ -52785,13 +52200,13 @@ let
         sha512 = "T9q82TJI9e/C1TAxYvfb16xO120tMVFZrGA3f9/P4424DNu6ypK103y0GPFVa17yotwSyZW5iYXgjYHkGrJW/g==";
       };
     };
-    "uglify-js-3.18.0" = {
+    "uglify-js-3.19.0" = {
       name = "uglify-js";
       packageName = "uglify-js";
-      version = "3.18.0";
+      version = "3.19.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.18.0.tgz";
-        sha512 = "SyVVbcNBCk0dzr9XL/R/ySrmYf0s372K6/hFklzgcp2lBFyXtw4I7BOdDjlLhE1aVqaI/SHWXWmYdlZxuyF38A==";
+        url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.19.0.tgz";
+        sha512 = "wNKHUY2hYYkf6oSFfhwwiHo4WCHzHmzcXsqXYTN9ja3iApYIFbb2U6ics9hBcYLHcYGQoAlwnZlTrf3oF+BL/Q==";
       };
     };
     "uglify-to-browserify-1.0.2" = {
@@ -52938,13 +52353,13 @@ let
         sha512 = "pJOW4nxjlmfwKApE4zvxLScM/njmwj/DiUBv7EabwE4O8kRUy+HIwxQtZLBPll/jx1LJyBcqNfB3/cpv9EZwOw==";
       };
     };
-    "underscore-1.13.6" = {
+    "underscore-1.13.7" = {
       name = "underscore";
       packageName = "underscore";
-      version = "1.13.6";
+      version = "1.13.7";
       src = fetchurl {
-        url = "https://registry.npmjs.org/underscore/-/underscore-1.13.6.tgz";
-        sha512 = "+A5Sja4HP1M08MaXya7p5LvjuM7K6q/2EaC0+iovj/wOcMsTzMvDFbasi/oSapiwOlt252IqsKqPjCl7huKS0A==";
+        url = "https://registry.npmjs.org/underscore/-/underscore-1.13.7.tgz";
+        sha512 = "GMXzWtsc57XAtguZgaQViUOzs0KTkk8ojr3/xAxXLITqf/3EMwxC0inyETfDFjH/Krbhuep0HNbbjI9i/q3F3g==";
       };
     };
     "underscore-1.4.4" = {
@@ -53001,15 +52416,6 @@ let
         sha512 = "+hhVICbnp+rlzZMgxXenpvTxpuvA67Bfgtt+O9WOE5jo7w/dyiF1VmoZVIHvP2EkUjsyKyTwYKlLhA+j47m1Ew==";
       };
     };
-    "undici-5.26.5" = {
-      name = "undici";
-      packageName = "undici";
-      version = "5.26.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/undici/-/undici-5.26.5.tgz";
-        sha512 = "cSb4bPFd5qgR7qr2jYAi0hlX9n5YKK2ONKkLFkxl+v/9BvC0sOpZjBHDBSXc5lWAf5ty9oZdRXytBIHzgUcerw==";
-      };
-    };
     "undici-5.28.4" = {
       name = "undici";
       packageName = "undici";
@@ -53028,15 +52434,6 @@ let
         sha512 = "JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==";
       };
     };
-    "unenv-1.10.0-1717606461.a117952" = {
-      name = "unenv";
-      packageName = "unenv";
-      version = "1.10.0-1717606461.a117952";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/unenv-nightly/-/unenv-nightly-1.10.0-1717606461.a117952.tgz";
-        sha512 = "u3TfBX02WzbHTpaEfWEKwDijDSFAHcgXkayUZ+MVDrjhLFvgAJzFGTSTmwlEhwWi2exyRQey23ah9wELMM6etg==";
-      };
-    };
     "unherit-3.0.1" = {
       name = "unherit";
       packageName = "unherit";
@@ -53118,13 +52515,13 @@ let
         sha512 = "pUSWAi/RAnVy1Pif2kAoeWNBa3JVrx0MId2LASj8G+7AiHWoKZNTomq6LG326T68U7/e263X6fTdcXIy7XnF7Q==";
       };
     };
-    "unified-11.0.4" = {
+    "unified-11.0.5" = {
       name = "unified";
       packageName = "unified";
-      version = "11.0.4";
+      version = "11.0.5";
       src = fetchurl {
-        url = "https://registry.npmjs.org/unified/-/unified-11.0.4.tgz";
-        sha512 = "apMPnyLjAX+ty4OrNap7yumyVAMlKx5IWU2wlzzUdYJO9A8f1p9m/gywF/GM2ZDFcjQPrx59Mc90KwmxsoklxQ==";
+        url = "https://registry.npmjs.org/unified/-/unified-11.0.5.tgz";
+        sha512 = "xKvGhPWw3k84Qjh8bI3ZeJjqnyadK+GEFtazSfZv/rKeTkTjOJho6mFqh2SM96iIcZokxiOpg78GazTSg8+KHA==";
       };
     };
     "unified-9.2.2" = {
@@ -53388,13 +52785,13 @@ let
         sha512 = "Op0XnmHUl6C2zo/yJCwhXQSm/SmW22eDZdWP2qdf4WpGrgO1ZxFodq+5zFyeRGasFjJotAnLgfuD1jkcKqiH1Q==";
       };
     };
-    "unist-util-inspect-8.0.0" = {
+    "unist-util-inspect-8.1.0" = {
       name = "unist-util-inspect";
       packageName = "unist-util-inspect";
-      version = "8.0.0";
+      version = "8.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/unist-util-inspect/-/unist-util-inspect-8.0.0.tgz";
-        sha512 = "/3Wn/wU6/H6UEo4FoYUeo8KUePN8ERiZpQYFWYoihOsr1DoDuv80PeB0hobVZyYSvALa2e556bG1A1/AbwU4yg==";
+        url = "https://registry.npmjs.org/unist-util-inspect/-/unist-util-inspect-8.1.0.tgz";
+        sha512 = "mOlg8Mp33pR0eeFpo5d2902ojqFFOKMMG2hF8bmH7ZlhnmjFgh0NI3/ZDwdaBJNbvrS7LZFVrBVtIE9KZ9s7vQ==";
       };
     };
     "unist-util-is-3.0.0" = {
@@ -53838,13 +53235,13 @@ let
         sha512 = "1uEe95xksV1O0CYKXo8vQvN1JEbtJp7lb7C5U9HMsIp6IVwntkH/oNUzyVNQSd4S1sYk2FpSSW44FqMc8qee5w==";
       };
     };
-    "update-browserslist-db-1.0.16" = {
+    "update-browserslist-db-1.1.0" = {
       name = "update-browserslist-db";
       packageName = "update-browserslist-db";
-      version = "1.0.16";
+      version = "1.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.16.tgz";
-        sha512 = "KVbTxlBYlckhF5wgfyZXTWnMn7MMZjMu9XG8bPlliUOP9ThaF4QnhP8qrjrH7DRzHfSk0oQv1wToW+iA5GajEQ==";
+        url = "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.0.tgz";
+        sha512 = "EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ==";
       };
     };
     "update-check-1.5.3" = {
@@ -53901,13 +53298,13 @@ let
         sha512 = "EDxhTEVPZZRLWYcJ4ZXjGFN0oP7qYvbXWzEgRm/Yql4dHX5wDbvh89YHP6PK1lzZJYrMtXUuZZz8XGK+U6U1og==";
       };
     };
-    "update-notifier-7.0.0" = {
+    "update-notifier-7.1.0" = {
       name = "update-notifier";
       packageName = "update-notifier";
-      version = "7.0.0";
+      version = "7.1.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/update-notifier/-/update-notifier-7.0.0.tgz";
-        sha512 = "Hv25Bh+eAbOLlsjJreVPOs4vd51rrtCrmhyOJtbpAojro34jS4KQaEp4/EvlHJX7jSO42VvEFpkastVyXyIsdQ==";
+        url = "https://registry.npmjs.org/update-notifier/-/update-notifier-7.1.0.tgz";
+        sha512 = "8SV3rIqVY6EFC1WxH6L0j55s0MO79MFBS1pivmInRJg3pCEDgWHBj1Q6XByTtCLOZIFA0f6zoG9ZWf2Ks9lvTA==";
       };
     };
     "upnp-device-client-1.0.2" = {
@@ -54261,6 +53658,15 @@ let
         sha512 = "2ZLjisH0HQkpqZTg2m7TK0Yn7TETTg7DxM0EpCKIIIV2ky9w9nSxW5a7gzdk4nH2h+pomrrGw0uywrUJfsm2eA==";
       };
     };
+    "uuid-10.0.0" = {
+      name = "uuid";
+      packageName = "uuid";
+      version = "10.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/uuid/-/uuid-10.0.0.tgz";
+        sha512 = "8XkAphELsDnEGrDxUOHB3RGvXz6TeuYSGEZBOjtTtPm2lwhGBjLgOzLHB63IUWfBpNucQjND6d3AOudO+H3RWQ==";
+      };
+    };
     "uuid-2.0.3" = {
       name = "uuid";
       packageName = "uuid";
@@ -54333,15 +53739,6 @@ let
         sha512 = "+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==";
       };
     };
-    "uuid-9.0.0" = {
-      name = "uuid";
-      packageName = "uuid";
-      version = "9.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/uuid/-/uuid-9.0.0.tgz";
-        sha512 = "MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg==";
-      };
-    };
     "uuid-9.0.1" = {
       name = "uuid";
       packageName = "uuid";
@@ -54432,15 +53829,6 @@ let
         sha512 = "M6w37eVCMMouJ9V/sdPGnC5H4uDr73/+xdq0FBLO3TFFX1+7wiUY6Es328NN+y43tmY+doUdN9g9J21vqB7iLw==";
       };
     };
-    "validate-npm-package-name-5.0.0" = {
-      name = "validate-npm-package-name";
-      packageName = "validate-npm-package-name";
-      version = "5.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-5.0.0.tgz";
-        sha512 = "YuKoXDAhBYxY7SfOKxHBDoSyENFeW5VvIIQp2TGQuit8gpK6MnWaQelBKxso72DoxTZfZdcP3W90LqpSkgPzLQ==";
-      };
-    };
     "validate-npm-package-name-5.0.1" = {
       name = "validate-npm-package-name";
       packageName = "validate-npm-package-name";
@@ -54549,15 +53937,6 @@ let
         sha512 = "Hq72JaTpcTFdWiNA4Y22Amej2GH3BFmBaKPPlDZ4/oC8HNn2ISHLkFrJU4Ds8R3jcUi7oo5Y9jcMHKjES+N9wQ==";
       };
     };
-    "vega-5.29.0" = {
-      name = "vega";
-      packageName = "vega";
-      version = "5.29.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vega/-/vega-5.29.0.tgz";
-        sha512 = "4+pX8UIxV1rtHpIKvzHXof5CeyMTGKMDFtuN8UmSjvJ+l5FtSen++qmSxbAc/EnkLqo5i9B2iCYTr2og77EBrA==";
-      };
-    };
     "vega-5.30.0" = {
       name = "vega";
       packageName = "vega";
@@ -54639,15 +54018,6 @@ let
         sha512 = "0kUfAj0dg0U6GcEY0Kp6LiSTCZ8l8jl1qVdQyToMyKmtZg/q56qsiJQZy3WWRr1MtWkTIZL71xSJXgjwjeUaAw==";
       };
     };
-    "vega-functions-5.14.0" = {
-      name = "vega-functions";
-      packageName = "vega-functions";
-      version = "5.14.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vega-functions/-/vega-functions-5.14.0.tgz";
-        sha512 = "Q0rocHmJDfQ0tS91kdN8WcEosq1e3HPK1Yf5z36SPYPmTzKw3uxUGE52tLxC832acAYqPmi8R41wAoI/yFQTPg==";
-      };
-    };
     "vega-functions-5.15.0" = {
       name = "vega-functions";
       packageName = "vega-functions";
@@ -54675,15 +54045,6 @@ let
         sha512 = "m+xDtT5092YPSnV0rdTLW+AWmoCb+A54JQ66MUJwiDBpKxvfKnTiQeuiWDU2YudjUoXZN9EBOcI6QHF8H2Lu2A==";
       };
     };
-    "vega-label-1.2.1" = {
-      name = "vega-label";
-      packageName = "vega-label";
-      version = "1.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vega-label/-/vega-label-1.2.1.tgz";
-        sha512 = "n/ackJ5lc0Xs9PInCaGumYn2awomPjJ87EMVT47xNgk2bHmJoZV1Ve/1PUM6Eh/KauY211wPMrNp/9Im+7Ripg==";
-      };
-    };
     "vega-label-1.3.0" = {
       name = "vega-label";
       packageName = "vega-label";
@@ -54702,15 +54063,6 @@ let
         sha512 = "ktIdGz3DRIS3XfTP9lJ6oMT5cKwC86nQkjUbXZbOtwXQFVNE2xVWBuH13GP6FKUZxg5hJCMtb5v/e/fwTvhKsQ==";
       };
     };
-    "vega-parser-6.3.0" = {
-      name = "vega-parser";
-      packageName = "vega-parser";
-      version = "6.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vega-parser/-/vega-parser-6.3.0.tgz";
-        sha512 = "swS5RuP2imRarMpGWaAZusoKkXc4Z5WxWx349pkqxIAf4F7H8Ya9nThEkSWsFozd75O9nWh0QLifds8Xb7KjUg==";
-      };
-    };
     "vega-parser-6.4.0" = {
       name = "vega-parser";
       packageName = "vega-parser";
@@ -54729,15 +54081,6 @@ let
         sha512 = "sqfnAAHumU7MWU1tQN3b6HNgKGF3legek0uLHhjLKcDJQxEc7kwcD18txFz2ffQks6d5j+AUhBiq4GARWf0DEQ==";
       };
     };
-    "vega-regression-1.2.0" = {
-      name = "vega-regression";
-      packageName = "vega-regression";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vega-regression/-/vega-regression-1.2.0.tgz";
-        sha512 = "6TZoPlhV/280VbxACjRKqlE0Nv48z5g4CSNf1FmGGTWS1rQtElPTranSoVW4d7ET5eVQ6f9QLxNAiALptvEq+g==";
-      };
-    };
     "vega-regression-1.3.0" = {
       name = "vega-regression";
       packageName = "vega-regression";
@@ -54747,15 +54090,6 @@ let
         sha512 = "gxOQfmV7Ft/MYKpXDEo09WZyBuKOBqxqDRWay9KtfGq/E0Y4vbTPsWLv2cB1ToPJdKE6XSN6Re9tCIw5M/yMUg==";
       };
     };
-    "vega-runtime-6.1.4" = {
-      name = "vega-runtime";
-      packageName = "vega-runtime";
-      version = "6.1.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vega-runtime/-/vega-runtime-6.1.4.tgz";
-        sha512 = "0dDYXyFLQcxPQ2OQU0WuBVYLRZnm+/CwVu6i6N4idS7R9VXIX5581EkCh3pZ20pQ/+oaA7oJ0pR9rJgJ6rukRQ==";
-      };
-    };
     "vega-runtime-6.2.0" = {
       name = "vega-runtime";
       packageName = "vega-runtime";
@@ -54774,15 +54108,6 @@ let
         sha512 = "dArA28DbV/M92O2QvswnzCmQ4bq9WwLKUoyhqFYWCltmDwkmvX7yhqiFLFMWPItIm7mi4Qyoygby6r4DKd1X2A==";
       };
     };
-    "vega-scenegraph-4.12.0" = {
-      name = "vega-scenegraph";
-      packageName = "vega-scenegraph";
-      version = "4.12.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vega-scenegraph/-/vega-scenegraph-4.12.0.tgz";
-        sha512 = "l0Us6TLRV7AAd1CxB6mvxXt9/psknqgrr0+6d1zNWtHL8tGszPE4FqllZC5m4ZtUouvE4PWKGybd5uJR0dpchw==";
-      };
-    };
     "vega-scenegraph-4.13.0" = {
       name = "vega-scenegraph";
       packageName = "vega-scenegraph";
@@ -54819,15 +54144,6 @@ let
         sha512 = "6rXc6JdDt8MnCRy6UzUCsa6EeFycPDmvioMddLfKw38OYCV8pRQC5nw44gyddOwXgUTJLiCtn/sp53P0iA542A==";
       };
     };
-    "vega-transforms-4.11.1" = {
-      name = "vega-transforms";
-      packageName = "vega-transforms";
-      version = "4.11.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vega-transforms/-/vega-transforms-4.11.1.tgz";
-        sha512 = "DDbqEQnvy9/qEvv0bAKPqAuzgaNb7Lh2xKJFom2Yzx4tZHCl8dnKxC1lH9JnJlAMdtZuiNLPARUkf3pCNQ/olw==";
-      };
-    };
     "vega-transforms-4.12.0" = {
       name = "vega-transforms";
       packageName = "vega-transforms";
@@ -54837,15 +54153,6 @@ let
         sha512 = "bh/2Qbj85O70mjfLRgPKAsABArgSUP0k+GjmaY54zukIRxoGxKju+85nigeX/aR/INpEqNWif+5lL+NvmyWA5w==";
       };
     };
-    "vega-typings-1.1.0" = {
-      name = "vega-typings";
-      packageName = "vega-typings";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vega-typings/-/vega-typings-1.1.0.tgz";
-        sha512 = "uI6RWlMiGRhsgmw/LzJtjCc0kwhw2f0JpyNMTAnOy90kE4e4CiaZN5nJp8S9CcfcBoPEZHc166AOn2SSNrKn3A==";
-      };
-    };
     "vega-typings-1.3.1" = {
       name = "vega-typings";
       packageName = "vega-typings";
@@ -54864,15 +54171,6 @@ let
         sha512 = "omNmGiZBdjm/jnHjZlywyYqafscDdHaELHx1q96n5UOz/FlO9JO99P4B3jZg391EFG8dqhWjQilSf2JH6F1mIw==";
       };
     };
-    "vega-view-5.12.1" = {
-      name = "vega-view";
-      packageName = "vega-view";
-      version = "5.12.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vega-view/-/vega-view-5.12.1.tgz";
-        sha512 = "9TdF35FTZNzfvfj+YM38vHOgfeGxMy2xMY+2B46ZHoustt3J/mxtfueu3RGFsGIitUGhFrmLeEHxlVHP/tY+sQ==";
-      };
-    };
     "vega-view-5.13.0" = {
       name = "vega-view";
       packageName = "vega-view";
@@ -54882,15 +54180,6 @@ let
         sha512 = "ZPAAQ3iYz6YrQjJoDT+0bcxJkXt9PKF5v4OO7Omw8PFhkIv++jFXeKlQTW1bBtyQ92dkdGGHv5lYY67Djqjf3A==";
       };
     };
-    "vega-view-transforms-4.5.9" = {
-      name = "vega-view-transforms";
-      packageName = "vega-view-transforms";
-      version = "4.5.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vega-view-transforms/-/vega-view-transforms-4.5.9.tgz";
-        sha512 = "NxEq4ZD4QwWGRrl2yDLnBRXM9FgCI+vvYb3ZC2+nVDtkUxOlEIKZsMMw31op5GZpfClWLbjCT3mVvzO2xaTF+g==";
-      };
-    };
     "vega-view-transforms-4.6.0" = {
       name = "vega-view-transforms";
       packageName = "vega-view-transforms";
@@ -54981,13 +54270,13 @@ let
         sha512 = "r7qlzkgErKjobAmyNIkkSpizsFPYiUPuJb5pNW1RB4JcYVZhs4lIbVqk8XPk033CV/1z8ss5pkax8SuhGpcG8g==";
       };
     };
-    "vfile-6.0.1" = {
+    "vfile-6.0.2" = {
       name = "vfile";
       packageName = "vfile";
-      version = "6.0.1";
+      version = "6.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vfile/-/vfile-6.0.1.tgz";
-        sha512 = "1bYqc7pt6NIADBJ98UiG0Bn/CHIVOoZ/IyEkqIruLg0mE1BKzkOXY2D6CSqQIcKqgadppE5lrxgWXJmXd7zZJw==";
+        url = "https://registry.npmjs.org/vfile/-/vfile-6.0.2.tgz";
+        sha512 = "zND7NlS8rJYb/sPqkb13ZvbbUoExdbi4w3SfRrMq6R3FvnLQmmfpajJNITuuYm6AZ5uao9vy4BAos3EXBPf2rg==";
       };
     };
     "vfile-find-up-6.1.0" = {
@@ -55008,13 +54297,13 @@ let
         sha512 = "YF23YMyASIIJXpktBa4vIGLJ5Gs88UB/XePgqPmTa7cDA+JeO3yclbpheQYCHjVHBn/yePzrXuygIL+xbvRYHw==";
       };
     };
-    "vfile-location-5.0.2" = {
+    "vfile-location-5.0.3" = {
       name = "vfile-location";
       packageName = "vfile-location";
-      version = "5.0.2";
+      version = "5.0.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vfile-location/-/vfile-location-5.0.2.tgz";
-        sha512 = "NXPYyxyBSH7zB5U6+3uDdd6Nybz6o6/od9rk8bp9H8GR3L+cm/fC0uUTbqBmUTnMCUDslAGBOIKNfvvb+gGlDg==";
+        url = "https://registry.npmjs.org/vfile-location/-/vfile-location-5.0.3.tgz";
+        sha512 = "5yXvWDEgqeiYiBe1lbxYF7UMAIm/IcopxMHrMQDq3nvKcjPKIhZklUKL+AE7J7uApI4kwe2snsK+eI6UTj9EHg==";
       };
     };
     "vfile-message-2.0.4" = {
@@ -55197,76 +54486,67 @@ let
         sha512 = "Dhxzh5HZuiHQhbvTW9AMetFfBHDMYpo23Uo9btPXgdYP+3T5S+p+jgNy7spra+veYhBP2dCSgxR/i2Y02h5/6w==";
       };
     };
-    "volar-service-css-0.0.45" = {
+    "volar-service-css-0.0.59" = {
       name = "volar-service-css";
       packageName = "volar-service-css";
-      version = "0.0.45";
+      version = "0.0.59";
       src = fetchurl {
-        url = "https://registry.npmjs.org/volar-service-css/-/volar-service-css-0.0.45.tgz";
-        sha512 = "f+AlUI1+kESbcZSVaNJVAnK0c/9Da5StoxzPqA5/8VqUHJWNdubWNnwG5xpFVTfgh6pgTcey3UBhBfHytFaIOg==";
+        url = "https://registry.npmjs.org/volar-service-css/-/volar-service-css-0.0.59.tgz";
+        sha512 = "gLNjJnECbalPvQB7qeJjhkDN8sR5M3ItbVYjnyio61aHaWptIiXm/HfDahcQ2ApwmvWidkMWWegjGq5L0BENDA==";
       };
     };
-    "volar-service-emmet-0.0.45" = {
+    "volar-service-emmet-0.0.59" = {
       name = "volar-service-emmet";
       packageName = "volar-service-emmet";
-      version = "0.0.45";
+      version = "0.0.59";
       src = fetchurl {
-        url = "https://registry.npmjs.org/volar-service-emmet/-/volar-service-emmet-0.0.45.tgz";
-        sha512 = "9nLXSDkR1vA/3fQkFEsSXAu3XovQxOpTkVG2jilQgfek/K1ZLkaA/WMhN/TtmPmQg4NxE9Ni6mA5udBQ5gVXIA==";
+        url = "https://registry.npmjs.org/volar-service-emmet/-/volar-service-emmet-0.0.59.tgz";
+        sha512 = "6EynHcuMwMBETpK29TbZvIMmvzdVG+Tkokk9VWfZeI+SwDptk2tgdhEqiXXvIkqYNgbuu73Itp66lpH76cAU+Q==";
       };
     };
-    "volar-service-html-0.0.45" = {
+    "volar-service-html-0.0.59" = {
       name = "volar-service-html";
       packageName = "volar-service-html";
-      version = "0.0.45";
+      version = "0.0.59";
       src = fetchurl {
-        url = "https://registry.npmjs.org/volar-service-html/-/volar-service-html-0.0.45.tgz";
-        sha512 = "tLTJqfy1v5C4nmeAsfekFIKPl4r4qDMyL0L9MWywr/EApZzPCsbeUGxCqdzxSMC2q7PMCfX2i167txDo+J0LVA==";
+        url = "https://registry.npmjs.org/volar-service-html/-/volar-service-html-0.0.59.tgz";
+        sha512 = "hEXOsYpILDlITZxnqRLV9OepVWD63GZBsyjMxszwdzlxvGZjzbGcBBinJGGJRwFIV8djdJwnt91bkdg1V5tj6Q==";
       };
     };
-    "volar-service-prettier-0.0.45" = {
+    "volar-service-prettier-0.0.59" = {
       name = "volar-service-prettier";
       packageName = "volar-service-prettier";
-      version = "0.0.45";
+      version = "0.0.59";
       src = fetchurl {
-        url = "https://registry.npmjs.org/volar-service-prettier/-/volar-service-prettier-0.0.45.tgz";
-        sha512 = "+mBS2EsDgp/kunKEBnHvhBwIQm5v2ahw4NKpKdg4sTpXy3UxqHt+Fq/wRYQ7Z8LlNVNRVfp75ThjM+w2zaZBAw==";
+        url = "https://registry.npmjs.org/volar-service-prettier/-/volar-service-prettier-0.0.59.tgz";
+        sha512 = "FmBR4lsgFRGR3V0LnxZZal0WqdOJjuLL6mQSj4p57M15APtQwuocG/FiF+ONGFnwRXMOIBDBTCARdth+TKgL3A==";
       };
     };
-    "volar-service-typescript-0.0.45" = {
+    "volar-service-typescript-0.0.59" = {
       name = "volar-service-typescript";
       packageName = "volar-service-typescript";
-      version = "0.0.45";
+      version = "0.0.59";
       src = fetchurl {
-        url = "https://registry.npmjs.org/volar-service-typescript/-/volar-service-typescript-0.0.45.tgz";
-        sha512 = "i/mMIIAMastJ2kgPo3qvX0Rrl7NyxhIYZ0ug/B4ambZcLPI1vzBgS2fmvyWX3jhBYHh8NmbAotFj+0Y9JtN47A==";
+        url = "https://registry.npmjs.org/volar-service-typescript/-/volar-service-typescript-0.0.59.tgz";
+        sha512 = "VCOpfiu+lUo5lapWLB5L5vmQGtwzmNWn5MueV915eku7blpphmE+Z7hCNcL1NApn7AetXWhiblv8ZhmUx/dGIA==";
       };
     };
-    "volar-service-typescript-twoslash-queries-0.0.45" = {
+    "volar-service-typescript-twoslash-queries-0.0.59" = {
       name = "volar-service-typescript-twoslash-queries";
       packageName = "volar-service-typescript-twoslash-queries";
-      version = "0.0.45";
+      version = "0.0.59";
       src = fetchurl {
-        url = "https://registry.npmjs.org/volar-service-typescript-twoslash-queries/-/volar-service-typescript-twoslash-queries-0.0.45.tgz";
-        sha512 = "KrPUUvKggZgV9mrDpstCzmf20irgv0ooMv+FGDzIIQUkya+d2+nSS8Mx2h9FvsYgLccUVw5jU3Rhwhd3pv/7qg==";
+        url = "https://registry.npmjs.org/volar-service-typescript-twoslash-queries/-/volar-service-typescript-twoslash-queries-0.0.59.tgz";
+        sha512 = "skm8e6yhCIkqLwJB6S9MqT5lO9LNFuMD3dYxKpmOZs1CKbXmCZZTmLfEaD5VkJae1xdleEDZFFTHl2O5HLjOGQ==";
       };
     };
-    "vscode-css-languageservice-3.0.13" = {
+    "vscode-css-languageservice-6.3.0" = {
       name = "vscode-css-languageservice";
       packageName = "vscode-css-languageservice";
-      version = "3.0.13";
+      version = "6.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-3.0.13.tgz";
-        sha512 = "RWkO/c/A7iXhHEy3OuEqkCqavDjpD4NF2Ca8vjai+ZtEYNeHrm1ybTnBYLP4Ft1uXvvaaVtYA9HrDjD6+CUONg==";
-      };
-    };
-    "vscode-css-languageservice-6.2.14" = {
-      name = "vscode-css-languageservice";
-      packageName = "vscode-css-languageservice";
-      version = "6.2.14";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-6.2.14.tgz";
-        sha512 = "5UPQ9Y1sUTnuMyaMBpO7LrBkqjhEJb5eAwdUlDp+Uez8lry+Tspnk3+3p2qWS4LlNsr4p3v9WkZxUf1ltgFpgw==";
+        url = "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-6.3.0.tgz";
+        sha512 = "nU92imtkgzpCL0xikrIb8WvedV553F2BENzgz23wFuok/HLN5BeQmroMy26pUwFxV2eV8oNRmYCUv8iO7kSMhw==";
       };
     };
     "vscode-emmet-helper-1.2.17" = {
@@ -55278,40 +54558,13 @@ let
         sha512 = "X4pzcrJ8dE7M3ArFuySF5fgipKDd/EauXkiJwtjBIVRWpVNq0tF9+lNCyuC7iDUwP3Oq7ow/TGssD3GdG96Jow==";
       };
     };
-    "vscode-html-languageservice-2.1.12" = {
+    "vscode-html-languageservice-5.3.0" = {
       name = "vscode-html-languageservice";
       packageName = "vscode-html-languageservice";
-      version = "2.1.12";
+      version = "5.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-2.1.12.tgz";
-        sha512 = "mIb5VMXM5jI97HzCk2eadI1K//rCEZXte0wBqA7PGXsyJH4KTyJUaYk9MR+mbfpUl2vMi3HZw9GUOLGYLc6l5w==";
-      };
-    };
-    "vscode-html-languageservice-5.2.0" = {
-      name = "vscode-html-languageservice";
-      packageName = "vscode-html-languageservice";
-      version = "5.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-5.2.0.tgz";
-        sha512 = "cdNMhyw57/SQzgUUGSIMQ66jikqEN6nBNyhx5YuOyj9310+eY9zw8Q0cXpiKzDX8aHYFewQEXRnigl06j/TVwQ==";
-      };
-    };
-    "vscode-html-languageservice-5.2.0-34a5462" = {
-      name = "vscode-html-languageservice";
-      packageName = "vscode-html-languageservice";
-      version = "5.2.0-34a5462";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@johnsoncodehk/vscode-html-languageservice/-/vscode-html-languageservice-5.2.0-34a5462.tgz";
-        sha512 = "etqLfpSJ5zaw76KUNF603be6d6QsiQPmaHr9FKEp4zhLZJzWCCMH6Icak7MtLUFLZLMpL761mZNImi/joBo1ZA==";
-      };
-    };
-    "vscode-json-languageservice-3.11.0" = {
-      name = "vscode-json-languageservice";
-      packageName = "vscode-json-languageservice";
-      version = "3.11.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-3.11.0.tgz";
-        sha512 = "QxI+qV97uD7HHOCjh3MrM1TfbdwmTXrMckri5Tus1/FQiG3baDZb2C9Y0y8QThs7PwHYBIQXcAc59ZveCRZKPA==";
+        url = "https://registry.npmjs.org/vscode-html-languageservice/-/vscode-html-languageservice-5.3.0.tgz";
+        sha512 = "C4Z3KsP5Ih+fjHpiBc5jxmvCl+4iEwvXegIrzu2F5pktbWvQaBT3YkVPk8N+QlSSMk8oCG6PKtZ/Sq2YHb5e8g==";
       };
     };
     "vscode-json-languageservice-4.2.1" = {
@@ -55323,15 +54576,6 @@ let
         sha512 = "xGmv9QIWs2H8obGbWg+sIPI/3/pFgj/5OWBhNzs00BkYQ9UaB2F6JJaGB/2/YOZJ3BvLXQTC4Q7muqU25QgAhA==";
       };
     };
-    "vscode-jsonrpc-3.5.0" = {
-      name = "vscode-jsonrpc";
-      packageName = "vscode-jsonrpc";
-      version = "3.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-3.5.0.tgz";
-        sha512 = "LeE9LS1IOIRDZy5Xugrbk2tKeMa64vkRODrXPZbwyn2l/Q0e/jyYq8ze/Lo96sjOFiRe3HHbTVN39Ta8KN2RpA==";
-      };
-    };
     "vscode-jsonrpc-4.0.0" = {
       name = "vscode-jsonrpc";
       packageName = "vscode-jsonrpc";
@@ -55395,15 +54639,6 @@ let
         sha512 = "C+r0eKJUIfiDIfwJhria30+TYWPtuHJXHtI7J0YlOmKAo7ogxP20T0zxB7HZQIFhIyvoBPwWskjxrvAtfjyZfA==";
       };
     };
-    "vscode-jsonrpc-8.2.0-next.2" = {
-      name = "vscode-jsonrpc";
-      packageName = "vscode-jsonrpc";
-      version = "8.2.0-next.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.2.0-next.2.tgz";
-        sha512 = "1FQrqLselaLLe5ApFSU/8qGUbJ8tByWbqczMkT2PEDpDYthCQTe5wONPuVphe7BB+FvZwvBFI2kFkY7FtyHc1A==";
-      };
-    };
     "vscode-jsonrpc-8.2.1" = {
       name = "vscode-jsonrpc";
       packageName = "vscode-jsonrpc";
@@ -55422,24 +54657,6 @@ let
         sha512 = "GL4QdbYUF/XxQlAsvYWZRV3V34kOkpRlvV60/72ghHfsYFnS/v2MANZ9P6sHmxFcZKOse8O+L9G7Czg0NUWing==";
       };
     };
-    "vscode-languageserver-3.5.1" = {
-      name = "vscode-languageserver";
-      packageName = "vscode-languageserver";
-      version = "3.5.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-3.5.1.tgz";
-        sha512 = "RYUKn0DgHTFcS8kS4VaNCjNMaQXYqiXdN9bKrFjXzu5RPKfjIYcoh47oVWwZj4L3R/DPB0Se7HPaDatvYY2XgQ==";
-      };
-    };
-    "vscode-languageserver-4.4.2" = {
-      name = "vscode-languageserver";
-      packageName = "vscode-languageserver";
-      version = "4.4.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-4.4.2.tgz";
-        sha512 = "61y8Raevi9EigDgg9NelvT9cUAohiEbUl1LOwQQgOCAaNX62yKny/ddi0uC+FUTm4CzsjhBu+06R+vYgfCYReA==";
-      };
-    };
     "vscode-languageserver-5.2.1" = {
       name = "vscode-languageserver";
       packageName = "vscode-languageserver";
@@ -55485,15 +54702,6 @@ let
         sha512 = "eUt8f1z2N2IEUDBsKaNapkz7jl5QpskN2Y0G01T/ItMxBxw1fJwvtySGB9QMecatne8jFIWJGWI61dWjyTLQsw==";
       };
     };
-    "vscode-languageserver-8.2.0-next.3" = {
-      name = "vscode-languageserver";
-      packageName = "vscode-languageserver";
-      version = "8.2.0-next.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-8.2.0-next.3.tgz";
-        sha512 = "fqHRwcIRoxfKke7iLDSeUmdo3uk7o/uWNn/44xdWa4urdhsvpTZ5c1GsL1EX4TAvdDg0qeXy89NBZ5Gld2DkgQ==";
-      };
-    };
     "vscode-languageserver-9.0.1" = {
       name = "vscode-languageserver";
       packageName = "vscode-languageserver";
@@ -55557,15 +54765,6 @@ let
         sha512 = "924/h0AqsMtA5yK22GgMtCYiMdCOtWTSGgUOkgEDX+wk2b0x4sAfLiO4NxBxqbiVtz7K7/1/RgVrVI0NClZwqA==";
       };
     };
-    "vscode-languageserver-protocol-3.17.4-next.3" = {
-      name = "vscode-languageserver-protocol";
-      packageName = "vscode-languageserver-protocol";
-      version = "3.17.4-next.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.4-next.3.tgz";
-        sha512 = "GnW3ldfzlsDK9B1/L1edBW1ddSakC59r+DRipTYCcXIT/zCCbLID998Dxn+exgrL33e3/XLQ+7hQQiSz6TnhKQ==";
-      };
-    };
     "vscode-languageserver-protocol-3.17.5" = {
       name = "vscode-languageserver-protocol";
       packageName = "vscode-languageserver-protocol";
@@ -55575,24 +54774,6 @@ let
         sha512 = "mb1bvRJN8SVznADSGWM9u/b07H7Ecg0I3OgXDuLdn307rl/J3A9YD6/eYOssqhecL27hK1IPZAsaqh00i/Jljg==";
       };
     };
-    "vscode-languageserver-protocol-3.5.1" = {
-      name = "vscode-languageserver-protocol";
-      packageName = "vscode-languageserver-protocol";
-      version = "3.5.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.5.1.tgz";
-        sha512 = "1fPDIwsAv1difCV+8daOrJEGunClNJWqnUHq/ncWrjhitKWXgGmRCjlwZ3gDUTt54yRcvXz1PXJDaRNvNH6pYA==";
-      };
-    };
-    "vscode-languageserver-protocol-foldingprovider-2.0.1" = {
-      name = "vscode-languageserver-protocol-foldingprovider";
-      packageName = "vscode-languageserver-protocol-foldingprovider";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-languageserver-protocol-foldingprovider/-/vscode-languageserver-protocol-foldingprovider-2.0.1.tgz";
-        sha512 = "N8bOS8i0xuQMn/y0bijyefDbOsMl6hiH6LDREYWavTLTM5jbj44EiQfStsbmAv/0eaFKkL/jf5hW7nWwBy2HBw==";
-      };
-    };
     "vscode-languageserver-textdocument-1.0.11" = {
       name = "vscode-languageserver-textdocument";
       packageName = "vscode-languageserver-textdocument";
@@ -55638,15 +54819,6 @@ let
         sha512 = "tZFUSbyjUcrh+qQf13ALX4QDdOfDX0cVaBFgy7ktJ0VwS7AW/yRKgGPSxVqqP9OCMNPdqP57O5q47w2pEwfaUg==";
       };
     };
-    "vscode-languageserver-types-3.16.0-next.2" = {
-      name = "vscode-languageserver-types";
-      packageName = "vscode-languageserver-types";
-      version = "3.16.0-next.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0-next.2.tgz";
-        sha512 = "QjXB7CKIfFzKbiCJC4OWC8xUncLsxo19FzGVp/ADFvvi87PlmBSCAtZI5xwGjF5qE0xkLf0jjKUn3DzmpDP52Q==";
-      };
-    };
     "vscode-languageserver-types-3.17.0-next.3" = {
       name = "vscode-languageserver-types";
       packageName = "vscode-languageserver-types";
@@ -55674,15 +54846,6 @@ let
         sha512 = "SYU4z1dL0PyIMd4Vj8YOqFvHu7Hz/enbWtpfnVbJHU4Nd1YNYx8u0ennumc6h48GQNeOLxmwySmnADouT/AuZA==";
       };
     };
-    "vscode-languageserver-types-3.17.4-next.2" = {
-      name = "vscode-languageserver-types";
-      packageName = "vscode-languageserver-types";
-      version = "3.17.4-next.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.4-next.2.tgz";
-        sha512 = "r6tXyCXyXQH7b6VHkvRT0Nd9v+DWQiosgTR6HQajCb4iJ1myr3KgueWEGBF1Ph5/YAiDy8kXUhf8dHl7wE1H2A==";
-      };
-    };
     "vscode-languageserver-types-3.17.5" = {
       name = "vscode-languageserver-types";
       packageName = "vscode-languageserver-types";
@@ -55692,33 +54855,6 @@ let
         sha512 = "Ld1VelNuX9pdF39h2Hgaeb5hEZM2Z3jUrrMgWQAu82jMtZp7p3vJT3BzToKtZI7NgQssZje5o0zryOrhQvzQAg==";
       };
     };
-    "vscode-languageserver-types-3.5.0" = {
-      name = "vscode-languageserver-types";
-      packageName = "vscode-languageserver-types";
-      version = "3.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.5.0.tgz";
-        sha512 = "D4rUfu/oKYdc9Tmec0nEfedj+uXO2tZHR+eoHs9rE9G/QpRyZaHuug8ZUNGTGdO+ALLGgenL6bRpY8y3J9acHg==";
-      };
-    };
-    "vscode-nls-2.0.2" = {
-      name = "vscode-nls";
-      packageName = "vscode-nls";
-      version = "2.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-nls/-/vscode-nls-2.0.2.tgz";
-        sha512 = "xK4p7Wksahb1imTwJZeA7+OSobDlRkWYWBuz9eR6LyJRLLG4LBxvLvZF8GO1ZY1tUWHITjZn2BtA8nRufKdHSg==";
-      };
-    };
-    "vscode-nls-3.2.5" = {
-      name = "vscode-nls";
-      packageName = "vscode-nls";
-      version = "3.2.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-nls/-/vscode-nls-3.2.5.tgz";
-        sha512 = "ITtoh3V4AkWXMmp3TB97vsMaHRgHhsSFPsUdzlueSL+dRZbSNTZeOmdQv60kjCV306ghPxhDeoNUEm3+EZMuyw==";
-      };
-    };
     "vscode-nls-4.1.2" = {
       name = "vscode-nls";
       packageName = "vscode-nls";
@@ -55809,13 +54945,13 @@ let
         sha512 = "4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==";
       };
     };
-    "w3c-xmlserializer-4.0.0" = {
+    "w3c-xmlserializer-5.0.0" = {
       name = "w3c-xmlserializer";
       packageName = "w3c-xmlserializer";
-      version = "4.0.0";
+      version = "5.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-4.0.0.tgz";
-        sha512 = "d+BFHzbiCx6zGfz0HyQ6Rg69w9k19nviJspaj4yNscGjrHu94sVP+aRm75yEbCh+r2/yR+7q6hux9LVtbuTGBw==";
+        url = "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-5.0.0.tgz";
+        sha512 = "o8qghlI8NZHU1lLPrpi2+Uq7abh4GGPpYANlalzWxyWteJOCsr/P+oPBA49TOLu5FTZO4d3F9MnWJfiMo4BkmA==";
       };
     };
     "walk-2.3.15" = {
@@ -55926,15 +55062,6 @@ let
         sha512 = "d2JWLCivmZYTSIoge9MsgFCZrt571BikcWGYkjC1khllbTeDlGqZ2D8vD8E/lJa8WGWbb7Plm8/XJYV7IJHZZw==";
       };
     };
-    "web-tree-sitter-0.20.5" = {
-      name = "web-tree-sitter";
-      packageName = "web-tree-sitter";
-      version = "0.20.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/web-tree-sitter/-/web-tree-sitter-0.20.5.tgz";
-        sha512 = "mpXlqIeEBE5Q71cnBnt8w6XKhIiKmllPECqsIFBtMvzcfCxA8+614iyMJXBCQo95Vs3y1zORLqiLJn25pYZ4Tw==";
-      };
-    };
     "web-tree-sitter-0.22.5" = {
       name = "web-tree-sitter";
       packageName = "web-tree-sitter";
@@ -56034,13 +55161,13 @@ let
         sha512 = "VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==";
       };
     };
-    "webpack-5.92.0" = {
+    "webpack-5.93.0" = {
       name = "webpack";
       packageName = "webpack";
-      version = "5.92.0";
+      version = "5.93.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/webpack/-/webpack-5.92.0.tgz";
-        sha512 = "Bsw2X39MYIgxouNATyVpCNVWBCuUwDgWtN78g6lSdPJRLaQ/PUVm/oXcaRAyY/sMFoKFQrsPeqvTizWtq7QPCA==";
+        url = "https://registry.npmjs.org/webpack/-/webpack-5.93.0.tgz";
+        sha512 = "Y0m5oEY1LRuwly578VqluorkXbvXKh7U3rLoQCEO04M97ScRr44afGVkI0FQFsXzysk5OgFAxjZAb9rsGQVihA==";
       };
     };
     "webpack-cli-5.1.4" = {
@@ -56061,13 +55188,13 @@ let
         sha512 = "BVdTqhhs+0IfoeAf7EoH5WE+exCmqGerHfDM0IL096Px60Tq2Mn9MAbnaGUe6HiMa41KMCYF19gyzZmBcq/o4Q==";
       };
     };
-    "webpack-dev-middleware-7.2.1" = {
+    "webpack-dev-middleware-7.3.0" = {
       name = "webpack-dev-middleware";
       packageName = "webpack-dev-middleware";
-      version = "7.2.1";
+      version = "7.3.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-7.2.1.tgz";
-        sha512 = "hRLz+jPQXo999Nx9fXVdKlg/aehsw1ajA9skAneGmT03xwmyuhvF93p6HUKKbWhXdcERtGTzUCtIQr+2IQegrA==";
+        url = "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-7.3.0.tgz";
+        sha512 = "xD2qnNew+F6KwOGZR7kWdbIou/ud7cVqLEXeK1q0nHcNsX/u7ul/fSdlOTX4ntSL5FNFy7ZJJXbf0piF591JYw==";
       };
     };
     "webpack-dev-server-4.15.2" = {
@@ -56115,13 +55242,13 @@ let
         sha512 = "/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==";
       };
     };
-    "webrtc-polyfill-1.1.6" = {
+    "webrtc-polyfill-1.1.8" = {
       name = "webrtc-polyfill";
       packageName = "webrtc-polyfill";
-      version = "1.1.6";
+      version = "1.1.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/webrtc-polyfill/-/webrtc-polyfill-1.1.6.tgz";
-        sha512 = "sB9m4P5ZF6Af1zNiMc/jW+PMVtvPSRuE3f0FNhje5iplljZ5mAUTUtZTdaoi+l5Z17/ePQinJbNDfT+YzB6fdQ==";
+        url = "https://registry.npmjs.org/webrtc-polyfill/-/webrtc-polyfill-1.1.8.tgz";
+        sha512 = "ms2rE5MEg1KXQX45sjl2QaIIevhpPogqoFz7Z1MAJYxWUuxFfI3L0SoiifrTNrWJiJiuFn/Dsf5OIGUWJFdU5g==";
       };
     };
     "websocket-driver-0.7.4" = {
@@ -56142,13 +55269,13 @@ let
         sha512 = "OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==";
       };
     };
-    "webtorrent-2.4.1" = {
+    "webtorrent-2.4.12" = {
       name = "webtorrent";
       packageName = "webtorrent";
-      version = "2.4.1";
+      version = "2.4.12";
       src = fetchurl {
-        url = "https://registry.npmjs.org/webtorrent/-/webtorrent-2.4.1.tgz";
-        sha512 = "9/WTMFaAAbfopNQiGK5rD7ZJJTdPwOrl/T6izTWVEk56+cJdtZBz9FelMnwnS4Q7rqFKoEYuonzi+ig0nXjYsA==";
+        url = "https://registry.npmjs.org/webtorrent/-/webtorrent-2.4.12.tgz";
+        sha512 = "Lp/2WDQH0nUhIkpp03F7PnAorQSVCFIDGY4ZNeNPGtA1CgoeX4eie1BfK6QAlH/OtHbilPhpxlVrBkZsA6HqPA==";
       };
     };
     "whatwg-encoding-1.0.5" = {
@@ -56160,13 +55287,13 @@ let
         sha512 = "b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==";
       };
     };
-    "whatwg-encoding-2.0.0" = {
+    "whatwg-encoding-3.1.1" = {
       name = "whatwg-encoding";
       packageName = "whatwg-encoding";
-      version = "2.0.0";
+      version = "3.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz";
-        sha512 = "p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==";
+        url = "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-3.1.1.tgz";
+        sha512 = "6qN4hJdMwfYBtE3YBTTHhoeuUrDBPZmbQaxWAqSALV/MeEnR5z1xd8UKud2RAkFoPkmB+hli1TZSnyi84xz1vQ==";
       };
     };
     "whatwg-mimetype-2.3.0" = {
@@ -56178,22 +55305,22 @@ let
         sha512 = "M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==";
       };
     };
-    "whatwg-mimetype-3.0.0" = {
+    "whatwg-mimetype-4.0.0" = {
       name = "whatwg-mimetype";
       packageName = "whatwg-mimetype";
-      version = "3.0.0";
+      version = "4.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz";
-        sha512 = "nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==";
+        url = "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-4.0.0.tgz";
+        sha512 = "QaKxh0eNIi2mE9p2vEdzfagOKHCcj1pJ56EEHGQOVxp8r9/iszLUUV7v89x9O1p/T+NlTM5W7jW6+cz4Fq1YVg==";
       };
     };
-    "whatwg-url-12.0.1" = {
+    "whatwg-url-14.0.0" = {
       name = "whatwg-url";
       packageName = "whatwg-url";
-      version = "12.0.1";
+      version = "14.0.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-12.0.1.tgz";
-        sha512 = "Ed/LrqB8EPlGxjS+TrsXcpUond1mhccS3pchLhzSgPCnTimUCKj3IZE75pAs5m6heB2U2TMerKFUXheyHY+VDQ==";
+        url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-14.0.0.tgz";
+        sha512 = "1lfMEm2IEr7RIV+f4lUNPOqfFL+pO+Xw3fJSqmjX9AbXcXcYOkCe1P6+9VBZB6n94af16NfZf+sSk0JCBZC9aw==";
       };
     };
     "whatwg-url-5.0.0" = {
@@ -56223,13 +55350,13 @@ let
         sha512 = "gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==";
       };
     };
-    "when-exit-2.1.2" = {
+    "when-exit-2.1.3" = {
       name = "when-exit";
       packageName = "when-exit";
-      version = "2.1.2";
+      version = "2.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/when-exit/-/when-exit-2.1.2.tgz";
-        sha512 = "u9J+toaf3CCxCAzM/484qNAxQE75rFdVgiFEEV8Xps2gzYhf0tx73s1WXDQhkwV17E3MxRMz40m7Ekd2/121Lg==";
+        url = "https://registry.npmjs.org/when-exit/-/when-exit-2.1.3.tgz";
+        sha512 = "uVieSTccFIr/SFQdFWN/fFaQYmV37OKtuaGphMAzi4DmmUlrvRBJW5WSLkHyjNQY/ePJMz3LoiX9R3yy1Su6Hw==";
       };
     };
     "whet.extend-0.9.9" = {
@@ -56313,13 +55440,13 @@ let
         sha512 = "iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==";
       };
     };
-    "which-pm-2.0.0" = {
+    "which-pm-2.2.0" = {
       name = "which-pm";
       packageName = "which-pm";
-      version = "2.0.0";
+      version = "2.2.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/which-pm/-/which-pm-2.0.0.tgz";
-        sha512 = "Lhs9Pmyph0p5n5Z3mVnN0yWcbQYUAD7rbQUiMsQxOJ3T57k7RFe35SUwWMf7dsbDZks1uOmw4AecB/JMDj3v/w==";
+        url = "https://registry.npmjs.org/which-pm/-/which-pm-2.2.0.tgz";
+        sha512 = "MOiaDbA5ZZgUjkeMWM5EkJp4loW5ZRoa5bc3/aeMox/PJelMhE6t7S/mLuiY43DBupyxH+S0U1bTui9kWUlmsw==";
       };
     };
     "which-typed-array-1.1.15" = {
@@ -56493,22 +55620,22 @@ let
         sha512 = "L3yR6/MzZAOl0DsysUXHVjOwv8mKZ71TrA/41EIduGpOOV5LQVodqN+QdQ6BS6PJ/RdIshZhq84P/fStEZkk7g==";
       };
     };
-    "winston-3.13.0" = {
+    "winston-3.13.1" = {
       name = "winston";
       packageName = "winston";
-      version = "3.13.0";
+      version = "3.13.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/winston/-/winston-3.13.0.tgz";
-        sha512 = "rwidmA1w3SE4j0E5MuIufFhyJPBDG7Nu71RkZor1p2+qHvJSZ9GYDA81AyleQcZbh/+V6HjeBdfnTZJm9rSeQQ==";
+        url = "https://registry.npmjs.org/winston/-/winston-3.13.1.tgz";
+        sha512 = "SvZit7VFNvXRzbqGHsv5KSmgbEYR5EiQfDAL9gxYkRqa934Hnk++zze0wANKtMHcy/gI4W/3xmSDwlhf865WGw==";
       };
     };
-    "winston-transport-4.7.0" = {
+    "winston-transport-4.7.1" = {
       name = "winston-transport";
       packageName = "winston-transport";
-      version = "4.7.0";
+      version = "4.7.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/winston-transport/-/winston-transport-4.7.0.tgz";
-        sha512 = "ajBj65K5I7denzer2IYW6+2bNIVqLGDHqDw3Ow8Ohh+vdW+rv4MZ6eiDvHoKhfJFZ2auyN8byXieDDJ96ViONg==";
+        url = "https://registry.npmjs.org/winston-transport/-/winston-transport-4.7.1.tgz";
+        sha512 = "wQCXXVgfv/wUPOfb2x0ruxzwkcZfxcktz6JIMUaPLmcNhO4bZTwA/WtDWK74xV3F2dKu8YadrFv0qhwYjVEwhA==";
       };
     };
     "with-7.0.2" = {
@@ -56601,13 +55728,31 @@ let
         sha512 = "rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw==";
       };
     };
-    "workerpool-6.2.1" = {
-      name = "workerpool";
-      packageName = "workerpool";
-      version = "6.2.1";
+    "worker-timers-7.1.8" = {
+      name = "worker-timers";
+      packageName = "worker-timers";
+      version = "7.1.8";
       src = fetchurl {
-        url = "https://registry.npmjs.org/workerpool/-/workerpool-6.2.1.tgz";
-        sha512 = "ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw==";
+        url = "https://registry.npmjs.org/worker-timers/-/worker-timers-7.1.8.tgz";
+        sha512 = "R54psRKYVLuzff7c1OTFcq/4Hue5Vlz4bFtNEIarpSiCYhpifHU3aIQI29S84o1j87ePCYqbmEJPqwBTf+3sfw==";
+      };
+    };
+    "worker-timers-broker-6.1.8" = {
+      name = "worker-timers-broker";
+      packageName = "worker-timers-broker";
+      version = "6.1.8";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/worker-timers-broker/-/worker-timers-broker-6.1.8.tgz";
+        sha512 = "FUCJu9jlK3A8WqLTKXM9E6kAmI/dR1vAJ8dHYLMisLNB/n3GuaFIjJ7pn16ZcD1zCOf7P6H62lWIEBi+yz/zQQ==";
+      };
+    };
+    "worker-timers-worker-7.0.71" = {
+      name = "worker-timers-worker";
+      packageName = "worker-timers-worker";
+      version = "7.0.71";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/worker-timers-worker/-/worker-timers-worker-7.0.71.tgz";
+        sha512 = "ks/5YKwZsto1c2vmljroppOKCivB/ma97g9y77MAAz2TBBjPPgpoOiS1qYQKIgvGTr2QYPT3XhJWIB6Rj2MVPQ==";
       };
     };
     "workerpool-6.5.1" = {
@@ -56817,13 +55962,13 @@ let
         sha512 = "eqZfL+NE/YQc1/ZynhojeV8q+H050oR8AZ2uIev7RU10svA9ZnJUddHcOUZTJLinZ9yEfdA2kSATS2qZK5fhJA==";
       };
     };
-    "ws-6.2.2" = {
+    "ws-6.2.3" = {
       name = "ws";
       packageName = "ws";
-      version = "6.2.2";
+      version = "6.2.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ws/-/ws-6.2.2.tgz";
-        sha512 = "zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw==";
+        url = "https://registry.npmjs.org/ws/-/ws-6.2.3.tgz";
+        sha512 = "jmTjYU0j60B+vHey6TfR3Z7RD61z/hmxBS3VMSGIrroOWXQEneK1zNuotOUrGyBHQj0yrpsLHPWtigEFd13ndA==";
       };
     };
     "ws-7.4.5" = {
@@ -56835,31 +55980,13 @@ let
         sha512 = "xzyu3hFvomRfXKH8vOFMU3OguG6oOvhXMo3xsGy3xWExqaM2dxBbVxuD99O7m3ZUFMvvscsZDqxfgMaRr/Nr1g==";
       };
     };
-    "ws-7.4.6" = {
+    "ws-7.5.10" = {
       name = "ws";
       packageName = "ws";
-      version = "7.4.6";
+      version = "7.5.10";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ws/-/ws-7.4.6.tgz";
-        sha512 = "YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==";
-      };
-    };
-    "ws-7.5.6" = {
-      name = "ws";
-      packageName = "ws";
-      version = "7.5.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ws/-/ws-7.5.6.tgz";
-        sha512 = "6GLgCqo2cy2A2rjCNFlxQS6ZljG/coZfZXclldI8FB/1G3CCI36Zd8xy2HrFVACi8tfk5XrgLQEk+P0Tnz9UcA==";
-      };
-    };
-    "ws-7.5.9" = {
-      name = "ws";
-      packageName = "ws";
-      version = "7.5.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ws/-/ws-7.5.9.tgz";
-        sha512 = "F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==";
+        url = "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz";
+        sha512 = "+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==";
       };
     };
     "ws-8.11.0" = {
@@ -56880,22 +56007,22 @@ let
         sha512 = "x9vcZYTrFPC7aSIbj7sRCYo7L/Xb8Iy+pW0ng0wt2vCJv7M9HOMy0UoN3rr+IFC7hb7vXoqS+P9ktyLLLhO+LA==";
       };
     };
-    "ws-8.17.0" = {
+    "ws-8.17.1" = {
       name = "ws";
       packageName = "ws";
-      version = "8.17.0";
+      version = "8.17.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ws/-/ws-8.17.0.tgz";
-        sha512 = "uJq6108EgZMAl20KagGkzCKfMEjxmKvZHG7Tlq0Z6nOky7YF7aq4mOx6xK8TJ/i1LeK4Qus7INktacctDgY8Ow==";
+        url = "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz";
+        sha512 = "6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==";
       };
     };
-    "ws-8.8.1" = {
+    "ws-8.18.0" = {
       name = "ws";
       packageName = "ws";
-      version = "8.8.1";
+      version = "8.18.0";
       src = fetchurl {
-        url = "https://registry.npmjs.org/ws/-/ws-8.8.1.tgz";
-        sha512 = "bGy2JzvzkPowEJV++hF07hAD6niYSr0JzBNo/J29WsB57A2r7Wlc1UFcTR9IzrPvuNVO4B8LGqF8qcpsVOhJCA==";
+        url = "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz";
+        sha512 = "8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==";
       };
     };
     "xcase-2.0.1" = {
@@ -57033,6 +56160,15 @@ let
         sha512 = "ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==";
       };
     };
+    "xml-name-validator-5.0.0" = {
+      name = "xml-name-validator";
+      packageName = "xml-name-validator";
+      version = "5.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-5.0.0.tgz";
+        sha512 = "EvGK8EJ3DhaHfbRlETOWAS5pO9MZITeauHKJyb8wyajUfQUenkIg2MvLDTZ4T/TgIcm3HU0TFBgWWboAZ30UHg==";
+      };
+    };
     "xml-parse-from-string-1.0.1" = {
       name = "xml-parse-from-string";
       packageName = "xml-parse-from-string";
@@ -57232,15 +56368,6 @@ let
         sha512 = "LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==";
       };
     };
-    "xxhash-wasm-1.0.2" = {
-      name = "xxhash-wasm";
-      packageName = "xxhash-wasm";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/xxhash-wasm/-/xxhash-wasm-1.0.2.tgz";
-        sha512 = "ibF0Or+FivM9lNrg+HGJfVX8WJqgo+kCLDc4vx6xMeTce7Aj+DLttKbxxRR/gNLSAelRc1omAPlJ77N/Jem07A==";
-      };
-    };
     "y18n-3.2.2" = {
       name = "y18n";
       packageName = "y18n";
@@ -57295,6 +56422,15 @@ let
         sha512 = "3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==";
       };
     };
+    "yallist-5.0.0" = {
+      name = "yallist";
+      packageName = "yallist";
+      version = "5.0.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yallist/-/yallist-5.0.0.tgz";
+        sha512 = "YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw==";
+      };
+    };
     "yaml-1.10.2" = {
       name = "yaml";
       packageName = "yaml";
@@ -57322,6 +56458,15 @@ let
         sha512 = "aBx2bnqDzVOyNKfsysjA2ms5ZlnjSAW2eG3/L5G/CSujfjLJTJsEw1bGw8kCf04KodQWk1pxlGnZ56CRxiawmg==";
       };
     };
+    "yaml-2.5.0" = {
+      name = "yaml";
+      packageName = "yaml";
+      version = "2.5.0";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yaml/-/yaml-2.5.0.tgz";
+        sha512 = "2wWLbGbYDiSqqIKoPjar3MPgB94ErzCtrNE1FdqGuaO0pi2JGjmE8aW8TDZwzU7vuxcGRdL/4gPQwQ7hD5AMSw==";
+      };
+    };
     "yargs-13.3.2" = {
       name = "yargs";
       packageName = "yargs";
@@ -57448,15 +56593,6 @@ let
         sha512 = "9pIKIJhnI5tonzG6OnCFlz/yln8xHYcGl+pn3xR0Vzff0vzN1PbNRaelgfgRUwZ3s4i3jvxT9WhmUGL4whnasA==";
       };
     };
-    "yargs-parser-20.2.4" = {
-      name = "yargs-parser";
-      packageName = "yargs-parser";
-      version = "20.2.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.4.tgz";
-        sha512 = "WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==";
-      };
-    };
     "yargs-parser-20.2.9" = {
       name = "yargs-parser";
       packageName = "yargs-parser";
@@ -57601,22 +56737,31 @@ let
         sha512 = "rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==";
       };
     };
-    "yocto-queue-1.0.0" = {
+    "yocto-queue-1.1.1" = {
       name = "yocto-queue";
       packageName = "yocto-queue";
-      version = "1.0.0";
+      version = "1.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.0.0.tgz";
-        sha512 = "9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==";
+        url = "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.1.1.tgz";
+        sha512 = "b4JR1PFR10y1mKjhHY9LaGo6tmrgjit7hxVIeAmyMw3jegXR4dhYqLaQF5zMXZxY7tLpMyJeLjr1C4rLmkVe8g==";
       };
     };
-    "yoctocolors-2.0.2" = {
+    "yoctocolors-2.1.1" = {
       name = "yoctocolors";
       packageName = "yoctocolors";
-      version = "2.0.2";
+      version = "2.1.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/yoctocolors/-/yoctocolors-2.0.2.tgz";
-        sha512 = "Ct97huExsu7cWeEjmrXlofevF8CvzUglJ4iGUet5B8xn1oumtAZBpHU4GzYuoE6PVqcZ5hghtBrSlhwHuR1Jmw==";
+        url = "https://registry.npmjs.org/yoctocolors/-/yoctocolors-2.1.1.tgz";
+        sha512 = "GQHQqAopRhwU8Kt1DDM8NjibDXHC8eoh1erhGAJPEyveY9qqVeXvVikNKrDz69sHowPMorbPUrH/mx8c50eiBQ==";
+      };
+    };
+    "yoctocolors-cjs-2.1.2" = {
+      name = "yoctocolors-cjs";
+      packageName = "yoctocolors-cjs";
+      version = "2.1.2";
+      src = fetchurl {
+        url = "https://registry.npmjs.org/yoctocolors-cjs/-/yoctocolors-cjs-2.1.2.tgz";
+        sha512 = "cYVsTjKl8b+FrnidjibDWskAv7UKOfcwaVZdp/it9n1s9fU3IkgDbhdIRKCW4JDsAlECJY0ytoVPT3sK6kideA==";
       };
     };
     "yoga-layout-prebuilt-1.10.0" = {
@@ -57637,15 +56782,6 @@ let
         sha512 = "N+d4UJSJbt/R3wqY7Coqs5pcV0aUj2j9IaQ3rNj9bVCLld8tTGKRa2USARjnvZJWVx1NDmQev8EknoczaOQDOA==";
       };
     };
-    "youch-3.3.3" = {
-      name = "youch";
-      packageName = "youch";
-      version = "3.3.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/youch/-/youch-3.3.3.tgz";
-        sha512 = "qSFXUk3UZBLfggAW3dJKg0BMblG5biqSF8M34E06o5CSsZtH92u9Hqmj2RzGiHDi64fhe83+4tENFP2DB6t6ZA==";
-      };
-    };
     "yurnalist-2.1.0" = {
       name = "yurnalist";
       packageName = "yurnalist";
@@ -57733,16 +56869,45 @@ in
   "@angular/cli" = nodeEnv.buildNodePackage {
     name = "_at_angular_slash_cli";
     packageName = "@angular/cli";
-    version = "18.0.4";
+    version = "18.1.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/@angular/cli/-/cli-18.0.4.tgz";
-      sha512 = "i7DLVIc4HN0CFZZKbEeVeQSADRG1Dt2CwXh/wTUzglRLu/tE7Q+WMrqJ2+lGTT2edZp2KKysM4Gxp+ATAzP8AQ==";
+      url = "https://registry.npmjs.org/@angular/cli/-/cli-18.1.2.tgz";
+      sha512 = "5H0scWgJcDE3NSM6/j/xSwNfAQBVOhVjXuj+nZOaEkJC0Bxh6AoEdWpQdzmZ6qSlx4LMlJYI6P/sH0kiBlFfgA==";
     };
     dependencies = [
-      sources."@angular-devkit/architect-0.1800.4"
-      sources."@angular-devkit/core-18.0.4"
-      sources."@angular-devkit/schematics-18.0.4"
-      sources."@inquirer/figures-1.0.3"
+      sources."@angular-devkit/architect-0.1801.2"
+      sources."@angular-devkit/core-18.1.2"
+      sources."@angular-devkit/schematics-18.1.2"
+      (sources."@inquirer/checkbox-2.4.2" // {
+        dependencies = [
+          sources."ansi-escapes-4.3.2"
+        ];
+      })
+      sources."@inquirer/confirm-3.1.17"
+      (sources."@inquirer/core-9.0.5" // {
+        dependencies = [
+          sources."ansi-escapes-4.3.2"
+          sources."signal-exit-4.1.0"
+          sources."wrap-ansi-6.2.0"
+        ];
+      })
+      sources."@inquirer/editor-2.1.17"
+      sources."@inquirer/expand-2.1.17"
+      sources."@inquirer/figures-1.0.5"
+      sources."@inquirer/input-2.2.4"
+      (sources."@inquirer/password-2.1.17" // {
+        dependencies = [
+          sources."ansi-escapes-4.3.2"
+        ];
+      })
+      sources."@inquirer/prompts-5.0.7"
+      sources."@inquirer/rawlist-2.1.17"
+      (sources."@inquirer/select-2.4.2" // {
+        dependencies = [
+          sources."ansi-escapes-4.3.2"
+        ];
+      })
+      sources."@inquirer/type-1.5.1"
       (sources."@isaacs/cliui-8.0.2" // {
         dependencies = [
           sources."ansi-regex-6.0.1"
@@ -57753,11 +56918,11 @@ in
           sources."wrap-ansi-8.1.0"
         ];
       })
-      sources."@jridgewell/sourcemap-codec-1.4.15"
-      sources."@ljharb/through-2.3.13"
+      sources."@jridgewell/sourcemap-codec-1.5.0"
+      sources."@listr2/prompt-adapter-inquirer-2.0.13"
       sources."@npmcli/agent-2.2.2"
       sources."@npmcli/fs-3.1.1"
-      (sources."@npmcli/git-5.0.7" // {
+      (sources."@npmcli/git-5.0.8" // {
         dependencies = [
           sources."isexe-3.1.1"
           sources."which-4.0.0"
@@ -57779,7 +56944,7 @@ in
           sources."which-4.0.0"
         ];
       })
-      sources."@schematics/angular-18.0.4"
+      sources."@schematics/angular-18.1.2"
       sources."@sigstore/bundle-2.3.2"
       sources."@sigstore/core-1.1.0"
       sources."@sigstore/protobuf-specs-0.3.2"
@@ -57788,14 +56953,16 @@ in
       sources."@sigstore/verify-1.2.1"
       sources."@tufjs/canonical-json-2.0.0"
       sources."@tufjs/models-2.0.1"
+      sources."@types/mute-stream-0.0.4"
+      sources."@types/node-20.14.12"
+      sources."@types/wrap-ansi-3.0.0"
       sources."@yarnpkg/lockfile-1.1.0"
       sources."abbrev-2.0.0"
       sources."agent-base-7.1.1"
       sources."aggregate-error-3.1.0"
-      sources."ajv-8.13.0"
+      sources."ajv-8.16.0"
       sources."ajv-formats-3.0.1"
-      sources."ansi-colors-4.1.3"
-      sources."ansi-escapes-4.3.2"
+      sources."ansi-escapes-6.2.1"
       sources."ansi-regex-5.0.1"
       sources."ansi-styles-4.3.0"
       (sources."anymatch-3.1.3" // {
@@ -57810,36 +56977,42 @@ in
       sources."brace-expansion-2.0.1"
       sources."braces-3.0.3"
       sources."buffer-5.7.1"
-      sources."cacache-18.0.3"
-      sources."call-bind-1.0.7"
+      sources."cacache-18.0.4"
       sources."chalk-4.1.2"
       sources."chardet-0.7.0"
       sources."chokidar-3.6.0"
       sources."chownr-2.0.0"
       sources."clean-stack-2.2.0"
-      sources."cli-cursor-3.1.0"
+      sources."cli-cursor-4.0.0"
       sources."cli-spinners-2.9.2"
+      (sources."cli-truncate-4.0.0" // {
+        dependencies = [
+          sources."ansi-regex-6.0.1"
+          sources."emoji-regex-10.3.0"
+          sources."string-width-7.2.0"
+          sources."strip-ansi-7.1.0"
+        ];
+      })
       sources."cli-width-4.1.0"
       sources."cliui-8.0.1"
       sources."clone-1.0.4"
       sources."color-convert-2.0.1"
       sources."color-name-1.1.4"
+      sources."colorette-2.0.20"
       sources."cross-spawn-7.0.3"
       sources."debug-4.3.5"
       sources."defaults-1.0.4"
-      sources."define-data-property-1.1.4"
       sources."eastasianwidth-0.2.0"
       sources."emoji-regex-8.0.0"
       sources."env-paths-2.2.1"
       sources."err-code-2.0.3"
-      sources."es-define-property-1.0.0"
-      sources."es-errors-1.3.0"
       sources."escalade-3.1.2"
+      sources."eventemitter3-5.0.1"
       sources."exponential-backoff-3.1.1"
       sources."external-editor-3.1.0"
       sources."fast-deep-equal-3.1.3"
       sources."fill-range-7.1.1"
-      (sources."foreground-child-3.2.0" // {
+      (sources."foreground-child-3.2.1" // {
         dependencies = [
           sources."signal-exit-4.1.0"
         ];
@@ -57847,36 +57020,26 @@ in
       sources."fs-minipass-3.0.3"
       sources."function-bind-1.1.2"
       sources."get-caller-file-2.0.5"
-      sources."get-intrinsic-1.2.4"
-      sources."glob-10.4.1"
+      sources."get-east-asian-width-1.2.0"
+      sources."glob-10.4.5"
       sources."glob-parent-5.1.2"
-      sources."gopd-1.0.1"
       sources."graceful-fs-4.2.11"
       sources."has-flag-4.0.0"
-      sources."has-property-descriptors-1.0.2"
-      sources."has-proto-1.0.3"
-      sources."has-symbols-1.0.3"
       sources."hasown-2.0.2"
       sources."hosted-git-info-7.0.2"
       sources."http-cache-semantics-4.1.1"
       sources."http-proxy-agent-7.0.2"
-      sources."https-proxy-agent-7.0.4"
+      sources."https-proxy-agent-7.0.5"
       sources."iconv-lite-0.4.24"
       sources."ieee754-1.2.1"
       sources."ignore-walk-6.0.5"
       sources."imurmurhash-0.1.4"
       sources."indent-string-4.0.0"
       sources."inherits-2.0.4"
-      sources."ini-4.1.2"
-      (sources."inquirer-9.2.22" // {
-        dependencies = [
-          sources."chalk-5.3.0"
-          sources."wrap-ansi-6.2.0"
-        ];
-      })
+      sources."ini-4.1.3"
       sources."ip-address-9.0.5"
       sources."is-binary-path-2.1.0"
-      sources."is-core-module-2.13.1"
+      sources."is-core-module-2.15.0"
       sources."is-extglob-2.1.1"
       sources."is-fullwidth-code-point-3.0.0"
       sources."is-glob-4.0.3"
@@ -57885,19 +57048,40 @@ in
       sources."is-number-7.0.0"
       sources."is-unicode-supported-0.1.0"
       sources."isexe-2.0.0"
-      sources."jackspeak-3.4.0"
+      sources."jackspeak-3.4.3"
       sources."jsbn-1.1.0"
       sources."json-parse-even-better-errors-3.0.2"
       sources."json-schema-traverse-1.0.0"
-      sources."jsonc-parser-3.2.1"
+      sources."jsonc-parser-3.3.1"
       sources."jsonparse-1.3.1"
-      sources."lodash-4.17.21"
+      (sources."listr2-8.2.3" // {
+        dependencies = [
+          sources."ansi-regex-6.0.1"
+          sources."ansi-styles-6.2.1"
+          sources."emoji-regex-10.3.0"
+          sources."string-width-7.2.0"
+          sources."strip-ansi-7.1.0"
+          sources."wrap-ansi-9.0.0"
+        ];
+      })
       sources."log-symbols-4.1.0"
-      sources."lru-cache-10.2.2"
+      (sources."log-update-6.0.0" // {
+        dependencies = [
+          sources."ansi-regex-6.0.1"
+          sources."ansi-styles-6.2.1"
+          sources."emoji-regex-10.3.0"
+          sources."is-fullwidth-code-point-5.0.0"
+          sources."slice-ansi-7.1.0"
+          sources."string-width-7.2.0"
+          sources."strip-ansi-7.1.0"
+          sources."wrap-ansi-9.0.0"
+        ];
+      })
+      sources."lru-cache-10.4.3"
       sources."magic-string-0.30.10"
       sources."make-fetch-happen-13.0.1"
       sources."mimic-fn-2.1.0"
-      sources."minimatch-9.0.4"
+      sources."minimatch-9.0.5"
       sources."minipass-7.1.2"
       sources."minipass-collect-2.0.1"
       sources."minipass-fetch-3.0.5"
@@ -57925,15 +57109,14 @@ in
       sources."ms-2.1.2"
       sources."mute-stream-1.0.0"
       sources."negotiator-0.6.3"
-      (sources."node-gyp-10.1.0" // {
+      (sources."node-gyp-10.2.0" // {
         dependencies = [
           sources."isexe-3.1.1"
-          sources."proc-log-3.0.0"
           sources."which-4.0.0"
         ];
       })
       sources."nopt-7.2.1"
-      sources."normalize-package-data-6.0.1"
+      sources."normalize-package-data-6.0.2"
       sources."normalize-path-3.0.0"
       sources."npm-bundled-3.0.1"
       sources."npm-install-checks-6.3.0"
@@ -57943,9 +57126,15 @@ in
       sources."npm-pick-manifest-9.0.1"
       sources."npm-registry-fetch-17.1.0"
       sources."onetime-5.1.2"
-      sources."ora-5.4.1"
+      (sources."ora-5.4.1" // {
+        dependencies = [
+          sources."cli-cursor-3.1.0"
+          sources."restore-cursor-3.1.0"
+        ];
+      })
       sources."os-tmpdir-1.0.2"
       sources."p-map-4.0.0"
+      sources."package-json-from-dist-1.0.0"
       sources."pacote-18.0.6"
       sources."path-key-3.1.1"
       sources."path-parse-1.0.7"
@@ -57964,21 +57153,26 @@ in
       sources."require-directory-2.1.1"
       sources."require-from-string-2.0.2"
       sources."resolve-1.22.8"
-      sources."restore-cursor-3.1.0"
+      sources."restore-cursor-4.0.0"
       sources."retry-0.12.0"
-      sources."run-async-3.0.0"
+      sources."rfdc-1.4.1"
       sources."rxjs-7.8.1"
       sources."safe-buffer-5.2.1"
       sources."safer-buffer-2.1.2"
       sources."semver-7.6.2"
-      sources."set-function-length-1.2.2"
       sources."shebang-command-2.0.0"
       sources."shebang-regex-3.0.0"
       sources."signal-exit-3.0.7"
       sources."sigstore-2.3.1"
+      (sources."slice-ansi-5.0.0" // {
+        dependencies = [
+          sources."ansi-styles-6.2.1"
+          sources."is-fullwidth-code-point-4.0.0"
+        ];
+      })
       sources."smart-buffer-4.2.0"
       sources."socks-2.8.3"
-      sources."socks-proxy-agent-8.0.3"
+      sources."socks-proxy-agent-8.0.4"
       sources."source-map-0.7.4"
       sources."spdx-correct-3.2.0"
       sources."spdx-exceptions-2.5.0"
@@ -58009,6 +57203,7 @@ in
       sources."tslib-2.6.3"
       sources."tuf-js-2.2.1"
       sources."type-fest-0.21.3"
+      sources."undici-types-5.26.5"
       sources."unique-filename-3.0.0"
       sources."unique-slug-4.0.0"
       sources."uri-js-4.4.1"
@@ -58023,6 +57218,7 @@ in
       sources."yallist-4.0.0"
       sources."yargs-17.7.2"
       sources."yargs-parser-21.1.1"
+      sources."yoctocolors-cjs-2.1.2"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -58037,10 +57233,10 @@ in
   "@antfu/ni" = nodeEnv.buildNodePackage {
     name = "_at_antfu_slash_ni";
     packageName = "@antfu/ni";
-    version = "0.21.12";
+    version = "0.22.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/@antfu/ni/-/ni-0.21.12.tgz";
-      sha512 = "2aDL3WUv8hMJb2L3r/PIQWsTLyq7RQr3v9xD16fiz6O8ys1xEyLhhTOv8gxtZvJiTzjTF5pHoArvRdesGL1DMQ==";
+      url = "https://registry.npmjs.org/@antfu/ni/-/ni-0.22.0.tgz";
+      sha512 = "qP2zFsmypfWpKnmQcjoqMfYrPRHbqcXnhaUrg3VGqPGFXyN9sKz2+/TvNKByWDqAfuVStE8Fy2ppuVdoWQDjkw==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -58055,13 +57251,13 @@ in
   "@astrojs/language-server" = nodeEnv.buildNodePackage {
     name = "_at_astrojs_slash_language-server";
     packageName = "@astrojs/language-server";
-    version = "2.10.0";
+    version = "2.12.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/@astrojs/language-server/-/language-server-2.10.0.tgz";
-      sha512 = "crHXpqYfA5qWioiuZnZFpTsNItgBlF1f0S9MzDYS7/pfCALkHNJ7K3w9U/j0uMKymsT4hC7BfMaX0DYlfdSzHg==";
+      url = "https://registry.npmjs.org/@astrojs/language-server/-/language-server-2.12.1.tgz";
+      sha512 = "CCibE6XwSmrZEKlPDr48LZJN7NWxOurOJK1yOzqZFMNV8Y6DIqF6s1e60gbNNHMZkthWYBNTPno4Ni/XyviinQ==";
     };
     dependencies = [
-      sources."@astrojs/compiler-2.8.0"
+      sources."@astrojs/compiler-2.9.2"
       sources."@emmetio/abbreviation-2.3.3"
       sources."@emmetio/css-abbreviation-2.1.8"
       sources."@emmetio/css-parser-0.4.0"
@@ -58069,23 +57265,23 @@ in
       sources."@emmetio/scanner-1.0.4"
       sources."@emmetio/stream-reader-2.2.0"
       sources."@emmetio/stream-reader-utils-0.1.0"
-      sources."@jridgewell/sourcemap-codec-1.4.15"
+      sources."@jridgewell/sourcemap-codec-1.5.0"
       sources."@nodelib/fs.scandir-2.1.5"
       sources."@nodelib/fs.stat-2.0.5"
       sources."@nodelib/fs.walk-1.2.8"
-      sources."@volar/kit-2.2.5"
-      sources."@volar/language-core-2.2.5"
-      sources."@volar/language-server-2.2.5"
-      sources."@volar/language-service-2.2.5"
-      sources."@volar/snapshot-document-2.2.5"
-      sources."@volar/source-map-2.2.5"
-      sources."@volar/typescript-2.2.5"
+      sources."@volar/kit-2.4.0-alpha.18"
+      sources."@volar/language-core-2.4.0-alpha.18"
+      sources."@volar/language-server-2.4.0-alpha.18"
+      sources."@volar/language-service-2.4.0-alpha.18"
+      sources."@volar/snapshot-document-2.4.0-alpha.18"
+      sources."@volar/source-map-2.4.0-alpha.18"
+      sources."@volar/typescript-2.4.0-alpha.18"
       (sources."@vscode/emmet-helper-2.9.3" // {
         dependencies = [
           sources."vscode-uri-2.1.2"
         ];
       })
-      sources."@vscode/l10n-0.0.16"
+      sources."@vscode/l10n-0.0.18"
       sources."braces-3.0.3"
       sources."emmet-2.4.7"
       sources."fast-glob-3.3.2"
@@ -58101,45 +57297,28 @@ in
       sources."muggle-string-0.4.1"
       sources."path-browserify-1.0.1"
       sources."picomatch-2.3.1"
-      sources."prettier-3.3.2"
-      (sources."prettier-plugin-astro-0.14.0" // {
-        dependencies = [
-          sources."@astrojs/compiler-1.8.2"
-        ];
-      })
+      sources."prettier-3.3.3"
+      sources."prettier-plugin-astro-0.14.1"
       sources."queue-microtask-1.2.3"
       sources."request-light-0.7.0"
       sources."reusify-1.0.4"
       sources."run-parallel-1.2.0"
       sources."s.color-0.0.15"
       sources."sass-formatter-0.7.9"
-      sources."semver-7.6.2"
+      sources."semver-7.6.3"
       sources."suf-log-2.5.3"
       sources."to-regex-range-5.0.1"
       sources."typesafe-path-0.2.2"
-      sources."typescript-5.4.5"
-      sources."typescript-auto-import-cache-0.3.2"
-      sources."volar-service-css-0.0.45"
-      sources."volar-service-emmet-0.0.45"
-      (sources."volar-service-html-0.0.45" // {
-        dependencies = [
-          sources."@vscode/l10n-0.0.18"
-          sources."vscode-html-languageservice-5.2.0-34a5462"
-        ];
-      })
-      sources."volar-service-prettier-0.0.45"
-      sources."volar-service-typescript-0.0.45"
-      sources."volar-service-typescript-twoslash-queries-0.0.45"
-      (sources."vscode-css-languageservice-6.2.14" // {
-        dependencies = [
-          sources."@vscode/l10n-0.0.18"
-        ];
-      })
-      (sources."vscode-html-languageservice-5.2.0" // {
-        dependencies = [
-          sources."@vscode/l10n-0.0.18"
-        ];
-      })
+      sources."typescript-5.5.4"
+      sources."typescript-auto-import-cache-0.3.3"
+      sources."volar-service-css-0.0.59"
+      sources."volar-service-emmet-0.0.59"
+      sources."volar-service-html-0.0.59"
+      sources."volar-service-prettier-0.0.59"
+      sources."volar-service-typescript-0.0.59"
+      sources."volar-service-typescript-twoslash-queries-0.0.59"
+      sources."vscode-css-languageservice-6.3.0"
+      sources."vscode-html-languageservice-5.3.0"
       sources."vscode-jsonrpc-8.2.0"
       sources."vscode-languageserver-9.0.1"
       sources."vscode-languageserver-protocol-3.17.5"
@@ -58161,22 +57340,22 @@ in
   "@babel/cli" = nodeEnv.buildNodePackage {
     name = "_at_babel_slash_cli";
     packageName = "@babel/cli";
-    version = "7.24.7";
+    version = "7.24.8";
     src = fetchurl {
-      url = "https://registry.npmjs.org/@babel/cli/-/cli-7.24.7.tgz";
-      sha512 = "8dfPprJgV4O14WTx+AQyEA+opgUKPrsIXX/MdL50J1n06EQJ6m1T+CdsJe0qEC0B/Xl85i+Un5KVAxd/PACX9A==";
+      url = "https://registry.npmjs.org/@babel/cli/-/cli-7.24.8.tgz";
+      sha512 = "isdp+G6DpRyKc+3Gqxy2rjzgF7Zj9K0mzLNnxz+E/fgeag8qT3vVulX4gY9dGO1q0y+0lUv6V3a+uhUzMzrwXg==";
     };
     dependencies = [
       sources."@ampproject/remapping-2.3.0"
       sources."@babel/code-frame-7.24.7"
-      sources."@babel/compat-data-7.24.7"
-      (sources."@babel/core-7.24.7" // {
+      sources."@babel/compat-data-7.24.9"
+      (sources."@babel/core-7.24.9" // {
         dependencies = [
           sources."semver-6.3.1"
         ];
       })
-      sources."@babel/generator-7.24.7"
-      (sources."@babel/helper-compilation-targets-7.24.7" // {
+      sources."@babel/generator-7.24.10"
+      (sources."@babel/helper-compilation-targets-7.24.8" // {
         dependencies = [
           sources."semver-6.3.1"
         ];
@@ -58185,28 +57364,28 @@ in
       sources."@babel/helper-function-name-7.24.7"
       sources."@babel/helper-hoist-variables-7.24.7"
       sources."@babel/helper-module-imports-7.24.7"
-      sources."@babel/helper-module-transforms-7.24.7"
+      sources."@babel/helper-module-transforms-7.24.9"
       sources."@babel/helper-simple-access-7.24.7"
       sources."@babel/helper-split-export-declaration-7.24.7"
-      sources."@babel/helper-string-parser-7.24.7"
+      sources."@babel/helper-string-parser-7.24.8"
       sources."@babel/helper-validator-identifier-7.24.7"
-      sources."@babel/helper-validator-option-7.24.7"
-      sources."@babel/helpers-7.24.7"
+      sources."@babel/helper-validator-option-7.24.8"
+      sources."@babel/helpers-7.24.8"
       sources."@babel/highlight-7.24.7"
-      sources."@babel/parser-7.24.7"
+      sources."@babel/parser-7.24.8"
       sources."@babel/template-7.24.7"
-      sources."@babel/traverse-7.24.7"
-      sources."@babel/types-7.24.7"
+      sources."@babel/traverse-7.24.8"
+      sources."@babel/types-7.24.9"
       sources."@jridgewell/gen-mapping-0.3.5"
       sources."@jridgewell/resolve-uri-3.1.2"
       sources."@jridgewell/set-array-1.2.1"
-      sources."@jridgewell/sourcemap-codec-1.4.15"
+      sources."@jridgewell/sourcemap-codec-1.5.0"
       sources."@jridgewell/trace-mapping-0.3.25"
       sources."ansi-styles-3.2.1"
       sources."balanced-match-1.0.2"
       sources."brace-expansion-1.1.11"
-      sources."browserslist-4.23.1"
-      sources."caniuse-lite-1.0.30001634"
+      sources."browserslist-4.23.2"
+      sources."caniuse-lite-1.0.30001643"
       sources."chalk-2.4.2"
       sources."color-convert-1.9.3"
       sources."color-name-1.1.3"
@@ -58214,7 +57393,7 @@ in
       sources."concat-map-0.0.1"
       sources."convert-source-map-2.0.0"
       sources."debug-4.3.5"
-      sources."electron-to-chromium-1.4.802"
+      sources."electron-to-chromium-1.5.1"
       sources."escalade-3.1.2"
       sources."escape-string-regexp-1.0.5"
       sources."fs-readdir-recursive-1.1.0"
@@ -58232,7 +57411,7 @@ in
       sources."make-dir-2.1.0"
       sources."minimatch-3.1.2"
       sources."ms-2.1.2"
-      sources."node-releases-2.0.14"
+      sources."node-releases-2.0.18"
       sources."once-1.4.0"
       sources."path-is-absolute-1.0.1"
       sources."picocolors-1.0.1"
@@ -58241,7 +57420,7 @@ in
       sources."slash-2.0.0"
       sources."supports-color-5.5.0"
       sources."to-fast-properties-2.0.0"
-      sources."update-browserslist-db-1.0.16"
+      sources."update-browserslist-db-1.1.0"
       sources."wrappy-1.0.2"
       sources."yallist-3.1.1"
     ];
@@ -58287,9 +57466,9 @@ in
       sources."@commitlint/top-level-19.0.0"
       sources."@commitlint/types-19.0.3"
       sources."@types/conventional-commits-parser-5.0.0"
-      sources."@types/node-20.14.2"
+      sources."@types/node-20.14.12"
       sources."JSONStream-1.3.5"
-      sources."ajv-8.16.0"
+      sources."ajv-8.17.1"
       sources."ansi-regex-5.0.1"
       sources."ansi-styles-3.2.1"
       sources."argparse-2.0.1"
@@ -58314,6 +57493,7 @@ in
       sources."escape-string-regexp-1.0.5"
       sources."execa-8.0.1"
       sources."fast-deep-equal-3.1.3"
+      sources."fast-uri-3.0.1"
       sources."find-up-7.0.0"
       sources."get-caller-file-2.0.5"
       sources."get-stream-8.0.1"
@@ -58368,11 +57548,10 @@ in
       sources."path-exists-5.0.0"
       sources."path-key-3.1.1"
       sources."picocolors-1.0.1"
-      sources."punycode-2.3.1"
       sources."require-directory-2.1.1"
       sources."require-from-string-2.0.2"
       sources."resolve-from-5.0.0"
-      sources."semver-7.6.2"
+      sources."semver-7.6.3"
       sources."shebang-command-2.0.0"
       sources."shebang-regex-3.0.0"
       sources."signal-exit-4.1.0"
@@ -58383,10 +57562,9 @@ in
       sources."supports-color-5.5.0"
       sources."text-extensions-2.4.0"
       sources."through-2.3.8"
-      sources."typescript-5.4.5"
+      sources."typescript-5.5.4"
       sources."undici-types-5.26.5"
       sources."unicorn-magic-0.1.0"
-      sources."uri-js-4.4.1"
       sources."which-2.0.2"
       (sources."wrap-ansi-7.0.0" // {
         dependencies = [
@@ -58398,7 +57576,7 @@ in
       sources."y18n-5.0.8"
       sources."yargs-17.7.2"
       sources."yargs-parser-21.1.1"
-      sources."yocto-queue-1.0.0"
+      sources."yocto-queue-1.1.1"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -58421,7 +57599,7 @@ in
     dependencies = [
       sources."@commitlint/types-19.0.3"
       sources."@types/conventional-commits-parser-5.0.0"
-      sources."@types/node-20.14.2"
+      sources."@types/node-20.14.12"
       sources."array-ify-1.0.0"
       sources."chalk-5.3.0"
       sources."compare-func-2.0.0"
@@ -58443,10 +57621,10 @@ in
   "@microsoft/rush" = nodeEnv.buildNodePackage {
     name = "_at_microsoft_slash_rush";
     packageName = "@microsoft/rush";
-    version = "5.128.1";
+    version = "5.130.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/@microsoft/rush/-/rush-5.128.1.tgz";
-      sha512 = "Im/WUAT2Oqxvy92VqVZ+SoBsdffm0F7Luy5dJX853NFrj0W6VzspcR8T5yKKYHzh4fk4YNRKBVa7Mz3VhUJ0ow==";
+      url = "https://registry.npmjs.org/@microsoft/rush/-/rush-5.130.2.tgz";
+      sha512 = "BmTod8PGP61MtJAEl4nsxGrS27dqkCU55NM5V7vh0Vqpl8OkrJXT7Ucvzbm/kbDG3J5d2Clc9pEmbRNiMPjwuw==";
     };
     dependencies = [
       (sources."@azure/abort-controller-1.1.0" // {
@@ -58484,11 +57662,11 @@ in
           sources."tslib-2.6.3"
         ];
       })
-      (sources."@azure/core-rest-pipeline-1.16.0" // {
+      (sources."@azure/core-rest-pipeline-1.16.2" // {
         dependencies = [
           sources."@azure/abort-controller-2.1.2"
           sources."agent-base-7.1.1"
-          sources."https-proxy-agent-7.0.4"
+          sources."https-proxy-agent-7.0.5"
           sources."tslib-2.6.3"
         ];
       })
@@ -58497,25 +57675,25 @@ in
           sources."tslib-2.6.3"
         ];
       })
-      (sources."@azure/core-util-1.9.0" // {
+      (sources."@azure/core-util-1.9.1" // {
         dependencies = [
           sources."@azure/abort-controller-2.1.2"
           sources."tslib-2.6.3"
         ];
       })
-      (sources."@azure/identity-4.0.1" // {
+      (sources."@azure/identity-4.2.1" // {
         dependencies = [
           sources."tslib-2.6.3"
         ];
       })
-      (sources."@azure/logger-1.1.2" // {
+      (sources."@azure/logger-1.1.3" // {
         dependencies = [
           sources."tslib-2.6.3"
         ];
       })
-      sources."@azure/msal-browser-3.17.0"
-      sources."@azure/msal-common-14.12.0"
-      sources."@azure/msal-node-2.9.2"
+      sources."@azure/msal-browser-3.20.0"
+      sources."@azure/msal-common-14.14.0"
+      sources."@azure/msal-node-2.12.0"
       (sources."@azure/storage-blob-12.17.0" // {
         dependencies = [
           sources."@azure/core-tracing-1.0.0-preview.13"
@@ -58523,25 +57701,25 @@ in
         ];
       })
       sources."@babel/code-frame-7.24.7"
-      sources."@babel/generator-7.24.7"
+      sources."@babel/generator-7.24.10"
       sources."@babel/helper-environment-visitor-7.24.7"
       sources."@babel/helper-function-name-7.24.7"
       sources."@babel/helper-hoist-variables-7.24.7"
       sources."@babel/helper-split-export-declaration-7.24.7"
-      sources."@babel/helper-string-parser-7.24.7"
+      sources."@babel/helper-string-parser-7.24.8"
       sources."@babel/helper-validator-identifier-7.24.7"
       sources."@babel/highlight-7.24.7"
-      sources."@babel/parser-7.24.7"
+      sources."@babel/parser-7.24.8"
       sources."@babel/template-7.24.7"
-      sources."@babel/traverse-7.24.7"
-      sources."@babel/types-7.24.7"
+      sources."@babel/traverse-7.24.8"
+      sources."@babel/types-7.24.9"
       sources."@devexpress/error-stack-parser-2.0.6"
       sources."@jridgewell/gen-mapping-0.3.5"
       sources."@jridgewell/resolve-uri-3.1.2"
       sources."@jridgewell/set-array-1.2.1"
-      sources."@jridgewell/sourcemap-codec-1.4.15"
+      sources."@jridgewell/sourcemap-codec-1.5.0"
       sources."@jridgewell/trace-mapping-0.3.25"
-      sources."@microsoft/rush-lib-5.128.1"
+      sources."@microsoft/rush-lib-5.130.2"
       sources."@nodelib/fs.scandir-2.1.5"
       sources."@nodelib/fs.stat-2.0.5"
       sources."@nodelib/fs.walk-1.2.8"
@@ -58577,14 +57755,14 @@ in
           sources."@pnpm/types-6.4.0"
         ];
       })
-      sources."@rushstack/heft-config-file-0.14.25"
-      (sources."@rushstack/node-core-library-5.4.1" // {
+      sources."@rushstack/heft-config-file-0.15.2"
+      (sources."@rushstack/node-core-library-5.5.0" // {
         dependencies = [
           sources."import-lazy-4.0.0"
         ];
       })
-      sources."@rushstack/package-deps-hash-4.1.57"
-      (sources."@rushstack/package-extractor-0.7.16" // {
+      sources."@rushstack/package-deps-hash-4.1.61"
+      (sources."@rushstack/package-extractor-0.7.20" // {
         dependencies = [
           sources."brace-expansion-1.1.11"
           sources."minimatch-3.0.8"
@@ -58595,18 +57773,18 @@ in
           sources."strip-json-comments-3.1.1"
         ];
       })
-      sources."@rushstack/rush-amazon-s3-build-cache-plugin-5.128.1"
-      sources."@rushstack/rush-azure-storage-build-cache-plugin-5.128.1"
-      sources."@rushstack/rush-http-build-cache-plugin-5.128.1"
-      sources."@rushstack/rush-sdk-5.128.1"
-      sources."@rushstack/stream-collator-4.1.56"
-      (sources."@rushstack/terminal-0.13.0" // {
+      sources."@rushstack/rush-amazon-s3-build-cache-plugin-5.130.2"
+      sources."@rushstack/rush-azure-storage-build-cache-plugin-5.130.2"
+      sources."@rushstack/rush-http-build-cache-plugin-5.130.2"
+      sources."@rushstack/rush-sdk-5.130.2"
+      sources."@rushstack/stream-collator-4.1.60"
+      (sources."@rushstack/terminal-0.13.2" // {
         dependencies = [
           sources."has-flag-4.0.0"
           sources."supports-color-8.1.1"
         ];
       })
-      (sources."@rushstack/ts-command-line-4.22.0" // {
+      (sources."@rushstack/ts-command-line-4.22.2" // {
         dependencies = [
           sources."argparse-1.0.10"
         ];
@@ -58614,19 +57792,19 @@ in
       sources."@sindresorhus/is-0.14.0"
       sources."@szmarczak/http-timer-1.1.2"
       sources."@types/argparse-1.0.38"
-      sources."@types/lodash-4.17.5"
+      sources."@types/lodash-4.17.7"
       sources."@types/minimatch-3.0.5"
       sources."@types/minimist-1.2.5"
-      sources."@types/node-20.14.2"
+      sources."@types/node-20.14.12"
       sources."@types/node-fetch-2.6.2"
       sources."@types/normalize-package-data-2.4.4"
       sources."@types/parse-json-4.0.2"
       sources."@types/tunnel-0.0.3"
-      sources."@vue/compiler-core-3.4.29"
-      sources."@vue/compiler-dom-3.4.29"
-      sources."@vue/compiler-sfc-3.4.29"
-      sources."@vue/compiler-ssr-3.4.29"
-      sources."@vue/shared-3.4.29"
+      sources."@vue/compiler-core-3.4.34"
+      sources."@vue/compiler-dom-3.4.34"
+      sources."@vue/compiler-sfc-3.4.34"
+      sources."@vue/compiler-ssr-3.4.34"
+      sources."@vue/shared-3.4.34"
       sources."@yarnpkg/lockfile-1.0.2"
       sources."@zkochan/cmd-shim-5.4.1"
       sources."agent-base-6.0.2"
@@ -58861,7 +58039,7 @@ in
       })
       sources."is-arrayish-0.2.1"
       sources."is-ci-2.0.0"
-      sources."is-core-module-2.13.1"
+      sources."is-core-module-2.15.0"
       sources."is-docker-2.2.1"
       sources."is-es2016-keyword-1.0.0"
       sources."is-extglob-2.1.1"
@@ -59067,13 +58245,13 @@ in
         ];
       })
       sources."please-upgrade-node-3.2.0"
-      (sources."pnpm-sync-lib-0.2.6" // {
+      (sources."pnpm-sync-lib-0.2.9" // {
         dependencies = [
           sources."yaml-2.4.1"
         ];
       })
-      sources."postcss-8.4.38"
-      (sources."preferred-pm-3.1.3" // {
+      sources."postcss-8.4.40"
+      (sources."preferred-pm-3.1.4" // {
         dependencies = [
           sources."find-up-5.0.0"
           sources."locate-path-6.0.0"
@@ -59225,7 +58403,7 @@ in
       sources."webidl-conversions-3.0.1"
       sources."whatwg-url-5.0.0"
       sources."which-1.3.1"
-      sources."which-pm-2.0.0"
+      sources."which-pm-2.2.0"
       sources."widest-line-3.1.0"
       (sources."wrap-ansi-7.0.0" // {
         dependencies = [
@@ -59265,10 +58443,10 @@ in
   "@shopify/cli" = nodeEnv.buildNodePackage {
     name = "_at_shopify_slash_cli";
     packageName = "@shopify/cli";
-    version = "3.61.2";
+    version = "3.64.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/@shopify/cli/-/cli-3.61.2.tgz";
-      sha512 = "XVG6IyNBJTL8YN6qGzRKapkOijI2mTVeDB2zTg/BnQsmDV57XH5ciGfDWSSN39banCZg7jwU+FssIXgmDl5ERg==";
+      url = "https://registry.npmjs.org/@shopify/cli/-/cli-3.64.1.tgz";
+      sha512 = "7S5SfhlQnk5Rng8t0oh22TEldCSlFm18yWgP+st7blUrk94wsNDiykv3oAYlm8fG6xZzEp80HQZjX7yBYgcQvw==";
     };
     dependencies = [
       sources."@ast-grep/napi-0.11.0"
@@ -59300,30 +58478,7 @@ in
       sources."@esbuild/win32-arm64-0.19.8"
       sources."@esbuild/win32-ia32-0.19.8"
       sources."@esbuild/win32-x64-0.19.8"
-      sources."@parcel/watcher-2.4.1"
-      sources."@parcel/watcher-android-arm64-2.4.1"
-      sources."@parcel/watcher-darwin-arm64-2.4.1"
-      sources."@parcel/watcher-darwin-x64-2.4.1"
-      sources."@parcel/watcher-freebsd-x64-2.4.1"
-      sources."@parcel/watcher-linux-arm-glibc-2.4.1"
-      sources."@parcel/watcher-linux-arm64-glibc-2.4.1"
-      sources."@parcel/watcher-linux-arm64-musl-2.4.1"
-      sources."@parcel/watcher-linux-x64-glibc-2.4.1"
-      sources."@parcel/watcher-linux-x64-musl-2.4.1"
-      sources."@parcel/watcher-win32-arm64-2.4.1"
-      sources."@parcel/watcher-win32-ia32-2.4.1"
-      sources."@parcel/watcher-win32-x64-2.4.1"
-      sources."braces-3.0.3"
-      sources."detect-libc-1.0.3"
       sources."esbuild-0.19.8"
-      sources."fill-range-7.1.1"
-      sources."is-extglob-2.1.1"
-      sources."is-glob-4.0.3"
-      sources."is-number-7.0.0"
-      sources."micromatch-4.0.7"
-      sources."node-addon-api-7.1.0"
-      sources."picomatch-2.3.1"
-      sources."to-regex-range-5.0.1"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -59354,22 +58509,22 @@ in
       sources."@jridgewell/gen-mapping-0.3.5"
       sources."@jridgewell/resolve-uri-3.1.2"
       sources."@jridgewell/set-array-1.2.1"
-      sources."@jridgewell/sourcemap-codec-1.4.15"
+      sources."@jridgewell/sourcemap-codec-1.5.0"
       sources."@jridgewell/trace-mapping-0.3.25"
       sources."@nodelib/fs.scandir-2.1.5"
       sources."@nodelib/fs.stat-2.0.5"
       sources."@nodelib/fs.walk-1.2.8"
-      sources."@swc/core-1.5.29"
+      sources."@swc/core-1.7.1"
       sources."@swc/counter-0.1.3"
-      sources."@swc/helpers-0.5.11"
-      sources."@swc/types-0.1.8"
-      sources."@swc/wasm-1.5.29"
+      sources."@swc/helpers-0.5.12"
+      sources."@swc/types-0.1.12"
+      sources."@swc/wasm-1.7.1"
       sources."@tsconfig/node10-1.0.11"
       sources."@tsconfig/node12-1.0.11"
       sources."@tsconfig/node14-1.0.3"
       sources."@tsconfig/node16-1.0.4"
-      sources."@types/node-20.14.2"
-      sources."acorn-8.12.0"
+      sources."@types/node-20.14.12"
+      sources."acorn-8.12.1"
       sources."acorn-walk-8.3.3"
       sources."ansi-regex-5.0.1"
       sources."ansi-styles-6.2.1"
@@ -59404,33 +58559,34 @@ in
       })
       sources."fastq-1.17.1"
       sources."fill-range-7.1.1"
-      sources."foreground-child-3.2.0"
+      sources."foreground-child-3.2.1"
       sources."function-bind-1.1.2"
-      sources."glob-10.4.1"
+      sources."glob-10.4.5"
       sources."glob-parent-6.0.2"
       sources."hasown-2.0.2"
       sources."is-binary-path-2.1.0"
-      sources."is-core-module-2.13.1"
+      sources."is-core-module-2.15.0"
       sources."is-extglob-2.1.1"
       sources."is-fullwidth-code-point-3.0.0"
       sources."is-glob-4.0.3"
       sources."is-number-7.0.0"
       sources."isexe-2.0.0"
-      sources."jackspeak-3.4.0"
+      sources."jackspeak-3.4.3"
       sources."jiti-1.21.6"
       sources."lilconfig-2.1.0"
       sources."lines-and-columns-1.2.4"
-      sources."lru-cache-10.2.2"
+      sources."lru-cache-10.4.3"
       sources."make-error-1.3.6"
       sources."merge2-1.4.1"
       sources."micromatch-4.0.7"
-      sources."minimatch-9.0.4"
+      sources."minimatch-9.0.5"
       sources."minipass-7.1.2"
       sources."mz-2.7.0"
       sources."nanoid-3.3.7"
       sources."normalize-path-3.0.0"
       sources."object-assign-4.1.1"
       sources."object-hash-3.0.0"
+      sources."package-json-from-dist-1.0.0"
       sources."path-key-3.1.1"
       sources."path-parse-1.0.7"
       sources."path-scurry-1.11.1"
@@ -59438,7 +58594,7 @@ in
       sources."picomatch-2.3.1"
       sources."pify-2.3.0"
       sources."pirates-4.0.6"
-      sources."postcss-8.4.38"
+      sources."postcss-8.4.40"
       sources."postcss-import-15.1.0"
       sources."postcss-js-4.0.1"
       (sources."postcss-load-config-4.0.2" // {
@@ -59446,8 +58602,8 @@ in
           sources."lilconfig-3.1.2"
         ];
       })
-      sources."postcss-nested-6.0.1"
-      sources."postcss-selector-parser-6.1.0"
+      sources."postcss-nested-6.2.0"
+      sources."postcss-selector-parser-6.1.1"
       sources."postcss-value-parser-4.2.0"
       sources."queue-microtask-1.2.3"
       sources."read-cache-1.0.0"
@@ -59474,7 +58630,7 @@ in
       sources."strip-ansi-cjs-6.0.1"
       sources."sucrase-3.35.0"
       sources."supports-preserve-symlinks-flag-1.0.0"
-      sources."tailwindcss-3.4.4"
+      sources."tailwindcss-3.4.6"
       sources."thenify-3.3.1"
       sources."thenify-all-1.6.0"
       sources."to-regex-range-5.0.1"
@@ -59485,7 +58641,7 @@ in
         ];
       })
       sources."tslib-2.6.3"
-      sources."typescript-5.4.5"
+      sources."typescript-5.5.4"
       sources."undici-types-5.26.5"
       sources."util-deprecate-1.0.2"
       sources."v8-compile-cache-lib-3.0.1"
@@ -59499,7 +58655,7 @@ in
           sources."strip-ansi-6.0.1"
         ];
       })
-      sources."yaml-2.4.5"
+      sources."yaml-2.5.0"
       sources."yn-3.1.1"
     ];
     buildInputs = globalBuildInputs;
@@ -59531,22 +58687,22 @@ in
       sources."@jridgewell/gen-mapping-0.3.5"
       sources."@jridgewell/resolve-uri-3.1.2"
       sources."@jridgewell/set-array-1.2.1"
-      sources."@jridgewell/sourcemap-codec-1.4.15"
+      sources."@jridgewell/sourcemap-codec-1.5.0"
       sources."@jridgewell/trace-mapping-0.3.25"
       sources."@nodelib/fs.scandir-2.1.5"
       sources."@nodelib/fs.stat-2.0.5"
       sources."@nodelib/fs.walk-1.2.8"
-      sources."@swc/core-1.5.29"
+      sources."@swc/core-1.7.1"
       sources."@swc/counter-0.1.3"
-      sources."@swc/helpers-0.5.11"
-      sources."@swc/types-0.1.8"
-      sources."@swc/wasm-1.5.29"
+      sources."@swc/helpers-0.5.12"
+      sources."@swc/types-0.1.12"
+      sources."@swc/wasm-1.7.1"
       sources."@tsconfig/node10-1.0.11"
       sources."@tsconfig/node12-1.0.11"
       sources."@tsconfig/node14-1.0.3"
       sources."@tsconfig/node16-1.0.4"
-      sources."@types/node-20.14.2"
-      sources."acorn-8.12.0"
+      sources."@types/node-20.14.12"
+      sources."acorn-8.12.1"
       sources."acorn-walk-8.3.3"
       sources."ansi-regex-5.0.1"
       sources."ansi-styles-6.2.1"
@@ -59581,34 +58737,35 @@ in
       })
       sources."fastq-1.17.1"
       sources."fill-range-7.1.1"
-      sources."foreground-child-3.2.0"
+      sources."foreground-child-3.2.1"
       sources."function-bind-1.1.2"
-      sources."glob-10.4.1"
+      sources."glob-10.4.5"
       sources."glob-parent-6.0.2"
       sources."hasown-2.0.2"
       sources."is-binary-path-2.1.0"
-      sources."is-core-module-2.13.1"
+      sources."is-core-module-2.15.0"
       sources."is-extglob-2.1.1"
       sources."is-fullwidth-code-point-3.0.0"
       sources."is-glob-4.0.3"
       sources."is-number-7.0.0"
       sources."isexe-2.0.0"
-      sources."jackspeak-3.4.0"
+      sources."jackspeak-3.4.3"
       sources."jiti-1.21.6"
       sources."lilconfig-2.1.0"
       sources."lines-and-columns-1.2.4"
-      sources."lru-cache-10.2.2"
+      sources."lru-cache-10.4.3"
       sources."make-error-1.3.6"
       sources."merge2-1.4.1"
       sources."micromatch-4.0.7"
       sources."mini-svg-data-uri-1.4.4"
-      sources."minimatch-9.0.4"
+      sources."minimatch-9.0.5"
       sources."minipass-7.1.2"
       sources."mz-2.7.0"
       sources."nanoid-3.3.7"
       sources."normalize-path-3.0.0"
       sources."object-assign-4.1.1"
       sources."object-hash-3.0.0"
+      sources."package-json-from-dist-1.0.0"
       sources."path-key-3.1.1"
       sources."path-parse-1.0.7"
       sources."path-scurry-1.11.1"
@@ -59616,7 +58773,7 @@ in
       sources."picomatch-2.3.1"
       sources."pify-2.3.0"
       sources."pirates-4.0.6"
-      sources."postcss-8.4.38"
+      sources."postcss-8.4.40"
       sources."postcss-import-15.1.0"
       sources."postcss-js-4.0.1"
       (sources."postcss-load-config-4.0.2" // {
@@ -59624,8 +58781,8 @@ in
           sources."lilconfig-3.1.2"
         ];
       })
-      sources."postcss-nested-6.0.1"
-      sources."postcss-selector-parser-6.1.0"
+      sources."postcss-nested-6.2.0"
+      sources."postcss-selector-parser-6.1.1"
       sources."postcss-value-parser-4.2.0"
       sources."queue-microtask-1.2.3"
       sources."read-cache-1.0.0"
@@ -59652,7 +58809,7 @@ in
       sources."strip-ansi-cjs-6.0.1"
       sources."sucrase-3.35.0"
       sources."supports-preserve-symlinks-flag-1.0.0"
-      sources."tailwindcss-3.4.4"
+      sources."tailwindcss-3.4.6"
       sources."thenify-3.3.1"
       sources."thenify-all-1.6.0"
       sources."to-regex-range-5.0.1"
@@ -59663,7 +58820,7 @@ in
         ];
       })
       sources."tslib-2.6.3"
-      sources."typescript-5.4.5"
+      sources."typescript-5.5.4"
       sources."undici-types-5.26.5"
       sources."util-deprecate-1.0.2"
       sources."v8-compile-cache-lib-3.0.1"
@@ -59677,7 +58834,7 @@ in
           sources."strip-ansi-6.0.1"
         ];
       })
-      sources."yaml-2.4.5"
+      sources."yaml-2.5.0"
       sources."yn-3.1.1"
     ];
     buildInputs = globalBuildInputs;
@@ -59709,22 +58866,22 @@ in
       sources."@jridgewell/gen-mapping-0.3.5"
       sources."@jridgewell/resolve-uri-3.1.2"
       sources."@jridgewell/set-array-1.2.1"
-      sources."@jridgewell/sourcemap-codec-1.4.15"
+      sources."@jridgewell/sourcemap-codec-1.5.0"
       sources."@jridgewell/trace-mapping-0.3.25"
       sources."@nodelib/fs.scandir-2.1.5"
       sources."@nodelib/fs.stat-2.0.5"
       sources."@nodelib/fs.walk-1.2.8"
-      sources."@swc/core-1.5.29"
+      sources."@swc/core-1.7.1"
       sources."@swc/counter-0.1.3"
-      sources."@swc/helpers-0.5.11"
-      sources."@swc/types-0.1.8"
-      sources."@swc/wasm-1.5.29"
+      sources."@swc/helpers-0.5.12"
+      sources."@swc/types-0.1.12"
+      sources."@swc/wasm-1.7.1"
       sources."@tsconfig/node10-1.0.11"
       sources."@tsconfig/node12-1.0.11"
       sources."@tsconfig/node14-1.0.3"
       sources."@tsconfig/node16-1.0.4"
-      sources."@types/node-20.14.2"
-      sources."acorn-8.12.0"
+      sources."@types/node-20.14.12"
+      sources."acorn-8.12.1"
       sources."acorn-walk-8.3.3"
       sources."ansi-regex-5.0.1"
       sources."ansi-styles-6.2.1"
@@ -59759,33 +58916,34 @@ in
       })
       sources."fastq-1.17.1"
       sources."fill-range-7.1.1"
-      sources."foreground-child-3.2.0"
+      sources."foreground-child-3.2.1"
       sources."function-bind-1.1.2"
-      sources."glob-10.4.1"
+      sources."glob-10.4.5"
       sources."glob-parent-6.0.2"
       sources."hasown-2.0.2"
       sources."is-binary-path-2.1.0"
-      sources."is-core-module-2.13.1"
+      sources."is-core-module-2.15.0"
       sources."is-extglob-2.1.1"
       sources."is-fullwidth-code-point-3.0.0"
       sources."is-glob-4.0.3"
       sources."is-number-7.0.0"
       sources."isexe-2.0.0"
-      sources."jackspeak-3.4.0"
+      sources."jackspeak-3.4.3"
       sources."jiti-1.21.6"
       sources."lilconfig-2.1.0"
       sources."lines-and-columns-1.2.4"
-      sources."lru-cache-10.2.2"
+      sources."lru-cache-10.4.3"
       sources."make-error-1.3.6"
       sources."merge2-1.4.1"
       sources."micromatch-4.0.7"
-      sources."minimatch-9.0.4"
+      sources."minimatch-9.0.5"
       sources."minipass-7.1.2"
       sources."mz-2.7.0"
       sources."nanoid-3.3.7"
       sources."normalize-path-3.0.0"
       sources."object-assign-4.1.1"
       sources."object-hash-3.0.0"
+      sources."package-json-from-dist-1.0.0"
       sources."path-key-3.1.1"
       sources."path-parse-1.0.7"
       sources."path-scurry-1.11.1"
@@ -59793,7 +58951,7 @@ in
       sources."picomatch-2.3.1"
       sources."pify-2.3.0"
       sources."pirates-4.0.6"
-      sources."postcss-8.4.38"
+      sources."postcss-8.4.40"
       sources."postcss-import-15.1.0"
       sources."postcss-js-4.0.1"
       (sources."postcss-load-config-4.0.2" // {
@@ -59801,8 +58959,8 @@ in
           sources."lilconfig-3.1.2"
         ];
       })
-      sources."postcss-nested-6.0.1"
-      sources."postcss-selector-parser-6.1.0"
+      sources."postcss-nested-6.2.0"
+      sources."postcss-selector-parser-6.1.1"
       sources."postcss-value-parser-4.2.0"
       sources."queue-microtask-1.2.3"
       sources."read-cache-1.0.0"
@@ -59829,7 +58987,7 @@ in
       sources."strip-ansi-cjs-6.0.1"
       sources."sucrase-3.35.0"
       sources."supports-preserve-symlinks-flag-1.0.0"
-      sources."tailwindcss-3.4.4"
+      sources."tailwindcss-3.4.6"
       sources."thenify-3.3.1"
       sources."thenify-all-1.6.0"
       sources."to-regex-range-5.0.1"
@@ -59840,7 +58998,7 @@ in
         ];
       })
       sources."tslib-2.6.3"
-      sources."typescript-5.4.5"
+      sources."typescript-5.5.4"
       sources."undici-types-5.26.5"
       sources."util-deprecate-1.0.2"
       sources."v8-compile-cache-lib-3.0.1"
@@ -59854,7 +59012,7 @@ in
           sources."strip-ansi-6.0.1"
         ];
       })
-      sources."yaml-2.4.5"
+      sources."yaml-2.5.0"
       sources."yn-3.1.1"
     ];
     buildInputs = globalBuildInputs;
@@ -59886,22 +59044,22 @@ in
       sources."@jridgewell/gen-mapping-0.3.5"
       sources."@jridgewell/resolve-uri-3.1.2"
       sources."@jridgewell/set-array-1.2.1"
-      sources."@jridgewell/sourcemap-codec-1.4.15"
+      sources."@jridgewell/sourcemap-codec-1.5.0"
       sources."@jridgewell/trace-mapping-0.3.25"
       sources."@nodelib/fs.scandir-2.1.5"
       sources."@nodelib/fs.stat-2.0.5"
       sources."@nodelib/fs.walk-1.2.8"
-      sources."@swc/core-1.5.29"
+      sources."@swc/core-1.7.1"
       sources."@swc/counter-0.1.3"
-      sources."@swc/helpers-0.5.11"
-      sources."@swc/types-0.1.8"
-      sources."@swc/wasm-1.5.29"
+      sources."@swc/helpers-0.5.12"
+      sources."@swc/types-0.1.12"
+      sources."@swc/wasm-1.7.1"
       sources."@tsconfig/node10-1.0.11"
       sources."@tsconfig/node12-1.0.11"
       sources."@tsconfig/node14-1.0.3"
       sources."@tsconfig/node16-1.0.4"
-      sources."@types/node-20.14.2"
-      sources."acorn-8.12.0"
+      sources."@types/node-20.14.12"
+      sources."acorn-8.12.1"
       sources."acorn-walk-8.3.3"
       sources."ansi-regex-5.0.1"
       sources."ansi-styles-6.2.1"
@@ -59936,36 +59094,37 @@ in
       })
       sources."fastq-1.17.1"
       sources."fill-range-7.1.1"
-      sources."foreground-child-3.2.0"
+      sources."foreground-child-3.2.1"
       sources."function-bind-1.1.2"
-      sources."glob-10.4.1"
+      sources."glob-10.4.5"
       sources."glob-parent-6.0.2"
       sources."hasown-2.0.2"
       sources."is-binary-path-2.1.0"
-      sources."is-core-module-2.13.1"
+      sources."is-core-module-2.15.0"
       sources."is-extglob-2.1.1"
       sources."is-fullwidth-code-point-3.0.0"
       sources."is-glob-4.0.3"
       sources."is-number-7.0.0"
       sources."isexe-2.0.0"
-      sources."jackspeak-3.4.0"
+      sources."jackspeak-3.4.3"
       sources."jiti-1.21.6"
       sources."lilconfig-2.1.0"
       sources."lines-and-columns-1.2.4"
       sources."lodash.castarray-4.4.0"
       sources."lodash.isplainobject-4.0.6"
       sources."lodash.merge-4.6.2"
-      sources."lru-cache-10.2.2"
+      sources."lru-cache-10.4.3"
       sources."make-error-1.3.6"
       sources."merge2-1.4.1"
       sources."micromatch-4.0.7"
-      sources."minimatch-9.0.4"
+      sources."minimatch-9.0.5"
       sources."minipass-7.1.2"
       sources."mz-2.7.0"
       sources."nanoid-3.3.7"
       sources."normalize-path-3.0.0"
       sources."object-assign-4.1.1"
       sources."object-hash-3.0.0"
+      sources."package-json-from-dist-1.0.0"
       sources."path-key-3.1.1"
       sources."path-parse-1.0.7"
       sources."path-scurry-1.11.1"
@@ -59973,7 +59132,7 @@ in
       sources."picomatch-2.3.1"
       sources."pify-2.3.0"
       sources."pirates-4.0.6"
-      sources."postcss-8.4.38"
+      sources."postcss-8.4.40"
       sources."postcss-import-15.1.0"
       sources."postcss-js-4.0.1"
       (sources."postcss-load-config-4.0.2" // {
@@ -59981,9 +59140,9 @@ in
           sources."lilconfig-3.1.2"
         ];
       })
-      (sources."postcss-nested-6.0.1" // {
+      (sources."postcss-nested-6.2.0" // {
         dependencies = [
-          sources."postcss-selector-parser-6.1.0"
+          sources."postcss-selector-parser-6.1.1"
         ];
       })
       sources."postcss-selector-parser-6.0.10"
@@ -60013,9 +59172,9 @@ in
       sources."strip-ansi-cjs-6.0.1"
       sources."sucrase-3.35.0"
       sources."supports-preserve-symlinks-flag-1.0.0"
-      (sources."tailwindcss-3.4.4" // {
+      (sources."tailwindcss-3.4.6" // {
         dependencies = [
-          sources."postcss-selector-parser-6.1.0"
+          sources."postcss-selector-parser-6.1.1"
         ];
       })
       sources."thenify-3.3.1"
@@ -60028,7 +59187,7 @@ in
         ];
       })
       sources."tslib-2.6.3"
-      sources."typescript-5.4.5"
+      sources."typescript-5.5.4"
       sources."undici-types-5.26.5"
       sources."util-deprecate-1.0.2"
       sources."v8-compile-cache-lib-3.0.1"
@@ -60042,7 +59201,7 @@ in
           sources."strip-ansi-6.0.1"
         ];
       })
-      sources."yaml-2.4.5"
+      sources."yaml-2.5.0"
       sources."yn-3.1.1"
     ];
     buildInputs = globalBuildInputs;
@@ -60058,10 +59217,10 @@ in
   "@uppy/companion" = nodeEnv.buildNodePackage {
     name = "_at_uppy_slash_companion";
     packageName = "@uppy/companion";
-    version = "4.13.3";
+    version = "5.0.4";
     src = fetchurl {
-      url = "https://registry.npmjs.org/@uppy/companion/-/companion-4.13.3.tgz";
-      sha512 = "FTg+WumdND6cgcRMdWhYKIPQ+00k21aIrbCFGQbDH79kWgRlHVDAur+ryVh+zT5YeM8u475tddn02nmJ2QqIow==";
+      url = "https://registry.npmjs.org/@uppy/companion/-/companion-5.0.4.tgz";
+      sha512 = "JmlTk2EaOMZViEbHXNDTv8fvkIjuS63R0Bf0aqXo5j5BVjQGA2htESvcx73lqtBRqIuGGxPynQ3/cOLr/hdUnA==";
     };
     dependencies = [
       sources."@aws-crypto/crc32-5.2.0"
@@ -60083,104 +59242,100 @@ in
           sources."@smithy/util-utf8-2.3.0"
         ];
       })
-      sources."@aws-sdk/client-s3-3.598.0"
-      sources."@aws-sdk/client-sso-3.598.0"
-      sources."@aws-sdk/client-sso-oidc-3.598.0"
-      sources."@aws-sdk/client-sts-3.598.0"
-      sources."@aws-sdk/core-3.598.0"
-      sources."@aws-sdk/credential-provider-env-3.598.0"
-      sources."@aws-sdk/credential-provider-http-3.598.0"
-      sources."@aws-sdk/credential-provider-ini-3.598.0"
-      sources."@aws-sdk/credential-provider-node-3.598.0"
-      sources."@aws-sdk/credential-provider-process-3.598.0"
-      sources."@aws-sdk/credential-provider-sso-3.598.0"
-      sources."@aws-sdk/credential-provider-web-identity-3.598.0"
-      (sources."@aws-sdk/lib-storage-3.598.0" // {
+      sources."@aws-sdk/client-s3-3.617.0"
+      sources."@aws-sdk/client-sso-3.616.0"
+      sources."@aws-sdk/client-sso-oidc-3.616.0"
+      sources."@aws-sdk/client-sts-3.616.0"
+      sources."@aws-sdk/core-3.616.0"
+      sources."@aws-sdk/credential-provider-env-3.609.0"
+      sources."@aws-sdk/credential-provider-http-3.616.0"
+      sources."@aws-sdk/credential-provider-ini-3.616.0"
+      sources."@aws-sdk/credential-provider-node-3.616.0"
+      sources."@aws-sdk/credential-provider-process-3.614.0"
+      sources."@aws-sdk/credential-provider-sso-3.616.0"
+      sources."@aws-sdk/credential-provider-web-identity-3.609.0"
+      (sources."@aws-sdk/lib-storage-3.617.0" // {
         dependencies = [
           sources."buffer-5.6.0"
         ];
       })
-      sources."@aws-sdk/middleware-bucket-endpoint-3.598.0"
-      sources."@aws-sdk/middleware-expect-continue-3.598.0"
-      (sources."@aws-sdk/middleware-flexible-checksums-3.598.0" // {
+      sources."@aws-sdk/middleware-bucket-endpoint-3.616.0"
+      sources."@aws-sdk/middleware-expect-continue-3.616.0"
+      (sources."@aws-sdk/middleware-flexible-checksums-3.616.0" // {
         dependencies = [
           sources."@smithy/is-array-buffer-3.0.0"
         ];
       })
-      sources."@aws-sdk/middleware-host-header-3.598.0"
-      sources."@aws-sdk/middleware-location-constraint-3.598.0"
-      sources."@aws-sdk/middleware-logger-3.598.0"
-      sources."@aws-sdk/middleware-recursion-detection-3.598.0"
-      sources."@aws-sdk/middleware-sdk-s3-3.598.0"
-      sources."@aws-sdk/middleware-signing-3.598.0"
-      sources."@aws-sdk/middleware-ssec-3.598.0"
-      sources."@aws-sdk/middleware-user-agent-3.598.0"
-      sources."@aws-sdk/region-config-resolver-3.598.0"
-      sources."@aws-sdk/s3-presigned-post-3.598.0"
-      sources."@aws-sdk/s3-request-presigner-3.598.0"
-      sources."@aws-sdk/signature-v4-multi-region-3.598.0"
-      sources."@aws-sdk/token-providers-3.598.0"
-      sources."@aws-sdk/types-3.598.0"
+      sources."@aws-sdk/middleware-host-header-3.616.0"
+      sources."@aws-sdk/middleware-location-constraint-3.609.0"
+      sources."@aws-sdk/middleware-logger-3.609.0"
+      sources."@aws-sdk/middleware-recursion-detection-3.616.0"
+      sources."@aws-sdk/middleware-sdk-s3-3.617.0"
+      sources."@aws-sdk/middleware-signing-3.616.0"
+      sources."@aws-sdk/middleware-ssec-3.609.0"
+      sources."@aws-sdk/middleware-user-agent-3.616.0"
+      sources."@aws-sdk/region-config-resolver-3.614.0"
+      sources."@aws-sdk/s3-presigned-post-3.617.0"
+      sources."@aws-sdk/s3-request-presigner-3.617.0"
+      sources."@aws-sdk/signature-v4-multi-region-3.617.0"
+      sources."@aws-sdk/token-providers-3.614.0"
+      sources."@aws-sdk/types-3.609.0"
       sources."@aws-sdk/util-arn-parser-3.568.0"
-      sources."@aws-sdk/util-endpoints-3.598.0"
-      sources."@aws-sdk/util-format-url-3.598.0"
+      sources."@aws-sdk/util-endpoints-3.614.0"
+      sources."@aws-sdk/util-format-url-3.609.0"
       sources."@aws-sdk/util-locate-window-3.568.0"
-      sources."@aws-sdk/util-user-agent-browser-3.598.0"
-      sources."@aws-sdk/util-user-agent-node-3.598.0"
+      sources."@aws-sdk/util-user-agent-browser-3.609.0"
+      sources."@aws-sdk/util-user-agent-node-3.614.0"
       sources."@aws-sdk/util-utf8-browser-3.259.0"
-      sources."@aws-sdk/xml-builder-3.598.0"
+      sources."@aws-sdk/xml-builder-3.609.0"
       sources."@httptoolkit/websocket-stream-6.0.1"
-      sources."@redis/bloom-1.2.0"
-      sources."@redis/client-1.5.16"
-      sources."@redis/graph-1.1.1"
-      sources."@redis/json-1.0.6"
-      sources."@redis/search-1.1.6"
-      sources."@redis/time-series-1.0.5"
-      sources."@sindresorhus/is-4.6.0"
-      sources."@smithy/abort-controller-3.0.1"
+      sources."@ioredis/commands-1.2.0"
+      sources."@opentelemetry/api-1.9.0"
+      sources."@sindresorhus/is-5.6.0"
+      sources."@smithy/abort-controller-3.1.1"
       sources."@smithy/chunked-blob-reader-3.0.0"
       sources."@smithy/chunked-blob-reader-native-3.0.0"
-      sources."@smithy/config-resolver-3.0.2"
-      sources."@smithy/core-2.2.1"
-      sources."@smithy/credential-provider-imds-3.1.1"
-      sources."@smithy/eventstream-codec-3.1.0"
-      sources."@smithy/eventstream-serde-browser-3.0.2"
-      sources."@smithy/eventstream-serde-config-resolver-3.0.1"
-      sources."@smithy/eventstream-serde-node-3.0.2"
-      sources."@smithy/eventstream-serde-universal-3.0.2"
-      sources."@smithy/fetch-http-handler-3.0.2"
-      sources."@smithy/hash-blob-browser-3.1.0"
-      (sources."@smithy/hash-node-3.0.1" // {
+      sources."@smithy/config-resolver-3.0.5"
+      sources."@smithy/core-2.3.0"
+      sources."@smithy/credential-provider-imds-3.2.0"
+      sources."@smithy/eventstream-codec-3.1.2"
+      sources."@smithy/eventstream-serde-browser-3.0.5"
+      sources."@smithy/eventstream-serde-config-resolver-3.0.3"
+      sources."@smithy/eventstream-serde-node-3.0.4"
+      sources."@smithy/eventstream-serde-universal-3.0.4"
+      sources."@smithy/fetch-http-handler-3.2.3"
+      sources."@smithy/hash-blob-browser-3.1.2"
+      (sources."@smithy/hash-node-3.0.3" // {
         dependencies = [
           sources."@smithy/is-array-buffer-3.0.0"
           sources."@smithy/util-buffer-from-3.0.0"
         ];
       })
-      sources."@smithy/hash-stream-node-3.1.0"
-      sources."@smithy/invalid-dependency-3.0.1"
+      sources."@smithy/hash-stream-node-3.1.2"
+      sources."@smithy/invalid-dependency-3.0.3"
       sources."@smithy/is-array-buffer-2.2.0"
-      sources."@smithy/md5-js-3.0.1"
-      sources."@smithy/middleware-content-length-3.0.1"
-      sources."@smithy/middleware-endpoint-3.0.2"
-      sources."@smithy/middleware-retry-3.0.4"
-      sources."@smithy/middleware-serde-3.0.1"
-      sources."@smithy/middleware-stack-3.0.1"
-      sources."@smithy/node-config-provider-3.1.1"
-      sources."@smithy/node-http-handler-3.0.1"
-      sources."@smithy/property-provider-3.1.1"
-      sources."@smithy/protocol-http-4.0.1"
-      sources."@smithy/querystring-builder-3.0.1"
-      sources."@smithy/querystring-parser-3.0.1"
-      sources."@smithy/service-error-classification-3.0.1"
-      sources."@smithy/shared-ini-file-loader-3.1.1"
-      (sources."@smithy/signature-v4-3.1.0" // {
+      sources."@smithy/md5-js-3.0.3"
+      sources."@smithy/middleware-content-length-3.0.5"
+      sources."@smithy/middleware-endpoint-3.1.0"
+      sources."@smithy/middleware-retry-3.0.12"
+      sources."@smithy/middleware-serde-3.0.3"
+      sources."@smithy/middleware-stack-3.0.3"
+      sources."@smithy/node-config-provider-3.1.4"
+      sources."@smithy/node-http-handler-3.1.4"
+      sources."@smithy/property-provider-3.1.3"
+      sources."@smithy/protocol-http-4.1.0"
+      sources."@smithy/querystring-builder-3.0.3"
+      sources."@smithy/querystring-parser-3.0.3"
+      sources."@smithy/service-error-classification-3.0.3"
+      sources."@smithy/shared-ini-file-loader-3.1.4"
+      (sources."@smithy/signature-v4-4.1.0" // {
         dependencies = [
           sources."@smithy/is-array-buffer-3.0.0"
         ];
       })
-      sources."@smithy/smithy-client-3.1.2"
-      sources."@smithy/types-3.1.0"
-      sources."@smithy/url-parser-3.0.1"
+      sources."@smithy/smithy-client-3.1.10"
+      sources."@smithy/types-3.3.0"
+      sources."@smithy/url-parser-3.0.3"
       (sources."@smithy/util-base64-3.0.0" // {
         dependencies = [
           sources."@smithy/is-array-buffer-3.0.0"
@@ -60191,13 +59346,13 @@ in
       sources."@smithy/util-body-length-node-3.0.0"
       sources."@smithy/util-buffer-from-2.2.0"
       sources."@smithy/util-config-provider-3.0.0"
-      sources."@smithy/util-defaults-mode-browser-3.0.4"
-      sources."@smithy/util-defaults-mode-node-3.0.4"
-      sources."@smithy/util-endpoints-2.0.2"
+      sources."@smithy/util-defaults-mode-browser-3.0.12"
+      sources."@smithy/util-defaults-mode-node-3.0.12"
+      sources."@smithy/util-endpoints-2.0.5"
       sources."@smithy/util-hex-encoding-3.0.0"
-      sources."@smithy/util-middleware-3.0.1"
-      sources."@smithy/util-retry-3.0.1"
-      (sources."@smithy/util-stream-3.0.2" // {
+      sources."@smithy/util-middleware-3.0.3"
+      sources."@smithy/util-retry-3.0.3"
+      (sources."@smithy/util-stream-3.1.2" // {
         dependencies = [
           sources."@smithy/is-array-buffer-3.0.0"
           sources."@smithy/util-buffer-from-3.0.0"
@@ -60210,26 +59365,26 @@ in
           sources."@smithy/util-buffer-from-3.0.0"
         ];
       })
-      sources."@smithy/util-waiter-3.0.1"
-      sources."@szmarczak/http-timer-4.0.6"
-      sources."@types/cacheable-request-6.0.3"
+      sources."@smithy/util-waiter-3.1.2"
+      sources."@szmarczak/http-timer-5.0.1"
+      sources."@types/body-parser-1.19.5"
+      sources."@types/connect-3.4.38"
+      sources."@types/express-4.17.21"
+      sources."@types/express-serve-static-core-4.19.5"
       sources."@types/http-cache-semantics-4.0.4"
-      sources."@types/keyv-3.1.4"
-      sources."@types/node-20.14.2"
-      sources."@types/responselike-1.0.3"
-      sources."@types/ws-8.5.10"
+      sources."@types/http-errors-2.0.4"
+      sources."@types/mime-1.3.5"
+      sources."@types/node-20.14.12"
+      sources."@types/qs-6.9.15"
+      sources."@types/range-parser-1.2.7"
+      sources."@types/send-0.17.4"
+      sources."@types/serve-static-1.15.7"
+      sources."@types/ws-8.5.11"
       sources."accepts-1.3.8"
-      sources."ansi-styles-4.3.0"
       sources."array-flatten-1.1.1"
-      sources."asn1.js-5.4.1"
       sources."asynckit-0.4.0"
-      sources."atob-2.1.2"
       sources."aws-crt-1.21.3"
-      (sources."axios-1.7.2" // {
-        dependencies = [
-          sources."form-data-4.0.0"
-        ];
-      })
+      sources."axios-1.7.2"
       sources."balanced-match-1.0.2"
       sources."base64-js-1.5.1"
       (sources."basic-auth-2.0.1" // {
@@ -60244,8 +59399,7 @@ in
           sources."readable-stream-3.6.2"
         ];
       })
-      sources."bn.js-4.12.0"
-      (sources."body-parser-1.20.0" // {
+      (sources."body-parser-1.20.2" // {
         dependencies = [
           sources."debug-2.6.9"
           sources."ms-2.0.0"
@@ -60253,20 +59407,15 @@ in
       })
       sources."bowser-2.11.0"
       sources."brace-expansion-1.1.11"
-      sources."brorand-1.1.0"
       sources."buffer-6.0.3"
       sources."buffer-equal-constant-time-1.0.1"
       sources."buffer-from-1.1.2"
       sources."bufferutil-4.0.8"
       sources."bytes-3.1.2"
-      sources."cacheable-lookup-5.0.4"
-      sources."cacheable-request-7.0.4"
+      sources."cacheable-lookup-7.0.0"
+      sources."cacheable-request-10.2.14"
       sources."call-bind-1.0.7"
-      sources."chalk-4.1.2"
-      sources."clone-response-1.0.3"
       sources."cluster-key-slot-1.1.2"
-      sources."color-convert-2.0.1"
-      sources."color-name-1.1.4"
       sources."combine-errors-3.0.3"
       sources."combined-stream-1.0.8"
       sources."commist-1.1.0"
@@ -60277,7 +59426,7 @@ in
           sources."readable-stream-3.6.2"
         ];
       })
-      sources."connect-redis-7.1.0"
+      sources."connect-redis-7.1.1"
       sources."content-disposition-0.5.4"
       sources."content-type-1.0.5"
       sources."cookie-0.4.1"
@@ -60285,7 +59434,7 @@ in
       sources."cookie-signature-1.0.6"
       sources."core-util-is-1.0.3"
       sources."cors-2.8.5"
-      sources."cron-parser-3.5.0"
+      sources."cron-parser-4.9.0"
       sources."crypto-js-4.2.0"
       sources."custom-error-instance-2.1.1"
       (sources."debug-4.3.5" // {
@@ -60300,14 +59449,13 @@ in
       })
       sources."defer-to-connect-2.0.1"
       sources."define-data-property-1.1.4"
-      sources."define-properties-1.2.1"
       sources."delayed-stream-1.0.0"
+      sources."denque-2.1.0"
       sources."depd-2.0.0"
       sources."destroy-1.2.0"
       sources."duplexify-3.7.1"
       sources."ecdsa-sig-formatter-1.0.11"
       sources."ee-first-1.1.1"
-      sources."elliptic-6.5.5"
       sources."encodeurl-1.0.2"
       sources."end-of-stream-1.4.4"
       sources."es-define-property-1.0.0"
@@ -60319,12 +59467,9 @@ in
       sources."events-3.3.0"
       (sources."express-4.19.2" // {
         dependencies = [
-          sources."body-parser-1.20.2"
           sources."cookie-0.6.0"
           sources."debug-2.6.9"
           sources."ms-2.0.0"
-          sources."qs-6.11.0"
-          sources."raw-body-2.5.2"
         ];
       })
       (sources."express-interceptor-1.2.0" // {
@@ -60333,15 +59478,11 @@ in
           sources."ms-2.0.0"
         ];
       })
-      sources."express-prom-bundle-6.5.0"
-      (sources."express-request-id-1.4.1" // {
+      sources."express-prom-bundle-7.0.0"
+      (sources."express-session-1.18.0" // {
         dependencies = [
-          sources."uuid-3.4.0"
-        ];
-      })
-      (sources."express-session-1.17.3" // {
-        dependencies = [
-          sources."cookie-0.4.2"
+          sources."cookie-0.6.0"
+          sources."cookie-signature-1.0.7"
           sources."debug-2.6.9"
           sources."ms-2.0.0"
         ];
@@ -60354,60 +59495,52 @@ in
         ];
       })
       sources."follow-redirects-1.15.6"
-      sources."form-data-3.0.1"
+      sources."form-data-4.0.0"
+      sources."form-data-encoder-2.1.4"
       sources."forwarded-0.2.0"
       sources."fresh-0.5.2"
       sources."fs.realpath-1.0.0"
       sources."function-bind-1.1.2"
-      sources."generic-pool-3.9.0"
       sources."get-intrinsic-1.2.4"
-      sources."get-stream-5.2.0"
+      sources."get-stream-6.0.1"
       sources."glob-7.2.3"
       sources."gopd-1.0.1"
-      sources."got-11.8.6"
+      sources."got-13.0.0"
       sources."graceful-fs-4.2.11"
-      (sources."grant-5.4.21" // {
+      (sources."grant-5.4.22" // {
         dependencies = [
-          sources."cookie-signature-1.2.1"
+          sources."qs-6.12.3"
         ];
       })
       sources."has-flag-4.0.0"
       sources."has-property-descriptors-1.0.2"
       sources."has-proto-1.0.3"
       sources."has-symbols-1.0.3"
-      sources."hash.js-1.1.7"
       sources."hasown-2.0.2"
-      sources."helmet-4.6.0"
+      sources."helmet-7.1.0"
       (sources."help-me-3.0.0" // {
         dependencies = [
           sources."readable-stream-3.6.2"
         ];
       })
-      sources."hmac-drbg-1.0.1"
       sources."http-cache-semantics-4.1.1"
       sources."http-errors-2.0.0"
-      sources."http2-wrapper-1.0.3"
+      sources."http2-wrapper-2.2.1"
       sources."iconv-lite-0.4.24"
       sources."ieee754-1.2.1"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
+      sources."ioredis-5.4.1"
       sources."ipaddr.js-2.2.0"
-      sources."is-nan-1.3.2"
       sources."is-stream-2.0.1"
       sources."isarray-1.0.0"
       sources."isomorphic-ws-4.0.1"
       sources."js-base64-3.7.7"
       sources."js-sdsl-4.3.0"
       sources."json-buffer-3.0.1"
-      (sources."jsonwebtoken-9.0.0" // {
-        dependencies = [
-          sources."jwa-1.4.1"
-          sources."jws-3.2.2"
-        ];
-      })
-      sources."jwa-2.0.0"
-      sources."jwk-to-pem-2.0.5"
-      sources."jws-4.0.0"
+      sources."jsonwebtoken-9.0.2"
+      sources."jwa-1.4.1"
+      sources."jws-3.2.2"
       sources."keyv-4.5.4"
       sources."leven-2.1.0"
       sources."lodash-4.17.21"
@@ -60417,21 +59550,28 @@ in
       sources."lodash._createset-4.0.3"
       sources."lodash._root-3.0.1"
       sources."lodash._stringtopath-4.8.0"
+      sources."lodash.defaults-4.2.0"
+      sources."lodash.includes-4.3.0"
+      sources."lodash.isarguments-3.1.0"
+      sources."lodash.isboolean-3.0.3"
+      sources."lodash.isinteger-4.0.4"
+      sources."lodash.isnumber-3.0.3"
+      sources."lodash.isplainobject-4.0.6"
+      sources."lodash.isstring-4.0.1"
+      sources."lodash.once-4.1.1"
       sources."lodash.throttle-4.1.1"
       sources."lodash.uniqby-4.5.0"
       sources."long-timeout-0.1.1"
-      sources."lowercase-keys-2.0.0"
+      sources."lowercase-keys-3.0.0"
       sources."lru-cache-6.0.0"
-      sources."luxon-1.28.1"
+      sources."luxon-3.4.4"
       sources."media-typer-0.3.0"
       sources."merge-descriptors-1.0.1"
       sources."methods-1.1.2"
       sources."mime-1.6.0"
       sources."mime-db-1.52.0"
       sources."mime-types-2.1.35"
-      sources."mimic-response-1.0.1"
-      sources."minimalistic-assert-1.0.1"
-      sources."minimalistic-crypto-utils-1.0.1"
+      sources."mimic-response-4.0.0"
       sources."minimatch-3.1.2"
       sources."minimist-1.2.8"
       sources."moment-2.30.1"
@@ -60447,30 +59587,29 @@ in
         dependencies = [
           sources."duplexify-4.1.3"
           sources."readable-stream-3.6.2"
-          sources."ws-7.5.9"
+          sources."ws-7.5.10"
         ];
       })
       sources."mqtt-packet-6.10.0"
       sources."ms-2.1.3"
       sources."negotiator-0.6.3"
       sources."node-gyp-build-4.8.1"
-      sources."node-schedule-2.1.0"
-      sources."normalize-url-6.1.0"
+      sources."node-schedule-2.1.1"
+      sources."normalize-url-8.0.1"
       sources."number-allocator-1.0.14"
       sources."oauth-sign-0.9.0"
       sources."object-assign-4.1.1"
-      sources."object-inspect-1.13.1"
-      sources."object-keys-1.1.1"
+      sources."object-inspect-1.13.2"
       sources."on-finished-2.4.1"
       sources."on-headers-1.0.2"
       sources."once-1.4.0"
-      sources."p-cancelable-2.1.1"
+      sources."p-cancelable-3.0.0"
       sources."parseurl-1.3.3"
       sources."path-is-absolute-1.0.1"
       sources."path-to-regexp-0.1.7"
       sources."process-0.11.10"
       sources."process-nextick-args-2.0.1"
-      sources."prom-client-14.0.1"
+      sources."prom-client-15.1.2"
       sources."proper-lockfile-4.1.2"
       (sources."proxy-addr-2.0.7" // {
         dependencies = [
@@ -60479,19 +59618,20 @@ in
       })
       sources."proxy-from-env-1.1.0"
       sources."pump-3.0.0"
-      sources."qs-6.10.3"
+      sources."qs-6.11.0"
       sources."querystringify-2.2.0"
       sources."quick-lru-5.1.1"
       sources."random-bytes-1.0.0"
       sources."randombytes-2.1.0"
       sources."range-parser-1.2.1"
-      sources."raw-body-2.5.1"
+      sources."raw-body-2.5.2"
       (sources."readable-stream-2.3.8" // {
         dependencies = [
           sources."safe-buffer-5.1.2"
         ];
       })
-      sources."redis-4.6.14"
+      sources."redis-errors-1.2.0"
+      sources."redis-parser-3.0.0"
       sources."reinterval-1.1.0"
       sources."request-compose-2.1.6"
       (sources."request-oauth-1.0.1" // {
@@ -60501,12 +59641,12 @@ in
       })
       sources."requires-port-1.0.0"
       sources."resolve-alpn-1.2.1"
-      sources."responselike-2.0.1"
+      sources."responselike-3.0.0"
       sources."retry-0.12.0"
       sources."rfdc-1.4.1"
       sources."safe-buffer-5.2.1"
       sources."safer-buffer-2.1.2"
-      sources."semver-7.6.2"
+      sources."semver-7.6.3"
       (sources."send-0.18.0" // {
         dependencies = [
           (sources."debug-2.6.9" // {
@@ -60516,7 +59656,7 @@ in
           })
         ];
       })
-      sources."serialize-error-2.1.0"
+      sources."serialize-error-11.0.3"
       sources."serialize-javascript-6.0.2"
       sources."serve-static-1.15.0"
       sources."set-function-length-1.2.2"
@@ -60529,6 +59669,7 @@ in
           sources."readable-stream-3.6.2"
         ];
       })
+      sources."standard-as-callback-2.1.0"
       sources."statuses-2.0.1"
       (sources."stream-browserify-3.0.0" // {
         dependencies = [
@@ -60542,11 +59683,12 @@ in
         ];
       })
       sources."strnum-1.0.5"
-      sources."supports-color-7.2.0"
+      sources."supports-color-8.1.1"
       sources."tdigest-0.1.2"
       sources."toidentifier-1.0.1"
       sources."tslib-2.6.3"
-      sources."tus-js-client-3.1.3"
+      sources."tus-js-client-4.1.0"
+      sources."type-fest-2.19.0"
       sources."type-is-1.6.18"
       sources."typedarray-0.0.6"
       sources."uid-safe-2.1.5"
@@ -60561,7 +59703,7 @@ in
       sources."validator-13.12.0"
       sources."vary-1.1.2"
       sources."wrappy-1.0.2"
-      sources."ws-8.8.1"
+      sources."ws-8.17.1"
       sources."xtend-4.0.2"
       sources."yallist-4.0.0"
     ];
@@ -60700,17 +59842,17 @@ in
     };
     dependencies = [
       sources."@babel/code-frame-7.24.7"
-      sources."@babel/generator-7.24.7"
-      sources."@babel/helper-string-parser-7.24.7"
+      sources."@babel/generator-7.24.10"
+      sources."@babel/helper-string-parser-7.24.8"
       sources."@babel/helper-validator-identifier-7.24.7"
       sources."@babel/highlight-7.24.7"
-      sources."@babel/parser-7.24.7"
+      sources."@babel/parser-7.24.8"
       sources."@babel/template-7.24.7"
-      sources."@babel/types-7.24.7"
+      sources."@babel/types-7.24.9"
       sources."@jridgewell/gen-mapping-0.3.5"
       sources."@jridgewell/resolve-uri-3.1.2"
       sources."@jridgewell/set-array-1.2.1"
-      sources."@jridgewell/sourcemap-codec-1.4.15"
+      sources."@jridgewell/sourcemap-codec-1.5.0"
       sources."@jridgewell/trace-mapping-0.3.25"
       sources."@webassemblyjs/ast-1.11.1"
       sources."@webassemblyjs/floating-point-hex-parser-1.11.1"
@@ -60792,8 +59934,8 @@ in
       sources."@npmcli/config-6.4.1"
       (sources."@npmcli/map-workspaces-3.0.6" // {
         dependencies = [
-          sources."glob-10.4.1"
-          sources."minimatch-9.0.4"
+          sources."glob-10.4.5"
+          sources."minimatch-9.0.5"
         ];
       })
       sources."@npmcli/name-from-folder-2.0.0"
@@ -60818,12 +59960,12 @@ in
       sources."@types/minimist-1.2.5"
       sources."@types/ms-0.7.34"
       sources."@types/nlcst-1.0.4"
-      sources."@types/node-18.19.34"
+      sources."@types/node-18.19.42"
       sources."@types/normalize-package-data-2.4.4"
       sources."@types/supports-color-8.1.3"
       sources."@types/unist-2.0.10"
       sources."abbrev-2.0.0"
-      sources."acorn-8.12.0"
+      sources."acorn-8.12.1"
       sources."acorn-jsx-5.3.2"
       (sources."ansi-align-3.0.1" // {
         dependencies = [
@@ -60918,7 +60060,7 @@ in
       sources."extend-3.0.2"
       sources."fault-2.0.1"
       sources."find-up-6.3.0"
-      sources."foreground-child-3.2.0"
+      sources."foreground-child-3.2.1"
       sources."form-data-encoder-2.1.4"
       sources."format-0.2.2"
       sources."from-0.1.7"
@@ -60974,7 +60116,7 @@ in
           sources."ci-info-3.9.0"
         ];
       })
-      sources."is-core-module-2.13.1"
+      sources."is-core-module-2.15.0"
       sources."is-decimal-2.0.1"
       sources."is-empty-1.2.0"
       sources."is-fullwidth-code-point-3.0.0"
@@ -60988,7 +60130,7 @@ in
       sources."is-yarn-global-0.4.1"
       sources."isarray-0.0.1"
       sources."isexe-2.0.0"
-      sources."jackspeak-3.4.0"
+      sources."jackspeak-3.4.3"
       sources."js-tokens-4.0.0"
       sources."json-buffer-3.0.1"
       sources."json-parse-even-better-errors-2.3.1"
@@ -61087,6 +60229,7 @@ in
       sources."p-limit-4.0.0"
       sources."p-locate-6.0.0"
       sources."package-json-8.1.1"
+      sources."package-json-from-dist-1.0.0"
       (sources."parse-english-5.0.0" // {
         dependencies = [
           sources."nlcst-to-string-2.0.4"
@@ -61105,7 +60248,7 @@ in
       sources."path-key-3.1.1"
       (sources."path-scurry-1.11.1" // {
         dependencies = [
-          sources."lru-cache-10.2.2"
+          sources."lru-cache-10.4.3"
         ];
       })
       sources."pause-stream-0.0.11"
@@ -61162,7 +60305,7 @@ in
       sources."retext-profanities-7.2.2"
       sources."sade-1.8.1"
       sources."safe-buffer-5.2.1"
-      sources."semver-7.6.2"
+      sources."semver-7.6.3"
       sources."semver-diff-4.0.0"
       sources."shebang-command-2.0.0"
       sources."shebang-regex-3.0.0"
@@ -61301,9 +60444,9 @@ in
       sources."xdg-basedir-5.1.0"
       sources."xtend-2.1.2"
       sources."yallist-4.0.0"
-      sources."yaml-2.4.5"
+      sources."yaml-2.5.0"
       sources."yargs-parser-21.1.1"
-      sources."yocto-queue-1.0.0"
+      sources."yocto-queue-1.1.1"
       sources."zwitch-2.0.4"
     ];
     buildInputs = globalBuildInputs;
@@ -61369,10 +60512,10 @@ in
   aws-cdk = nodeEnv.buildNodePackage {
     name = "aws-cdk";
     packageName = "aws-cdk";
-    version = "2.146.0";
+    version = "2.150.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/aws-cdk/-/aws-cdk-2.146.0.tgz";
-      sha512 = "uLotAflIqQn8rskLC1r2NGNMaTwDgW8Vq016QiACmatIcp2n/hfNlwazg+hRlSzq2FwGda6Qht2aOlsGm0QcBw==";
+      url = "https://registry.npmjs.org/aws-cdk/-/aws-cdk-2.150.0.tgz";
+      sha512 = "leo4J70QrJp+SYm/87VuoOVfALsW11F7JpkAGu5TLL/qd2k/CbovZ8k9/3Ov+jCVsvAgdn9DeHL01Sn6hSl6Zg==";
     };
     dependencies = [
       sources."fsevents-2.3.2"
@@ -61411,7 +60554,7 @@ in
       sources."@sindresorhus/merge-streams-4.0.0"
       sources."@szmarczak/http-timer-5.0.1"
       sources."@types/debug-4.1.12"
-      sources."@types/eslint-8.56.10"
+      sources."@types/eslint-8.56.11"
       sources."@types/estree-1.0.5"
       sources."@types/estree-jsx-1.0.5"
       sources."@types/hast-3.0.4"
@@ -61491,7 +60634,7 @@ in
         ];
       })
       sources."eslint-rule-docs-1.1.235"
-      sources."execa-9.2.0"
+      sources."execa-9.3.0"
       sources."extend-3.0.2"
       sources."fast-glob-3.3.2"
       sources."fastq-1.17.1"
@@ -61499,7 +60642,6 @@ in
       sources."fill-range-7.1.1"
       sources."form-data-encoder-2.1.4"
       sources."fs.realpath-1.0.0"
-      sources."function-bind-1.1.2"
       sources."get-east-asian-width-1.2.0"
       sources."get-stream-9.0.1"
       sources."github-slugger-2.0.0"
@@ -61507,7 +60649,7 @@ in
       sources."glob-7.2.3"
       sources."glob-option-error-1.0.0"
       sources."glob-parent-5.1.2"
-      (sources."globby-14.0.1" // {
+      (sources."globby-14.0.2" // {
         dependencies = [
           sources."@sindresorhus/merge-streams-2.3.0"
         ];
@@ -61519,7 +60661,6 @@ in
       })
       sources."graceful-fs-4.2.11"
       sources."has-flag-3.0.0"
-      sources."hasown-2.0.2"
       sources."hosted-git-info-7.0.2"
       sources."http-cache-semantics-4.1.1"
       sources."http2-wrapper-2.2.1"
@@ -61534,7 +60675,6 @@ in
       sources."is-alphabetical-2.0.1"
       sources."is-alphanumerical-2.0.1"
       sources."is-buffer-2.0.5"
-      sources."is-core-module-2.13.1"
       sources."is-decimal-2.0.1"
       sources."is-extglob-2.1.1"
       sources."is-fullwidth-code-point-3.0.0"
@@ -61561,7 +60701,7 @@ in
       })
       sources."longest-streak-3.1.0"
       sources."lowercase-keys-3.0.0"
-      sources."lru-cache-10.2.2"
+      sources."lru-cache-10.4.3"
       sources."mdast-comment-marker-3.0.0"
       sources."mdast-util-directive-3.0.0"
       sources."mdast-util-from-markdown-2.0.1"
@@ -61601,7 +60741,7 @@ in
       sources."mimic-response-4.0.0"
       sources."minimatch-3.1.2"
       sources."ms-2.1.2"
-      sources."normalize-package-data-6.0.1"
+      sources."normalize-package-data-6.0.2"
       sources."normalize-url-8.0.1"
       (sources."npm-run-path-5.3.0" // {
         dependencies = [
@@ -61618,7 +60758,7 @@ in
           sources."@types/unist-2.0.10"
         ];
       })
-      sources."parse-github-url-1.0.2"
+      sources."parse-github-url-1.0.3"
       sources."parse-json-8.1.0"
       sources."parse-ms-4.0.0"
       sources."path-is-absolute-1.0.1"
@@ -61628,7 +60768,7 @@ in
       sources."picomatch-2.3.1"
       sources."plur-4.0.0"
       sources."pluralize-8.0.0"
-      sources."pretty-ms-9.0.0"
+      sources."pretty-ms-9.1.0"
       sources."queue-microtask-1.2.3"
       sources."quick-lru-5.1.1"
       sources."quotation-2.0.3"
@@ -61756,7 +60896,7 @@ in
       sources."rimraf-2.7.1"
       sources."rmfr-2.0.0"
       sources."run-parallel-1.2.0"
-      sources."semver-7.6.2"
+      sources."semver-7.6.3"
       sources."shebang-command-2.0.0"
       sources."shebang-regex-3.0.0"
       sources."signal-exit-4.1.0"
@@ -61768,7 +60908,7 @@ in
       sources."spdx-expression-parse-3.0.1"
       sources."spdx-license-ids-3.0.18"
       sources."stdin-discarder-0.2.2"
-      sources."string-width-7.1.0"
+      sources."string-width-7.2.0"
       sources."stringify-entities-4.0.4"
       sources."strip-ansi-7.1.0"
       sources."strip-final-newline-4.0.0"
@@ -61789,9 +60929,9 @@ in
       sources."to-regex-range-5.0.1"
       sources."to-vfile-8.0.0"
       sources."trough-2.2.0"
-      sources."type-fest-4.20.0"
+      sources."type-fest-4.23.0"
       sources."unicorn-magic-0.1.0"
-      sources."unified-11.0.4"
+      sources."unified-11.0.5"
       sources."unified-lint-rule-3.0.0"
       sources."unified-message-control-5.0.0"
       sources."unique-string-3.0.0"
@@ -61828,8 +60968,8 @@ in
         ];
       })
       sources."validate-npm-package-license-3.0.4"
-      sources."vfile-6.0.1"
-      sources."vfile-location-5.0.2"
+      sources."vfile-6.0.2"
+      sources."vfile-location-5.0.3"
       sources."vfile-message-4.0.2"
       sources."vfile-reporter-pretty-7.0.0"
       sources."vfile-statistics-3.0.0"
@@ -61837,7 +60977,7 @@ in
       sources."which-2.0.2"
       sources."wrapped-1.0.1"
       sources."wrappy-1.0.2"
-      sources."yoctocolors-2.0.2"
+      sources."yoctocolors-2.1.1"
       sources."zwitch-2.0.4"
     ];
     buildInputs = globalBuildInputs;
@@ -61914,7 +61054,7 @@ in
       sources."inherits-2.0.4"
       sources."intersect-1.0.1"
       sources."is-arrayish-0.2.1"
-      sources."is-core-module-2.13.1"
+      sources."is-core-module-2.15.0"
       sources."is-finite-1.1.0"
       sources."is-plain-obj-1.1.0"
       sources."is-utf8-0.2.1"
@@ -61937,7 +61077,7 @@ in
       sources."loud-rejection-1.6.0"
       sources."map-obj-1.0.1"
       sources."meow-3.7.0"
-      sources."mime-db-1.52.0"
+      sources."mime-db-1.53.0"
       sources."minimatch-3.1.2"
       sources."minimist-1.2.8"
       sources."mkdirp-0.5.6"
@@ -62080,7 +61220,7 @@ in
       })
       sources."domain-browser-1.2.0"
       sources."duplexer2-0.1.4"
-      (sources."elliptic-6.5.5" // {
+      (sources."elliptic-6.5.6" // {
         dependencies = [
           sources."bn.js-4.12.0"
         ];
@@ -62120,7 +61260,7 @@ in
       sources."is-arguments-1.1.1"
       sources."is-buffer-1.1.6"
       sources."is-callable-1.2.7"
-      sources."is-core-module-2.13.1"
+      sources."is-core-module-2.15.0"
       sources."is-generator-function-1.0.10"
       sources."is-typed-array-1.1.13"
       sources."isarray-1.0.0"
@@ -62139,7 +61279,7 @@ in
       sources."minimist-1.2.8"
       sources."mkdirp-classic-0.5.3"
       sources."module-deps-6.2.3"
-      sources."object-inspect-1.13.1"
+      sources."object-inspect-1.13.2"
       sources."object-keys-1.1.1"
       sources."object.assign-4.1.5"
       sources."once-1.4.0"
@@ -62165,7 +61305,7 @@ in
         ];
       })
       sources."punycode-1.4.1"
-      sources."qs-6.12.1"
+      sources."qs-6.12.3"
       sources."querystring-es3-0.2.1"
       sources."randombytes-2.1.0"
       sources."randomfill-1.0.4"
@@ -62239,7 +61379,7 @@ in
       sources."@socket.io/component-emitter-3.1.2"
       sources."@types/cookie-0.4.1"
       sources."@types/cors-2.8.17"
-      sources."@types/node-20.14.2"
+      sources."@types/node-20.14.12"
       sources."accepts-1.3.8"
       sources."ansi-regex-5.0.1"
       sources."ansi-styles-4.3.0"
@@ -62282,9 +61422,9 @@ in
       sources."ee-first-1.1.1"
       sources."emoji-regex-8.0.0"
       sources."encodeurl-1.0.2"
-      sources."engine.io-6.5.4"
-      sources."engine.io-client-6.5.3"
-      sources."engine.io-parser-5.2.2"
+      sources."engine.io-6.5.5"
+      sources."engine.io-client-6.5.4"
+      sources."engine.io-parser-5.2.3"
       sources."escalade-3.1.2"
       sources."escape-html-1.0.3"
       sources."etag-1.8.1"
@@ -62378,7 +61518,7 @@ in
       sources."server-destroy-1.0.1"
       sources."setprototypeof-1.2.0"
       sources."socket.io-4.7.5"
-      sources."socket.io-adapter-2.5.4"
+      sources."socket.io-adapter-2.5.5"
       sources."socket.io-client-4.7.5"
       sources."socket.io-parser-4.2.4"
       sources."statuses-1.3.1"
@@ -62392,11 +61532,11 @@ in
       sources."undici-types-5.26.5"
       sources."universalify-0.1.2"
       sources."unpipe-1.0.0"
-      sources."utf-8-validate-5.0.10"
+      sources."utf-8-validate-6.0.4"
       sources."utils-merge-1.0.1"
       sources."vary-1.1.2"
       sources."wrap-ansi-7.0.0"
-      sources."ws-8.11.0"
+      sources."ws-8.17.1"
       sources."xmlhttprequest-ssl-2.0.0"
       sources."y18n-5.0.8"
       sources."yargs-17.7.2"
@@ -62415,16 +61555,16 @@ in
   cdk8s-cli = nodeEnv.buildNodePackage {
     name = "cdk8s-cli";
     packageName = "cdk8s-cli";
-    version = "2.198.145";
+    version = "2.198.175";
     src = fetchurl {
-      url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-2.198.145.tgz";
-      sha512 = "I1tHAcRV6k0zk32Row37Ds8eoQC0LmRrT62EMQuyyaivAus1AgGD7dGn3cw+idJCepfxME6Rrc7jOvIa/Mv3Jg==";
+      url = "https://registry.npmjs.org/cdk8s-cli/-/cdk8s-cli-2.198.175.tgz";
+      sha512 = "4p2thnOpOFZgBQ2OmiFT6llXRy09d4aHGkTPYx4OQzzFLGKEJ5wDMVJrZPvuOu1czvYrxk3jsULluouRbAgXqQ==";
     };
     dependencies = [
       sources."@colors/colors-1.6.0"
       sources."@dabh/diagnostics-2.0.3"
-      sources."@jsii/check-node-1.100.0"
-      sources."@jsii/spec-1.100.0"
+      sources."@jsii/check-node-1.101.0"
+      sources."@jsii/spec-1.101.0"
       sources."@nodelib/fs.scandir-2.1.5"
       sources."@nodelib/fs.stat-2.0.5"
       sources."@nodelib/fs.walk-1.2.8"
@@ -62440,11 +61580,11 @@ in
       sources."@octokit/request-error-2.1.0"
       sources."@octokit/rest-18.12.0"
       sources."@octokit/types-6.41.0"
-      sources."@types/node-16.18.98"
+      sources."@types/node-16.18.104"
       sources."@types/triple-beam-1.3.5"
       sources."@xmldom/xmldom-0.8.10"
       sources."aggregate-error-3.1.0"
-      sources."ajv-8.16.0"
+      sources."ajv-8.17.1"
       sources."ansi-escapes-4.3.2"
       sources."ansi-regex-5.0.1"
       sources."ansi-styles-4.3.0"
@@ -62472,7 +61612,7 @@ in
       sources."call-bind-1.0.7"
       sources."camelcase-6.3.0"
       sources."case-1.6.3"
-      sources."cdk8s-2.68.79"
+      sources."cdk8s-2.68.87"
       sources."cdk8s-plus-25-2.22.79"
       sources."chalk-4.1.2"
       sources."chardet-0.7.0"
@@ -62486,7 +61626,7 @@ in
         ];
       })
       sources."clone-1.0.4"
-      (sources."codemaker-1.100.0" // {
+      (sources."codemaker-1.101.0" // {
         dependencies = [
           sources."fs-extra-10.1.0"
         ];
@@ -62530,7 +61670,7 @@ in
       sources."dotenv-16.4.5"
       (sources."downlevel-dts-0.11.0" // {
         dependencies = [
-          sources."typescript-5.6.0-dev.20240614"
+          sources."typescript-5.6.0-dev.20240725"
         ];
       })
       sources."emoji-regex-8.0.0"
@@ -62552,6 +61692,7 @@ in
       })
       sources."fast-deep-equal-3.1.3"
       sources."fast-glob-3.3.2"
+      sources."fast-uri-3.0.1"
       sources."fastq-1.17.1"
       sources."fecha-4.2.3"
       sources."figures-3.2.0"
@@ -62581,7 +61722,7 @@ in
       sources."globby-11.1.0"
       sources."gopd-1.0.1"
       sources."graceful-fs-4.2.11"
-      sources."graphql-16.8.2"
+      sources."graphql-16.9.0"
       sources."graphql-tag-2.12.6"
       sources."has-bigints-1.0.2"
       sources."has-flag-4.0.0"
@@ -62604,7 +61745,7 @@ in
       sources."is-bigint-1.0.4"
       sources."is-boolean-object-1.1.2"
       sources."is-callable-1.2.7"
-      sources."is-core-module-2.13.1"
+      sources."is-core-module-2.15.0"
       sources."is-data-view-1.0.1"
       sources."is-date-object-1.0.5"
       sources."is-extglob-2.1.1"
@@ -62626,13 +61767,12 @@ in
       sources."is-unicode-supported-0.1.0"
       sources."is-weakref-1.0.2"
       sources."isarray-2.0.5"
-      (sources."jsii-5.4.21" // {
+      (sources."jsii-5.4.26" // {
         dependencies = [
-          sources."@jsii/check-node-1.99.0"
           sources."yargs-17.7.2"
         ];
       })
-      (sources."jsii-pacmak-1.100.0" // {
+      (sources."jsii-pacmak-1.101.0" // {
         dependencies = [
           sources."cliui-7.0.4"
           sources."clone-2.1.2"
@@ -62643,7 +61783,7 @@ in
           sources."yargs-parser-20.2.9"
         ];
       })
-      (sources."jsii-reflect-1.100.0" // {
+      (sources."jsii-reflect-1.101.0" // {
         dependencies = [
           sources."cliui-7.0.4"
           sources."fs-extra-10.1.0"
@@ -62652,13 +61792,12 @@ in
           sources."yargs-parser-20.2.9"
         ];
       })
-      (sources."jsii-rosetta-5.4.21" // {
+      (sources."jsii-rosetta-5.4.25" // {
         dependencies = [
-          sources."@jsii/check-node-1.98.0"
           sources."yargs-17.7.2"
         ];
       })
-      (sources."jsii-srcmak-0.1.1154" // {
+      (sources."jsii-srcmak-0.1.1193" // {
         dependencies = [
           sources."fs-extra-9.1.0"
           sources."yargs-17.7.2"
@@ -62674,7 +61813,7 @@ in
       sources."lodash.truncate-4.4.2"
       sources."log-symbols-4.1.0"
       sources."log4js-6.9.1"
-      sources."logform-2.6.0"
+      sources."logform-2.6.1"
       sources."lower-case-2.0.2"
       (sources."make-dir-3.1.0" // {
         dependencies = [
@@ -62694,13 +61833,13 @@ in
       sources."ncp-2.0.0"
       sources."no-case-3.0.4"
       sources."node-fetch-2.7.0"
-      sources."object-inspect-1.13.1"
+      sources."object-inspect-1.13.2"
       sources."object-keys-1.1.1"
       sources."object.assign-4.1.5"
       sources."once-1.4.0"
       sources."one-time-1.0.0"
       sources."onetime-5.1.2"
-      sources."oo-ascii-tree-1.100.0"
+      sources."oo-ascii-tree-1.101.0"
       sources."ora-5.4.1"
       sources."os-tmpdir-1.0.2"
       sources."p-limit-3.1.0"
@@ -62713,7 +61852,6 @@ in
       sources."path-type-4.0.0"
       sources."picomatch-2.3.1"
       sources."possible-typed-array-names-1.0.0"
-      sources."punycode-2.3.1"
       sources."queue-microtask-1.2.3"
       sources."readable-stream-3.6.2"
       sources."rechoir-0.6.2"
@@ -62735,7 +61873,7 @@ in
       sources."safe-regex-test-1.0.3"
       sources."safe-stable-stringify-2.4.3"
       sources."safer-buffer-2.1.2"
-      sources."semver-7.6.2"
+      sources."semver-7.6.3"
       (sources."semver-intersect-1.5.0" // {
         dependencies = [
           sources."semver-6.3.1"
@@ -62787,7 +61925,6 @@ in
       sources."unbox-primitive-1.0.2"
       sources."universal-user-agent-6.0.1"
       sources."universalify-2.0.1"
-      sources."uri-js-4.4.1"
       sources."util-deprecate-1.0.2"
       sources."utility-types-3.11.0"
       sources."wcwidth-1.0.1"
@@ -62796,8 +61933,8 @@ in
       sources."which-boxed-primitive-1.0.2"
       sources."which-module-2.0.1"
       sources."which-typed-array-1.1.15"
-      sources."winston-3.13.0"
-      sources."winston-transport-4.7.0"
+      sources."winston-3.13.1"
+      sources."winston-transport-4.7.1"
       sources."workerpool-6.5.1"
       sources."wrap-ansi-6.2.0"
       sources."wrappy-1.0.2"
@@ -62833,10 +61970,10 @@ in
   cdktf-cli = nodeEnv.buildNodePackage {
     name = "cdktf-cli";
     packageName = "cdktf-cli";
-    version = "0.20.7";
+    version = "0.20.8";
     src = fetchurl {
-      url = "https://registry.npmjs.org/cdktf-cli/-/cdktf-cli-0.20.7.tgz";
-      sha512 = "muEJhxWHZLv1Rayz2t7W3gP1zZbCE4DPFq3gNo4G667TzrwdY7XWreeze8Pj7i3mkQu+K492cSVdWBYKa3AJpg==";
+      url = "https://registry.npmjs.org/cdktf-cli/-/cdktf-cli-0.20.8.tgz";
+      sha512 = "iLTm3rlJXQ2OziNNAa5faONur/VWztue9jbrpqmmZo5QDUBqFbTbAcEQ1LgVqFvm4rBWXL3G26E7Di5iuCifuA==";
     };
     dependencies = [
       (sources."@alcalzone/ansi-tokenize-0.1.3" // {
@@ -62846,8 +61983,8 @@ in
         ];
       })
       sources."@babel/code-frame-7.24.7"
-      sources."@babel/generator-7.24.4"
-      sources."@babel/helper-string-parser-7.24.7"
+      sources."@babel/generator-7.24.7"
+      sources."@babel/helper-string-parser-7.24.8"
       sources."@babel/helper-validator-identifier-7.24.7"
       (sources."@babel/highlight-7.24.7" // {
         dependencies = [
@@ -62860,10 +61997,10 @@ in
           sources."supports-color-5.5.0"
         ];
       })
-      sources."@babel/parser-7.24.7"
-      sources."@babel/template-7.24.0"
-      sources."@babel/types-7.24.0"
-      (sources."@cdktf/cli-core-0.20.7" // {
+      sources."@babel/parser-7.24.8"
+      sources."@babel/template-7.24.7"
+      sources."@babel/types-7.24.7"
+      (sources."@cdktf/cli-core-0.20.8" // {
         dependencies = [
           (sources."ansi-escapes-4.3.2" // {
             dependencies = [
@@ -62878,47 +62015,37 @@ in
           sources."convert-to-spaces-1.0.2"
           sources."indent-string-4.0.0"
           sources."ink-3.2.0"
-          sources."lru-cache-6.0.0"
           sources."patch-console-1.0.0"
           sources."react-17.0.2"
           sources."react-reconciler-0.26.2"
           sources."restore-cursor-3.1.0"
           sources."scheduler-0.20.2"
-          sources."semver-7.6.0"
+          sources."semver-7.6.2"
           sources."slice-ansi-3.0.0"
           sources."type-fest-0.12.0"
           sources."utf-8-validate-5.0.10"
           sources."uuid-8.3.2"
           sources."widest-line-3.1.0"
           sources."wrap-ansi-6.2.0"
-          sources."ws-7.5.9"
+          sources."ws-7.5.10"
         ];
       })
-      (sources."@cdktf/commons-0.20.7" // {
+      (sources."@cdktf/commons-0.20.8" // {
         dependencies = [
-          sources."@sentry-internal/tracing-7.109.0"
-          sources."@sentry/core-7.109.0"
-          sources."@sentry/node-7.109.0"
-          sources."@sentry/types-7.109.0"
-          sources."@sentry/utils-7.109.0"
           sources."fs-extra-11.2.0"
           sources."jsonfile-6.1.0"
           sources."universalify-2.0.1"
         ];
       })
-      sources."@cdktf/hcl-tools-0.20.7"
-      (sources."@cdktf/hcl2cdk-0.20.7" // {
+      sources."@cdktf/hcl-tools-0.20.8"
+      (sources."@cdktf/hcl2cdk-0.20.8" // {
         dependencies = [
           sources."brace-expansion-2.0.1"
-          sources."commonmark-0.31.0"
-          sources."entities-3.0.1"
-          sources."glob-10.3.12"
-          sources."jsii-rosetta-5.3.28"
-          sources."minimatch-9.0.4"
-          sources."string.prototype.repeat-1.0.0"
+          sources."glob-10.4.1"
+          sources."minimatch-9.0.5"
         ];
       })
-      (sources."@cdktf/hcl2json-0.20.7" // {
+      (sources."@cdktf/hcl2json-0.20.8" // {
         dependencies = [
           sources."fs-extra-11.2.0"
           sources."jsonfile-6.1.0"
@@ -62926,14 +62053,14 @@ in
         ];
       })
       sources."@cdktf/node-pty-prebuilt-multiarch-0.10.1-pre.11"
-      (sources."@cdktf/provider-generator-0.20.7" // {
+      (sources."@cdktf/provider-generator-0.20.8" // {
         dependencies = [
           sources."brace-expansion-2.0.1"
-          sources."glob-10.3.12"
-          sources."minimatch-9.0.4"
+          sources."glob-10.4.1"
+          sources."minimatch-9.0.5"
         ];
       })
-      (sources."@cdktf/provider-schema-0.20.7" // {
+      (sources."@cdktf/provider-schema-0.20.8" // {
         dependencies = [
           sources."fs-extra-11.2.0"
           sources."jsonfile-6.1.0"
@@ -62944,7 +62071,7 @@ in
         dependencies = [
           sources."@inquirer/core-6.0.0"
           sources."@types/mute-stream-0.0.4"
-          sources."@types/node-20.14.2"
+          sources."@types/node-20.14.12"
           sources."ansi-escapes-4.3.2"
           sources."signal-exit-4.1.0"
           sources."type-fest-0.21.3"
@@ -62955,7 +62082,7 @@ in
         dependencies = [
           sources."@inquirer/core-6.0.0"
           sources."@types/mute-stream-0.0.4"
-          sources."@types/node-20.14.2"
+          sources."@types/node-20.14.12"
           sources."ansi-escapes-4.3.2"
           sources."signal-exit-4.1.0"
           sources."type-fest-0.21.3"
@@ -62964,7 +62091,7 @@ in
       })
       (sources."@inquirer/core-2.3.1" // {
         dependencies = [
-          sources."@types/node-20.14.2"
+          sources."@types/node-20.14.12"
           sources."ansi-escapes-4.3.2"
           sources."type-fest-0.21.3"
           sources."wrap-ansi-6.2.0"
@@ -62974,7 +62101,7 @@ in
         dependencies = [
           sources."@inquirer/core-6.0.0"
           sources."@types/mute-stream-0.0.4"
-          sources."@types/node-20.14.2"
+          sources."@types/node-20.14.12"
           sources."ansi-escapes-4.3.2"
           sources."signal-exit-4.1.0"
           sources."type-fest-0.21.3"
@@ -62985,7 +62112,7 @@ in
         dependencies = [
           sources."@inquirer/core-6.0.0"
           sources."@types/mute-stream-0.0.4"
-          sources."@types/node-20.14.2"
+          sources."@types/node-20.14.12"
           sources."ansi-escapes-4.3.2"
           sources."signal-exit-4.1.0"
           sources."type-fest-0.21.3"
@@ -62996,7 +62123,7 @@ in
         dependencies = [
           sources."@inquirer/core-6.0.0"
           sources."@types/mute-stream-0.0.4"
-          sources."@types/node-20.14.2"
+          sources."@types/node-20.14.12"
           sources."ansi-escapes-4.3.2"
           sources."signal-exit-4.1.0"
           sources."type-fest-0.21.3"
@@ -63007,7 +62134,7 @@ in
         dependencies = [
           sources."@inquirer/core-6.0.0"
           sources."@types/mute-stream-0.0.4"
-          sources."@types/node-20.14.2"
+          sources."@types/node-20.14.12"
           sources."ansi-escapes-4.3.2"
           sources."signal-exit-4.1.0"
           sources."type-fest-0.21.3"
@@ -63019,7 +62146,7 @@ in
         dependencies = [
           sources."@inquirer/core-6.0.0"
           sources."@types/mute-stream-0.0.4"
-          sources."@types/node-20.14.2"
+          sources."@types/node-20.14.12"
           sources."ansi-escapes-4.3.2"
           sources."signal-exit-4.1.0"
           sources."type-fest-0.21.3"
@@ -63030,14 +62157,14 @@ in
         dependencies = [
           sources."@inquirer/core-6.0.0"
           sources."@types/mute-stream-0.0.4"
-          sources."@types/node-20.14.2"
+          sources."@types/node-20.14.12"
           sources."ansi-escapes-4.3.2"
           sources."signal-exit-4.1.0"
           sources."type-fest-0.21.3"
           sources."wrap-ansi-6.2.0"
         ];
       })
-      sources."@inquirer/type-1.3.3"
+      sources."@inquirer/type-1.5.1"
       (sources."@isaacs/cliui-8.0.2" // {
         dependencies = [
           sources."ansi-regex-6.0.1"
@@ -63051,20 +62178,21 @@ in
       sources."@jridgewell/gen-mapping-0.3.5"
       sources."@jridgewell/resolve-uri-3.1.2"
       sources."@jridgewell/set-array-1.2.1"
-      sources."@jridgewell/sourcemap-codec-1.4.15"
+      sources."@jridgewell/sourcemap-codec-1.5.0"
       sources."@jridgewell/trace-mapping-0.3.25"
-      sources."@jsii/check-node-1.95.0"
-      sources."@jsii/spec-1.100.0"
+      sources."@jsii/check-node-1.98.0"
+      sources."@jsii/spec-1.101.0"
       sources."@nodelib/fs.scandir-2.1.5"
       sources."@nodelib/fs.stat-2.0.5"
       sources."@nodelib/fs.walk-1.2.8"
-      sources."@sentry-internal/tracing-7.110.0"
-      sources."@sentry/core-7.110.0"
-      sources."@sentry/node-7.110.0"
-      sources."@sentry/types-7.110.0"
-      sources."@sentry/utils-7.110.0"
+      sources."@sentry-internal/tracing-7.116.0"
+      sources."@sentry/core-7.116.0"
+      sources."@sentry/integrations-7.116.0"
+      sources."@sentry/node-7.116.0"
+      sources."@sentry/types-7.116.0"
+      sources."@sentry/utils-7.116.0"
       sources."@types/mute-stream-0.0.1"
-      sources."@types/node-18.19.30"
+      sources."@types/node-18.19.34"
       sources."@types/prop-types-15.7.12"
       sources."@types/react-18.3.3"
       sources."@types/wrap-ansi-3.0.0"
@@ -63073,7 +62201,7 @@ in
       sources."@xmldom/xmldom-0.8.10"
       sources."address-1.2.2"
       sources."agent-base-6.0.2"
-      sources."ajv-8.16.0"
+      sources."ajv-8.17.1"
       sources."ansi-escapes-7.0.0"
       sources."ansi-regex-5.0.1"
       sources."ansi-styles-4.3.0"
@@ -63091,7 +62219,6 @@ in
       sources."arraybuffer.prototype.slice-1.0.3"
       sources."astral-regex-2.0.0"
       sources."async-3.2.5"
-      sources."at-least-node-1.0.0"
       sources."auto-bind-5.0.1"
       sources."available-typed-arrays-1.0.7"
       sources."balanced-match-1.0.2"
@@ -63106,7 +62233,7 @@ in
       sources."call-bind-1.0.7"
       sources."camelcase-6.3.0"
       sources."case-1.6.3"
-      sources."cdktf-0.20.7"
+      sources."cdktf-0.20.8"
       sources."chalk-4.1.2"
       sources."chardet-0.7.0"
       sources."chokidar-3.6.0"
@@ -63122,7 +62249,7 @@ in
           sources."emoji-regex-10.3.0"
           sources."is-fullwidth-code-point-4.0.0"
           sources."slice-ansi-5.0.0"
-          sources."string-width-7.1.0"
+          sources."string-width-7.2.0"
           sources."strip-ansi-7.1.0"
         ];
       })
@@ -63130,7 +62257,7 @@ in
       sources."cliui-8.0.1"
       sources."clone-2.1.2"
       sources."code-excerpt-4.0.0"
-      (sources."codemaker-1.95.0" // {
+      (sources."codemaker-1.98.0" // {
         dependencies = [
           sources."fs-extra-10.1.0"
           sources."jsonfile-6.1.0"
@@ -63142,7 +62269,7 @@ in
       sources."commonmark-0.30.0"
       sources."compress-commons-4.1.2"
       sources."concat-map-0.0.1"
-      sources."constructs-10.1.167"
+      sources."constructs-10.3.0"
       sources."convert-to-spaces-2.0.1"
       sources."core-util-is-1.0.3"
       sources."crc-32-1.2.2"
@@ -63165,10 +62292,10 @@ in
       sources."detect-indent-5.0.0"
       sources."detect-libc-2.0.3"
       sources."detect-newline-2.1.0"
-      sources."detect-port-1.5.1"
+      sources."detect-port-1.6.1"
       (sources."downlevel-dts-0.11.0" // {
         dependencies = [
-          sources."typescript-5.6.0-dev.20240614"
+          sources."typescript-5.6.0-dev.20240725"
         ];
       })
       sources."eastasianwidth-0.2.0"
@@ -63201,6 +62328,7 @@ in
       })
       sources."fast-deep-equal-3.1.3"
       sources."fast-glob-3.3.2"
+      sources."fast-uri-3.0.1"
       sources."fastq-1.17.1"
       sources."fd-slicer-1.1.0"
       (sources."figures-3.2.0" // {
@@ -63209,11 +62337,11 @@ in
         ];
       })
       sources."fill-range-7.1.1"
-      sources."find-up-4.1.0"
+      sources."find-up-3.0.0"
       sources."flatted-3.3.1"
       sources."follow-redirects-1.15.6"
       sources."for-each-0.3.3"
-      (sources."foreground-child-3.2.0" // {
+      (sources."foreground-child-3.2.1" // {
         dependencies = [
           sources."signal-exit-4.1.0"
         ];
@@ -63252,6 +62380,7 @@ in
       sources."human-signals-2.1.0"
       sources."iconv-lite-0.6.3"
       sources."ieee754-1.2.1"
+      sources."immediate-3.0.6"
       sources."indent-string-5.0.0"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
@@ -63262,7 +62391,7 @@ in
           sources."ansi-styles-6.2.1"
           sources."chalk-5.3.0"
           sources."emoji-regex-10.3.0"
-          sources."string-width-7.1.0"
+          sources."string-width-7.2.0"
           sources."strip-ansi-7.1.0"
           sources."wrap-ansi-9.0.0"
         ];
@@ -63292,7 +62421,7 @@ in
           sources."utf-8-validate-5.0.10"
           sources."widest-line-3.1.0"
           sources."wrap-ansi-6.2.0"
-          sources."ws-7.5.9"
+          sources."ws-7.5.10"
         ];
       })
       sources."ink-spinner-4.0.3"
@@ -63312,7 +62441,7 @@ in
           sources."ci-info-2.0.0"
         ];
       })
-      sources."is-core-module-2.13.1"
+      sources."is-core-module-2.15.0"
       sources."is-data-view-1.0.1"
       sources."is-date-object-1.0.5"
       sources."is-docker-2.2.1"
@@ -63338,11 +62467,11 @@ in
       sources."is-wsl-2.2.0"
       sources."isarray-2.0.5"
       sources."isexe-2.0.0"
-      sources."jackspeak-2.3.6"
+      sources."jackspeak-3.4.3"
       sources."js-tokens-4.0.0"
       sources."jsesc-2.5.2"
-      sources."jsii-5.3.29"
-      (sources."jsii-pacmak-1.95.0" // {
+      sources."jsii-5.4.12"
+      (sources."jsii-pacmak-1.98.0" // {
         dependencies = [
           sources."cliui-7.0.4"
           sources."escape-string-regexp-4.0.0"
@@ -63353,9 +62482,9 @@ in
           sources."yargs-parser-20.2.9"
         ];
       })
-      (sources."jsii-reflect-1.100.0" // {
+      (sources."jsii-reflect-1.101.0" // {
         dependencies = [
-          sources."@jsii/check-node-1.100.0"
+          sources."@jsii/check-node-1.101.0"
           sources."cliui-7.0.4"
           sources."fs-extra-10.1.0"
           sources."jsonfile-6.1.0"
@@ -63364,34 +62493,11 @@ in
           sources."yargs-parser-20.2.9"
         ];
       })
-      (sources."jsii-rosetta-1.100.0" // {
+      (sources."jsii-rosetta-5.4.14" // {
         dependencies = [
-          sources."@jsii/check-node-1.100.0"
-          sources."cliui-7.0.4"
           sources."commonmark-0.31.0"
           sources."entities-3.0.1"
-          sources."fs-extra-10.1.0"
-          sources."jsii-1.100.0"
-          sources."jsonfile-6.1.0"
           sources."string.prototype.repeat-1.0.0"
-          sources."typescript-3.9.10"
-          sources."universalify-2.0.1"
-          sources."yargs-16.2.0"
-          sources."yargs-parser-20.2.9"
-        ];
-      })
-      (sources."jsii-srcmak-0.1.1039" // {
-        dependencies = [
-          sources."camelcase-5.3.1"
-          sources."cliui-6.0.0"
-          sources."decamelize-1.2.0"
-          sources."fs-extra-9.1.0"
-          sources."jsonfile-6.1.0"
-          sources."universalify-2.0.1"
-          sources."wrap-ansi-6.2.0"
-          sources."y18n-4.0.3"
-          sources."yargs-15.4.1"
-          sources."yargs-parser-18.1.3"
         ];
       })
       sources."json-schema-traverse-1.0.0"
@@ -63403,7 +62509,9 @@ in
           sources."safe-buffer-5.1.2"
         ];
       })
-      sources."locate-path-5.0.0"
+      sources."lie-3.1.1"
+      sources."localforage-1.10.0"
+      sources."locate-path-3.0.0"
       sources."lodash-4.17.21"
       sources."lodash.defaults-4.2.0"
       sources."lodash.difference-4.5.0"
@@ -63413,7 +62521,7 @@ in
       sources."lodash.union-4.6.0"
       sources."log4js-6.9.1"
       sources."loose-envify-1.4.0"
-      sources."lru-cache-10.2.2"
+      sources."lru-cache-10.4.3"
       sources."mdurl-1.0.1"
       sources."merge-stream-2.0.0"
       sources."merge2-1.4.1"
@@ -63432,7 +62540,6 @@ in
       sources."mute-stream-1.0.0"
       sources."nan-2.20.0"
       sources."napi-build-utils-1.0.2"
-      sources."ncp-2.0.0"
       sources."node-abi-3.65.0"
       sources."node-fetch-2.7.0"
       sources."node-gyp-build-4.8.1"
@@ -63440,22 +62547,22 @@ in
       sources."npm-run-path-4.0.1"
       sources."object-assign-4.1.1"
       sources."object-hash-2.2.0"
-      sources."object-inspect-1.13.1"
+      sources."object-inspect-1.13.2"
       sources."object-is-1.1.6"
       sources."object-keys-1.1.1"
       sources."object.assign-4.1.5"
       sources."obliterator-2.0.4"
       sources."once-1.4.0"
       sources."onetime-5.1.2"
-      sources."oo-ascii-tree-1.100.0"
+      sources."oo-ascii-tree-1.101.0"
       sources."open-7.4.2"
       sources."os-tmpdir-1.0.2"
       sources."p-limit-2.3.0"
-      sources."p-locate-4.1.0"
+      sources."p-locate-3.0.0"
       sources."p-try-2.2.0"
       sources."parse-gitignore-1.0.1"
       sources."patch-console-2.0.0"
-      sources."path-exists-4.0.0"
+      sources."path-exists-3.0.0"
       sources."path-is-absolute-1.0.1"
       sources."path-key-3.1.1"
       sources."path-parse-1.0.7"
@@ -63465,14 +62572,7 @@ in
       sources."picomatch-2.3.1"
       sources."pidtree-0.6.0"
       sources."pidusage-3.0.2"
-      (sources."pkg-up-3.1.0" // {
-        dependencies = [
-          sources."find-up-3.0.0"
-          sources."locate-path-3.0.0"
-          sources."p-locate-3.0.0"
-          sources."path-exists-3.0.0"
-        ];
-      })
+      sources."pkg-up-3.1.0"
       sources."possible-typed-array-names-1.0.0"
       sources."prebuild-install-7.1.2"
       sources."prettier-2.8.8"
@@ -63485,7 +62585,7 @@ in
       (sources."react-devtools-core-4.28.5" // {
         dependencies = [
           sources."utf-8-validate-5.0.10"
-          sources."ws-7.5.9"
+          sources."ws-7.5.10"
         ];
       })
       sources."react-reconciler-0.29.2"
@@ -63496,7 +62596,6 @@ in
       sources."regexp.prototype.flags-1.5.2"
       sources."require-directory-2.1.1"
       sources."require-from-string-2.0.2"
-      sources."require-main-filename-2.0.0"
       sources."reserved-words-0.1.2"
       sources."resolve-1.22.8"
       sources."restore-cursor-4.0.0"
@@ -63510,13 +62609,12 @@ in
       sources."safer-buffer-2.1.2"
       sources."sax-1.4.1"
       sources."scheduler-0.23.2"
-      sources."semver-7.6.2"
+      sources."semver-7.6.3"
       (sources."semver-intersect-1.5.0" // {
         dependencies = [
           sources."semver-6.3.1"
         ];
       })
-      sources."set-blocking-2.0.0"
       sources."set-function-length-1.2.2"
       sources."set-function-name-2.0.2"
       sources."shebang-command-2.0.0"
@@ -63566,16 +62664,15 @@ in
       sources."to-regex-range-5.0.1"
       sources."tr46-0.0.3"
       sources."tunnel-agent-0.6.0"
-      sources."type-fest-4.20.0"
+      sources."type-fest-4.23.0"
       sources."typed-array-buffer-1.0.2"
       sources."typed-array-byte-length-1.0.1"
       sources."typed-array-byte-offset-1.0.2"
       sources."typed-array-length-1.0.6"
-      sources."typescript-5.3.3"
+      sources."typescript-5.4.5"
       sources."unbox-primitive-1.0.2"
       sources."undici-types-5.26.5"
       sources."universalify-0.1.2"
-      sources."uri-js-4.4.1"
       sources."utf-8-validate-6.0.4"
       sources."util-deprecate-1.0.2"
       sources."uuid-9.0.1"
@@ -63584,13 +62681,12 @@ in
       sources."which-2.0.2"
       sources."which-boxed-primitive-1.0.2"
       sources."which-collection-1.0.2"
-      sources."which-module-2.0.1"
       sources."which-typed-array-1.1.15"
       (sources."widest-line-5.0.0" // {
         dependencies = [
           sources."ansi-regex-6.0.1"
           sources."emoji-regex-10.3.0"
-          sources."string-width-7.1.0"
+          sources."string-width-7.2.0"
           sources."strip-ansi-7.1.0"
         ];
       })
@@ -63598,12 +62694,11 @@ in
       sources."wrap-ansi-7.0.0"
       sources."wrap-ansi-cjs-7.0.0"
       sources."wrappy-1.0.2"
-      sources."ws-8.17.0"
+      sources."ws-8.18.0"
       sources."xml-js-1.6.11"
       sources."xmlbuilder-15.1.1"
       sources."xstate-4.38.3"
       sources."y18n-5.0.8"
-      sources."yallist-4.0.0"
       sources."yargs-17.7.2"
       sources."yargs-parser-21.1.1"
       sources."yauzl-2.10.0"
@@ -63614,7 +62709,7 @@ in
           sources."archiver-utils-3.0.4"
         ];
       })
-      sources."zod-3.22.4"
+      sources."zod-3.23.8"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -63727,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";
@@ -63756,7 +62833,11 @@ in
     dependencies = [
       sources."dockerfile-ast-0.4.2"
       sources."dockerfile-language-server-nodejs-0.9.0"
-      sources."dockerfile-language-service-0.9.0"
+      (sources."dockerfile-language-service-0.9.0" // {
+        dependencies = [
+          sources."vscode-languageserver-types-3.17.0-next.3"
+        ];
+      })
       sources."dockerfile-utils-0.10.0"
       sources."tslib-2.6.3"
       sources."vscode-jsonrpc-8.1.0"
@@ -63767,7 +62848,7 @@ in
         ];
       })
       sources."vscode-languageserver-textdocument-1.0.11"
-      sources."vscode-languageserver-types-3.17.0-next.3"
+      sources."vscode-languageserver-types-3.17.5"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -63823,10 +62904,10 @@ in
   coc-explorer = nodeEnv.buildNodePackage {
     name = "coc-explorer";
     packageName = "coc-explorer";
-    version = "0.27.2";
+    version = "0.27.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coc-explorer/-/coc-explorer-0.27.2.tgz";
-      sha512 = "uwy/RckeCGUU2pook/LADo/czly2ZyAUTB6GfIZK+DByaS7kmpuyapwnfD3BC5B+vOLqi+5JjrunCf4ts5McEg==";
+      url = "https://registry.npmjs.org/coc-explorer/-/coc-explorer-0.27.3.tgz";
+      sha512 = "NakEw0nyOvlzqb/8P40ywDMv6mgtyNXOHAEftzLS3K4zgnaKLrt0PsaPmAYUlUfrNw+isGrveMSQB2azjSU0iA==";
     };
     dependencies = [
       sources."@sindresorhus/chunkify-0.2.0"
@@ -63965,10 +63046,10 @@ in
   coc-haxe = nodeEnv.buildNodePackage {
     name = "coc-haxe";
     packageName = "coc-haxe";
-    version = "0.20.0";
+    version = "0.21.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coc-haxe/-/coc-haxe-0.20.0.tgz";
-      sha512 = "bdxigpWTdoImf3+8ACcWwH/gjBMcovh87QiqOoqECcR10mOqewO63/UPfPASeZF9P6QiQEJrAJcBNpYNnY0upA==";
+      url = "https://registry.npmjs.org/coc-haxe/-/coc-haxe-0.21.0.tgz";
+      sha512 = "SQ1AbfLWomaNY+xDCKnNDMryVlsp6YbJ9S2mWvKF6DjuaTcxHE5hVUTMbkYA0zA+NiByFx5hzHEZdsIC/XMCCw==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -64207,7 +63288,7 @@ in
       sources."flatted-3.3.1"
       sources."follow-redirects-1.15.6"
       sources."for-each-0.3.3"
-      sources."fp-ts-2.16.6"
+      sources."fp-ts-2.16.8"
       sources."fs-extra-8.1.0"
       (sources."fs-minipass-2.1.0" // {
         dependencies = [
@@ -64299,7 +63380,7 @@ in
       sources."node-fetch-2.7.0"
       sources."node-int64-0.4.0"
       sources."npm-run-path-2.0.2"
-      sources."object-inspect-1.13.1"
+      sources."object-inspect-1.13.2"
       sources."object-keys-1.1.1"
       sources."object.assign-4.1.5"
       sources."once-1.4.0"
@@ -64326,7 +63407,7 @@ in
       sources."safe-buffer-5.2.1"
       sources."safe-regex-test-1.0.3"
       sources."safer-buffer-2.1.2"
-      sources."semver-7.6.2"
+      sources."semver-7.6.3"
       sources."set-function-length-1.2.2"
       sources."set-function-name-2.0.2"
       sources."setimmediate-1.0.5"
@@ -64427,13 +63508,13 @@ in
   coc-pyright = nodeEnv.buildNodePackage {
     name = "coc-pyright";
     packageName = "coc-pyright";
-    version = "1.1.365";
+    version = "1.1.371";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.365.tgz";
-      sha512 = "rADFFHjr8CBjZDKMfuyXLIeUelah3ZTxQTHEWatQwnrS9WW/Xj6goJO/8z06zjjvX2oVhJypDXbnjd5CJB0f1A==";
+      url = "https://registry.npmjs.org/coc-pyright/-/coc-pyright-1.1.371.tgz";
+      sha512 = "8vgKSjuMVpylSoHIwdzP9edeHwmjUFY+ZyBkcLQMdyjdZtEc3+6OblXS0Dm5nXosjLY/ATc+w+38ITIssqm76g==";
     };
     dependencies = [
-      sources."pyright-1.1.367"
+      sources."pyright-1.1.373"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -64507,10 +63588,10 @@ in
   coc-rust-analyzer = nodeEnv.buildNodePackage {
     name = "coc-rust-analyzer";
     packageName = "coc-rust-analyzer";
-    version = "0.76.1";
+    version = "0.77.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.76.1.tgz";
-      sha512 = "a9/5Gm5msHs+5CWhNzICmpPWNFILtXmJ/r3Gae/lDXg6rtq+QUpQp+OUQlNSrjm9iuygbKyVGVkG26pJNAGaKg==";
+      url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.77.2.tgz";
+      sha512 = "Qq08/2Fx31bgfQhxKomQN42mfGM9gDCd4CKDMmlCJBMZKD439LaLWlYXGevmkp0qcIU2AWFD415j7041OpkFhQ==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -64561,7 +63642,7 @@ in
       sources."reusify-1.0.4"
       sources."run-parallel-1.2.0"
       sources."safer-buffer-2.1.2"
-      sources."semver-7.6.2"
+      sources."semver-7.6.3"
       sources."to-regex-range-5.0.1"
       sources."tr46-0.0.3"
       sources."tslib-2.6.3"
@@ -64699,7 +63780,7 @@ in
       })
       (sources."cspell-lib-4.3.12" // {
         dependencies = [
-          sources."comment-json-4.2.3"
+          sources."comment-json-4.2.4"
           sources."esprima-4.0.1"
           sources."fs-extra-9.1.0"
           sources."gensequence-3.1.1"
@@ -64784,34 +63865,44 @@ in
     dependencies = [
       sources."@ampproject/remapping-2.3.0"
       sources."@babel/code-frame-7.24.7"
-      sources."@babel/compat-data-7.24.7"
-      sources."@babel/core-7.24.7"
-      sources."@babel/generator-7.24.7"
-      sources."@babel/helper-compilation-targets-7.24.7"
+      sources."@babel/compat-data-7.24.9"
+      (sources."@babel/core-7.24.9" // {
+        dependencies = [
+          sources."semver-6.3.1"
+        ];
+      })
+      sources."@babel/generator-7.24.10"
+      (sources."@babel/helper-compilation-targets-7.24.8" // {
+        dependencies = [
+          sources."lru-cache-5.1.1"
+          sources."semver-6.3.1"
+          sources."yallist-3.1.1"
+        ];
+      })
       sources."@babel/helper-environment-visitor-7.24.7"
       sources."@babel/helper-function-name-7.24.7"
       sources."@babel/helper-hoist-variables-7.24.7"
       sources."@babel/helper-module-imports-7.24.7"
-      sources."@babel/helper-module-transforms-7.24.7"
+      sources."@babel/helper-module-transforms-7.24.9"
       sources."@babel/helper-simple-access-7.24.7"
       sources."@babel/helper-split-export-declaration-7.24.7"
-      sources."@babel/helper-string-parser-7.24.7"
+      sources."@babel/helper-string-parser-7.24.8"
       sources."@babel/helper-validator-identifier-7.24.7"
-      sources."@babel/helper-validator-option-7.24.7"
-      sources."@babel/helpers-7.24.7"
+      sources."@babel/helper-validator-option-7.24.8"
+      sources."@babel/helpers-7.24.8"
       (sources."@babel/highlight-7.24.7" // {
         dependencies = [
           sources."chalk-2.4.2"
         ];
       })
-      sources."@babel/parser-7.24.7"
+      sources."@babel/parser-7.24.8"
       sources."@babel/template-7.24.7"
-      sources."@babel/traverse-7.24.7"
-      sources."@babel/types-7.24.7"
+      sources."@babel/traverse-7.24.8"
+      sources."@babel/types-7.24.9"
       sources."@jridgewell/gen-mapping-0.3.5"
       sources."@jridgewell/resolve-uri-3.1.2"
       sources."@jridgewell/set-array-1.2.1"
-      sources."@jridgewell/sourcemap-codec-1.4.15"
+      sources."@jridgewell/sourcemap-codec-1.5.0"
       sources."@jridgewell/trace-mapping-0.3.25"
       sources."@nodelib/fs.scandir-2.1.5"
       sources."@nodelib/fs.stat-2.0.5"
@@ -64823,7 +63914,7 @@ in
       sources."@types/normalize-package-data-2.4.4"
       sources."@types/parse-json-4.0.2"
       sources."@types/unist-2.0.10"
-      sources."ajv-8.16.0"
+      sources."ajv-8.17.1"
       sources."ansi-regex-5.0.1"
       sources."ansi-styles-3.2.1"
       sources."array-union-2.1.0"
@@ -64842,11 +63933,11 @@ in
         ];
       })
       sources."braces-3.0.3"
-      sources."browserslist-4.23.1"
+      sources."browserslist-4.23.2"
       sources."callsites-3.1.0"
       sources."camelcase-5.3.1"
       sources."camelcase-keys-6.2.2"
-      sources."caniuse-lite-1.0.30001634"
+      sources."caniuse-lite-1.0.30001643"
       (sources."chalk-4.1.2" // {
         dependencies = [
           sources."ansi-styles-4.3.0"
@@ -64883,7 +63974,7 @@ in
       sources."domelementtype-1.3.1"
       sources."domhandler-2.4.2"
       sources."domutils-1.7.0"
-      sources."electron-to-chromium-1.4.802"
+      sources."electron-to-chromium-1.5.1"
       sources."emoji-regex-8.0.0"
       sources."entities-1.1.2"
       sources."error-ex-1.3.2"
@@ -64894,6 +63985,7 @@ in
       sources."fast-deep-equal-3.1.3"
       sources."fast-diff-1.3.0"
       sources."fast-glob-3.3.2"
+      sources."fast-uri-3.0.1"
       sources."fastest-levenshtein-1.0.16"
       sources."fastq-1.17.1"
       sources."file-entry-cache-6.0.1"
@@ -64916,12 +64008,7 @@ in
       sources."hard-rejection-2.1.0"
       sources."has-flag-3.0.0"
       sources."hasown-2.0.2"
-      (sources."hosted-git-info-4.1.0" // {
-        dependencies = [
-          sources."lru-cache-6.0.0"
-          sources."yallist-4.0.0"
-        ];
-      })
+      sources."hosted-git-info-4.1.0"
       sources."html-tags-3.3.1"
       sources."htmlparser2-3.10.1"
       sources."ignore-5.3.1"
@@ -64940,14 +64027,14 @@ in
       sources."is-alphanumerical-1.0.4"
       sources."is-arrayish-0.2.1"
       sources."is-buffer-2.0.5"
-      sources."is-core-module-2.13.1"
+      sources."is-core-module-2.15.0"
       sources."is-decimal-1.0.4"
       sources."is-extglob-2.1.1"
       sources."is-fullwidth-code-point-3.0.0"
       sources."is-glob-4.0.3"
       sources."is-hexadecimal-1.0.4"
       sources."is-number-7.0.0"
-      sources."is-plain-obj-2.1.0"
+      sources."is-plain-obj-1.1.0"
       sources."is-regexp-2.1.0"
       sources."is-typedarray-1.0.0"
       sources."is-unicode-supported-0.1.0"
@@ -64967,7 +64054,7 @@ in
       sources."lodash.truncate-4.4.2"
       sources."log-symbols-4.1.0"
       sources."longest-streak-2.0.4"
-      sources."lru-cache-5.1.1"
+      sources."lru-cache-6.0.0"
       sources."map-obj-4.3.0"
       sources."mathml-tag-names-2.1.3"
       sources."mdast-util-from-markdown-0.8.5"
@@ -64980,18 +64067,10 @@ in
       sources."min-indent-1.0.1"
       sources."minimatch-3.1.2"
       sources."minimist-1.2.8"
-      (sources."minimist-options-4.1.0" // {
-        dependencies = [
-          sources."is-plain-obj-1.1.0"
-        ];
-      })
+      sources."minimist-options-4.1.0"
       sources."ms-2.1.2"
-      sources."node-releases-2.0.14"
-      (sources."normalize-package-data-3.0.3" // {
-        dependencies = [
-          sources."semver-7.6.2"
-        ];
-      })
+      sources."node-releases-2.0.18"
+      sources."normalize-package-data-3.0.3"
       sources."normalize-range-0.1.2"
       sources."normalize-selector-0.2.0"
       sources."num2fraction-1.2.2"
@@ -65017,14 +64096,13 @@ in
       sources."postcss-html-0.36.0"
       sources."postcss-less-3.1.4"
       sources."postcss-media-query-parser-0.2.3"
-      sources."postcss-resolve-nested-selector-0.1.1"
+      sources."postcss-resolve-nested-selector-0.1.4"
       sources."postcss-safe-parser-4.0.2"
       sources."postcss-sass-0.4.4"
       sources."postcss-scss-2.1.1"
-      sources."postcss-selector-parser-6.1.0"
+      sources."postcss-selector-parser-6.1.1"
       sources."postcss-syntax-0.36.2"
       sources."postcss-value-parser-4.2.0"
-      sources."punycode-2.3.1"
       sources."queue-microtask-1.2.3"
       sources."quick-lru-4.0.1"
       (sources."read-pkg-5.2.0" // {
@@ -65053,7 +64131,7 @@ in
       sources."rimraf-3.0.2"
       sources."run-parallel-1.2.0"
       sources."safe-buffer-5.2.1"
-      sources."semver-6.3.1"
+      sources."semver-7.6.3"
       sources."signal-exit-3.0.7"
       sources."slash-3.0.0"
       (sources."slice-ansi-4.0.0" // {
@@ -65086,12 +64164,15 @@ in
       sources."trough-1.0.5"
       sources."type-fest-0.18.1"
       sources."typedarray-to-buffer-3.1.5"
-      sources."unified-9.2.2"
+      (sources."unified-9.2.2" // {
+        dependencies = [
+          sources."is-plain-obj-2.1.0"
+        ];
+      })
       sources."unist-util-find-all-after-3.0.2"
       sources."unist-util-is-4.1.0"
       sources."unist-util-stringify-position-2.0.3"
-      sources."update-browserslist-db-1.0.16"
-      sources."uri-js-4.4.1"
+      sources."update-browserslist-db-1.1.0"
       sources."util-deprecate-1.0.2"
       sources."v8-compile-cache-2.4.0"
       sources."validate-npm-package-license-3.0.4"
@@ -65110,7 +64191,7 @@ in
       sources."which-1.3.1"
       sources."wrappy-1.0.2"
       sources."write-file-atomic-3.0.3"
-      sources."yallist-3.1.1"
+      sources."yallist-4.0.0"
       sources."yaml-1.10.2"
       sources."yargs-parser-20.2.9"
       sources."zwitch-1.0.5"
@@ -65154,7 +64235,7 @@ in
       sha512 = "0yKAPkIKoLJWksPefWXVvRcRQ+Ja3kc2Bx/tKL4tQwEOlAwc5qeUU+1FZRw+71Jp8HeC5Wo9YqtlgSIJlyic3g==";
     };
     dependencies = [
-      sources."semver-7.6.2"
+      sources."semver-7.6.3"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -65261,7 +64342,7 @@ in
       sources."hasown-2.0.2"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
-      sources."is-core-module-2.13.1"
+      sources."is-core-module-2.15.0"
       sources."js-tokens-4.0.0"
       sources."js-yaml-3.14.1"
       sources."minimatch-3.1.2"
@@ -65334,7 +64415,7 @@ in
       sha512 = "XUhAHtYOBHgLobVODFNONdJkCmFbsjS/8nMH95IQYRE0ECzwljupPOrGKBQa7OiGyWqQ5CAJfZJcbhzCHWdr+Q==";
     };
     dependencies = [
-      sources."typescript-5.4.5"
+      sources."typescript-5.5.4"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -65442,13 +64523,14 @@ in
         ];
       })
       sources."esprima-4.0.1"
-      sources."esquery-1.5.0"
+      sources."esquery-1.6.0"
       sources."esrecurse-4.3.0"
       sources."estraverse-5.3.0"
       sources."esutils-2.0.3"
       sources."fast-deep-equal-3.1.3"
       sources."fast-json-stable-stringify-2.1.0"
       sources."fast-levenshtein-2.0.6"
+      sources."fast-uri-3.0.1"
       sources."file-entry-cache-6.0.1"
       sources."flat-cache-3.2.0"
       sources."flatted-3.3.1"
@@ -65471,7 +64553,7 @@ in
       sources."imurmurhash-0.1.4"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
-      sources."is-core-module-2.13.1"
+      sources."is-core-module-2.15.0"
       sources."is-expression-4.0.0"
       sources."is-extglob-2.1.1"
       sources."is-fullwidth-code-point-3.0.0"
@@ -65512,7 +64594,7 @@ in
       sources."resolve-1.22.8"
       sources."resolve-from-4.0.0"
       sources."rimraf-3.0.2"
-      sources."semver-7.6.2"
+      sources."semver-7.6.3"
       sources."set-function-length-1.2.2"
       sources."shebang-command-2.0.0"
       sources."shebang-regex-3.0.0"
@@ -65525,7 +64607,7 @@ in
       sources."supports-preserve-symlinks-flag-1.0.0"
       (sources."table-6.8.2" // {
         dependencies = [
-          sources."ajv-8.16.0"
+          sources."ajv-8.17.1"
           sources."json-schema-traverse-1.0.0"
         ];
       })
@@ -65844,7 +64926,7 @@ in
       sha512 = "1dP4gpXFhei8IOtlXRE/T/4H88ElHgTiUzh71YUmtjTEHMSRS2Z/fgOxHSxxusGHogsRfxNq1vyAwxSC+EVyDg==";
     };
     dependencies = [
-      sources."@babel/runtime-7.24.7"
+      sources."@babel/runtime-7.24.8"
       sources."ansi-regex-5.0.1"
       sources."ansi-styles-4.3.0"
       (sources."chalk-4.1.2" // {
@@ -65928,27 +65010,24 @@ in
       sources."dot-prop-5.3.0"
       sources."escape-string-regexp-1.0.5"
       sources."find-up-simple-1.0.0"
-      sources."function-bind-1.1.2"
       sources."git-raw-commits-5.0.0"
       sources."git-semver-tags-8.0.0"
       sources."handlebars-4.7.8"
       sources."has-flag-3.0.0"
-      sources."hasown-2.0.2"
       sources."hosted-git-info-7.0.2"
       sources."index-to-position-0.1.2"
-      sources."is-core-module-2.13.1"
       sources."is-obj-2.0.0"
       sources."js-tokens-4.0.0"
-      sources."lru-cache-10.2.2"
+      sources."lru-cache-10.4.3"
       sources."meow-13.2.0"
       sources."minimist-1.2.8"
       sources."neo-async-2.6.2"
-      sources."normalize-package-data-6.0.1"
+      sources."normalize-package-data-6.0.2"
       sources."parse-json-8.1.0"
       sources."picocolors-1.0.1"
       sources."read-package-up-11.0.0"
       sources."read-pkg-9.0.1"
-      sources."semver-7.6.2"
+      sources."semver-7.6.3"
       sources."source-map-0.6.1"
       sources."spdx-correct-3.2.0"
       sources."spdx-exceptions-2.5.0"
@@ -65957,8 +65036,8 @@ in
       sources."supports-color-5.5.0"
       sources."temp-dir-3.0.0"
       sources."tempfile-5.0.0"
-      sources."type-fest-4.20.0"
-      sources."uglify-js-3.18.0"
+      sources."type-fest-4.23.0"
+      sources."uglify-js-3.19.0"
       sources."unicorn-magic-0.1.0"
       sources."validate-npm-package-license-3.0.4"
       sources."wordwrap-1.0.0"
@@ -66054,7 +65133,7 @@ in
       sources."@cycle/run-3.4.0"
       sources."@cycle/time-0.10.1"
       sources."@types/cookiejar-2.1.5"
-      sources."@types/node-20.14.2"
+      sources."@types/node-20.14.12"
       sources."@types/superagent-3.8.2"
       sources."ansi-escapes-3.2.0"
       sources."ansi-regex-2.1.1"
@@ -66142,14 +65221,14 @@ in
       sources."mute-stream-0.0.7"
       sources."next-tick-1.1.0"
       sources."object-assign-4.1.1"
-      sources."object-inspect-1.13.1"
+      sources."object-inspect-1.13.2"
       sources."object-keys-1.1.1"
       sources."onetime-2.0.1"
       sources."os-tmpdir-1.0.2"
       sources."performance-now-2.1.0"
       sources."process-nextick-args-2.0.1"
       sources."pseudomap-1.0.2"
-      sources."qs-6.12.1"
+      sources."qs-6.12.3"
       sources."quicktask-1.1.0"
       sources."raf-3.3.2"
       sources."readable-stream-2.3.8"
@@ -66224,23 +65303,23 @@ in
   cspell = nodeEnv.buildNodePackage {
     name = "cspell";
     packageName = "cspell";
-    version = "8.8.4";
+    version = "8.12.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/cspell/-/cspell-8.8.4.tgz";
-      sha512 = "eRUHiXvh4iRapw3lqE1nGOEAyYVfa/0lgK/e34SpcM/ECm4QuvbfY7Yl0ozCbiYywecog0RVbeJJUEYJTN5/Mg==";
+      url = "https://registry.npmjs.org/cspell/-/cspell-8.12.1.tgz";
+      sha512 = "mdnUUPydxxdj/uyF84U/DvPiY/l58Z2IpNwTx3H9Uve9dfT0vRv/7jiFNAvK4hAfZQaMaE7DPC00ckywTI/XgA==";
     };
     dependencies = [
-      sources."@cspell/cspell-bundled-dicts-8.8.4"
-      sources."@cspell/cspell-json-reporter-8.8.4"
-      sources."@cspell/cspell-pipe-8.8.4"
-      sources."@cspell/cspell-resolver-8.8.4"
-      sources."@cspell/cspell-service-bus-8.8.4"
-      sources."@cspell/cspell-types-8.8.4"
+      sources."@cspell/cspell-bundled-dicts-8.12.1"
+      sources."@cspell/cspell-json-reporter-8.12.1"
+      sources."@cspell/cspell-pipe-8.12.1"
+      sources."@cspell/cspell-resolver-8.12.1"
+      sources."@cspell/cspell-service-bus-8.12.1"
+      sources."@cspell/cspell-types-8.12.1"
       sources."@cspell/dict-ada-4.0.2"
-      sources."@cspell/dict-aws-4.0.2"
+      sources."@cspell/dict-aws-4.0.3"
       sources."@cspell/dict-bash-4.1.3"
-      sources."@cspell/dict-companies-3.1.2"
-      sources."@cspell/dict-cpp-5.1.9"
+      sources."@cspell/dict-companies-3.1.3"
+      sources."@cspell/dict-cpp-5.1.12"
       sources."@cspell/dict-cryptocurrencies-5.0.0"
       sources."@cspell/dict-csharp-4.0.2"
       sources."@cspell/dict-css-4.0.12"
@@ -66250,13 +65329,13 @@ in
       sources."@cspell/dict-docker-1.1.7"
       sources."@cspell/dict-dotnet-5.0.2"
       sources."@cspell/dict-elixir-4.0.3"
-      sources."@cspell/dict-en-common-misspellings-2.0.1"
+      sources."@cspell/dict-en-common-misspellings-2.0.3"
       sources."@cspell/dict-en-gb-1.1.33"
-      sources."@cspell/dict-en_us-4.3.21"
+      sources."@cspell/dict-en_us-4.3.23"
       sources."@cspell/dict-filetypes-3.0.4"
       sources."@cspell/dict-fonts-4.0.0"
       sources."@cspell/dict-fsharp-1.0.1"
-      sources."@cspell/dict-fullstack-3.1.8"
+      sources."@cspell/dict-fullstack-3.2.0"
       sources."@cspell/dict-gaming-terms-1.0.5"
       sources."@cspell/dict-git-3.0.0"
       sources."@cspell/dict-golang-6.0.9"
@@ -66266,31 +65345,32 @@ in
       sources."@cspell/dict-html-symbol-entities-4.0.0"
       sources."@cspell/dict-java-5.0.7"
       sources."@cspell/dict-julia-1.0.1"
-      sources."@cspell/dict-k8s-1.0.5"
+      sources."@cspell/dict-k8s-1.0.6"
       sources."@cspell/dict-latex-4.0.0"
       sources."@cspell/dict-lorem-ipsum-4.0.0"
       sources."@cspell/dict-lua-4.0.3"
       sources."@cspell/dict-makefile-1.0.0"
       sources."@cspell/dict-monkeyc-1.0.6"
       sources."@cspell/dict-node-5.0.1"
-      sources."@cspell/dict-npm-5.0.16"
+      sources."@cspell/dict-npm-5.0.18"
       sources."@cspell/dict-php-4.0.8"
-      sources."@cspell/dict-powershell-5.0.4"
+      sources."@cspell/dict-powershell-5.0.5"
       sources."@cspell/dict-public-licenses-2.0.7"
-      sources."@cspell/dict-python-4.2.1"
+      sources."@cspell/dict-python-4.2.3"
       sources."@cspell/dict-r-2.0.1"
       sources."@cspell/dict-ruby-5.0.2"
-      sources."@cspell/dict-rust-4.0.4"
-      sources."@cspell/dict-scala-5.0.2"
-      sources."@cspell/dict-software-terms-3.4.6"
+      sources."@cspell/dict-rust-4.0.5"
+      sources."@cspell/dict-scala-5.0.3"
+      sources."@cspell/dict-software-terms-4.0.3"
       sources."@cspell/dict-sql-2.1.3"
       sources."@cspell/dict-svelte-1.0.2"
       sources."@cspell/dict-swift-2.0.1"
       sources."@cspell/dict-terraform-1.0.0"
-      sources."@cspell/dict-typescript-3.1.5"
+      sources."@cspell/dict-typescript-3.1.6"
       sources."@cspell/dict-vue-3.0.0"
-      sources."@cspell/dynamic-import-8.8.4"
-      sources."@cspell/strong-weak-map-8.8.4"
+      sources."@cspell/dynamic-import-8.12.1"
+      sources."@cspell/strong-weak-map-8.12.1"
+      sources."@cspell/url-8.12.1"
       sources."@nodelib/fs.scandir-2.1.5"
       sources."@nodelib/fs.stat-2.0.5"
       sources."@nodelib/fs.walk-1.2.8"
@@ -66302,26 +65382,26 @@ in
       sources."chalk-template-1.1.0"
       sources."clear-module-4.1.2"
       sources."commander-12.1.0"
-      sources."comment-json-4.2.3"
+      sources."comment-json-4.2.4"
       sources."core-util-is-1.0.3"
-      sources."cspell-config-lib-8.8.4"
-      sources."cspell-dictionary-8.8.4"
-      sources."cspell-gitignore-8.8.4"
-      sources."cspell-glob-8.8.4"
-      sources."cspell-grammar-8.8.4"
-      sources."cspell-io-8.8.4"
-      sources."cspell-lib-8.8.4"
-      sources."cspell-trie-lib-8.8.4"
+      sources."cspell-config-lib-8.12.1"
+      sources."cspell-dictionary-8.12.1"
+      sources."cspell-gitignore-8.12.1"
+      sources."cspell-glob-8.12.1"
+      sources."cspell-grammar-8.12.1"
+      sources."cspell-io-8.12.1"
+      sources."cspell-lib-8.12.1"
+      sources."cspell-trie-lib-8.12.1"
       sources."env-paths-3.0.0"
       sources."esprima-4.0.1"
       sources."fast-equals-5.0.1"
       sources."fast-glob-3.3.2"
       sources."fast-json-stable-stringify-2.1.0"
       sources."fastq-1.17.1"
-      sources."file-entry-cache-8.0.0"
+      sources."file-entry-cache-9.0.0"
       sources."fill-range-7.1.1"
       sources."find-up-simple-1.0.0"
-      sources."flat-cache-4.0.1"
+      sources."flat-cache-5.0.0"
       sources."flatted-3.3.1"
       sources."gensequence-7.0.0"
       sources."get-stdin-9.0.0"
@@ -66350,13 +65430,13 @@ in
       sources."resolve-from-5.0.0"
       sources."reusify-1.0.4"
       sources."run-parallel-1.2.0"
-      sources."semver-7.6.2"
+      sources."semver-7.6.3"
       sources."strip-ansi-7.1.0"
       sources."to-regex-range-5.0.1"
       sources."vscode-languageserver-textdocument-1.0.11"
       sources."vscode-uri-3.0.8"
       sources."xdg-basedir-5.1.0"
-      sources."yaml-2.4.5"
+      sources."yaml-2.5.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -66494,15 +65574,15 @@ in
   dotenv-vault = nodeEnv.buildNodePackage {
     name = "dotenv-vault";
     packageName = "dotenv-vault";
-    version = "1.26.1";
+    version = "1.26.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/dotenv-vault/-/dotenv-vault-1.26.1.tgz";
-      sha512 = "v+RK6LXpJQWhaelTT2s0b5FQB0qziRBuGCrAgAeDHtgkDEA0NqF7OXYXsrnKTuCPnwBg0FmNJr4lZebCpJnrFA==";
+      url = "https://registry.npmjs.org/dotenv-vault/-/dotenv-vault-1.26.2.tgz";
+      sha512 = "nURqmc3kii3kqiZXcBYdt0QrjpXBjXWtzevCwC9FRbIjwKenGoN/bZHC9l9ueYI3gGoKjgt/1Cmno6HvzgMlDA==";
     };
     dependencies = [
       sources."@cspotcode/source-map-support-0.8.1"
       sources."@jridgewell/resolve-uri-3.1.2"
-      sources."@jridgewell/sourcemap-codec-1.4.15"
+      sources."@jridgewell/sourcemap-codec-1.5.0"
       sources."@jridgewell/trace-mapping-0.3.9"
       sources."@nodelib/fs.scandir-2.1.5"
       sources."@nodelib/fs.stat-2.0.5"
@@ -66530,18 +65610,18 @@ in
         ];
       })
       sources."@oclif/screen-3.0.8"
-      sources."@swc/core-1.5.29"
+      sources."@swc/core-1.7.1"
       sources."@swc/counter-0.1.3"
-      sources."@swc/helpers-0.5.11"
-      sources."@swc/types-0.1.8"
-      sources."@swc/wasm-1.5.29"
+      sources."@swc/helpers-0.5.12"
+      sources."@swc/types-0.1.12"
+      sources."@swc/wasm-1.7.1"
       sources."@tsconfig/node10-1.0.11"
       sources."@tsconfig/node12-1.0.11"
       sources."@tsconfig/node14-1.0.3"
       sources."@tsconfig/node16-1.0.4"
-      sources."@types/cli-progress-3.11.5"
-      sources."@types/node-20.14.2"
-      sources."acorn-8.12.0"
+      sources."@types/cli-progress-3.11.6"
+      sources."@types/node-20.14.12"
+      sources."acorn-8.12.1"
       sources."acorn-walk-8.3.3"
       sources."ansi-escapes-4.3.2"
       sources."ansi-regex-5.0.1"
@@ -66645,7 +65725,7 @@ in
       sources."is-unicode-supported-0.1.0"
       sources."is-wsl-2.2.0"
       sources."isexe-2.0.0"
-      sources."jake-10.9.1"
+      sources."jake-10.9.2"
       sources."js-yaml-3.14.1"
       sources."json-parse-better-errors-1.0.2"
       sources."jsonfile-6.1.0"
@@ -66693,7 +65773,7 @@ in
       sources."rxjs-7.8.1"
       sources."safe-buffer-5.2.1"
       sources."safer-buffer-2.1.2"
-      sources."semver-7.6.2"
+      sources."semver-7.6.3"
       sources."shebang-command-2.0.0"
       sources."shebang-regex-3.0.0"
       sources."signal-exit-3.0.7"
@@ -66718,7 +65798,7 @@ in
       sources."tslib-2.6.3"
       sources."tunnel-agent-0.6.0"
       sources."type-fest-0.21.3"
-      sources."typescript-5.4.5"
+      sources."typescript-5.5.4"
       sources."undici-types-5.26.5"
       sources."universalify-2.0.1"
       sources."util-deprecate-1.0.2"
@@ -66744,10 +65824,10 @@ in
   elasticdump = nodeEnv.buildNodePackage {
     name = "elasticdump";
     packageName = "elasticdump";
-    version = "6.110.0";
+    version = "6.111.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.110.0.tgz";
-      sha512 = "PxA3Q5OMndTlmFyrf7s/u+aAjOxQF+T5WIN3wzQUfwJ4gVSFC6qMuRT6Zhue24fDzE17v53voT572aooNCPYQw==";
+      url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.111.0.tgz";
+      sha512 = "nvcobmgSuPm+TwoilMVL5tjJW4ikI55uHFQS+dbHUc35HrMunPdgSeICCK+McNW+YL9bKe/1DSJxCpqzxwyVYA==";
     };
     dependencies = [
       sources."@fast-csv/format-4.3.5"
@@ -66842,7 +65922,7 @@ in
       sources."mime-types-2.1.35"
       sources."minimist-1.2.8"
       sources."oauth-sign-0.9.0"
-      sources."object-inspect-1.13.1"
+      sources."object-inspect-1.13.2"
       sources."p-finally-1.0.0"
       sources."p-queue-6.6.2"
       sources."p-timeout-3.2.0"
@@ -66956,7 +66036,7 @@ in
           sources."commander-5.1.0"
         ];
       })
-      (sources."@electron/get-3.0.0" // {
+      (sources."@electron/get-3.1.0" // {
         dependencies = [
           sources."fs-extra-8.1.0"
           sources."jsonfile-4.0.0"
@@ -66969,8 +66049,8 @@ in
           sources."fs-extra-9.1.0"
         ];
       })
-      sources."@electron/osx-sign-1.3.0"
-      (sources."@electron/packager-18.3.2" // {
+      sources."@electron/osx-sign-1.3.1"
+      (sources."@electron/packager-18.3.3" // {
         dependencies = [
           sources."fs-extra-11.2.0"
         ];
@@ -66980,10 +66060,10 @@ in
         dependencies = [
           sources."brace-expansion-2.0.1"
           sources."fs-extra-11.2.0"
-          sources."minimatch-9.0.4"
+          sources."minimatch-9.0.5"
         ];
       })
-      (sources."@electron/windows-sign-1.1.2" // {
+      (sources."@electron/windows-sign-1.1.3" // {
         dependencies = [
           sources."fs-extra-11.2.0"
         ];
@@ -67001,7 +66081,7 @@ in
       sources."@types/cacheable-request-6.0.3"
       sources."@types/http-cache-semantics-4.0.4"
       sources."@types/keyv-3.1.4"
-      sources."@types/node-20.14.2"
+      sources."@types/node-20.14.12"
       sources."@types/responselike-1.0.3"
       sources."@types/yauzl-2.10.3"
       sources."@xmldom/xmldom-0.8.10"
@@ -67009,11 +66089,7 @@ in
       sources."agent-base-6.0.2"
       sources."agentkeepalive-4.5.0"
       sources."aggregate-error-3.1.0"
-      (sources."ansi-escapes-5.0.0" // {
-        dependencies = [
-          sources."type-fest-1.4.0"
-        ];
-      })
+      sources."ansi-escapes-5.0.0"
       sources."ansi-regex-5.0.1"
       sources."ansi-styles-4.3.0"
       sources."aproba-2.0.0"
@@ -67024,7 +66100,6 @@ in
       sources."base64-js-1.5.1"
       sources."bl-4.1.0"
       sources."bluebird-3.7.2"
-      sources."boolean-3.2.0"
       sources."brace-expansion-1.1.11"
       sources."braces-3.0.3"
       sources."buffer-5.7.1"
@@ -67078,11 +66153,8 @@ in
       })
       sources."defaults-1.0.4"
       sources."defer-to-connect-2.0.1"
-      sources."define-data-property-1.1.4"
-      sources."define-properties-1.2.1"
       sources."delegates-1.0.0"
       sources."detect-libc-2.0.3"
-      sources."detect-node-2.1.0"
       sources."dir-compare-4.2.0"
       sources."eastasianwidth-0.2.0"
       sources."emoji-regex-8.0.0"
@@ -67091,9 +66163,6 @@ in
       sources."env-paths-2.2.1"
       sources."err-code-2.0.3"
       sources."error-ex-1.3.2"
-      sources."es-define-property-1.0.0"
-      sources."es-errors-1.3.0"
-      sources."es6-error-4.1.1"
       sources."escalade-3.1.2"
       sources."escape-string-regexp-1.0.5"
       sources."eventemitter3-5.0.1"
@@ -67133,7 +66202,6 @@ in
       sources."gauge-4.0.4"
       sources."get-caller-file-2.0.5"
       sources."get-installed-path-2.1.1"
-      sources."get-intrinsic-1.2.4"
       (sources."get-package-info-1.0.0" // {
         dependencies = [
           sources."debug-2.6.9"
@@ -67142,21 +66210,15 @@ in
       sources."get-stream-5.2.0"
       sources."glob-7.2.3"
       sources."glob-parent-5.1.2"
-      sources."global-agent-3.0.0"
       sources."global-modules-1.0.0"
       (sources."global-prefix-1.0.2" // {
         dependencies = [
           sources."which-1.3.1"
         ];
       })
-      sources."globalthis-1.0.4"
-      sources."gopd-1.0.1"
       sources."got-11.8.6"
       sources."graceful-fs-4.2.11"
       sources."has-flag-4.0.0"
-      sources."has-property-descriptors-1.0.2"
-      sources."has-proto-1.0.3"
-      sources."has-symbols-1.0.3"
       sources."has-unicode-2.0.1"
       sources."hasown-2.0.2"
       sources."homedir-polyfill-1.0.3"
@@ -67177,7 +66239,7 @@ in
       sources."interpret-3.1.1"
       sources."ip-address-9.0.5"
       sources."is-arrayish-0.2.1"
-      sources."is-core-module-2.13.1"
+      sources."is-core-module-2.15.0"
       sources."is-extglob-2.1.1"
       sources."is-fullwidth-code-point-3.0.0"
       sources."is-glob-4.0.3"
@@ -67191,7 +66253,6 @@ in
       sources."isexe-2.0.0"
       sources."jsbn-1.1.0"
       sources."json-buffer-3.0.1"
-      sources."json-stringify-safe-5.0.1"
       sources."jsonfile-6.1.0"
       sources."junk-3.1.0"
       sources."keyv-4.5.4"
@@ -67226,11 +66287,6 @@ in
       sources."lru-cache-7.18.3"
       sources."make-fetch-happen-10.2.1"
       sources."map-age-cleaner-0.1.3"
-      (sources."matcher-3.0.0" // {
-        dependencies = [
-          sources."escape-string-regexp-4.0.0"
-        ];
-      })
       sources."mem-4.3.0"
       sources."merge2-1.4.1"
       sources."micromatch-4.0.7"
@@ -67266,7 +66322,6 @@ in
         ];
       })
       sources."npmlog-6.0.2"
-      sources."object-keys-1.1.1"
       sources."once-1.4.0"
       sources."onetime-5.1.2"
       sources."ora-5.4.1"
@@ -67337,13 +66392,10 @@ in
       sources."reusify-1.0.4"
       sources."rfdc-1.4.1"
       sources."rimraf-3.0.2"
-      sources."roarr-2.15.4"
       sources."run-parallel-1.2.0"
       sources."safe-buffer-5.2.1"
       sources."safer-buffer-2.1.2"
-      sources."semver-7.6.2"
-      sources."semver-compare-1.0.0"
-      sources."serialize-error-7.0.1"
+      sources."semver-7.6.3"
       sources."set-blocking-2.0.0"
       sources."shebang-command-2.0.0"
       sources."shebang-regex-3.0.0"
@@ -67383,7 +66435,7 @@ in
       sources."to-regex-range-5.0.1"
       sources."tr46-0.0.3"
       sources."trim-repeated-1.0.0"
-      sources."type-fest-0.13.1"
+      sources."type-fest-1.4.0"
       sources."undici-types-5.26.5"
       sources."unique-filename-2.0.1"
       sources."unique-slug-3.0.0"
@@ -67429,10 +66481,10 @@ in
   eas-cli = nodeEnv.buildNodePackage {
     name = "eas-cli";
     packageName = "eas-cli";
-    version = "10.0.0";
+    version = "10.2.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/eas-cli/-/eas-cli-10.0.0.tgz";
-      sha512 = "N0s3BcFHBTOKYST7bzPvcMa7cGA7B7hDTOh+NgfkPB6qavGPgSFwbQo8c8BHFXI1iWw8vvjhh24/OEt06dFjOw==";
+      url = "https://registry.npmjs.org/eas-cli/-/eas-cli-10.2.1.tgz";
+      sha512 = "ayiCnxv58RYFPgYtgDhzcTIsJuN4CWFIl0IR1zMLlau/tNQxR6AnXTyF+XNUYEIHMaLwc1TDsZ5DlZu9e/2sXg==";
     };
     dependencies = [
       sources."@0no-co/graphql.web-1.0.7"
@@ -67453,7 +66505,7 @@ in
           sources."@jridgewell/trace-mapping-0.3.9"
         ];
       })
-      sources."@expo/apple-utils-1.7.0"
+      sources."@expo/apple-utils-1.7.1"
       (sources."@expo/bunyan-4.0.0" // {
         dependencies = [
           sources."uuid-8.3.2"
@@ -67476,13 +66528,13 @@ in
         ];
       })
       sources."@expo/config-types-50.0.0"
-      (sources."@expo/eas-build-job-1.0.117" // {
+      (sources."@expo/eas-build-job-1.0.119" // {
         dependencies = [
-          sources."joi-17.13.1"
-          sources."semver-7.6.2"
+          sources."joi-17.13.3"
+          sources."semver-7.6.3"
         ];
       })
-      (sources."@expo/eas-json-10.0.0" // {
+      (sources."@expo/eas-json-10.0.3" // {
         dependencies = [
           (sources."@babel/code-frame-7.23.5" // {
             dependencies = [
@@ -67566,10 +66618,10 @@ in
       })
       sources."@expo/sdk-runtime-versions-1.0.0"
       sources."@expo/spawn-async-1.7.0"
-      (sources."@expo/steps-1.0.117" // {
+      (sources."@expo/steps-1.0.119" // {
         dependencies = [
           sources."@expo/spawn-async-1.7.2"
-          sources."joi-17.13.1"
+          sources."joi-17.13.3"
         ];
       })
       sources."@expo/timeago.js-1.0.0"
@@ -67578,7 +66630,7 @@ in
       sources."@jridgewell/gen-mapping-0.3.5"
       sources."@jridgewell/resolve-uri-3.1.2"
       sources."@jridgewell/set-array-1.2.1"
-      sources."@jridgewell/sourcemap-codec-1.4.15"
+      sources."@jridgewell/sourcemap-codec-1.5.0"
       sources."@jridgewell/trace-mapping-0.3.25"
       sources."@nodelib/fs.scandir-2.1.5"
       sources."@nodelib/fs.stat-2.0.5"
@@ -67598,27 +66650,27 @@ in
       })
       sources."@oclif/screen-3.0.8"
       sources."@react-native/normalize-color-2.1.0"
-      sources."@segment/ajv-human-errors-2.12.0"
+      sources."@segment/ajv-human-errors-2.13.0"
       sources."@segment/loosely-validate-event-2.0.0"
       sources."@sideway/address-4.1.5"
       sources."@sideway/formula-3.0.1"
       sources."@sideway/pinpoint-2.0.0"
-      sources."@swc/core-1.5.29"
+      sources."@swc/core-1.7.1"
       sources."@swc/counter-0.1.3"
-      sources."@swc/helpers-0.5.11"
-      sources."@swc/types-0.1.8"
-      sources."@swc/wasm-1.5.29"
+      sources."@swc/helpers-0.5.12"
+      sources."@swc/types-0.1.12"
+      sources."@swc/wasm-1.7.1"
       sources."@tsconfig/node10-1.0.11"
       sources."@tsconfig/node12-1.0.11"
       sources."@tsconfig/node14-1.0.3"
       sources."@tsconfig/node16-1.0.4"
       sources."@types/bunyan-1.8.11"
-      sources."@types/cli-progress-3.11.5"
-      sources."@types/node-20.14.2"
+      sources."@types/cli-progress-3.11.6"
+      sources."@types/node-20.14.12"
       sources."@urql/core-4.0.11"
       sources."@urql/exchange-retry-1.2.0"
       sources."@xmldom/xmldom-0.7.13"
-      sources."acorn-8.12.0"
+      sources."acorn-8.12.1"
       sources."acorn-walk-8.3.3"
       sources."agent-base-6.0.2"
       sources."ajv-8.11.0"
@@ -67760,7 +66812,7 @@ in
       sources."is-unicode-supported-0.1.0"
       sources."is-wsl-2.2.0"
       sources."isexe-2.0.0"
-      (sources."jake-10.9.1" // {
+      (sources."jake-10.9.2" // {
         dependencies = [
           sources."brace-expansion-1.1.11"
           sources."minimatch-3.1.2"
@@ -67772,7 +66824,7 @@ in
       sources."join-component-1.1.0"
       sources."js-tokens-4.0.0"
       sources."js-yaml-3.14.1"
-      sources."jsep-1.3.8"
+      sources."jsep-1.3.9"
       sources."json-parse-better-errors-1.0.2"
       sources."json-schema-traverse-1.0.0"
       sources."json5-2.2.3"
@@ -67934,7 +66986,7 @@ in
       sources."tunnel-agent-0.6.0"
       sources."turndown-7.1.2"
       sources."type-fest-0.21.3"
-      sources."typescript-5.4.5"
+      sources."typescript-5.5.4"
       sources."undici-types-5.26.5"
       sources."unique-string-1.0.0"
       sources."universalify-2.0.1"
@@ -67965,7 +67017,7 @@ in
       })
       sources."xmlbuilder-14.0.0"
       sources."yallist-4.0.0"
-      sources."yaml-2.4.5"
+      sources."yaml-2.5.0"
       sources."yn-3.1.1"
       sources."yocto-queue-0.1.0"
       sources."zod-3.23.8"
@@ -68010,7 +67062,7 @@ in
       sources."@alcalzone/ansi-tokenize-0.1.3"
       sources."@types/prop-types-15.7.12"
       sources."@types/react-18.3.3"
-      sources."ajv-8.16.0"
+      sources."ajv-8.17.1"
       sources."ajv-formats-2.1.1"
       sources."ansi-escapes-7.0.0"
       sources."ansi-regex-6.0.1"
@@ -68041,6 +67093,7 @@ in
       sources."escape-string-regexp-2.0.0"
       sources."execa-8.0.1"
       sources."fast-deep-equal-3.1.3"
+      sources."fast-uri-3.0.1"
       sources."get-east-asian-width-1.2.0"
       sources."get-stream-8.0.1"
       sources."human-signals-5.0.0"
@@ -68048,12 +67101,12 @@ in
       (sources."ink-5.0.1" // {
         dependencies = [
           sources."signal-exit-3.0.7"
-          sources."type-fest-4.20.0"
+          sources."type-fest-4.23.0"
         ];
       })
       (sources."ink-text-input-6.0.0" // {
         dependencies = [
-          sources."type-fest-4.20.0"
+          sources."type-fest-4.23.0"
         ];
       })
       sources."is-docker-3.0.0"
@@ -68084,12 +67137,11 @@ in
       sources."p-defer-1.0.0"
       sources."patch-console-2.0.0"
       sources."path-key-3.1.1"
-      sources."punycode-2.3.1"
       sources."react-18.3.1"
       (sources."react-devtools-core-4.28.5" // {
         dependencies = [
           sources."utf-8-validate-5.0.10"
-          sources."ws-7.5.9"
+          sources."ws-7.5.10"
         ];
       })
       sources."react-reconciler-0.29.2"
@@ -68102,7 +67154,7 @@ in
         ];
       })
       sources."scheduler-0.23.2"
-      sources."semver-7.6.2"
+      sources."semver-7.6.3"
       sources."shebang-command-2.0.0"
       sources."shebang-regex-3.0.0"
       sources."shell-quote-1.8.1"
@@ -68114,7 +67166,7 @@ in
         ];
       })
       sources."stack-utils-2.0.6"
-      sources."string-width-7.1.0"
+      sources."string-width-7.2.0"
       sources."strip-ansi-7.1.0"
       sources."strip-final-newline-3.0.0"
       sources."stubborn-fs-1.2.5"
@@ -68122,13 +67174,12 @@ in
       sources."type-fest-3.13.1"
       sources."uint8array-extras-0.3.0"
       sources."unicode-emoji-json-0.6.0"
-      sources."uri-js-4.4.1"
       sources."utf-8-validate-6.0.4"
-      sources."when-exit-2.1.2"
+      sources."when-exit-2.1.3"
       sources."which-2.0.2"
       sources."widest-line-5.0.0"
       sources."wrap-ansi-9.0.0"
-      sources."ws-8.17.0"
+      sources."ws-8.18.0"
       sources."yoga-wasm-web-0.3.3"
     ];
     buildInputs = globalBuildInputs;
@@ -68179,10 +67230,10 @@ in
   eslint = nodeEnv.buildNodePackage {
     name = "eslint";
     packageName = "eslint";
-    version = "9.5.0";
+    version = "9.7.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/eslint/-/eslint-9.5.0.tgz";
-      sha512 = "+NAOZFrW/jFTS3dASCGBxX1pkFD0/fsO+hfAkJ4TyYKwgsXZbqzrw+seCYFCcPCYXvnD67tAnglU7GQTz6kcVw==";
+      url = "https://registry.npmjs.org/eslint/-/eslint-9.7.0.tgz";
+      sha512 = "FzJ9D/0nGiCGBf8UXO/IGLTgLVzIxze1zpfA8Ton2mjLovXdAPlYDv+MQDcqj3TmrhAGYfOpz9RfR+ent0AgAw==";
     };
     dependencies = [
       (sources."@eslint-community/eslint-utils-4.4.0" // {
@@ -68190,17 +67241,17 @@ in
           sources."eslint-visitor-keys-3.4.3"
         ];
       })
-      sources."@eslint-community/regexpp-4.10.1"
-      sources."@eslint/config-array-0.16.0"
+      sources."@eslint-community/regexpp-4.11.0"
+      sources."@eslint/config-array-0.17.1"
       sources."@eslint/eslintrc-3.1.0"
-      sources."@eslint/js-9.5.0"
+      sources."@eslint/js-9.7.0"
       sources."@eslint/object-schema-2.1.4"
       sources."@humanwhocodes/module-importer-1.0.1"
       sources."@humanwhocodes/retry-0.3.0"
       sources."@nodelib/fs.scandir-2.1.5"
       sources."@nodelib/fs.stat-2.0.5"
       sources."@nodelib/fs.walk-1.2.8"
-      sources."acorn-8.12.0"
+      sources."acorn-8.12.1"
       sources."acorn-jsx-5.3.2"
       sources."ajv-6.12.6"
       sources."ansi-regex-5.0.1"
@@ -68217,11 +67268,11 @@ in
       sources."debug-4.3.5"
       sources."deep-is-0.1.4"
       sources."escape-string-regexp-4.0.0"
-      sources."eslint-9.5.0"
-      sources."eslint-scope-8.0.1"
+      sources."eslint-9.7.0"
+      sources."eslint-scope-8.0.2"
       sources."eslint-visitor-keys-4.0.0"
-      sources."espree-10.0.1"
-      sources."esquery-1.5.0"
+      sources."espree-10.1.0"
+      sources."esquery-1.6.0"
       sources."esrecurse-4.3.0"
       sources."estraverse-5.3.0"
       sources."esutils-2.0.3"
@@ -68315,26 +67366,24 @@ in
     };
     dependencies = [
       sources."@ampproject/remapping-2.3.0"
-      sources."@babel/code-frame-7.10.4"
-      sources."@babel/compat-data-7.24.7"
-      (sources."@babel/core-7.24.7" // {
+      sources."@babel/code-frame-7.24.7"
+      sources."@babel/compat-data-7.24.9"
+      (sources."@babel/core-7.24.9" // {
         dependencies = [
-          sources."@babel/code-frame-7.24.7"
-          sources."json5-2.2.3"
+          sources."debug-4.3.5"
+          sources."ms-2.1.2"
           sources."semver-6.3.1"
         ];
       })
-      sources."@babel/generator-7.24.7"
+      sources."@babel/generator-7.24.10"
       sources."@babel/helper-annotate-as-pure-7.24.7"
       sources."@babel/helper-builder-binary-assignment-operator-visitor-7.24.7"
-      (sources."@babel/helper-compilation-targets-7.24.7" // {
+      (sources."@babel/helper-compilation-targets-7.24.8" // {
         dependencies = [
-          sources."lru-cache-5.1.1"
           sources."semver-6.3.1"
-          sources."yallist-3.1.1"
         ];
       })
-      (sources."@babel/helper-create-class-features-plugin-7.24.7" // {
+      (sources."@babel/helper-create-class-features-plugin-7.24.8" // {
         dependencies = [
           sources."semver-6.3.1"
         ];
@@ -68344,31 +67393,37 @@ in
           sources."semver-6.3.1"
         ];
       })
-      sources."@babel/helper-define-polyfill-provider-0.6.2"
+      (sources."@babel/helper-define-polyfill-provider-0.6.2" // {
+        dependencies = [
+          sources."debug-4.3.5"
+          sources."ms-2.1.2"
+          sources."resolve-1.22.8"
+        ];
+      })
       sources."@babel/helper-environment-visitor-7.24.7"
       sources."@babel/helper-function-name-7.24.7"
       sources."@babel/helper-hoist-variables-7.24.7"
-      sources."@babel/helper-member-expression-to-functions-7.24.7"
+      sources."@babel/helper-member-expression-to-functions-7.24.8"
       sources."@babel/helper-module-imports-7.24.7"
-      sources."@babel/helper-module-transforms-7.24.7"
+      sources."@babel/helper-module-transforms-7.24.9"
       sources."@babel/helper-optimise-call-expression-7.24.7"
-      sources."@babel/helper-plugin-utils-7.24.7"
+      sources."@babel/helper-plugin-utils-7.24.8"
       sources."@babel/helper-remap-async-to-generator-7.24.7"
       sources."@babel/helper-replace-supers-7.24.7"
       sources."@babel/helper-simple-access-7.24.7"
       sources."@babel/helper-skip-transparent-expression-wrappers-7.24.7"
       sources."@babel/helper-split-export-declaration-7.24.7"
-      sources."@babel/helper-string-parser-7.24.7"
+      sources."@babel/helper-string-parser-7.24.8"
       sources."@babel/helper-validator-identifier-7.24.7"
-      sources."@babel/helper-validator-option-7.24.7"
+      sources."@babel/helper-validator-option-7.24.8"
       sources."@babel/helper-wrap-function-7.24.7"
-      sources."@babel/helpers-7.24.7"
+      sources."@babel/helpers-7.24.8"
       (sources."@babel/highlight-7.24.7" // {
         dependencies = [
           sources."chalk-2.4.2"
         ];
       })
-      sources."@babel/parser-7.24.7"
+      sources."@babel/parser-7.24.8"
       sources."@babel/plugin-bugfix-firefox-class-in-computed-class-key-7.24.7"
       sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.24.7"
       sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.24.7"
@@ -68412,9 +67467,9 @@ in
       sources."@babel/plugin-transform-block-scoping-7.24.7"
       sources."@babel/plugin-transform-class-properties-7.24.7"
       sources."@babel/plugin-transform-class-static-block-7.24.7"
-      sources."@babel/plugin-transform-classes-7.24.7"
+      sources."@babel/plugin-transform-classes-7.24.8"
       sources."@babel/plugin-transform-computed-properties-7.24.7"
-      sources."@babel/plugin-transform-destructuring-7.24.7"
+      sources."@babel/plugin-transform-destructuring-7.24.8"
       sources."@babel/plugin-transform-dotall-regex-7.24.7"
       sources."@babel/plugin-transform-duplicate-keys-7.24.7"
       sources."@babel/plugin-transform-dynamic-import-7.24.7"
@@ -68428,7 +67483,7 @@ in
       sources."@babel/plugin-transform-logical-assignment-operators-7.24.7"
       sources."@babel/plugin-transform-member-expression-literals-7.24.7"
       sources."@babel/plugin-transform-modules-amd-7.24.7"
-      sources."@babel/plugin-transform-modules-commonjs-7.24.7"
+      sources."@babel/plugin-transform-modules-commonjs-7.24.8"
       sources."@babel/plugin-transform-modules-systemjs-7.24.7"
       sources."@babel/plugin-transform-modules-umd-7.24.7"
       sources."@babel/plugin-transform-named-capturing-groups-regex-7.24.7"
@@ -68438,7 +67493,7 @@ in
       sources."@babel/plugin-transform-object-rest-spread-7.24.7"
       sources."@babel/plugin-transform-object-super-7.24.7"
       sources."@babel/plugin-transform-optional-catch-binding-7.24.7"
-      sources."@babel/plugin-transform-optional-chaining-7.24.7"
+      sources."@babel/plugin-transform-optional-chaining-7.24.8"
       sources."@babel/plugin-transform-parameters-7.24.7"
       sources."@babel/plugin-transform-private-methods-7.24.7"
       sources."@babel/plugin-transform-private-property-in-object-7.24.7"
@@ -68458,36 +67513,38 @@ in
       sources."@babel/plugin-transform-spread-7.24.7"
       sources."@babel/plugin-transform-sticky-regex-7.24.7"
       sources."@babel/plugin-transform-template-literals-7.24.7"
-      sources."@babel/plugin-transform-typeof-symbol-7.24.7"
-      sources."@babel/plugin-transform-typescript-7.24.7"
+      sources."@babel/plugin-transform-typeof-symbol-7.24.8"
+      sources."@babel/plugin-transform-typescript-7.24.8"
       sources."@babel/plugin-transform-unicode-escapes-7.24.7"
       sources."@babel/plugin-transform-unicode-property-regex-7.24.7"
       sources."@babel/plugin-transform-unicode-regex-7.24.7"
       sources."@babel/plugin-transform-unicode-sets-regex-7.24.7"
-      (sources."@babel/preset-env-7.24.7" // {
+      (sources."@babel/preset-env-7.24.8" // {
         dependencies = [
           sources."semver-6.3.1"
         ];
       })
       sources."@babel/preset-modules-0.1.6-no-external-plugins"
       sources."@babel/regjsgen-0.8.0"
-      sources."@babel/runtime-7.9.0"
-      (sources."@babel/template-7.24.7" // {
+      (sources."@babel/runtime-7.9.0" // {
         dependencies = [
-          sources."@babel/code-frame-7.24.7"
+          sources."regenerator-runtime-0.13.11"
         ];
       })
-      (sources."@babel/traverse-7.24.7" // {
+      sources."@babel/template-7.24.7"
+      (sources."@babel/traverse-7.24.8" // {
         dependencies = [
-          sources."@babel/code-frame-7.24.7"
+          sources."debug-4.3.5"
+          sources."ms-2.1.2"
         ];
       })
-      sources."@babel/types-7.24.7"
+      sources."@babel/types-7.24.9"
       sources."@expo/apple-utils-1.0.0"
       sources."@expo/bunyan-4.0.0"
       (sources."@expo/cli-0.7.3" // {
         dependencies = [
-          sources."@babel/runtime-7.24.7"
+          sources."@babel/code-frame-7.10.4"
+          sources."@babel/runtime-7.24.8"
           (sources."@expo/config-8.0.5" // {
             dependencies = [
               sources."semver-7.3.2"
@@ -68495,10 +67552,9 @@ in
           })
           (sources."@expo/config-plugins-6.0.2" // {
             dependencies = [
-              sources."semver-7.6.2"
+              sources."semver-7.6.3"
             ];
           })
-          sources."@expo/config-types-48.0.0"
           (sources."@expo/dev-server-0.3.0" // {
             dependencies = [
               sources."fs-extra-9.0.0"
@@ -68519,12 +67575,13 @@ in
                   sources."universalify-2.0.1"
                 ];
               })
+              sources."mime-2.6.0"
               sources."semver-7.3.2"
+              sources."temp-dir-1.0.0"
               sources."tempy-0.3.0"
               sources."universalify-1.0.0"
             ];
           })
-          sources."@expo/metro-config-0.7.1"
           sources."@expo/package-manager-1.0.3"
           (sources."@expo/prebuild-config-6.0.1" // {
             dependencies = [
@@ -68535,21 +67592,51 @@ in
             ];
           })
           sources."ansi-regex-5.0.1"
+          (sources."body-parser-1.20.2" // {
+            dependencies = [
+              sources."debug-2.6.9"
+              sources."ms-2.0.0"
+            ];
+          })
           sources."bplist-parser-0.3.2"
+          sources."bytes-3.1.2"
+          (sources."debug-4.3.5" // {
+            dependencies = [
+              sources."ms-2.1.2"
+            ];
+          })
+          sources."depd-2.0.0"
+          sources."destroy-1.2.0"
           sources."form-data-3.0.1"
           sources."fs-extra-8.1.0"
-          sources."jsonfile-4.0.0"
+          sources."http-errors-2.0.0"
+          sources."iconv-lite-0.4.24"
+          sources."mime-1.6.0"
+          sources."ms-2.1.3"
           sources."node-forge-1.3.1"
           (sources."npm-package-arg-7.0.0" // {
             dependencies = [
               sources."semver-5.7.2"
             ];
           })
-          sources."regenerator-runtime-0.14.1"
+          sources."on-finished-2.4.1"
+          sources."qs-6.11.0"
+          sources."raw-body-2.5.2"
           sources."semver-6.3.1"
-          sources."temp-dir-1.0.0"
-          sources."type-fest-0.3.1"
-          sources."universalify-0.1.2"
+          (sources."send-0.18.0" // {
+            dependencies = [
+              (sources."debug-2.6.9" // {
+                dependencies = [
+                  sources."ms-2.0.0"
+                ];
+              })
+            ];
+          })
+          sources."setprototypeof-1.2.0"
+          sources."slash-3.0.0"
+          sources."statuses-2.0.1"
+          sources."sudo-prompt-9.1.1"
+          sources."temp-dir-2.0.0"
         ];
       })
       (sources."@expo/code-signing-certificates-0.0.5" // {
@@ -68559,55 +67646,96 @@ in
       })
       (sources."@expo/config-6.0.24" // {
         dependencies = [
+          sources."@babel/code-frame-7.10.4"
+          sources."@expo/config-types-45.0.0"
           sources."@expo/json-file-8.2.36"
+          sources."json5-1.0.2"
         ];
       })
       (sources."@expo/config-plugins-4.1.5" // {
         dependencies = [
+          sources."@babel/code-frame-7.10.4"
+          sources."@expo/config-types-45.0.0"
           sources."@expo/json-file-8.2.36"
           sources."@expo/plist-0.0.18"
           sources."@xmldom/xmldom-0.7.13"
-          sources."semver-7.6.2"
+          sources."debug-4.3.5"
+          sources."json5-1.0.2"
+          sources."ms-2.1.2"
+          sources."semver-7.6.3"
+          sources."slash-3.0.0"
           sources."xmlbuilder-14.0.0"
         ];
       })
-      sources."@expo/config-types-45.0.0"
-      sources."@expo/dev-server-0.2.0"
+      sources."@expo/config-types-48.0.0"
+      (sources."@expo/dev-server-0.2.0" // {
+        dependencies = [
+          sources."@babel/code-frame-7.10.4"
+          sources."@expo/config-8.0.5"
+          (sources."@expo/config-plugins-6.0.2" // {
+            dependencies = [
+              sources."semver-7.6.3"
+            ];
+          })
+          sources."@expo/metro-config-0.6.0"
+          sources."body-parser-1.20.2"
+          sources."bytes-3.1.2"
+          sources."debug-4.3.5"
+          sources."depd-2.0.0"
+          sources."destroy-1.2.0"
+          sources."http-errors-2.0.0"
+          sources."iconv-lite-0.4.24"
+          sources."ms-2.1.2"
+          sources."on-finished-2.4.1"
+          sources."qs-6.11.0"
+          sources."raw-body-2.5.2"
+          sources."setprototypeof-1.2.0"
+          sources."slash-3.0.0"
+          sources."statuses-2.0.1"
+          sources."temp-dir-2.0.0"
+        ];
+      })
       (sources."@expo/devcert-1.1.2" // {
         dependencies = [
           sources."debug-3.2.7"
+          sources."mkdirp-0.5.6"
+          sources."ms-2.1.3"
           sources."rimraf-2.7.1"
-          sources."sudo-prompt-8.2.5"
         ];
       })
-      (sources."@expo/image-utils-0.3.21" // {
+      (sources."@expo/image-utils-0.3.23" // {
         dependencies = [
-          sources."temp-dir-1.0.0"
+          sources."mime-2.6.0"
           sources."tempy-0.3.0"
-          sources."type-fest-0.3.1"
         ];
       })
       (sources."@expo/json-file-8.2.37" // {
         dependencies = [
-          sources."json5-2.2.3"
+          sources."@babel/code-frame-7.10.4"
         ];
       })
-      (sources."@expo/metro-config-0.6.0" // {
+      (sources."@expo/metro-config-0.7.1" // {
         dependencies = [
+          sources."@babel/code-frame-7.10.4"
           sources."@expo/config-8.0.5"
           sources."@expo/config-plugins-6.0.2"
-          sources."@expo/config-types-48.0.0"
-          sources."semver-7.6.2"
+          sources."debug-4.3.5"
+          sources."ms-2.1.2"
+          sources."semver-7.6.3"
+          sources."slash-3.0.0"
         ];
       })
       sources."@expo/osascript-2.0.33"
       (sources."@expo/package-manager-0.0.56" // {
         dependencies = [
+          sources."@babel/code-frame-7.10.4"
           sources."@expo/json-file-8.2.36"
           sources."ansi-regex-5.0.1"
+          sources."json5-1.0.2"
           sources."npm-package-arg-7.0.0"
           sources."rimraf-3.0.2"
           sources."semver-5.7.2"
+          sources."sudo-prompt-9.1.1"
         ];
       })
       (sources."@expo/plist-0.0.20" // {
@@ -68618,30 +67746,41 @@ in
       })
       (sources."@expo/prebuild-config-4.0.3" // {
         dependencies = [
+          sources."@babel/code-frame-7.10.4"
+          sources."@expo/config-types-45.0.0"
+          sources."@expo/image-utils-0.3.21"
           sources."@expo/json-file-8.2.36"
+          sources."commander-7.2.0"
+          sources."debug-4.3.5"
+          (sources."expo-modules-autolinking-0.8.1" // {
+            dependencies = [
+              sources."fs-extra-9.1.0"
+            ];
+          })
+          sources."json5-1.0.2"
+          sources."jsonfile-6.1.0"
+          sources."mime-2.6.0"
+          sources."ms-2.1.2"
+          sources."tempy-0.3.0"
+          sources."universalify-2.0.1"
         ];
       })
       sources."@expo/rudder-sdk-node-1.1.1"
       (sources."@expo/schemer-1.4.5" // {
         dependencies = [
+          sources."ajv-8.17.1"
+          sources."json-schema-traverse-1.0.0"
           sources."probe-image-size-7.2.3"
         ];
       })
       sources."@expo/sdk-runtime-versions-1.0.0"
-      (sources."@expo/spawn-async-1.5.0" // {
-        dependencies = [
-          sources."cross-spawn-6.0.5"
-          sources."path-key-2.0.1"
-          sources."semver-5.7.2"
-          sources."shebang-command-1.2.0"
-          sources."shebang-regex-1.0.0"
-          sources."which-1.3.1"
-        ];
-      })
+      sources."@expo/spawn-async-1.5.0"
       sources."@expo/vector-icons-13.0.0"
       sources."@expo/webpack-config-18.1.0"
       (sources."@expo/xcpretty-4.3.1" // {
         dependencies = [
+          sources."@babel/code-frame-7.10.4"
+          sources."argparse-2.0.1"
           sources."js-yaml-4.1.0"
         ];
       })
@@ -68651,6 +67790,7 @@ in
       sources."@hapi/topo-5.1.0"
       (sources."@isaacs/cliui-8.0.2" // {
         dependencies = [
+          sources."ansi-regex-6.0.1"
           sources."ansi-styles-6.2.1"
           sources."strip-ansi-7.1.0"
           sources."wrap-ansi-8.1.0"
@@ -68661,7 +67801,7 @@ in
       sources."@jridgewell/resolve-uri-3.1.2"
       sources."@jridgewell/set-array-1.2.1"
       sources."@jridgewell/source-map-0.3.6"
-      sources."@jridgewell/sourcemap-codec-1.4.15"
+      sources."@jridgewell/sourcemap-codec-1.5.0"
       sources."@jridgewell/trace-mapping-0.3.25"
       sources."@leichtgewicht/ip-codec-2.0.5"
       sources."@module-federation/runtime-0.1.6"
@@ -68673,24 +67813,23 @@ in
       sources."@nodelib/fs.walk-1.2.8"
       (sources."@npmcli/fs-1.1.1" // {
         dependencies = [
-          sources."semver-7.6.2"
+          sources."semver-7.6.3"
         ];
       })
       (sources."@npmcli/move-file-1.1.2" // {
         dependencies = [
-          sources."mkdirp-1.0.4"
           sources."rimraf-3.0.2"
         ];
       })
       sources."@react-native/normalize-color-2.1.0"
-      sources."@rspack/binding-0.7.3"
-      sources."@rspack/core-0.7.3"
+      sources."@rspack/binding-0.7.5"
+      sources."@rspack/core-0.7.5"
       sources."@segment/loosely-validate-event-2.0.0"
       sources."@sideway/address-4.1.5"
       sources."@sideway/formula-3.0.1"
       sources."@sideway/pinpoint-2.0.0"
       sources."@sindresorhus/is-4.6.0"
-      sources."@swc/helpers-0.5.11"
+      sources."@swc/helpers-0.5.12"
       sources."@szmarczak/http-timer-4.0.6"
       sources."@trysound/sax-0.2.0"
       sources."@types/body-parser-1.19.5"
@@ -68698,11 +67837,11 @@ in
       sources."@types/cacheable-request-6.0.3"
       sources."@types/connect-3.4.38"
       sources."@types/connect-history-api-fallback-1.5.4"
-      sources."@types/eslint-8.56.10"
+      sources."@types/eslint-9.6.0"
       sources."@types/eslint-scope-3.7.7"
       sources."@types/estree-1.0.5"
       sources."@types/express-4.17.21"
-      sources."@types/express-serve-static-core-4.19.3"
+      sources."@types/express-serve-static-core-4.19.5"
       sources."@types/glob-7.2.0"
       sources."@types/html-minifier-terser-6.1.0"
       sources."@types/http-cache-semantics-4.0.4"
@@ -68715,7 +67854,7 @@ in
       sources."@types/keyv-3.1.4"
       sources."@types/mime-1.3.5"
       sources."@types/minimatch-5.1.2"
-      sources."@types/node-20.14.2"
+      sources."@types/node-20.14.12"
       sources."@types/node-forge-1.3.11"
       sources."@types/qs-6.9.15"
       sources."@types/range-parser-1.2.7"
@@ -68725,7 +67864,7 @@ in
       sources."@types/serve-index-1.9.4"
       sources."@types/serve-static-1.15.7"
       sources."@types/sockjs-0.3.36"
-      sources."@types/ws-8.5.10"
+      sources."@types/ws-8.5.11"
       sources."@types/yargs-15.0.19"
       sources."@types/yargs-parser-21.0.3"
       sources."@urql/core-2.3.6"
@@ -68750,18 +67889,23 @@ in
       sources."@xtuc/long-4.2.2"
       sources."abab-2.0.6"
       sources."accepts-1.3.8"
-      sources."acorn-8.12.0"
+      sources."acorn-8.12.1"
       sources."acorn-import-attributes-1.9.5"
-      sources."agent-base-6.0.2"
-      sources."aggregate-error-3.1.0"
-      sources."ajv-8.16.0"
-      sources."ajv-formats-2.1.1"
-      (sources."ajv-keywords-3.5.2" // {
+      (sources."agent-base-6.0.2" // {
         dependencies = [
-          sources."ajv-6.12.6"
-          sources."json-schema-traverse-0.4.1"
+          sources."debug-4.3.5"
+          sources."ms-2.1.2"
         ];
       })
+      sources."aggregate-error-3.1.0"
+      sources."ajv-6.12.6"
+      (sources."ajv-formats-2.1.1" // {
+        dependencies = [
+          sources."ajv-8.17.1"
+          sources."json-schema-traverse-1.0.0"
+        ];
+      })
+      sources."ajv-keywords-3.5.2"
       (sources."ansi-align-3.0.1" // {
         dependencies = [
           sources."emoji-regex-8.0.0"
@@ -68774,16 +67918,16 @@ in
         ];
       })
       sources."ansi-html-community-0.0.8"
-      sources."ansi-regex-6.0.1"
+      sources."ansi-regex-4.1.1"
       sources."ansi-styles-3.2.1"
       sources."any-promise-1.3.0"
       sources."anymatch-3.1.3"
       sources."application-config-path-0.1.1"
       sources."arg-4.1.0"
-      sources."argparse-2.0.1"
+      sources."argparse-1.0.10"
       sources."array-buffer-byte-length-1.0.1"
       sources."array-flatten-1.1.1"
-      sources."array-union-2.1.0"
+      sources."array-union-3.0.1"
       sources."array-uniq-1.0.3"
       sources."arraybuffer.prototype.slice-1.0.3"
       sources."arrify-2.0.1"
@@ -68793,8 +67937,16 @@ in
       sources."at-least-node-1.0.0"
       sources."available-typed-arrays-1.0.7"
       sources."axios-0.21.1"
-      sources."babel-loader-8.3.0"
-      sources."babel-plugin-module-resolver-4.1.0"
+      (sources."babel-loader-8.3.0" // {
+        dependencies = [
+          sources."schema-utils-2.7.1"
+        ];
+      })
+      (sources."babel-plugin-module-resolver-4.1.0" // {
+        dependencies = [
+          sources."resolve-1.22.8"
+        ];
+      })
       (sources."babel-plugin-polyfill-corejs2-0.4.11" // {
         dependencies = [
           sources."semver-6.3.1"
@@ -68812,12 +67964,7 @@ in
       sources."big.js-5.2.2"
       sources."binary-extensions-2.3.0"
       sources."blueimp-md5-2.19.0"
-      (sources."body-parser-1.20.2" // {
-        dependencies = [
-          sources."debug-2.6.9"
-          sources."ms-2.0.0"
-        ];
-      })
+      sources."body-parser-1.18.3"
       sources."bonjour-service-1.2.1"
       sources."boolbase-1.0.0"
       (sources."boxen-5.1.2" // {
@@ -68831,18 +67978,18 @@ in
       sources."bplist-parser-0.2.0"
       sources."brace-expansion-1.1.11"
       sources."braces-3.0.3"
-      sources."browserslist-4.23.1"
+      sources."browserslist-4.23.2"
       sources."buffer-alloc-1.2.0"
       sources."buffer-alloc-unsafe-1.1.0"
       sources."buffer-fill-1.0.0"
       sources."buffer-from-1.1.2"
       sources."bufferutil-4.0.8"
       sources."builtins-1.0.3"
-      sources."bytes-3.1.2"
+      sources."bytes-3.0.0"
       (sources."cacache-15.3.0" // {
         dependencies = [
           sources."lru-cache-6.0.0"
-          sources."mkdirp-1.0.4"
+          sources."p-map-4.0.0"
           sources."rimraf-3.0.2"
         ];
       })
@@ -68853,7 +68000,7 @@ in
       sources."camel-case-4.1.2"
       sources."camelcase-6.3.0"
       sources."caniuse-api-3.0.0"
-      sources."caniuse-lite-1.0.30001634"
+      sources."caniuse-lite-1.0.30001643"
       (sources."chalk-4.1.2" // {
         dependencies = [
           sources."ansi-styles-4.3.0"
@@ -68870,16 +68017,7 @@ in
       sources."ci-info-3.9.0"
       sources."clean-css-5.3.3"
       sources."clean-stack-2.2.0"
-      (sources."clean-webpack-plugin-4.0.0" // {
-        dependencies = [
-          sources."array-union-1.0.2"
-          sources."del-4.1.1"
-          sources."globby-6.1.0"
-          sources."p-map-2.1.0"
-          sources."pify-2.3.0"
-          sources."rimraf-2.7.1"
-        ];
-      })
+      sources."clean-webpack-plugin-4.0.0"
       sources."cli-boxes-2.2.1"
       sources."cli-cursor-2.1.0"
       sources."cli-spinners-2.9.2"
@@ -68902,20 +68040,13 @@ in
       sources."compare-versions-3.6.0"
       sources."component-type-1.2.2"
       sources."compressible-2.0.18"
-      (sources."compression-1.7.4" // {
-        dependencies = [
-          sources."bytes-3.0.0"
-          sources."debug-2.6.9"
-          sources."ms-2.0.0"
-          sources."safe-buffer-5.1.2"
-        ];
-      })
+      sources."compression-1.7.4"
       sources."concat-map-0.0.1"
       sources."concat-stream-1.6.2"
       (sources."connect-3.7.0" // {
         dependencies = [
-          sources."debug-2.6.9"
-          sources."ms-2.0.0"
+          sources."finalhandler-1.1.2"
+          sources."statuses-1.5.0"
         ];
       })
       sources."connect-history-api-fallback-2.0.0"
@@ -68926,29 +68057,34 @@ in
       sources."cookie-signature-1.0.6"
       (sources."copy-webpack-plugin-10.2.4" // {
         dependencies = [
+          sources."ajv-8.17.1"
           sources."ajv-keywords-5.1.0"
-          sources."array-union-3.0.1"
           sources."glob-parent-6.0.2"
-          sources."globby-12.2.0"
+          sources."json-schema-traverse-1.0.0"
           sources."schema-utils-4.2.0"
-          sources."slash-4.0.0"
         ];
       })
       sources."core-js-compat-3.37.1"
       sources."core-util-is-1.0.3"
       sources."cross-fetch-3.1.8"
-      sources."cross-spawn-7.0.3"
+      (sources."cross-spawn-6.0.5" // {
+        dependencies = [
+          sources."semver-5.7.2"
+        ];
+      })
       sources."crypt-0.0.2"
       sources."crypto-random-string-1.0.0"
       sources."css-declaration-sorter-6.4.1"
       (sources."css-loader-6.11.0" // {
         dependencies = [
-          sources."semver-7.6.2"
+          sources."semver-7.6.3"
         ];
       })
       (sources."css-minimizer-webpack-plugin-3.4.1" // {
         dependencies = [
+          sources."ajv-8.17.1"
           sources."ajv-keywords-5.1.0"
+          sources."json-schema-traverse-1.0.0"
           sources."schema-utils-4.2.0"
         ];
       })
@@ -68965,7 +68101,7 @@ in
       sources."data-view-byte-length-1.0.1"
       sources."data-view-byte-offset-1.0.0"
       sources."dateformat-3.0.3"
-      sources."debug-4.3.5"
+      sources."debug-2.6.9"
       sources."decache-4.4.0"
       (sources."decompress-response-6.0.0" // {
         dependencies = [
@@ -68980,14 +68116,21 @@ in
       sources."define-data-property-1.1.4"
       sources."define-lazy-prop-2.0.0"
       sources."define-properties-1.2.1"
-      (sources."del-6.1.1" // {
+      (sources."del-4.1.1" // {
         dependencies = [
-          sources."rimraf-3.0.2"
+          sources."array-union-1.0.2"
+          (sources."globby-6.1.0" // {
+            dependencies = [
+              sources."pify-2.3.0"
+            ];
+          })
+          sources."p-map-2.1.0"
+          sources."rimraf-2.7.1"
         ];
       })
       sources."delayed-stream-1.0.0"
-      sources."depd-2.0.0"
-      sources."destroy-1.2.0"
+      sources."depd-1.1.2"
+      sources."destroy-1.0.4"
       sources."detect-node-2.1.0"
       sources."dir-glob-3.0.1"
       sources."dns-packet-5.6.1"
@@ -69001,7 +68144,7 @@ in
       sources."duplexer3-0.1.5"
       sources."eastasianwidth-0.2.0"
       sources."ee-first-1.1.1"
-      sources."electron-to-chromium-1.4.802"
+      sources."electron-to-chromium-1.5.1"
       sources."emoji-regex-9.2.2"
       sources."emojis-list-3.0.0"
       sources."encodeurl-1.0.2"
@@ -69011,14 +68154,14 @@ in
         ];
       })
       sources."end-of-stream-1.4.4"
-      sources."enhanced-resolve-5.17.0"
+      sources."enhanced-resolve-5.17.1"
       sources."entities-2.2.0"
       sources."env-editor-0.4.2"
       sources."eol-0.9.1"
       sources."es-abstract-1.23.3"
       sources."es-define-property-1.0.0"
       sources."es-errors-1.3.0"
-      sources."es-module-lexer-1.5.3"
+      sources."es-module-lexer-1.5.4"
       sources."es-object-atoms-1.0.0"
       sources."es-set-tostringtag-2.0.3"
       sources."es-to-primitive-1.2.1"
@@ -69040,61 +68183,46 @@ in
       sources."exec-async-2.2.0"
       (sources."execa-1.0.0" // {
         dependencies = [
-          sources."cross-spawn-6.0.5"
           sources."get-stream-4.1.0"
-          sources."is-stream-1.1.0"
-          sources."path-key-2.0.1"
-          sources."semver-5.7.2"
-          sources."shebang-command-1.2.0"
-          sources."shebang-regex-1.0.0"
-          sources."which-1.3.1"
         ];
       })
       (sources."expo-48.0.21" // {
         dependencies = [
-          sources."@babel/runtime-7.24.7"
-          (sources."@expo/config-8.0.5" // {
-            dependencies = [
-              sources."semver-7.3.2"
-            ];
-          })
-          (sources."@expo/config-plugins-6.0.2" // {
-            dependencies = [
-              sources."semver-7.6.2"
-            ];
-          })
-          sources."@expo/config-types-48.0.0"
-          sources."commander-7.2.0"
-          sources."cross-spawn-6.0.5"
-          sources."expo-modules-autolinking-1.2.0"
-          sources."fs-extra-9.1.0"
-          sources."path-key-2.0.1"
-          sources."regenerator-runtime-0.14.1"
-          sources."semver-5.7.2"
-          sources."shebang-command-1.2.0"
-          sources."shebang-regex-1.0.0"
+          sources."@babel/code-frame-7.10.4"
+          sources."@babel/runtime-7.24.8"
+          sources."@expo/config-8.0.5"
+          sources."@expo/config-plugins-6.0.2"
+          sources."debug-4.3.5"
+          sources."ms-2.1.2"
+          sources."semver-7.6.3"
+          sources."slash-3.0.0"
           sources."uuid-3.4.0"
-          sources."which-1.3.1"
         ];
       })
       sources."expo-application-5.1.1"
       (sources."expo-asset-8.9.2" // {
         dependencies = [
+          sources."@babel/code-frame-7.10.4"
           sources."@expo/config-8.0.5"
           sources."@expo/config-plugins-6.0.2"
-          sources."@expo/config-types-48.0.0"
+          sources."debug-4.3.5"
           sources."expo-constants-14.3.0"
           sources."expo-file-system-15.3.0"
-          sources."semver-7.6.2"
+          sources."ms-2.1.2"
+          sources."semver-7.6.3"
+          sources."slash-3.0.0"
           sources."uuid-3.4.0"
         ];
       })
       (sources."expo-constants-14.2.1" // {
         dependencies = [
+          sources."@babel/code-frame-7.10.4"
           sources."@expo/config-8.0.5"
           sources."@expo/config-plugins-6.0.2"
-          sources."@expo/config-types-48.0.0"
-          sources."semver-7.6.2"
+          sources."debug-4.3.5"
+          sources."ms-2.1.2"
+          sources."semver-7.6.3"
+          sources."slash-3.0.0"
           sources."uuid-3.4.0"
         ];
       })
@@ -69105,47 +68233,25 @@ in
       })
       sources."expo-font-11.1.1"
       sources."expo-keep-awake-12.0.1"
-      (sources."expo-modules-autolinking-0.8.1" // {
+      (sources."expo-modules-autolinking-1.2.0" // {
         dependencies = [
           sources."commander-7.2.0"
           sources."fs-extra-9.1.0"
+          sources."jsonfile-6.1.0"
+          sources."universalify-2.0.1"
         ];
       })
       sources."expo-modules-core-1.2.7"
       (sources."expo-pwa-0.0.125" // {
         dependencies = [
-          sources."@expo/image-utils-0.3.23"
           sources."commander-2.20.0"
-          sources."temp-dir-1.0.0"
-          sources."tempy-0.3.0"
-          sources."type-fest-0.3.1"
-        ];
-      })
-      (sources."express-4.16.4" // {
-        dependencies = [
-          sources."body-parser-1.18.3"
-          sources."bytes-3.0.0"
-          sources."debug-2.6.9"
-          sources."depd-1.1.2"
-          sources."destroy-1.0.4"
-          sources."finalhandler-1.1.1"
-          sources."http-errors-1.6.3"
-          sources."iconv-lite-0.4.23"
-          sources."inherits-2.0.3"
-          sources."mime-1.4.1"
-          sources."ms-2.0.0"
-          sources."on-finished-2.3.0"
-          sources."qs-6.5.2"
-          sources."raw-body-2.3.3"
-          sources."safe-buffer-5.1.2"
-          sources."send-0.16.2"
-          sources."setprototypeof-1.1.0"
-          sources."statuses-1.4.0"
         ];
       })
+      sources."express-4.16.4"
       sources."fast-deep-equal-3.1.3"
       sources."fast-glob-3.3.2"
       sources."fast-json-stable-stringify-2.1.0"
+      sources."fast-uri-3.0.1"
       sources."fastq-1.17.1"
       sources."faye-websocket-0.11.4"
       sources."fbemitter-3.0.0"
@@ -69153,28 +68259,33 @@ in
       sources."fbjs-css-vars-1.0.2"
       sources."fetch-retry-4.1.1"
       sources."fill-range-7.1.1"
-      (sources."finalhandler-1.1.2" // {
-        dependencies = [
-          sources."debug-2.6.9"
-          sources."ms-2.0.0"
-          sources."on-finished-2.3.0"
-          sources."statuses-1.5.0"
-        ];
-      })
+      sources."finalhandler-1.1.1"
       (sources."find-babel-config-1.2.2" // {
         dependencies = [
+          sources."json5-1.0.2"
           sources."path-exists-3.0.0"
         ];
       })
       sources."find-cache-dir-3.3.2"
-      sources."find-up-5.0.0"
+      (sources."find-up-5.0.0" // {
+        dependencies = [
+          sources."locate-path-6.0.0"
+          sources."p-limit-3.1.0"
+          sources."p-locate-5.0.0"
+        ];
+      })
       sources."find-yarn-workspace-root-2.0.0"
       sources."follow-redirects-1.15.6"
       sources."fontfaceobserver-2.3.0"
       sources."for-each-0.3.3"
-      (sources."foreground-child-3.2.0" // {
+      (sources."foreground-child-3.2.1" // {
         dependencies = [
+          sources."cross-spawn-7.0.3"
+          sources."path-key-3.1.1"
+          sources."shebang-command-2.0.0"
+          sources."shebang-regex-3.0.0"
           sources."signal-exit-4.1.0"
+          sources."which-2.0.2"
         ];
       })
       sources."form-data-2.5.1"
@@ -69183,6 +68294,11 @@ in
       sources."fresh-0.5.2"
       (sources."fs-extra-9.0.0" // {
         dependencies = [
+          (sources."jsonfile-6.1.0" // {
+            dependencies = [
+              sources."universalify-2.0.1"
+            ];
+          })
           sources."universalify-1.0.0"
         ];
       })
@@ -69203,7 +68319,7 @@ in
       sources."glob-to-regexp-0.4.1"
       sources."globals-11.12.0"
       sources."globalthis-1.0.4"
-      sources."globby-11.1.0"
+      sources."globby-12.2.0"
       sources."gopd-1.0.1"
       sources."got-11.8.6"
       sources."graceful-fs-4.2.11"
@@ -69236,14 +68352,23 @@ in
       sources."htmlparser2-6.1.0"
       sources."http-cache-semantics-4.1.1"
       sources."http-deceiver-1.2.7"
-      sources."http-errors-2.0.0"
+      (sources."http-errors-1.6.3" // {
+        dependencies = [
+          sources."inherits-2.0.3"
+        ];
+      })
       sources."http-parser-js-0.5.8"
       sources."http-proxy-1.18.1"
       sources."http-proxy-middleware-2.0.6"
       sources."http2-wrapper-1.0.3"
-      sources."https-proxy-agent-5.0.1"
+      (sources."https-proxy-agent-5.0.1" // {
+        dependencies = [
+          sources."debug-4.3.5"
+          sources."ms-2.1.2"
+        ];
+      })
       sources."human-signals-2.1.0"
-      sources."iconv-lite-0.4.24"
+      sources."iconv-lite-0.4.23"
       sources."icss-utils-5.1.0"
       sources."ignore-5.3.1"
       sources."imurmurhash-0.1.4"
@@ -69263,7 +68388,7 @@ in
       sources."is-boolean-object-1.1.2"
       sources."is-buffer-1.1.6"
       sources."is-callable-1.2.7"
-      sources."is-core-module-2.13.1"
+      sources."is-core-module-2.15.0"
       sources."is-data-view-1.0.1"
       sources."is-date-object-1.0.5"
       sources."is-docker-2.2.1"
@@ -69280,12 +68405,8 @@ in
       sources."is-number-7.0.0"
       sources."is-number-object-1.0.7"
       sources."is-path-cwd-2.2.0"
-      (sources."is-path-in-cwd-2.1.0" // {
-        dependencies = [
-          sources."is-path-inside-2.1.0"
-        ];
-      })
-      sources."is-path-inside-3.0.3"
+      sources."is-path-in-cwd-2.1.0"
+      sources."is-path-inside-2.1.0"
       sources."is-plain-obj-3.0.0"
       sources."is-port-reachable-2.0.1"
       (sources."is-reachable-4.0.0" // {
@@ -69314,7 +68435,7 @@ in
       sources."is-regex-1.1.4"
       sources."is-root-2.1.0"
       sources."is-shared-array-buffer-1.0.3"
-      sources."is-stream-2.0.1"
+      sources."is-stream-1.1.0"
       sources."is-string-1.0.7"
       sources."is-symbol-1.0.4"
       sources."is-typed-array-1.1.13"
@@ -69323,7 +68444,7 @@ in
       sources."is-wsl-2.2.0"
       sources."isarray-1.0.0"
       sources."isexe-2.0.0"
-      sources."jackspeak-3.4.0"
+      sources."jackspeak-3.4.3"
       (sources."jest-worker-27.5.1" // {
         dependencies = [
           sources."has-flag-4.0.0"
@@ -69331,14 +68452,10 @@ in
         ];
       })
       sources."jimp-compact-0.16.1"
-      sources."joi-17.13.1"
+      sources."joi-17.13.3"
       sources."join-component-1.1.0"
       sources."js-tokens-4.0.0"
-      (sources."js-yaml-3.14.1" // {
-        dependencies = [
-          sources."argparse-1.0.10"
-        ];
-      })
+      sources."js-yaml-3.14.1"
       sources."jsesc-2.5.2"
       sources."json-buffer-3.0.1"
       sources."json-parse-even-better-errors-2.3.1"
@@ -69348,24 +68465,20 @@ in
           sources."md5-2.2.1"
         ];
       })
-      sources."json-schema-traverse-1.0.0"
-      sources."json5-1.0.2"
-      sources."jsonfile-6.1.0"
+      sources."json-schema-traverse-0.4.1"
+      sources."json5-2.2.3"
+      sources."jsonfile-4.0.0"
       sources."keychain-1.3.0"
       sources."keyv-4.5.4"
       sources."kleur-3.0.3"
       sources."latest-version-5.1.0"
-      sources."launch-editor-2.6.1"
+      sources."launch-editor-2.8.0"
       sources."leven-3.1.0"
       sources."lilconfig-2.1.0"
       sources."lines-and-columns-1.2.4"
       sources."loader-runner-4.3.0"
-      (sources."loader-utils-2.0.4" // {
-        dependencies = [
-          sources."json5-2.2.3"
-        ];
-      })
-      sources."locate-path-6.0.0"
+      sources."loader-utils-2.0.4"
+      sources."locate-path-5.0.0"
       sources."lodash-4.17.21"
       sources."lodash.debounce-4.0.8"
       sources."lodash.memoize-4.1.2"
@@ -69379,7 +68492,11 @@ in
       sources."loose-envify-1.4.0"
       sources."lower-case-2.0.2"
       sources."lowercase-keys-2.0.0"
-      sources."lru-cache-10.2.2"
+      (sources."lru-cache-5.1.1" // {
+        dependencies = [
+          sources."yallist-3.1.1"
+        ];
+      })
       (sources."make-dir-3.1.0" // {
         dependencies = [
           sources."semver-6.3.1"
@@ -69398,35 +68515,42 @@ in
       sources."methods-1.1.2"
       sources."metro-react-native-babel-preset-0.73.9"
       sources."micromatch-4.0.7"
-      sources."mime-2.6.0"
+      sources."mime-1.4.1"
       sources."mime-db-1.52.0"
       sources."mime-types-2.1.35"
       sources."mimic-fn-1.2.0"
       sources."mimic-response-1.0.1"
       (sources."mini-css-extract-plugin-2.9.0" // {
         dependencies = [
+          sources."ajv-8.17.1"
           sources."ajv-keywords-5.1.0"
+          sources."json-schema-traverse-1.0.0"
           sources."schema-utils-4.2.0"
         ];
       })
       sources."minimalistic-assert-1.0.1"
-      sources."minimatch-3.1.2"
+      sources."minimatch-3.0.4"
       sources."minimist-1.2.8"
       sources."minipass-3.1.6"
       sources."minipass-collect-1.0.2"
       sources."minipass-flush-1.0.5"
       sources."minipass-pipeline-1.2.4"
       sources."minizlib-2.1.2"
-      sources."mkdirp-0.5.6"
-      sources."ms-2.1.2"
+      sources."mkdirp-1.0.4"
+      sources."ms-2.0.0"
       sources."multicast-dns-7.2.5"
-      sources."mv-2.1.1"
+      (sources."mv-2.1.1" // {
+        dependencies = [
+          sources."mkdirp-0.5.6"
+        ];
+      })
       sources."mz-2.7.0"
       sources."nanoid-3.3.7"
       sources."ncp-2.0.0"
       (sources."needle-2.9.1" // {
         dependencies = [
           sources."debug-3.2.7"
+          sources."ms-2.1.3"
         ];
       })
       sources."negotiator-0.6.3"
@@ -69438,7 +68562,7 @@ in
       sources."node-forge-0.10.0"
       sources."node-gyp-build-4.8.1"
       sources."node-html-parser-5.4.2"
-      sources."node-releases-2.0.14"
+      sources."node-releases-2.0.18"
       sources."normalize-path-3.0.0"
       sources."normalize-url-6.1.0"
       (sources."npm-package-arg-6.1.0" // {
@@ -69447,26 +68571,21 @@ in
           sources."semver-5.7.2"
         ];
       })
-      (sources."npm-run-path-2.0.2" // {
-        dependencies = [
-          sources."path-key-2.0.1"
-        ];
-      })
+      sources."npm-run-path-2.0.2"
       sources."nth-check-2.1.1"
       sources."nullthrows-1.1.1"
       sources."object-assign-4.1.1"
-      sources."object-inspect-1.13.1"
+      sources."object-inspect-1.13.2"
       sources."object-keys-1.1.1"
       sources."object.assign-4.1.5"
       sources."obuf-1.1.2"
-      sources."on-finished-2.4.1"
+      sources."on-finished-2.3.0"
       sources."on-headers-1.0.2"
       sources."once-1.4.0"
       sources."onetime-2.0.1"
       sources."open-8.4.2"
       (sources."ora-3.4.0" // {
         dependencies = [
-          sources."ansi-regex-4.1.1"
           sources."chalk-2.4.2"
           sources."strip-ansi-5.2.0"
         ];
@@ -69474,16 +68593,12 @@ in
       sources."os-homedir-1.0.2"
       sources."os-tmpdir-1.0.2"
       sources."osenv-0.1.5"
-      (sources."p-any-2.1.0" // {
-        dependencies = [
-          sources."type-fest-0.3.1"
-        ];
-      })
+      sources."p-any-2.1.0"
       sources."p-cancelable-2.1.1"
       sources."p-finally-1.0.0"
-      sources."p-limit-3.1.0"
-      sources."p-locate-5.0.0"
-      sources."p-map-4.0.0"
+      sources."p-limit-2.3.0"
+      sources."p-locate-4.1.0"
+      sources."p-map-3.0.0"
       sources."p-retry-4.1.0"
       sources."p-some-4.1.0"
       sources."p-timeout-3.1.0"
@@ -69507,25 +68622,33 @@ in
           sources."lowercase-keys-1.0.1"
           sources."normalize-url-4.5.1"
           sources."p-cancelable-1.1.0"
-          sources."registry-auth-token-3.4.0"
-          sources."registry-url-5.1.0"
           sources."responselike-1.0.2"
           sources."semver-6.3.1"
         ];
       })
+      sources."package-json-from-dist-1.0.0"
       sources."param-case-3.0.4"
       sources."parse-png-2.1.0"
       sources."parseurl-1.3.3"
       sources."pascal-case-3.1.2"
-      sources."password-prompt-1.1.3"
+      (sources."password-prompt-1.1.3" // {
+        dependencies = [
+          sources."cross-spawn-7.0.3"
+          sources."path-key-3.1.1"
+          sources."shebang-command-2.0.0"
+          sources."shebang-regex-3.0.0"
+          sources."which-2.0.2"
+        ];
+      })
       sources."path-browserify-1.0.1"
       sources."path-exists-4.0.0"
       sources."path-is-absolute-1.0.1"
       sources."path-is-inside-1.0.2"
-      sources."path-key-3.1.1"
+      sources."path-key-2.0.1"
       sources."path-parse-1.0.7"
       (sources."path-scurry-1.11.1" // {
         dependencies = [
+          sources."lru-cache-10.4.3"
           sources."minipass-7.1.2"
         ];
       })
@@ -69540,16 +68663,12 @@ in
       (sources."pkg-dir-4.2.0" // {
         dependencies = [
           sources."find-up-4.1.0"
-          sources."locate-path-5.0.0"
-          sources."p-limit-2.3.0"
-          sources."p-locate-4.1.0"
         ];
       })
       (sources."pkg-up-3.1.0" // {
         dependencies = [
           sources."find-up-3.0.0"
           sources."locate-path-3.0.0"
-          sources."p-limit-2.3.0"
           sources."p-locate-3.0.0"
           sources."path-exists-3.0.0"
         ];
@@ -69557,7 +68676,7 @@ in
       sources."plist-3.1.0"
       sources."pngjs-3.4.0"
       sources."possible-typed-array-names-1.0.0"
-      sources."postcss-8.4.38"
+      sources."postcss-8.4.40"
       sources."postcss-calc-8.2.4"
       sources."postcss-colormin-5.3.1"
       sources."postcss-convert-values-5.1.3"
@@ -69587,7 +68706,7 @@ in
       sources."postcss-ordered-values-5.1.3"
       sources."postcss-reduce-initial-5.1.2"
       sources."postcss-reduce-transforms-5.1.0"
-      sources."postcss-selector-parser-6.1.0"
+      sources."postcss-selector-parser-6.1.1"
       sources."postcss-svgo-5.1.0"
       sources."postcss-unique-selectors-5.1.1"
       sources."postcss-value-parser-4.2.0"
@@ -69612,32 +68731,28 @@ in
       sources."pump-3.0.0"
       sources."punycode-2.3.1"
       sources."qrcode-terminal-0.11.0"
-      sources."qs-6.11.0"
+      sources."qs-6.5.2"
       sources."querystringify-2.2.0"
       sources."queue-microtask-1.2.3"
       sources."quick-lru-5.1.1"
       sources."randombytes-2.1.0"
       sources."range-parser-1.2.1"
-      sources."raw-body-2.5.2"
+      sources."raw-body-2.3.3"
       sources."rc-1.2.8"
       sources."react-is-17.0.2"
       sources."react-refresh-0.4.3"
       sources."read-chunk-3.2.0"
       sources."read-last-lines-1.6.0"
-      (sources."readable-stream-2.3.8" // {
-        dependencies = [
-          sources."safe-buffer-5.1.2"
-        ];
-      })
+      sources."readable-stream-2.3.8"
       sources."readdirp-3.6.0"
       sources."regenerate-1.4.2"
       sources."regenerate-unicode-properties-10.1.1"
-      sources."regenerator-runtime-0.13.11"
+      sources."regenerator-runtime-0.14.1"
       sources."regenerator-transform-0.15.2"
       sources."regexp.prototype.flags-1.5.2"
       sources."regexpu-core-5.3.2"
-      sources."registry-auth-token-3.3.2"
-      sources."registry-url-3.1.0"
+      sources."registry-auth-token-3.4.0"
+      sources."registry-url-5.1.0"
       (sources."regjsparser-0.9.1" // {
         dependencies = [
           sources."jsesc-0.5.0"
@@ -69647,14 +68762,10 @@ in
       sources."remove-trailing-slash-0.1.1"
       sources."renderkid-3.0.0"
       sources."require-from-string-2.0.2"
-      (sources."requireg-0.2.2" // {
-        dependencies = [
-          sources."resolve-1.7.1"
-        ];
-      })
+      sources."requireg-0.2.2"
       sources."requires-port-1.0.0"
       sources."reselect-4.1.8"
-      sources."resolve-1.22.8"
+      sources."resolve-1.7.1"
       sources."resolve-alpn-1.2.1"
       sources."resolve-from-5.0.0"
       sources."responselike-2.0.1"
@@ -69673,17 +68784,12 @@ in
           sources."isarray-2.0.5"
         ];
       })
-      sources."safe-buffer-5.2.1"
+      sources."safe-buffer-5.1.2"
       sources."safe-json-stringify-1.2.0"
       sources."safe-regex-test-1.0.3"
       sources."safer-buffer-2.1.2"
       sources."sax-1.4.1"
-      (sources."schema-utils-2.7.1" // {
-        dependencies = [
-          sources."ajv-6.12.6"
-          sources."json-schema-traverse-0.4.1"
-        ];
-      })
+      sources."schema-utils-3.3.0"
       sources."select-hose-2.0.0"
       (sources."selfsigned-2.4.1" // {
         dependencies = [
@@ -69691,51 +68797,21 @@ in
         ];
       })
       sources."semver-7.3.2"
-      (sources."send-0.18.0" // {
+      sources."send-0.16.2"
+      (sources."serialize-error-6.0.0" // {
         dependencies = [
-          (sources."debug-2.6.9" // {
-            dependencies = [
-              sources."ms-2.0.0"
-            ];
-          })
-          sources."mime-1.6.0"
-          sources."ms-2.1.3"
+          sources."type-fest-0.12.0"
         ];
       })
-      sources."serialize-error-6.0.0"
       sources."serialize-javascript-6.0.2"
-      (sources."serve-index-1.9.1" // {
-        dependencies = [
-          sources."debug-2.6.9"
-          sources."depd-1.1.2"
-          sources."http-errors-1.6.3"
-          sources."inherits-2.0.3"
-          sources."ms-2.0.0"
-          sources."setprototypeof-1.1.0"
-          sources."statuses-1.5.0"
-        ];
-      })
-      (sources."serve-static-1.13.2" // {
-        dependencies = [
-          sources."debug-2.6.9"
-          sources."depd-1.1.2"
-          sources."destroy-1.0.4"
-          sources."http-errors-1.6.3"
-          sources."inherits-2.0.3"
-          sources."mime-1.4.1"
-          sources."ms-2.0.0"
-          sources."on-finished-2.3.0"
-          sources."send-0.16.2"
-          sources."setprototypeof-1.1.0"
-          sources."statuses-1.4.0"
-        ];
-      })
+      sources."serve-index-1.9.1"
+      sources."serve-static-1.13.2"
       sources."set-function-length-1.2.2"
       sources."set-function-name-2.0.2"
       sources."setimmediate-1.0.5"
-      sources."setprototypeof-1.2.0"
-      sources."shebang-command-2.0.0"
-      sources."shebang-regex-3.0.0"
+      sources."setprototypeof-1.1.0"
+      sources."shebang-command-1.2.0"
+      sources."shebang-regex-1.0.0"
       sources."shell-quote-1.8.1"
       sources."side-channel-1.0.6"
       sources."signal-exit-3.0.7"
@@ -69745,7 +68821,7 @@ in
         ];
       })
       sources."sisteransi-1.0.5"
-      sources."slash-3.0.0"
+      sources."slash-4.0.0"
       sources."slugify-1.6.6"
       sources."sockjs-0.3.24"
       sources."source-list-map-2.0.1"
@@ -69761,9 +68837,16 @@ in
           sources."source-map-0.5.7"
         ];
       })
-      sources."spdy-4.0.2"
+      (sources."spdy-4.0.2" // {
+        dependencies = [
+          sources."debug-4.3.5"
+          sources."ms-2.1.2"
+        ];
+      })
       (sources."spdy-transport-3.0.0" // {
         dependencies = [
+          sources."debug-4.3.5"
+          sources."ms-2.1.2"
           sources."readable-stream-3.6.2"
         ];
       })
@@ -69771,16 +68854,12 @@ in
       sources."sprintf-js-1.0.3"
       sources."ssri-8.0.1"
       sources."stable-0.1.8"
-      sources."statuses-2.0.1"
+      sources."statuses-1.4.0"
       sources."stream-buffers-2.2.0"
-      (sources."stream-parser-0.3.1" // {
-        dependencies = [
-          sources."debug-2.6.9"
-          sources."ms-2.0.0"
-        ];
-      })
+      sources."stream-parser-0.3.1"
       (sources."string-width-5.1.2" // {
         dependencies = [
+          sources."ansi-regex-6.0.1"
           sources."strip-ansi-7.1.0"
         ];
       })
@@ -69792,11 +68871,7 @@ in
       sources."string.prototype.trim-1.2.9"
       sources."string.prototype.trimend-1.0.8"
       sources."string.prototype.trimstart-1.0.8"
-      (sources."string_decoder-1.1.1" // {
-        dependencies = [
-          sources."safe-buffer-5.1.2"
-        ];
-      })
+      sources."string_decoder-1.1.1"
       (sources."strip-ansi-6.0.1" // {
         dependencies = [
           sources."ansi-regex-5.0.1"
@@ -69817,12 +68892,12 @@ in
         dependencies = [
           sources."brace-expansion-2.0.1"
           sources."commander-4.1.1"
-          sources."glob-10.4.1"
-          sources."minimatch-9.0.4"
+          sources."glob-10.4.5"
+          sources."minimatch-9.0.5"
           sources."minipass-7.1.2"
         ];
       })
-      sources."sudo-prompt-9.1.1"
+      sources."sudo-prompt-8.2.5"
       sources."supports-color-5.5.0"
       (sources."supports-hyperlinks-2.3.0" // {
         dependencies = [
@@ -69840,31 +68915,33 @@ in
       (sources."tar-6.2.1" // {
         dependencies = [
           sources."minipass-5.0.0"
-          sources."mkdirp-1.0.4"
         ];
       })
-      sources."temp-dir-2.0.0"
+      sources."temp-dir-1.0.0"
       (sources."tempy-0.7.1" // {
         dependencies = [
+          sources."array-union-2.1.0"
           sources."crypto-random-string-2.0.0"
+          sources."del-6.1.1"
+          sources."globby-11.1.0"
+          sources."is-path-inside-3.0.3"
+          sources."is-stream-2.0.1"
+          sources."p-map-4.0.0"
+          sources."rimraf-3.0.2"
+          sources."slash-3.0.0"
+          sources."temp-dir-2.0.0"
           sources."type-fest-0.16.0"
           sources."unique-string-2.0.0"
         ];
       })
       sources."terminal-link-2.1.1"
-      (sources."terser-5.31.1" // {
+      (sources."terser-5.31.3" // {
         dependencies = [
           sources."commander-2.20.3"
           sources."source-map-support-0.5.21"
         ];
       })
-      (sources."terser-webpack-plugin-5.3.10" // {
-        dependencies = [
-          sources."ajv-6.12.6"
-          sources."json-schema-traverse-0.4.1"
-          sources."schema-utils-3.3.0"
-        ];
-      })
+      sources."terser-webpack-plugin-5.3.10"
       sources."text-table-0.2.0"
       sources."thenify-3.3.1"
       sources."thenify-all-1.6.0"
@@ -69881,7 +68958,7 @@ in
       sources."ts-interface-checker-0.1.13"
       sources."tslib-2.6.3"
       sources."turndown-7.0.0"
-      sources."type-fest-0.12.0"
+      sources."type-fest-0.3.1"
       sources."type-is-1.6.18"
       sources."typed-array-buffer-1.0.2"
       sources."typed-array-byte-length-1.0.1"
@@ -69899,11 +68976,16 @@ in
       sources."unique-filename-1.1.1"
       sources."unique-slug-2.0.2"
       sources."unique-string-1.0.0"
-      sources."universalify-2.0.1"
+      sources."universalify-0.1.2"
       sources."unpipe-1.0.0"
       sources."untildify-3.0.3"
-      sources."update-browserslist-db-1.0.16"
-      sources."update-check-1.5.3"
+      sources."update-browserslist-db-1.1.0"
+      (sources."update-check-1.5.3" // {
+        dependencies = [
+          sources."registry-auth-token-3.3.2"
+          sources."registry-url-3.1.0"
+        ];
+      })
       sources."uri-js-4.4.1"
       sources."url-join-4.0.0"
       sources."url-parse-1.5.10"
@@ -69924,41 +69006,58 @@ in
       sources."wbuf-1.7.3"
       sources."wcwidth-1.0.1"
       sources."webidl-conversions-3.0.1"
-      (sources."webpack-5.92.0" // {
-        dependencies = [
-          sources."ajv-6.12.6"
-          sources."json-schema-traverse-0.4.1"
-          sources."schema-utils-3.3.0"
-        ];
-      })
+      sources."webpack-5.93.0"
       (sources."webpack-dev-middleware-5.3.4" // {
         dependencies = [
+          sources."ajv-8.17.1"
           sources."ajv-keywords-5.1.0"
+          sources."json-schema-traverse-1.0.0"
           sources."schema-utils-4.2.0"
         ];
       })
       (sources."webpack-dev-server-4.15.2" // {
         dependencies = [
           sources."@types/retry-0.12.0"
+          sources."ajv-8.17.1"
           sources."ajv-keywords-5.1.0"
+          sources."body-parser-1.20.2"
+          sources."bytes-3.1.2"
           sources."content-disposition-0.5.4"
           sources."cookie-0.6.0"
-          sources."debug-2.6.9"
+          sources."cross-spawn-7.0.3"
           sources."default-gateway-6.0.3"
+          sources."depd-2.0.0"
+          sources."destroy-1.2.0"
           sources."execa-5.1.1"
           sources."express-4.19.2"
           sources."finalhandler-1.2.0"
           sources."get-stream-6.0.1"
+          sources."http-errors-2.0.0"
+          sources."iconv-lite-0.4.24"
           sources."ipaddr.js-2.2.0"
+          sources."is-stream-2.0.1"
+          sources."json-schema-traverse-1.0.0"
+          sources."mime-1.6.0"
           sources."mimic-fn-2.1.0"
-          sources."ms-2.0.0"
+          sources."ms-2.1.3"
           sources."npm-run-path-4.0.1"
+          sources."on-finished-2.4.1"
           sources."onetime-5.1.2"
           sources."p-retry-4.6.2"
+          sources."path-key-3.1.1"
+          sources."qs-6.11.0"
+          sources."raw-body-2.5.2"
           sources."retry-0.13.1"
           sources."rimraf-3.0.2"
+          sources."safe-buffer-5.2.1"
           sources."schema-utils-4.2.0"
+          sources."send-0.18.0"
           sources."serve-static-1.15.0"
+          sources."setprototypeof-1.2.0"
+          sources."shebang-command-2.0.0"
+          sources."shebang-regex-3.0.0"
+          sources."statuses-2.0.1"
+          sources."which-2.0.2"
         ];
       })
       (sources."webpack-manifest-plugin-4.1.1" // {
@@ -69970,7 +69069,7 @@ in
       sources."websocket-driver-0.7.4"
       sources."websocket-extensions-0.1.4"
       sources."whatwg-url-5.0.0"
-      sources."which-2.0.2"
+      sources."which-1.3.1"
       sources."which-boxed-primitive-1.0.2"
       sources."which-typed-array-1.1.15"
       (sources."widest-line-3.1.0" // {
@@ -70001,7 +69100,7 @@ in
       })
       sources."wrappy-1.0.2"
       sources."write-file-atomic-2.4.3"
-      sources."ws-8.17.0"
+      sources."ws-8.18.0"
       (sources."xcode-3.0.1" // {
         dependencies = [
           sources."uuid-7.0.3"
@@ -70010,8 +69109,6 @@ in
       (sources."xdl-60.0.10" // {
         dependencies = [
           sources."bplist-parser-0.3.2"
-          sources."minimatch-3.0.4"
-          sources."p-map-3.0.0"
         ];
       })
       (sources."xml2js-0.4.23" // {
@@ -70053,13 +69150,9 @@ in
           sources."escape-string-regexp-1.0.5"
         ];
       })
-      (sources."@puppeteer/browsers-2.2.3" // {
-        dependencies = [
-          sources."debug-4.3.4"
-        ];
-      })
+      sources."@puppeteer/browsers-2.3.0"
       sources."@tootallnate/quickjs-emscripten-0.23.0"
-      sources."@types/node-20.14.2"
+      sources."@types/node-20.14.12"
       sources."@types/prop-types-15.7.12"
       sources."@types/react-18.3.3"
       sources."@types/yauzl-2.10.3"
@@ -70078,7 +69171,7 @@ in
       sources."bufferutil-4.0.8"
       sources."callsites-3.1.0"
       sources."chalk-5.3.0"
-      sources."chromium-bidi-0.5.23"
+      sources."chromium-bidi-0.6.2"
       sources."cli-boxes-3.0.0"
       sources."cli-cursor-4.0.0"
       sources."cli-spinners-2.9.2"
@@ -70109,7 +69202,7 @@ in
       sources."data-uri-to-buffer-6.0.2"
       sources."debug-4.3.5"
       sources."degenerator-5.0.1"
-      sources."devtools-protocol-0.0.1299070"
+      sources."devtools-protocol-0.0.1312386"
       sources."emoji-regex-10.3.0"
       sources."end-of-stream-1.4.4"
       sources."env-paths-2.2.1"
@@ -70132,7 +69225,7 @@ in
       sources."graceful-fs-4.2.11"
       sources."has-flag-3.0.0"
       sources."http-proxy-agent-7.0.2"
-      sources."https-proxy-agent-7.0.4"
+      sources."https-proxy-agent-7.0.5"
       sources."ieee754-1.2.1"
       sources."import-fresh-3.3.0"
       sources."indent-string-5.0.0"
@@ -70159,7 +69252,7 @@ in
       sources."node-gyp-build-4.8.1"
       sources."once-1.4.0"
       sources."onetime-5.1.2"
-      sources."pac-proxy-agent-7.0.1"
+      sources."pac-proxy-agent-7.0.2"
       sources."pac-resolver-7.0.1"
       sources."parent-module-1.0.1"
       sources."parse-json-5.2.0"
@@ -70170,14 +69263,14 @@ in
       sources."proxy-agent-6.4.0"
       sources."proxy-from-env-1.1.0"
       sources."pump-3.0.0"
-      sources."puppeteer-22.11.0"
-      sources."puppeteer-core-22.11.0"
+      sources."puppeteer-22.14.0"
+      sources."puppeteer-core-22.14.0"
       sources."queue-tick-1.0.1"
       sources."react-18.3.1"
       (sources."react-devtools-core-4.28.5" // {
         dependencies = [
           sources."utf-8-validate-5.0.10"
-          sources."ws-7.5.9"
+          sources."ws-7.5.10"
         ];
       })
       sources."react-reconciler-0.29.2"
@@ -70185,11 +69278,7 @@ in
       sources."resolve-from-4.0.0"
       sources."restore-cursor-4.0.0"
       sources."scheduler-0.23.2"
-      (sources."semver-7.6.0" // {
-        dependencies = [
-          sources."lru-cache-6.0.0"
-        ];
-      })
+      sources."semver-7.6.3"
       sources."shell-quote-1.8.1"
       sources."signal-exit-3.0.7"
       (sources."slice-ansi-7.1.0" // {
@@ -70199,21 +69288,21 @@ in
       })
       sources."smart-buffer-4.2.0"
       sources."socks-2.8.3"
-      sources."socks-proxy-agent-8.0.3"
+      sources."socks-proxy-agent-8.0.4"
       sources."source-map-0.6.1"
       sources."sprintf-js-1.1.3"
       sources."stack-utils-2.0.6"
       sources."streamx-2.18.0"
-      sources."string-width-7.1.0"
+      sources."string-width-7.2.0"
       sources."strip-ansi-7.1.0"
       sources."supports-color-5.5.0"
-      sources."tar-fs-3.0.5"
+      sources."tar-fs-3.0.6"
       sources."tar-stream-3.1.7"
-      sources."text-decoder-1.1.0"
+      sources."text-decoder-1.1.1"
       sources."through-2.3.8"
       sources."tslib-2.6.3"
-      sources."type-fest-4.20.0"
-      sources."typescript-5.4.5"
+      sources."type-fest-4.23.0"
+      sources."typescript-5.5.4"
       sources."unbzip2-stream-1.4.3"
       sources."undici-types-5.26.5"
       sources."unicorn-magic-0.2.0"
@@ -70223,9 +69312,8 @@ in
       sources."widest-line-5.0.0"
       sources."wrap-ansi-9.0.0"
       sources."wrappy-1.0.2"
-      sources."ws-8.17.0"
+      sources."ws-8.18.0"
       sources."y18n-5.0.8"
-      sources."yallist-4.0.0"
       (sources."yargs-17.7.2" // {
         dependencies = [
           sources."ansi-regex-5.0.1"
@@ -70253,10 +69341,10 @@ in
   fauna-shell = nodeEnv.buildNodePackage {
     name = "fauna-shell";
     packageName = "fauna-shell";
-    version = "1.3.0";
+    version = "1.3.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/fauna-shell/-/fauna-shell-1.3.0.tgz";
-      sha512 = "V3z3HudBRv8dsLgvyZIpj7AlUstu3n0uztAtYWblLMwbld1/7Az/1AIpWZRlweZJd8XkaCPbL10xXy/DeAqbqw==";
+      url = "https://registry.npmjs.org/fauna-shell/-/fauna-shell-1.3.1.tgz";
+      sha512 = "ILJSsLuUers5JpuYvtW6cNUF/AJ9Tay73wnsfA5dPjktt/hs0KCafK1pZ3ZC2ICiXe7SorcS9Pqlni5njqHkcg==";
     };
     dependencies = [
       sources."@cspotcode/source-map-support-0.8.1"
@@ -70270,9 +69358,9 @@ in
       sources."@inquirer/prompts-3.3.2"
       sources."@inquirer/rawlist-1.2.16"
       sources."@inquirer/select-1.3.3"
-      sources."@inquirer/type-1.3.3"
+      sources."@inquirer/type-1.5.1"
       sources."@jridgewell/resolve-uri-3.1.2"
-      sources."@jridgewell/sourcemap-codec-1.4.15"
+      sources."@jridgewell/sourcemap-codec-1.5.0"
       sources."@jridgewell/trace-mapping-0.3.9"
       sources."@nodelib/fs.scandir-2.1.5"
       sources."@nodelib/fs.stat-2.0.5"
@@ -70295,20 +69383,20 @@ in
       sources."@oclif/plugin-help-5.2.20"
       sources."@oclif/plugin-plugins-2.4.7"
       sources."@oclif/screen-1.0.4"
-      sources."@swc/core-1.5.29"
+      sources."@swc/core-1.7.1"
       sources."@swc/counter-0.1.3"
-      sources."@swc/helpers-0.5.11"
-      sources."@swc/types-0.1.8"
-      sources."@swc/wasm-1.5.29"
+      sources."@swc/helpers-0.5.12"
+      sources."@swc/types-0.1.12"
+      sources."@swc/wasm-1.7.1"
       sources."@tsconfig/node10-1.0.11"
       sources."@tsconfig/node12-1.0.11"
       sources."@tsconfig/node14-1.0.3"
       sources."@tsconfig/node16-1.0.4"
-      sources."@types/cli-progress-3.11.5"
+      sources."@types/cli-progress-3.11.6"
       sources."@types/mute-stream-0.0.4"
-      sources."@types/node-20.14.2"
+      sources."@types/node-20.14.12"
       sources."@types/wrap-ansi-3.0.0"
-      sources."acorn-8.12.0"
+      sources."acorn-8.12.1"
       sources."acorn-walk-8.3.3"
       sources."ansi-align-3.0.1"
       sources."ansi-escapes-4.3.2"
@@ -70461,7 +69549,7 @@ in
       sources."is-unicode-supported-0.1.0"
       sources."is-wsl-2.2.0"
       sources."isexe-2.0.0"
-      sources."jake-10.9.1"
+      sources."jake-10.9.2"
       sources."js-yaml-3.14.1"
       sources."json-parse-better-errors-1.0.2"
       sources."jsonfile-6.1.0"
@@ -70521,7 +69609,7 @@ in
       sources."rxjs-7.8.1"
       sources."safe-buffer-5.2.1"
       sources."safer-buffer-2.1.2"
-      sources."semver-7.6.2"
+      sources."semver-7.6.3"
       sources."shebang-command-2.0.0"
       sources."shebang-regex-3.0.0"
       sources."signal-exit-4.1.0"
@@ -70551,7 +69639,7 @@ in
       sources."tunnel-agent-0.6.0"
       sources."type-check-0.3.2"
       sources."type-fest-0.21.3"
-      sources."typescript-5.4.5"
+      sources."typescript-5.5.4"
       sources."undici-types-5.26.5"
       sources."universalify-2.0.1"
       sources."util-deprecate-1.0.2"
@@ -70586,8 +69674,7 @@ in
       sha512 = "+eT/06NHwPXfzUSe4vDjjam9gZtalhwDYOq0xX6va88BLZd8APbo17Ajkz4hdnr2Gpls5+xFUqMeiklAQtBHYQ==";
     };
     dependencies = [
-      sources."@inquirer/figures-1.0.3"
-      sources."@ljharb/through-2.3.13"
+      sources."@inquirer/figures-1.0.5"
       sources."aggregate-error-5.0.0"
       sources."ansi-escapes-4.3.2"
       sources."ansi-regex-6.0.1"
@@ -70595,7 +69682,6 @@ in
       sources."base64-js-1.5.1"
       sources."bl-4.1.0"
       sources."buffer-5.7.1"
-      sources."call-bind-1.0.7"
       sources."chalk-5.3.0"
       sources."chardet-0.7.0"
       sources."clean-stack-5.2.0"
@@ -70608,10 +69694,7 @@ in
       sources."color-name-1.1.4"
       sources."cross-spawn-7.0.3"
       sources."defaults-1.0.4"
-      sources."define-data-property-1.1.4"
       sources."emoji-regex-10.3.0"
-      sources."es-define-property-1.0.0"
-      sources."es-errors-1.3.0"
       sources."esc-exit-3.0.1"
       sources."escape-string-regexp-5.0.0"
       sources."execa-8.0.1"
@@ -70622,23 +69705,16 @@ in
         ];
       })
       sources."fkill-9.0.0"
-      sources."function-bind-1.1.2"
       sources."fuzzy-search-3.2.1"
       sources."get-east-asian-width-1.2.0"
-      sources."get-intrinsic-1.2.4"
       sources."get-stream-8.0.1"
-      sources."gopd-1.0.1"
       sources."has-flag-4.0.0"
-      sources."has-property-descriptors-1.0.2"
-      sources."has-proto-1.0.3"
-      sources."has-symbols-1.0.3"
-      sources."hasown-2.0.2"
       sources."human-signals-5.0.0"
       sources."iconv-lite-0.4.24"
       sources."ieee754-1.2.1"
       sources."indent-string-5.0.0"
       sources."inherits-2.0.4"
-      (sources."inquirer-9.2.23" // {
+      (sources."inquirer-9.3.6" // {
         dependencies = [
           sources."ansi-regex-5.0.1"
           sources."emoji-regex-8.0.0"
@@ -70658,7 +69734,6 @@ in
       sources."is-stream-3.0.0"
       sources."is-unicode-supported-0.1.0"
       sources."isexe-2.0.0"
-      sources."lodash-4.17.21"
       (sources."log-symbols-4.1.0" // {
         dependencies = [
           sources."ansi-styles-4.3.0"
@@ -70702,12 +69777,11 @@ in
       sources."rxjs-7.8.1"
       sources."safe-buffer-5.2.1"
       sources."safer-buffer-2.1.2"
-      sources."set-function-length-1.2.2"
       sources."shebang-command-2.0.0"
       sources."shebang-regex-3.0.0"
       sources."signal-exit-4.1.0"
       sources."slice-ansi-5.0.0"
-      sources."string-width-7.1.0"
+      sources."string-width-7.2.0"
       sources."string_decoder-1.3.0"
       sources."strip-ansi-7.1.0"
       sources."strip-final-newline-3.0.0"
@@ -70736,6 +69810,7 @@ in
           sources."strip-ansi-6.0.1"
         ];
       })
+      sources."yoctocolors-cjs-2.1.2"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -70758,14 +69833,14 @@ in
     dependencies = [
       sources."@ethereumjs/rlp-4.0.1"
       sources."@ethereumjs/util-8.1.0"
-      sources."@noble/curves-1.4.0"
+      sources."@noble/curves-1.4.2"
       sources."@noble/hashes-1.4.0"
       sources."@scure/base-1.1.7"
       sources."@scure/bip32-1.4.0"
       sources."@scure/bip39-1.3.0"
       sources."@types/atob-2.1.4"
       sources."@types/inquirer-6.5.0"
-      sources."@types/node-20.14.2"
+      sources."@types/node-20.14.12"
       sources."@types/through-0.0.33"
       sources."ajv-6.12.6"
       sources."ansi-escapes-4.3.2"
@@ -70811,7 +69886,7 @@ in
       sources."escape-string-regexp-1.0.5"
       sources."esprima-4.0.1"
       sources."ethereum-bloom-filters-1.1.0"
-      sources."ethereum-cryptography-2.2.0"
+      sources."ethereum-cryptography-2.2.1"
       (sources."ethjs-unit-0.1.6" // {
         dependencies = [
           sources."bn.js-4.11.6"
@@ -71147,7 +70222,7 @@ in
       sources."kind-of-6.0.3"
       sources."kuler-2.0.0"
       sources."lazy-1.0.11"
-      sources."logform-2.6.0"
+      sources."logform-2.6.1"
       sources."make-dir-1.3.0"
       sources."map-cache-0.2.2"
       sources."map-stream-0.1.0"
@@ -71181,7 +70256,7 @@ in
           sources."kind-of-3.2.2"
         ];
       })
-      sources."object-inspect-1.13.1"
+      sources."object-inspect-1.13.2"
       sources."object-is-1.1.6"
       sources."object-keys-1.1.1"
       sources."object-visit-1.0.1"
@@ -71322,12 +70397,12 @@ in
       sources."which-boxed-primitive-1.0.2"
       sources."which-collection-1.0.2"
       sources."which-typed-array-1.1.15"
-      (sources."winston-3.13.0" // {
+      (sources."winston-3.13.1" // {
         dependencies = [
           sources."async-3.2.5"
         ];
       })
-      sources."winston-transport-4.7.0"
+      sources."winston-transport-4.7.1"
       sources."wordwrap-0.0.3"
       sources."wrappy-1.0.2"
       sources."write-file-atomic-2.4.3"
@@ -71346,10 +70421,10 @@ in
   fx = nodeEnv.buildNodePackage {
     name = "fx";
     packageName = "fx";
-    version = "34.0.0";
+    version = "35.0.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/fx/-/fx-34.0.0.tgz";
-      sha512 = "/fZih3/WLsrtlaj2mahjWxAmyuikmcl3D5kKPqLtFmEilLsy9wp0+/vEmfvYXXhwJc+ajtCFDCf+yttXmPMHSQ==";
+      url = "https://registry.npmjs.org/fx/-/fx-35.0.0.tgz";
+      sha512 = "O07q+Lknrom5RUX/u53tjo2KTTLUnL0K703JbqMYb19ORijfJNvijzFqqYXEjdk25T9R14S6t6wHD8fCWXCM0g==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -71378,7 +70453,7 @@ in
       })
       sources."@types/bn.js-5.1.5"
       sources."@types/lru-cache-5.1.1"
-      sources."@types/node-20.14.2"
+      sources."@types/node-20.14.12"
       sources."@types/seedrandom-3.0.1"
       sources."abstract-level-1.0.3"
       (sources."abstract-leveldown-7.2.0" // {
@@ -71427,20 +70502,20 @@ in
     dependencies = [
       sources."@ampproject/remapping-2.3.0"
       sources."@babel/code-frame-7.24.7"
-      sources."@babel/compat-data-7.24.7"
-      (sources."@babel/core-7.24.7" // {
+      sources."@babel/compat-data-7.24.9"
+      (sources."@babel/core-7.24.9" // {
         dependencies = [
           sources."semver-6.3.1"
         ];
       })
-      sources."@babel/generator-7.24.7"
+      sources."@babel/generator-7.24.10"
       sources."@babel/helper-annotate-as-pure-7.24.7"
-      (sources."@babel/helper-compilation-targets-7.24.7" // {
+      (sources."@babel/helper-compilation-targets-7.24.8" // {
         dependencies = [
           sources."semver-6.3.1"
         ];
       })
-      (sources."@babel/helper-create-class-features-plugin-7.24.7" // {
+      (sources."@babel/helper-create-class-features-plugin-7.24.8" // {
         dependencies = [
           sources."semver-6.3.1"
         ];
@@ -71448,40 +70523,40 @@ in
       sources."@babel/helper-environment-visitor-7.24.7"
       sources."@babel/helper-function-name-7.24.7"
       sources."@babel/helper-hoist-variables-7.24.7"
-      sources."@babel/helper-member-expression-to-functions-7.24.7"
+      sources."@babel/helper-member-expression-to-functions-7.24.8"
       sources."@babel/helper-module-imports-7.24.7"
-      sources."@babel/helper-module-transforms-7.24.7"
+      sources."@babel/helper-module-transforms-7.24.9"
       sources."@babel/helper-optimise-call-expression-7.24.7"
-      sources."@babel/helper-plugin-utils-7.24.7"
+      sources."@babel/helper-plugin-utils-7.24.8"
       sources."@babel/helper-replace-supers-7.24.7"
       sources."@babel/helper-simple-access-7.24.7"
       sources."@babel/helper-skip-transparent-expression-wrappers-7.24.7"
       sources."@babel/helper-split-export-declaration-7.24.7"
-      sources."@babel/helper-string-parser-7.24.7"
+      sources."@babel/helper-string-parser-7.24.8"
       sources."@babel/helper-validator-identifier-7.24.7"
-      sources."@babel/helper-validator-option-7.24.7"
-      sources."@babel/helpers-7.24.7"
+      sources."@babel/helper-validator-option-7.24.8"
+      sources."@babel/helpers-7.24.8"
       (sources."@babel/highlight-7.24.7" // {
         dependencies = [
           sources."chalk-2.4.2"
         ];
       })
-      sources."@babel/parser-7.24.7"
+      sources."@babel/parser-7.24.8"
       sources."@babel/plugin-syntax-jsx-7.24.7"
       sources."@babel/plugin-syntax-typescript-7.24.7"
-      sources."@babel/plugin-transform-modules-commonjs-7.24.7"
-      sources."@babel/plugin-transform-typescript-7.24.7"
+      sources."@babel/plugin-transform-modules-commonjs-7.24.8"
+      sources."@babel/plugin-transform-typescript-7.24.8"
       sources."@babel/preset-typescript-7.24.7"
-      sources."@babel/runtime-7.24.7"
+      sources."@babel/runtime-7.24.8"
       sources."@babel/template-7.24.7"
-      sources."@babel/traverse-7.24.7"
-      sources."@babel/types-7.24.7"
+      sources."@babel/traverse-7.24.8"
+      sources."@babel/types-7.24.9"
       sources."@hapi/hoek-9.3.0"
       sources."@hapi/topo-5.1.0"
       sources."@jridgewell/gen-mapping-0.3.5"
       sources."@jridgewell/resolve-uri-3.1.2"
       sources."@jridgewell/set-array-1.2.1"
-      sources."@jridgewell/sourcemap-codec-1.4.15"
+      sources."@jridgewell/sourcemap-codec-1.5.0"
       sources."@jridgewell/trace-mapping-0.3.25"
       sources."@lmdb/lmdb-darwin-arm64-2.5.3"
       sources."@lmdb/lmdb-darwin-x64-2.5.3"
@@ -71501,7 +70576,7 @@ in
       sources."@types/common-tags-1.8.4"
       sources."@types/http-cache-semantics-4.0.4"
       sources."@types/keyv-3.1.4"
-      sources."@types/node-20.14.2"
+      sources."@types/node-20.14.12"
       sources."@types/node-fetch-2.6.11"
       sources."@types/responselike-1.0.3"
       sources."@types/yoga-layout-1.9.2"
@@ -71517,7 +70592,7 @@ in
       sources."better-opn-2.1.1"
       sources."boolbase-1.0.0"
       sources."boxen-5.1.2"
-      sources."browserslist-4.23.1"
+      sources."browserslist-4.23.2"
       sources."cacheable-lookup-5.0.4"
       (sources."cacheable-request-7.0.4" // {
         dependencies = [
@@ -71525,7 +70600,7 @@ in
         ];
       })
       sources."camelcase-6.3.0"
-      sources."caniuse-lite-1.0.30001634"
+      sources."caniuse-lite-1.0.30001643"
       (sources."chalk-4.1.2" // {
         dependencies = [
           sources."ansi-styles-4.3.0"
@@ -71583,7 +70658,7 @@ in
       sources."domhandler-4.3.1"
       sources."domutils-2.8.0"
       sources."dot-prop-5.3.0"
-      sources."electron-to-chromium-1.4.802"
+      sources."electron-to-chromium-1.5.1"
       sources."emoji-regex-8.0.0"
       sources."encoding-0.1.13"
       sources."end-of-stream-1.4.4"
@@ -71661,7 +70736,7 @@ in
       sources."is-wsl-2.2.0"
       sources."is64bit-2.0.0"
       sources."isexe-2.0.0"
-      sources."joi-17.13.1"
+      sources."joi-17.13.3"
       sources."js-tokens-4.0.0"
       sources."jsesc-2.5.2"
       sources."json-buffer-3.0.1"
@@ -71686,13 +70761,13 @@ in
       sources."mimic-fn-4.0.0"
       sources."mimic-response-1.0.1"
       sources."ms-2.1.2"
-      sources."msgpackr-1.10.2"
+      sources."msgpackr-1.11.0"
       sources."mute-stream-0.0.8"
       sources."node-addon-api-4.3.0"
       sources."node-fetch-2.7.0"
       sources."node-gyp-build-optional-packages-5.0.3"
       sources."node-object-hash-2.3.10"
-      sources."node-releases-2.0.14"
+      sources."node-releases-2.0.18"
       sources."normalize-url-6.1.0"
       (sources."npm-run-path-5.3.0" // {
         dependencies = [
@@ -71751,7 +70826,7 @@ in
       sources."rxjs-6.6.7"
       sources."safe-buffer-5.2.1"
       sources."safer-buffer-2.1.2"
-      sources."semver-7.6.2"
+      sources."semver-7.6.3"
       sources."set-blocking-2.0.0"
       sources."shebang-command-2.0.0"
       sources."shebang-regex-3.0.0"
@@ -71780,7 +70855,7 @@ in
       sources."undici-types-5.26.5"
       sources."unique-string-2.0.0"
       sources."universalify-2.0.1"
-      sources."update-browserslist-db-1.0.16"
+      sources."update-browserslist-db-1.1.0"
       sources."util-deprecate-1.0.2"
       sources."utila-0.4.0"
       sources."weak-lru-cache-1.2.2"
@@ -71829,15 +70904,15 @@ in
   "@gitbeaker/cli" = nodeEnv.buildNodePackage {
     name = "_at_gitbeaker_slash_cli";
     packageName = "@gitbeaker/cli";
-    version = "40.0.3";
+    version = "40.1.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/@gitbeaker/cli/-/cli-40.0.3.tgz";
-      sha512 = "1zR4KJ2Pv5nWwxt/5UvCmw8Z2u75fR+BbclTQ/esxMGhQCCtpuu/oWD96MkBaDqZoQqHHTTJOBZk3OCpa2CPdg==";
+      url = "https://registry.npmjs.org/@gitbeaker/cli/-/cli-40.1.2.tgz";
+      sha512 = "jCpOPJaPTDLkQ85KraJOQHHmcBZkIY7p1vsrfhBOQK8hzt8JGR9SmcbsnK13tMWdCnu54XtSsLXiQXslNL77yA==";
     };
     dependencies = [
-      sources."@gitbeaker/core-40.0.3"
-      sources."@gitbeaker/requester-utils-40.0.3"
-      sources."@gitbeaker/rest-40.0.3"
+      sources."@gitbeaker/core-40.1.2"
+      sources."@gitbeaker/requester-utils-40.1.2"
+      sources."@gitbeaker/rest-40.1.2"
       sources."ansi-styles-4.3.0"
       sources."call-bind-1.0.7"
       sources."chalk-4.1.2"
@@ -71854,9 +70929,9 @@ in
       sources."has-proto-1.0.3"
       sources."has-symbols-1.0.3"
       sources."hasown-2.0.2"
-      sources."object-inspect-1.13.1"
+      sources."object-inspect-1.13.2"
       sources."picomatch-browser-2.2.6"
-      sources."qs-6.12.1"
+      sources."qs-6.12.3"
       sources."rate-limiter-flexible-4.0.1"
       sources."set-function-length-1.2.2"
       sources."side-channel-1.0.6"
@@ -71877,10 +70952,10 @@ in
   graphql = nodeEnv.buildNodePackage {
     name = "graphql";
     packageName = "graphql";
-    version = "16.8.2";
+    version = "16.9.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/graphql/-/graphql-16.8.2.tgz";
-      sha512 = "cvVIBILwuoSyD54U4cF/UXDh5yAobhNV/tPygI4lZhgOIJQE/WLWC4waBRb4I6bDVYb3OVx3lfHbaQOEoUD5sg==";
+      url = "https://registry.npmjs.org/graphql/-/graphql-16.9.0.tgz";
+      sha512 = "GGTKBX4SD7Wdb8mqeDLni2oaRGYQWjWHGKPQ24ZMnUtKfcsVoiv4uX8+LJr1K6U5VW2Lu1BwJnj7uiori0YtRw==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -71925,6 +71000,7 @@ in
           sources."cross-fetch-3.0.6"
           sources."graphql-15.3.0"
           sources."has-flag-4.0.0"
+          sources."node-fetch-2.6.1"
           sources."supports-color-7.2.0"
           sources."tslib-2.0.2"
         ];
@@ -72022,7 +71098,7 @@ in
       sources."@nodelib/fs.walk-1.2.8"
       sources."@sindresorhus/is-0.14.0"
       sources."@szmarczak/http-timer-1.1.2"
-      sources."@types/node-20.14.2"
+      sources."@types/node-20.14.12"
       sources."@types/parse-json-4.0.2"
       sources."@types/websocket-1.0.2"
       sources."abort-controller-3.0.0"
@@ -72098,7 +71174,11 @@ in
           sources."strip-ansi-5.2.0"
         ];
       })
-      sources."cross-fetch-3.1.4"
+      (sources."cross-fetch-3.1.4" // {
+        dependencies = [
+          sources."node-fetch-2.6.1"
+        ];
+      })
       sources."cross-spawn-6.0.5"
       sources."dashdash-1.14.1"
       sources."dataloader-2.0.0"
@@ -72115,6 +71195,7 @@ in
       sources."duplexer3-0.1.5"
       sources."ecc-jsbn-0.1.2"
       sources."emoji-regex-8.0.0"
+      sources."encoding-0.1.13"
       sources."end-of-stream-1.4.4"
       sources."error-ex-1.3.2"
       sources."es-define-property-1.0.0"
@@ -72130,6 +71211,7 @@ in
       sources."extend-3.0.2"
       (sources."external-editor-3.1.0" // {
         dependencies = [
+          sources."iconv-lite-0.4.24"
           sources."tmp-0.0.33"
         ];
       })
@@ -72172,7 +71254,7 @@ in
         ];
       })
       sources."graceful-fs-4.2.11"
-      sources."graphql-15.8.0"
+      sources."graphql-15.9.0"
       sources."graphql-config-3.0.3"
       sources."graphql-subscriptions-1.2.1"
       sources."graphql-type-json-0.3.2"
@@ -72189,7 +71271,7 @@ in
       sources."http-cache-semantics-4.1.1"
       sources."http-signature-1.2.0"
       sources."http2-client-1.3.5"
-      sources."iconv-lite-0.4.24"
+      sources."iconv-lite-0.6.3"
       sources."ieee754-1.2.1"
       sources."ignore-5.3.1"
       (sources."import-fresh-3.3.0" // {
@@ -72291,7 +71373,7 @@ in
       sources."nice-try-1.0.5"
       sources."no-case-3.0.4"
       sources."node-emoji-1.10.0"
-      sources."node-fetch-2.6.1"
+      sources."node-fetch-2.7.0"
       sources."node-fetch-h2-2.3.0"
       sources."node-gyp-build-4.8.1"
       sources."node-readfiles-0.2.0"
@@ -72310,7 +71392,7 @@ in
       sources."oas-schema-walker-1.1.5"
       sources."oas-validator-5.0.8"
       sources."oauth-sign-0.9.0"
-      sources."object-inspect-1.13.1"
+      sources."object-inspect-1.13.2"
       sources."object-is-1.1.6"
       sources."object-keys-1.1.1"
       sources."object.assign-4.1.5"
@@ -72424,6 +71506,7 @@ in
       sources."to-readable-stream-1.0.0"
       sources."to-regex-range-5.0.1"
       sources."tough-cookie-2.5.0"
+      sources."tr46-0.0.3"
       sources."tslib-2.6.3"
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
@@ -72439,6 +71522,8 @@ in
       sources."value-or-promise-1.0.11"
       sources."verror-1.10.0"
       sources."wcwidth-1.0.1"
+      sources."webidl-conversions-3.0.1"
+      sources."whatwg-url-5.0.0"
       sources."which-1.3.1"
       sources."which-boxed-primitive-1.0.2"
       sources."which-collection-1.0.2"
@@ -72466,20 +71551,20 @@ in
   graphql-language-service-cli = nodeEnv.buildNodePackage {
     name = "graphql-language-service-cli";
     packageName = "graphql-language-service-cli";
-    version = "3.4.0";
+    version = "3.4.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/graphql-language-service-cli/-/graphql-language-service-cli-3.4.0.tgz";
-      sha512 = "2bNbTYHwggYp/VwnmBzq2UQjoqwnIiBE8nE4M6ikC/0AX7hzNlz7uoBbQ0guFIrJ8Z6fyA0PjU28YGs5g5TMvw==";
+      url = "https://registry.npmjs.org/graphql-language-service-cli/-/graphql-language-service-cli-3.4.1.tgz";
+      sha512 = "bWnSJ6ibIAS8h2rR7DV+12FxoVPeJbcR9Du/WHGXMIj0eDwartZPX9NaXmlX6wInSdjjQm6BWdQt1dsim8Eu+w==";
     };
     dependencies = [
       sources."@ampproject/remapping-2.3.0"
       sources."@ardatan/sync-fetch-0.0.1"
-      sources."@astrojs/compiler-2.8.0"
+      sources."@astrojs/compiler-2.9.2"
       sources."@babel/code-frame-7.24.7"
-      sources."@babel/compat-data-7.24.7"
-      sources."@babel/core-7.24.7"
-      sources."@babel/generator-7.24.7"
-      (sources."@babel/helper-compilation-targets-7.24.7" // {
+      sources."@babel/compat-data-7.24.9"
+      sources."@babel/core-7.24.9"
+      sources."@babel/generator-7.24.10"
+      (sources."@babel/helper-compilation-targets-7.24.8" // {
         dependencies = [
           sources."lru-cache-5.1.1"
         ];
@@ -72488,28 +71573,28 @@ in
       sources."@babel/helper-function-name-7.24.7"
       sources."@babel/helper-hoist-variables-7.24.7"
       sources."@babel/helper-module-imports-7.24.7"
-      sources."@babel/helper-module-transforms-7.24.7"
-      sources."@babel/helper-plugin-utils-7.24.7"
+      sources."@babel/helper-module-transforms-7.24.9"
+      sources."@babel/helper-plugin-utils-7.24.8"
       sources."@babel/helper-simple-access-7.24.7"
       sources."@babel/helper-split-export-declaration-7.24.7"
-      sources."@babel/helper-string-parser-7.24.7"
+      sources."@babel/helper-string-parser-7.24.8"
       sources."@babel/helper-validator-identifier-7.24.7"
-      sources."@babel/helper-validator-option-7.24.7"
-      sources."@babel/helpers-7.24.7"
+      sources."@babel/helper-validator-option-7.24.8"
+      sources."@babel/helpers-7.24.8"
       sources."@babel/highlight-7.24.7"
-      sources."@babel/parser-7.24.7"
+      sources."@babel/parser-7.24.8"
       sources."@babel/plugin-syntax-import-assertions-7.24.7"
       sources."@babel/polyfill-7.12.1"
       sources."@babel/template-7.24.7"
-      sources."@babel/traverse-7.24.7"
-      sources."@babel/types-7.24.7"
+      sources."@babel/traverse-7.24.8"
+      sources."@babel/types-7.24.9"
       sources."@graphql-tools/batch-execute-9.0.4"
       sources."@graphql-tools/code-file-loader-8.0.3"
-      sources."@graphql-tools/delegate-10.0.11"
-      sources."@graphql-tools/executor-1.2.6"
-      sources."@graphql-tools/executor-graphql-ws-1.1.2"
-      sources."@graphql-tools/executor-http-1.0.9"
-      sources."@graphql-tools/executor-legacy-ws-1.0.6"
+      sources."@graphql-tools/delegate-10.0.16"
+      sources."@graphql-tools/executor-1.3.0"
+      sources."@graphql-tools/executor-graphql-ws-1.2.0"
+      sources."@graphql-tools/executor-http-1.1.5"
+      sources."@graphql-tools/executor-legacy-ws-1.1.0"
       sources."@graphql-tools/graphql-file-loader-8.0.1"
       sources."@graphql-tools/graphql-tag-pluck-8.1.0"
       sources."@graphql-tools/import-7.0.1"
@@ -72518,14 +71603,14 @@ in
       sources."@graphql-tools/merge-9.0.4"
       sources."@graphql-tools/schema-10.0.4"
       sources."@graphql-tools/url-loader-8.0.2"
-      sources."@graphql-tools/utils-10.2.2"
+      sources."@graphql-tools/utils-10.3.2"
       sources."@graphql-tools/wrap-10.0.5"
       sources."@graphql-typed-document-node/core-3.2.0"
       sources."@iarna/toml-2.2.5"
       sources."@jridgewell/gen-mapping-0.3.5"
       sources."@jridgewell/resolve-uri-3.1.2"
       sources."@jridgewell/set-array-1.2.1"
-      sources."@jridgewell/sourcemap-codec-1.4.15"
+      sources."@jridgewell/sourcemap-codec-1.5.0"
       sources."@jridgewell/trace-mapping-0.3.25"
       sources."@kamilkisiela/fast-url-parser-1.1.4"
       sources."@nodelib/fs.scandir-2.1.5"
@@ -72534,51 +71619,55 @@ in
       sources."@pkgr/core-0.1.1"
       sources."@repeaterjs/repeater-3.0.6"
       sources."@types/estree-1.0.5"
-      sources."@types/node-20.14.2"
-      sources."@types/ws-8.5.10"
+      sources."@types/node-20.14.12"
+      sources."@types/ws-8.5.11"
       sources."@types/yargs-16.0.5"
       sources."@types/yargs-parser-21.0.3"
-      (sources."@vue/compiler-core-3.4.29" // {
+      (sources."@vue/compiler-core-3.4.34" // {
         dependencies = [
+          sources."estree-walker-2.0.2"
           sources."source-map-js-1.2.0"
         ];
       })
-      sources."@vue/compiler-dom-3.4.29"
-      (sources."@vue/compiler-sfc-3.4.29" // {
+      sources."@vue/compiler-dom-3.4.34"
+      (sources."@vue/compiler-sfc-3.4.34" // {
         dependencies = [
+          sources."estree-walker-2.0.2"
           sources."source-map-js-1.2.0"
         ];
       })
-      sources."@vue/compiler-ssr-3.4.29"
-      sources."@vue/shared-3.4.29"
+      sources."@vue/compiler-ssr-3.4.34"
+      sources."@vue/shared-3.4.34"
       sources."@whatwg-node/events-0.1.1"
       sources."@whatwg-node/fetch-0.9.18"
-      sources."@whatwg-node/node-fetch-0.5.11"
-      sources."acorn-8.12.0"
+      sources."@whatwg-node/node-fetch-0.5.14"
+      sources."acorn-8.12.1"
       sources."ansi-regex-5.0.1"
-      sources."ansi-styles-3.2.1"
+      sources."ansi-styles-4.3.0"
       sources."argparse-2.0.1"
       sources."aria-query-5.3.0"
       sources."array-union-2.1.0"
       sources."astrojs-compiler-sync-1.0.0"
-      sources."axobject-query-4.0.0"
+      sources."axobject-query-4.1.0"
       sources."balanced-match-1.0.2"
       sources."brace-expansion-1.1.11"
       sources."braces-3.0.3"
-      sources."browserslist-4.23.1"
+      sources."browserslist-4.23.2"
       sources."bufferutil-4.0.8"
       sources."busboy-1.6.0"
       sources."callsites-3.1.0"
-      sources."caniuse-lite-1.0.30001634"
-      sources."chalk-2.4.2"
-      sources."cliui-7.0.4"
-      (sources."code-red-1.0.4" // {
+      sources."caniuse-lite-1.0.30001643"
+      (sources."chalk-2.4.2" // {
         dependencies = [
-          sources."estree-walker-3.0.3"
+          sources."ansi-styles-3.2.1"
+          sources."color-convert-1.9.3"
+          sources."color-name-1.1.3"
         ];
       })
-      sources."color-convert-1.9.3"
-      sources."color-name-1.1.3"
+      sources."cliui-7.0.4"
+      sources."code-red-1.0.4"
+      sources."color-convert-2.0.1"
+      sources."color-name-1.1.4"
       sources."concat-map-0.0.1"
       sources."convert-source-map-2.0.0"
       sources."core-js-2.6.12"
@@ -72593,14 +71682,14 @@ in
       sources."dir-glob-3.0.1"
       sources."dotenv-10.0.0"
       sources."dset-3.1.3"
-      sources."electron-to-chromium-1.4.802"
+      sources."electron-to-chromium-1.5.1"
       sources."emoji-regex-8.0.0"
       sources."encoding-0.1.13"
       sources."entities-4.5.0"
       sources."error-ex-1.3.2"
       sources."escalade-3.1.2"
       sources."escape-string-regexp-1.0.5"
-      sources."estree-walker-2.0.2"
+      sources."estree-walker-3.0.3"
       sources."extract-files-11.0.0"
       sources."fast-decode-uri-component-1.0.1"
       sources."fast-glob-3.3.2"
@@ -72614,14 +71703,14 @@ in
       sources."glob-parent-5.1.2"
       sources."globals-11.12.0"
       sources."globby-11.1.0"
-      sources."graphql-16.8.2"
+      sources."graphql-16.9.0"
       (sources."graphql-config-5.0.3" // {
         dependencies = [
           sources."minimatch-4.2.3"
         ];
       })
       sources."graphql-language-service-5.2.1"
-      sources."graphql-language-service-server-2.13.0"
+      sources."graphql-language-service-server-2.13.1"
       sources."graphql-ws-5.16.0"
       sources."has-flag-3.0.0"
       sources."iconv-lite-0.6.3"
@@ -72649,7 +71738,7 @@ in
       sources."lines-and-columns-1.2.4"
       sources."locate-character-3.0.0"
       sources."lower-case-2.0.2"
-      sources."lru-cache-10.2.2"
+      sources."lru-cache-10.4.3"
       sources."magic-string-0.30.10"
       sources."mdn-data-2.0.30"
       sources."merge2-1.4.1"
@@ -72663,7 +71752,7 @@ in
       sources."node-abort-controller-3.1.1"
       sources."node-fetch-2.7.0"
       sources."node-gyp-build-4.8.1"
-      sources."node-releases-2.0.14"
+      sources."node-releases-2.0.18"
       sources."normalize-path-2.1.1"
       sources."nullthrows-1.1.1"
       sources."once-1.4.0"
@@ -72673,14 +71762,10 @@ in
       sources."pascal-case-3.1.2"
       sources."path-is-absolute-1.0.1"
       sources."path-type-4.0.0"
-      (sources."periscopic-3.1.0" // {
-        dependencies = [
-          sources."estree-walker-3.0.3"
-        ];
-      })
+      sources."periscopic-3.1.0"
       sources."picocolors-1.0.1"
       sources."picomatch-2.3.1"
-      (sources."postcss-8.4.38" // {
+      (sources."postcss-8.4.40" // {
         dependencies = [
           sources."source-map-js-1.2.0"
         ];
@@ -72701,21 +71786,17 @@ in
       sources."string-width-4.2.3"
       sources."strip-ansi-6.0.1"
       sources."supports-color-5.5.0"
-      (sources."svelte-4.2.18" // {
-        dependencies = [
-          sources."estree-walker-3.0.3"
-        ];
-      })
-      sources."svelte2tsx-0.7.9"
-      sources."synckit-0.9.0"
+      sources."svelte-4.2.18"
+      sources."svelte2tsx-0.7.13"
+      sources."synckit-0.9.1"
       sources."to-fast-properties-2.0.0"
       sources."to-regex-range-5.0.1"
       sources."tr46-0.0.3"
       sources."tslib-2.6.3"
-      sources."typescript-5.4.5"
+      sources."typescript-5.5.4"
       sources."undici-types-5.26.5"
       sources."unixify-1.0.0"
-      sources."update-browserslist-db-1.0.16"
+      sources."update-browserslist-db-1.1.0"
       sources."urlpattern-polyfill-10.0.0"
       sources."utf-8-validate-6.0.4"
       sources."value-or-promise-1.0.12"
@@ -72731,15 +71812,9 @@ in
       sources."vscode-uri-3.0.8"
       sources."webidl-conversions-3.0.1"
       sources."whatwg-url-5.0.0"
-      (sources."wrap-ansi-7.0.0" // {
-        dependencies = [
-          sources."ansi-styles-4.3.0"
-          sources."color-convert-2.0.1"
-          sources."color-name-1.1.4"
-        ];
-      })
+      sources."wrap-ansi-7.0.0"
       sources."wrappy-1.0.2"
-      sources."ws-8.17.0"
+      sources."ws-8.18.0"
       sources."y18n-5.0.8"
       sources."yallist-3.1.1"
       sources."yargs-16.2.0"
@@ -72759,10 +71834,10 @@ in
   grunt-cli = nodeEnv.buildNodePackage {
     name = "grunt-cli";
     packageName = "grunt-cli";
-    version = "1.4.3";
+    version = "1.5.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/grunt-cli/-/grunt-cli-1.4.3.tgz";
-      sha512 = "9Dtx/AhVeB4LYzsViCjUQkd0Kw0McN2gYpdmGYKtE2a5Yt7v1Q+HYZVWhqXc/kGnxlMtqKDxSwotiGeFmkrCoQ==";
+      url = "https://registry.npmjs.org/grunt-cli/-/grunt-cli-1.5.0.tgz";
+      sha512 = "rILKAFoU0dzlf22SUfDtq2R1fosChXXlJM5j7wI6uoW8gwmXDXzbUvirlKZSYCdXl3LXFbR+8xyS+WFo+b6vlA==";
     };
     dependencies = [
       sources."abbrev-1.1.1"
@@ -72787,7 +71862,7 @@ in
       sources."ini-1.3.8"
       sources."interpret-1.1.0"
       sources."is-absolute-1.0.0"
-      sources."is-core-module-2.13.1"
+      sources."is-core-module-2.15.0"
       sources."is-extglob-2.1.1"
       sources."is-glob-4.0.3"
       sources."is-number-7.0.0"
@@ -72802,13 +71877,10 @@ in
       sources."make-iterator-1.0.1"
       sources."map-cache-0.2.2"
       sources."micromatch-4.0.7"
-      sources."nopt-4.0.3"
+      sources."nopt-5.0.0"
       sources."object.defaults-1.1.0"
       sources."object.map-1.0.1"
       sources."object.pick-1.3.0"
-      sources."os-homedir-1.0.2"
-      sources."os-tmpdir-1.0.2"
-      sources."osenv-0.1.5"
       sources."parse-filepath-1.0.2"
       sources."parse-passwd-1.0.0"
       sources."path-parse-1.0.7"
@@ -72821,7 +71893,7 @@ in
       sources."supports-preserve-symlinks-flag-1.0.0"
       sources."to-regex-range-5.0.1"
       sources."unc-path-regex-0.1.2"
-      sources."v8flags-3.2.0"
+      sources."v8flags-4.0.1"
       sources."which-1.3.1"
     ];
     buildInputs = globalBuildInputs;
@@ -72909,7 +71981,7 @@ in
       sources."minimist-1.2.8"
       sources."ms-2.1.3"
       sources."negotiator-0.6.3"
-      sources."object-inspect-1.13.1"
+      sources."object-inspect-1.13.2"
       sources."on-finished-2.4.1"
       sources."options-0.0.6"
       sources."parseurl-1.3.3"
@@ -72970,7 +72042,11 @@ in
       sources."braces-3.0.3"
       sources."buffer-6.0.3"
       sources."chalk-4.1.2"
-      sources."chokidar-3.6.0"
+      (sources."chokidar-3.6.0" // {
+        dependencies = [
+          sources."glob-parent-5.1.2"
+        ];
+      })
       sources."cliui-7.0.4"
       sources."clone-2.1.2"
       sources."clone-stats-1.0.0"
@@ -72998,12 +72074,8 @@ in
       sources."fs-mkdirp-stream-2.0.1"
       sources."function-bind-1.1.2"
       sources."get-caller-file-2.0.5"
-      sources."glob-parent-5.1.2"
-      (sources."glob-stream-8.0.2" // {
-        dependencies = [
-          sources."glob-parent-6.0.2"
-        ];
-      })
+      sources."glob-parent-6.0.2"
+      sources."glob-stream-8.0.2"
       sources."glob-watcher-6.0.0"
       sources."global-modules-1.0.0"
       sources."global-prefix-1.0.2"
@@ -73021,7 +72093,7 @@ in
       sources."interpret-3.1.1"
       sources."is-absolute-1.0.0"
       sources."is-binary-path-2.1.0"
-      sources."is-core-module-2.13.1"
+      sources."is-core-module-2.15.0"
       sources."is-extglob-2.1.1"
       sources."is-fullwidth-code-point-3.0.0"
       sources."is-glob-4.0.3"
@@ -73078,7 +72150,7 @@ in
       sources."supports-preserve-symlinks-flag-1.0.0"
       sources."sver-1.8.4"
       sources."teex-1.0.1"
-      sources."text-decoder-1.1.0"
+      sources."text-decoder-1.1.1"
       sources."to-regex-range-5.0.1"
       sources."to-through-3.0.0"
       sources."unc-path-regex-0.1.2"
@@ -73152,7 +72224,7 @@ in
       sources."ini-1.3.8"
       sources."interpret-3.1.1"
       sources."is-absolute-1.0.0"
-      sources."is-core-module-2.13.1"
+      sources."is-core-module-2.15.0"
       sources."is-extglob-2.1.1"
       sources."is-fullwidth-code-point-3.0.0"
       sources."is-glob-4.0.3"
@@ -73599,7 +72671,7 @@ in
       sources."is-wsl-2.2.0"
       sources."isexe-2.0.0"
       sources."jquery-3.7.1"
-      sources."jquery.terminal-2.42.0"
+      sources."jquery.terminal-2.42.2"
       sources."js-yaml-4.1.0"
       sources."keyboardevent-key-polyfill-1.1.0"
       sources."lcov-parse-1.0.0"
@@ -73642,10 +72714,10 @@ in
   intelephense = nodeEnv.buildNodePackage {
     name = "intelephense";
     packageName = "intelephense";
-    version = "1.10.4";
+    version = "1.11.5";
     src = fetchurl {
-      url = "https://registry.npmjs.org/intelephense/-/intelephense-1.10.4.tgz";
-      sha512 = "YcSeqygon2uNn3GjQqxs3vSZQTvdbZ13WG54i+c0t6UcViEso/K5Vq9To/024h3OqCvJR2RlmunnEIuorvDqHg==";
+      url = "https://registry.npmjs.org/intelephense/-/intelephense-1.11.5.tgz";
+      sha512 = "3gi/wFkKMENtRrP5Vo/A+/rN/ywyqxtPwRVUMJJFbm2NOlk4eyq4XirbuOH7U9e4P/iBhdCvZrk+AF/HmsnnXw==";
     };
     dependencies = [
       sources."@azure/abort-controller-2.1.2"
@@ -73661,10 +72733,10 @@ in
           sources."@azure/abort-controller-1.1.0"
         ];
       })
-      sources."@azure/logger-1.1.2"
+      sources."@azure/logger-1.1.3"
       sources."@azure/opentelemetry-instrumentation-azure-sdk-1.0.0-beta.5"
-      sources."@bmewburn/js-beautify-1.14.9"
-      sources."@bmewburn/vscode-html-languageserver-1.10.0"
+      sources."@bmewburn/js-beautify-1.15.2"
+      sources."@bmewburn/vscode-html-languageserver-1.11.0"
       sources."@isaacs/cliui-8.0.2"
       (sources."@mapbox/node-pre-gyp-1.0.11" // {
         dependencies = [
@@ -73672,17 +72744,18 @@ in
           sources."nopt-5.0.0"
         ];
       })
-      sources."@microsoft/applicationinsights-web-snippet-1.1.2"
+      sources."@microsoft/applicationinsights-web-snippet-1.2.1"
+      sources."@mixmark-io/domino-2.2.0"
       sources."@nodelib/fs.scandir-2.1.5"
       sources."@nodelib/fs.stat-2.0.5"
       sources."@nodelib/fs.walk-1.2.8"
       sources."@one-ini/wasm-0.1.1"
       sources."@opentelemetry/api-1.9.0"
-      sources."@opentelemetry/core-1.25.0"
+      sources."@opentelemetry/core-1.25.1"
       sources."@opentelemetry/instrumentation-0.41.2"
-      sources."@opentelemetry/resources-1.25.0"
-      sources."@opentelemetry/sdk-trace-base-1.25.0"
-      sources."@opentelemetry/semantic-conventions-1.25.0"
+      sources."@opentelemetry/resources-1.25.1"
+      sources."@opentelemetry/sdk-trace-base-1.25.1"
+      sources."@opentelemetry/semantic-conventions-1.25.1"
       sources."@protobufjs/aspromise-1.1.2"
       sources."@protobufjs/base64-1.1.2"
       sources."@protobufjs/codegen-2.0.4"
@@ -73695,22 +72768,21 @@ in
       sources."@protobufjs/utf8-1.1.0"
       sources."@selderee/plugin-htmlparser2-0.11.0"
       sources."@tootallnate/once-2.0.0"
-      sources."@types/node-20.14.2"
-      sources."@types/shimmer-1.0.5"
-      sources."@vscode/l10n-0.0.16"
+      sources."@tootallnate/quickjs-emscripten-0.23.0"
+      sources."@types/node-20.14.12"
+      sources."@types/shimmer-1.2.0"
+      sources."@vscode/l10n-0.0.18"
       sources."abbrev-2.0.0"
-      sources."acorn-8.12.0"
+      sources."acorn-8.12.1"
       sources."acorn-import-assertions-1.9.0"
       sources."agent-base-6.0.2"
-      sources."ajv-6.12.6"
       sources."ansi-regex-5.0.1"
       sources."ansi-styles-6.2.1"
       sources."applicationinsights-2.7.3"
-      sources."applicationinsights-native-metrics-0.0.10"
+      sources."applicationinsights-native-metrics-0.0.11"
       sources."aproba-2.0.0"
       sources."are-we-there-yet-2.0.0"
-      sources."asn1-0.2.6"
-      sources."assert-plus-1.0.0"
+      sources."ast-types-0.13.4"
       sources."async-hook-jl-1.7.6"
       (sources."async-listener-0.6.10" // {
         dependencies = [
@@ -73718,13 +72790,10 @@ in
         ];
       })
       sources."asynckit-0.4.0"
-      sources."aws-sign2-0.7.0"
-      sources."aws4-1.13.0"
       sources."balanced-match-1.0.2"
-      sources."bcrypt-pbkdf-1.0.2"
+      sources."basic-ftp-5.0.5"
       sources."brace-expansion-2.0.1"
       sources."braces-3.0.3"
-      sources."caseless-0.12.0"
       sources."chownr-2.0.0"
       sources."cjs-module-lexer-1.3.1"
       (sources."cls-hooked-4.2.2" // {
@@ -73741,11 +72810,11 @@ in
       sources."config-chain-1.1.13"
       sources."console-control-strings-1.1.0"
       sources."continuation-local-storage-3.2.1"
-      sources."core-util-is-1.0.2"
       sources."cross-spawn-7.0.3"
-      sources."dashdash-1.14.1"
+      sources."data-uri-to-buffer-6.0.2"
       sources."debug-4.3.5"
       sources."deepmerge-4.3.1"
+      sources."degenerator-5.0.1"
       sources."delayed-stream-1.0.0"
       sources."delegates-1.0.0"
       sources."detect-libc-2.0.3"
@@ -73754,30 +72823,23 @@ in
       sources."dom-serializer-2.0.0"
       sources."domelementtype-2.3.0"
       sources."domhandler-5.0.3"
-      sources."domino-2.1.6"
       sources."domutils-3.1.0"
       sources."eastasianwidth-0.2.0"
-      sources."ecc-jsbn-0.1.2"
-      (sources."editorconfig-1.0.4" // {
-        dependencies = [
-          sources."minimatch-9.0.1"
-        ];
-      })
+      sources."editorconfig-1.0.4"
       sources."emitter-listener-1.1.2"
       sources."emoji-regex-9.2.2"
       sources."encoding-0.1.13"
       sources."entities-4.5.0"
-      sources."extend-3.0.2"
-      sources."extsprintf-1.3.0"
-      sources."fast-deep-equal-3.1.3"
+      sources."escodegen-2.1.0"
+      sources."esprima-4.0.1"
+      sources."estraverse-5.3.0"
+      sources."esutils-2.0.3"
       sources."fast-glob-3.3.2"
-      sources."fast-json-stable-stringify-2.1.0"
       sources."fastq-1.17.1"
       sources."fill-range-7.1.1"
-      sources."foreground-child-3.2.0"
-      sources."forever-agent-0.6.1"
+      sources."foreground-child-3.2.1"
       sources."form-data-4.0.0"
-      sources."fs-extra-11.1.1"
+      sources."fs-extra-11.2.0"
       (sources."fs-minipass-2.1.0" // {
         dependencies = [
           sources."minipass-3.3.6"
@@ -73793,42 +72855,39 @@ in
           sources."strip-ansi-6.0.1"
         ];
       })
-      sources."getpass-0.1.7"
-      sources."glob-10.4.1"
+      sources."get-uri-6.0.3"
+      (sources."glob-10.4.5" // {
+        dependencies = [
+          sources."minimatch-9.0.5"
+        ];
+      })
       sources."glob-parent-5.1.2"
       sources."graceful-fs-4.2.11"
-      sources."har-schema-2.0.0"
-      sources."har-validator-5.1.5"
       sources."has-unicode-2.0.1"
       sources."hasown-2.0.2"
       sources."html-to-text-9.0.5"
       sources."htmlparser2-8.0.2"
       sources."http-proxy-agent-5.0.0"
-      sources."http-signature-1.2.0"
       sources."https-proxy-agent-5.0.1"
       sources."iconv-lite-0.6.3"
       sources."import-in-the-middle-1.4.2"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
       sources."ini-1.3.8"
-      sources."is-core-module-2.13.1"
+      sources."ip-address-9.0.5"
+      sources."is-core-module-2.15.0"
       sources."is-extglob-2.1.1"
       sources."is-fullwidth-code-point-3.0.0"
       sources."is-glob-4.0.3"
       sources."is-number-7.0.0"
-      sources."is-typedarray-1.0.0"
       sources."isexe-2.0.0"
-      sources."isstream-0.1.2"
-      sources."jackspeak-3.4.0"
-      sources."jsbn-0.1.1"
-      sources."json-schema-0.4.0"
-      sources."json-schema-traverse-0.4.1"
-      sources."json-stringify-safe-5.0.1"
+      sources."jackspeak-3.4.3"
+      sources."js-cookie-3.0.5"
+      sources."jsbn-1.1.0"
       sources."jsonfile-6.1.0"
-      sources."jsprim-1.4.2"
       sources."leac-0.6.0"
       sources."long-5.2.3"
-      sources."lru-cache-10.0.3"
+      sources."lru-cache-10.2.2"
       (sources."make-dir-3.1.0" // {
         dependencies = [
           sources."semver-6.3.1"
@@ -73838,7 +72897,7 @@ in
       sources."micromatch-4.0.7"
       sources."mime-db-1.52.0"
       sources."mime-types-2.1.35"
-      sources."minimatch-9.0.4"
+      sources."minimatch-9.0.1"
       sources."minipass-7.1.2"
       (sources."minizlib-2.1.2" // {
         dependencies = [
@@ -73849,37 +72908,41 @@ in
       sources."module-details-from-path-1.0.3"
       sources."ms-2.1.2"
       sources."nan-2.20.0"
+      sources."netmask-2.0.2"
       sources."node-fetch-2.7.0"
       sources."nopt-7.2.1"
       sources."npmlog-5.0.1"
-      sources."oauth-sign-0.9.0"
       sources."object-assign-4.1.1"
       sources."once-1.4.0"
+      (sources."pac-proxy-agent-7.0.2" // {
+        dependencies = [
+          sources."agent-base-7.1.1"
+          sources."http-proxy-agent-7.0.2"
+          sources."https-proxy-agent-7.0.5"
+        ];
+      })
+      sources."pac-resolver-7.0.1"
+      sources."package-json-from-dist-1.0.0"
       sources."parseley-0.12.1"
       sources."path-is-absolute-1.0.1"
       sources."path-key-3.1.1"
       sources."path-parse-1.0.7"
-      (sources."path-scurry-1.11.1" // {
-        dependencies = [
-          sources."lru-cache-10.2.2"
-        ];
-      })
+      sources."path-scurry-1.11.1"
       sources."peberminta-0.9.0"
-      sources."performance-now-2.1.0"
       sources."picomatch-2.3.1"
       sources."proto-list-1.2.4"
-      sources."protobufjs-7.2.6"
-      sources."psl-1.9.0"
-      sources."punycode-2.3.1"
-      sources."qs-6.5.3"
-      sources."queue-microtask-1.2.3"
-      sources."readable-stream-3.6.2"
-      (sources."request-2.88.2" // {
+      sources."protobufjs-7.3.2"
+      (sources."proxy-agent-6.4.0" // {
         dependencies = [
-          sources."form-data-2.3.3"
-          sources."uuid-3.4.0"
+          sources."agent-base-7.1.1"
+          sources."http-proxy-agent-7.0.2"
+          sources."https-proxy-agent-7.0.5"
+          sources."lru-cache-7.18.3"
         ];
       })
+      sources."proxy-from-env-1.1.0"
+      sources."queue-microtask-1.2.3"
+      sources."readable-stream-3.6.2"
       sources."require-in-the-middle-7.3.0"
       sources."resolve-1.22.8"
       sources."reusify-1.0.4"
@@ -73894,17 +72957,21 @@ in
       sources."safe-buffer-5.2.1"
       sources."safer-buffer-2.1.2"
       sources."selderee-0.11.0"
-      (sources."semver-7.5.4" // {
-        dependencies = [
-          sources."lru-cache-6.0.0"
-        ];
-      })
+      sources."semver-7.6.3"
       sources."set-blocking-2.0.0"
       sources."shebang-command-2.0.0"
       sources."shebang-regex-3.0.0"
       sources."shimmer-1.2.1"
       sources."signal-exit-4.1.0"
-      sources."sshpk-1.18.0"
+      sources."smart-buffer-4.2.0"
+      sources."socks-2.8.3"
+      (sources."socks-proxy-agent-8.0.4" // {
+        dependencies = [
+          sources."agent-base-7.1.1"
+        ];
+      })
+      sources."source-map-0.6.1"
+      sources."sprintf-js-1.1.3"
       sources."stack-chain-1.3.7"
       sources."string-width-5.1.2"
       (sources."string-width-cjs-4.2.3" // {
@@ -73927,38 +72994,19 @@ in
         ];
       })
       sources."to-regex-range-5.0.1"
-      sources."tough-cookie-2.5.0"
       sources."tr46-0.0.3"
       sources."tslib-2.6.3"
-      sources."tunnel-agent-0.6.0"
-      sources."turndown-7.1.3"
+      sources."turndown-7.2.0"
       sources."turndown-plugin-gfm-1.0.2"
-      sources."tweetnacl-0.14.5"
-      sources."typescript-5.4.5"
+      sources."typescript-5.5.4"
       sources."undici-types-5.26.5"
       sources."universalify-2.0.1"
-      sources."uri-js-4.4.1"
       sources."util-deprecate-1.0.2"
       sources."uuid-8.3.2"
-      sources."verror-1.10.0"
-      (sources."vscode-css-languageservice-6.2.14" // {
-        dependencies = [
-          sources."@vscode/l10n-0.0.18"
-        ];
-      })
-      (sources."vscode-html-languageservice-5.2.0" // {
-        dependencies = [
-          sources."@vscode/l10n-0.0.18"
-        ];
-      })
+      sources."vscode-css-languageservice-6.3.0"
+      sources."vscode-html-languageservice-5.3.0"
       sources."vscode-jsonrpc-8.2.0"
-      (sources."vscode-languageserver-8.2.0-next.3" // {
-        dependencies = [
-          sources."vscode-jsonrpc-8.2.0-next.2"
-          sources."vscode-languageserver-protocol-3.17.4-next.3"
-          sources."vscode-languageserver-types-3.17.4-next.2"
-        ];
-      })
+      sources."vscode-languageserver-9.0.1"
       sources."vscode-languageserver-protocol-3.17.5"
       sources."vscode-languageserver-textdocument-1.0.11"
       sources."vscode-languageserver-types-3.17.5"
@@ -73998,13 +73046,13 @@ in
   joplin = nodeEnv.buildNodePackage {
     name = "joplin";
     packageName = "joplin";
-    version = "2.14.1";
+    version = "3.0.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/joplin/-/joplin-2.14.1.tgz";
-      sha512 = "OMg8OB1cx6MzGMUSvycBYu152vYz6BbtAnerEqxAvX2Jtlj7+RjuXYxJ0TgoV2BG43BaOqjzdr+BC5WFFp+Huw==";
+      url = "https://registry.npmjs.org/joplin/-/joplin-3.0.1.tgz";
+      sha512 = "LxEwL+PuUcdcZ6Qi/otqyknl2kf9cE/DVnoiHnq6wgWGjccBOazp6kgIEOXSCOm5h1GZsLE+sJgEdeYYTEB3UQ==";
     };
     dependencies = [
-      sources."@adobe/css-tools-4.3.2"
+      sources."@adobe/css-tools-4.3.3"
       (sources."@aws-crypto/crc32-3.0.0" // {
         dependencies = [
           sources."tslib-1.14.1"
@@ -74111,13 +73159,13 @@ in
       sources."@aws-sdk/service-error-classification-3.296.0"
       sources."@aws-sdk/shared-ini-file-loader-3.296.0"
       sources."@aws-sdk/signature-v4-3.296.0"
-      (sources."@aws-sdk/signature-v4-crt-3.598.0" // {
+      (sources."@aws-sdk/signature-v4-crt-3.617.0" // {
         dependencies = [
-          sources."@aws-sdk/middleware-sdk-s3-3.598.0"
-          sources."@aws-sdk/signature-v4-multi-region-3.598.0"
-          sources."@aws-sdk/types-3.598.0"
+          sources."@aws-sdk/middleware-sdk-s3-3.617.0"
+          sources."@aws-sdk/signature-v4-multi-region-3.617.0"
+          sources."@aws-sdk/types-3.609.0"
           sources."@aws-sdk/util-arn-parser-3.568.0"
-          sources."@aws-sdk/util-user-agent-node-3.598.0"
+          sources."@aws-sdk/util-user-agent-node-3.614.0"
         ];
       })
       sources."@aws-sdk/signature-v4-multi-region-3.296.0"
@@ -74149,7 +73197,7 @@ in
       sources."@aws-sdk/util-utf8-browser-3.259.0"
       sources."@aws-sdk/util-waiter-3.296.0"
       sources."@aws-sdk/xml-builder-3.295.0"
-      sources."@babel/runtime-7.24.7"
+      sources."@babel/runtime-7.24.8"
       sources."@braintree/sanitize-url-6.0.4"
       sources."@cronvel/get-pixels-3.4.1"
       sources."@gar/promisify-1.1.3"
@@ -74162,50 +73210,55 @@ in
           sources."strip-ansi-7.1.0"
         ];
       })
-      sources."@joplin/fork-htmlparser2-4.1.51"
-      sources."@joplin/fork-sax-1.2.55"
-      sources."@joplin/fork-uslug-1.0.16"
-      sources."@joplin/htmlpack-2.14.1"
-      sources."@joplin/lib-2.14.1"
-      sources."@joplin/renderer-2.14.1"
-      sources."@joplin/turndown-4.0.73"
-      sources."@joplin/turndown-plugin-gfm-1.0.55"
-      (sources."@joplin/utils-2.14.1" // {
+      sources."@joplin/fork-htmlparser2-4.1.52"
+      sources."@joplin/fork-sax-1.2.56"
+      sources."@joplin/fork-uslug-1.0.17"
+      sources."@joplin/htmlpack-3.0.1"
+      sources."@joplin/lib-3.0.1"
+      sources."@joplin/renderer-3.0.1"
+      sources."@joplin/turndown-4.0.74"
+      sources."@joplin/turndown-plugin-gfm-1.0.56"
+      (sources."@joplin/utils-3.0.1" // {
         dependencies = [
           sources."brace-expansion-2.0.1"
           sources."glob-10.3.10"
-          sources."minimatch-9.0.4"
+          sources."minimatch-9.0.5"
+        ];
+      })
+      (sources."@mapbox/node-pre-gyp-1.0.11" // {
+        dependencies = [
+          sources."agent-base-6.0.2"
+          sources."https-proxy-agent-5.0.1"
         ];
       })
-      sources."@mapbox/node-pre-gyp-1.0.11"
       sources."@npmcli/fs-1.1.1"
       sources."@npmcli/move-file-1.1.2"
-      sources."@smithy/abort-controller-3.0.1"
-      sources."@smithy/fetch-http-handler-3.0.2"
+      sources."@smithy/abort-controller-3.1.1"
+      sources."@smithy/fetch-http-handler-3.2.3"
       sources."@smithy/is-array-buffer-3.0.0"
-      sources."@smithy/middleware-endpoint-3.0.2"
-      sources."@smithy/middleware-serde-3.0.1"
-      sources."@smithy/middleware-stack-3.0.1"
-      sources."@smithy/node-config-provider-3.1.1"
-      sources."@smithy/node-http-handler-3.0.1"
-      sources."@smithy/property-provider-3.1.1"
-      sources."@smithy/protocol-http-4.0.1"
-      sources."@smithy/querystring-builder-3.0.1"
-      sources."@smithy/querystring-parser-3.0.1"
-      sources."@smithy/shared-ini-file-loader-3.1.1"
-      sources."@smithy/signature-v4-3.1.0"
-      sources."@smithy/smithy-client-3.1.2"
-      sources."@smithy/types-3.1.0"
-      sources."@smithy/url-parser-3.0.1"
+      sources."@smithy/middleware-endpoint-3.1.0"
+      sources."@smithy/middleware-serde-3.0.3"
+      sources."@smithy/middleware-stack-3.0.3"
+      sources."@smithy/node-config-provider-3.1.4"
+      sources."@smithy/node-http-handler-3.1.4"
+      sources."@smithy/property-provider-3.1.3"
+      sources."@smithy/protocol-http-4.1.0"
+      sources."@smithy/querystring-builder-3.0.3"
+      sources."@smithy/querystring-parser-3.0.3"
+      sources."@smithy/shared-ini-file-loader-3.1.4"
+      sources."@smithy/signature-v4-4.1.0"
+      sources."@smithy/smithy-client-3.1.10"
+      sources."@smithy/types-3.3.0"
+      sources."@smithy/url-parser-3.0.3"
       sources."@smithy/util-base64-3.0.0"
       sources."@smithy/util-buffer-from-3.0.0"
       sources."@smithy/util-config-provider-3.0.0"
       sources."@smithy/util-hex-encoding-3.0.0"
-      sources."@smithy/util-middleware-3.0.1"
-      sources."@smithy/util-stream-3.0.2"
+      sources."@smithy/util-middleware-3.0.3"
+      sources."@smithy/util-stream-3.1.2"
       sources."@smithy/util-uri-escape-3.0.0"
       sources."@smithy/util-utf8-3.0.0"
-      sources."@tootallnate/once-2.0.0"
+      sources."@tootallnate/once-1.1.2"
       sources."@types/d3-scale-4.0.8"
       sources."@types/d3-scale-chromatic-3.0.3"
       sources."@types/d3-time-3.0.3"
@@ -74213,12 +73266,11 @@ in
       sources."@types/mdast-3.0.15"
       sources."@types/ms-0.7.34"
       sources."@types/nanoid-3.0.0"
-      sources."@types/node-20.14.2"
+      sources."@types/node-20.14.12"
       sources."@types/unist-2.0.10"
-      sources."@types/ws-8.5.10"
-      sources."abab-2.0.6"
+      sources."@types/ws-8.5.11"
       sources."abbrev-1.1.1"
-      sources."agent-base-6.0.2"
+      sources."agent-base-7.1.1"
       sources."agentkeepalive-4.5.0"
       sources."aggregate-error-3.1.0"
       sources."ajv-6.12.6"
@@ -74257,11 +73309,7 @@ in
       })
       sources."aws-sign2-0.7.0"
       sources."aws4-1.13.0"
-      (sources."axios-1.7.2" // {
-        dependencies = [
-          sources."follow-redirects-1.15.6"
-        ];
-      })
+      sources."axios-1.7.2"
       sources."balanced-match-1.0.2"
       sources."base-64-1.0.0"
       sources."base64-js-1.5.1"
@@ -74300,7 +73348,7 @@ in
       })
       sources."character-entities-2.0.2"
       sources."charenc-0.0.2"
-      sources."chokidar-3.5.3"
+      sources."chokidar-3.6.0"
       sources."chownr-2.0.0"
       sources."chroma-js-2.4.2"
       sources."clean-css-4.2.4"
@@ -74336,14 +73384,8 @@ in
       sources."crypto-js-4.2.0"
       sources."cssstyle-3.0.0"
       sources."cwise-compiler-1.1.3"
-      sources."cytoscape-3.29.2"
+      sources."cytoscape-3.30.1"
       sources."cytoscape-cose-bilkent-4.1.0"
-      (sources."cytoscape-fcose-2.2.0" // {
-        dependencies = [
-          sources."cose-base-2.2.0"
-          sources."layout-base-2.0.1"
-        ];
-      })
       sources."d3-7.9.0"
       sources."d3-array-3.2.4"
       sources."d3-axis-3.0.0"
@@ -74389,9 +73431,9 @@ in
       sources."d3-zoom-3.0.0"
       sources."dagre-d3-es-7.0.10"
       sources."dashdash-1.14.1"
-      sources."data-urls-4.0.0"
+      sources."data-urls-5.0.0"
       sources."datauri-4.1.0"
-      sources."dayjs-1.11.11"
+      sources."dayjs-1.11.12"
       sources."debug-4.3.5"
       sources."decimal.js-10.4.3"
       sources."decode-named-character-reference-1.0.2"
@@ -74416,14 +73458,13 @@ in
         ];
       })
       sources."domelementtype-2.3.0"
-      sources."domexception-4.0.0"
       sources."domhandler-5.0.3"
-      sources."dompurify-3.1.5"
+      sources."dompurify-3.1.6"
       sources."domutils-3.1.0"
       sources."duplexify-3.7.1"
       sources."eastasianwidth-0.2.0"
       sources."ecc-jsbn-0.1.2"
-      sources."elkjs-0.8.2"
+      sources."elkjs-0.9.3"
       sources."emoji-regex-8.0.0"
       (sources."emphasize-1.5.0" // {
         dependencies = [
@@ -74442,7 +73483,6 @@ in
       sources."err-code-2.0.3"
       sources."es-define-property-1.0.0"
       sources."es-errors-1.3.0"
-      sources."es6-promise-pool-2.5.0"
       sources."escape-string-regexp-1.0.5"
       sources."events-1.1.1"
       sources."execa-5.1.1"
@@ -74457,12 +73497,12 @@ in
       sources."fill-range-7.1.1"
       sources."filter-obj-1.1.0"
       sources."find-up-2.1.0"
-      sources."follow-redirects-1.15.5"
+      sources."follow-redirects-1.15.6"
       sources."font-awesome-filetypes-2.1.0"
       sources."for-each-0.3.3"
       sources."for-each-property-0.0.4"
       sources."for-each-property-deep-0.0.3"
-      (sources."foreground-child-3.2.0" // {
+      (sources."foreground-child-3.2.1" // {
         dependencies = [
           sources."signal-exit-4.1.0"
         ];
@@ -74483,7 +73523,6 @@ in
         ];
       })
       sources."fs.realpath-1.0.0"
-      sources."fsevents-2.3.3"
       sources."function-bind-1.1.2"
       sources."gauge-3.0.2"
       sources."get-intrinsic-1.2.4"
@@ -74519,14 +73558,14 @@ in
       })
       sources."highlight.js-11.9.0"
       sources."hpagent-1.2.0"
-      sources."html-encoding-sniffer-3.0.0"
+      sources."html-encoding-sniffer-4.0.0"
       sources."html-entities-1.4.0"
       sources."html-minifier-4.0.0"
       sources."http-cache-semantics-4.1.1"
       sources."http-errors-1.8.1"
-      sources."http-proxy-agent-5.0.0"
+      sources."http-proxy-agent-7.0.2"
       sources."http-signature-1.2.0"
-      sources."https-proxy-agent-5.0.1"
+      sources."https-proxy-agent-7.0.5"
       sources."human-signals-2.1.0"
       sources."humanize-ms-1.2.1"
       sources."iconv-lite-0.6.3"
@@ -74610,13 +73649,13 @@ in
       sources."js-sdsl-4.3.0"
       sources."js-yaml-4.1.0"
       sources."jsbn-0.1.1"
-      sources."jsdom-22.1.0"
+      sources."jsdom-23.0.1"
       sources."json-schema-0.4.0"
       sources."json-schema-traverse-0.4.1"
       sources."json-stringify-safe-5.0.1"
       sources."jsonfile-2.4.0"
       sources."jsprim-1.4.2"
-      (sources."katex-0.16.9" // {
+      (sources."katex-0.16.10" // {
         dependencies = [
           sources."commander-8.3.0"
         ];
@@ -74649,8 +73688,9 @@ in
       })
       (sources."make-fetch-happen-9.1.0" // {
         dependencies = [
-          sources."@tootallnate/once-1.1.2"
+          sources."agent-base-6.0.2"
           sources."http-proxy-agent-4.0.1"
+          sources."https-proxy-agent-5.0.1"
           sources."minipass-3.3.6"
         ];
       })
@@ -74677,7 +73717,7 @@ in
       sources."mdast-util-to-string-3.2.0"
       sources."mdurl-1.0.1"
       sources."merge-stream-2.0.0"
-      sources."mermaid-10.6.1"
+      sources."mermaid-10.9.1"
       sources."micromark-3.2.0"
       sources."micromark-core-commonmark-1.1.0"
       sources."micromark-factory-destination-1.1.0"
@@ -74745,7 +73785,7 @@ in
           sources."duplexify-4.1.3"
           sources."readable-stream-3.6.2"
           sources."utf-8-validate-5.0.10"
-          sources."ws-7.5.9"
+          sources."ws-7.5.10"
         ];
       })
       sources."mqtt-packet-6.10.0"
@@ -74794,7 +73834,7 @@ in
       sources."npm-run-path-4.0.1"
       sources."npmlog-5.0.1"
       sources."number-allocator-1.0.14"
-      sources."nwsapi-2.2.10"
+      sources."nwsapi-2.2.12"
       sources."oauth-sign-0.9.0"
       sources."object-assign-4.1.1"
       (sources."object-to-arguments-0.0.8" // {
@@ -74822,7 +73862,7 @@ in
       sources."path-key-3.1.1"
       (sources."path-scurry-1.11.1" // {
         dependencies = [
-          sources."lru-cache-10.2.2"
+          sources."lru-cache-10.4.3"
         ];
       })
       sources."performance-now-2.1.0"
@@ -74889,7 +73929,7 @@ in
       sources."safer-buffer-2.1.2"
       sources."sax-1.4.1"
       sources."saxes-6.0.0"
-      sources."semver-7.6.2"
+      sources."semver-7.6.3"
       sources."server-destroy-1.0.1"
       sources."set-blocking-2.0.0"
       sources."set-function-length-1.2.2"
@@ -74917,7 +73957,11 @@ in
       })
       sources."smart-buffer-4.2.0"
       sources."socks-2.8.3"
-      sources."socks-proxy-agent-6.2.1"
+      (sources."socks-proxy-agent-6.2.1" // {
+        dependencies = [
+          sources."agent-base-6.0.2"
+        ];
+      })
       sources."source-map-0.6.1"
       sources."split-on-first-1.1.0"
       sources."split-skip-0.0.2"
@@ -74937,7 +73981,7 @@ in
       sources."statuses-1.5.0"
       sources."stream-shift-1.0.3"
       sources."strict-uri-encode-2.0.0"
-      sources."string-kit-0.17.10"
+      sources."string-kit-0.18.3"
       sources."string-padding-1.0.2"
       (sources."string-to-stream-3.0.1" // {
         dependencies = [
@@ -74989,7 +74033,7 @@ in
           sources."debug-4.3.1"
         ];
       })
-      sources."terminal-kit-3.0.1"
+      sources."terminal-kit-3.0.2"
       (sources."tkwidgets-0.5.27" // {
         dependencies = [
           sources."ansi-styles-3.2.1"
@@ -75009,7 +74053,7 @@ in
       sources."to-regex-range-5.0.1"
       sources."toidentifier-1.0.1"
       sources."tough-cookie-4.1.4"
-      sources."tr46-4.1.1"
+      sources."tr46-5.0.0"
       sources."tree-kit-0.8.7"
       sources."ts-dedent-2.2.0"
       sources."tslib-2.6.3"
@@ -75018,7 +74062,7 @@ in
       sources."typedarray-0.0.6"
       sources."typical-2.6.1"
       sources."uc.micro-1.0.6"
-      sources."uglify-js-3.18.0"
+      sources."uglify-js-3.19.0"
       sources."uglifycss-0.0.29"
       sources."uid-safe-2.1.5"
       sources."undici-types-5.26.5"
@@ -75047,12 +74091,12 @@ in
           sources."core-util-is-1.0.2"
         ];
       })
-      sources."w3c-xmlserializer-4.0.0"
+      sources."w3c-xmlserializer-5.0.0"
       sources."web-worker-1.3.0"
       sources."webidl-conversions-7.0.0"
-      sources."whatwg-encoding-2.0.0"
-      sources."whatwg-mimetype-3.0.0"
-      sources."whatwg-url-12.0.1"
+      sources."whatwg-encoding-3.1.1"
+      sources."whatwg-mimetype-4.0.0"
+      sources."whatwg-url-14.0.0"
       sources."which-2.0.2"
       sources."which-typed-array-1.1.15"
       sources."wide-align-1.1.5"
@@ -75074,8 +74118,8 @@ in
         ];
       })
       sources."wrappy-1.0.2"
-      sources."ws-8.17.0"
-      sources."xml-name-validator-4.0.0"
+      sources."ws-8.18.0"
+      sources."xml-name-validator-5.0.0"
       sources."xml2js-0.4.23"
       sources."xmlbuilder-11.0.1"
       sources."xmlchars-2.2.0"
@@ -75117,25 +74161,26 @@ in
       sources."eastasianwidth-0.2.0"
       sources."editorconfig-1.0.4"
       sources."emoji-regex-9.2.2"
-      sources."foreground-child-3.2.0"
-      (sources."glob-10.4.1" // {
+      sources."foreground-child-3.2.1"
+      (sources."glob-10.4.5" // {
         dependencies = [
-          sources."minimatch-9.0.4"
+          sources."minimatch-9.0.5"
         ];
       })
       sources."ini-1.3.8"
       sources."is-fullwidth-code-point-3.0.0"
       sources."isexe-2.0.0"
-      sources."jackspeak-3.4.0"
+      sources."jackspeak-3.4.3"
       sources."js-cookie-3.0.5"
-      sources."lru-cache-10.2.2"
+      sources."lru-cache-10.4.3"
       sources."minimatch-9.0.1"
       sources."minipass-7.1.2"
       sources."nopt-7.2.1"
+      sources."package-json-from-dist-1.0.0"
       sources."path-key-3.1.1"
       sources."path-scurry-1.11.1"
       sources."proto-list-1.2.4"
-      sources."semver-7.6.2"
+      sources."semver-7.6.3"
       sources."shebang-command-2.0.0"
       sources."shebang-regex-3.0.0"
       sources."signal-exit-4.1.0"
@@ -75203,10 +74248,10 @@ in
       sha512 = "Nu7Sf35kXJ1MWDZIMAuATRQTg1iIPdzh7tqJ6jjvaU/GfDf+qi5UV8zJR3Mo+/pYFvm8mzay4+6O5EWigaQBQw==";
     };
     dependencies = [
-      sources."@babel/parser-7.24.7"
+      sources."@babel/parser-7.24.8"
       sources."@jsdoc/salty-0.2.8"
       sources."@types/linkify-it-5.0.0"
-      sources."@types/markdown-it-14.1.1"
+      sources."@types/markdown-it-14.1.2"
       sources."@types/mdurl-2.0.0"
       sources."argparse-2.0.1"
       sources."bluebird-3.7.2"
@@ -75227,7 +74272,7 @@ in
       sources."requizzle-0.2.4"
       sources."strip-json-comments-3.1.1"
       sources."uc.micro-2.1.0"
-      sources."underscore-1.13.6"
+      sources."underscore-1.13.7"
       sources."xmlcreate-2.0.4"
     ];
     buildInputs = globalBuildInputs;
@@ -75383,14 +74428,14 @@ in
       sources."mime-types-2.1.35"
       sources."ms-2.1.2"
       sources."native-promise-only-0.8.1"
-      sources."object-inspect-1.13.1"
+      sources."object-inspect-1.13.2"
       sources."once-1.4.0"
       sources."path-loader-1.0.12"
       sources."punycode-2.3.1"
-      sources."qs-6.12.1"
+      sources."qs-6.12.3"
       sources."readable-stream-3.6.2"
       sources."safe-buffer-5.2.1"
-      sources."semver-7.6.2"
+      sources."semver-7.6.3"
       sources."set-function-length-1.2.2"
       sources."side-channel-1.0.6"
       sources."slash-3.0.0"
@@ -75421,22 +74466,30 @@ in
     };
     dependencies = [
       sources."@polka/url-1.0.0-next.25"
-      sources."@tinyhttp/accepts-2.2.1"
-      sources."@tinyhttp/app-2.2.3"
-      sources."@tinyhttp/content-disposition-2.2.0"
+      (sources."@tinyhttp/accepts-2.2.2" // {
+        dependencies = [
+          sources."mime-4.0.1"
+        ];
+      })
+      sources."@tinyhttp/app-2.3.0"
+      sources."@tinyhttp/content-disposition-2.2.1"
       sources."@tinyhttp/content-type-0.1.4"
-      sources."@tinyhttp/cookie-2.1.0"
-      sources."@tinyhttp/cookie-signature-2.1.0"
-      sources."@tinyhttp/cors-2.0.0"
+      sources."@tinyhttp/cookie-2.1.1"
+      sources."@tinyhttp/cookie-signature-2.1.1"
+      sources."@tinyhttp/cors-2.0.1"
       sources."@tinyhttp/encode-url-2.1.1"
-      sources."@tinyhttp/etag-2.1.1"
-      sources."@tinyhttp/forwarded-2.1.2"
-      sources."@tinyhttp/proxy-addr-2.1.3"
-      sources."@tinyhttp/req-2.2.2"
-      sources."@tinyhttp/res-2.2.2"
+      sources."@tinyhttp/etag-2.1.2"
+      sources."@tinyhttp/forwarded-2.1.1"
+      sources."@tinyhttp/proxy-addr-2.2.0"
+      sources."@tinyhttp/req-2.2.3"
+      sources."@tinyhttp/res-2.2.3"
       sources."@tinyhttp/router-2.2.2"
-      sources."@tinyhttp/send-2.2.1"
-      sources."@tinyhttp/type-is-2.2.2"
+      sources."@tinyhttp/send-2.2.2"
+      (sources."@tinyhttp/type-is-2.2.3" // {
+        dependencies = [
+          sources."mime-4.0.1"
+        ];
+      })
       sources."@tinyhttp/url-2.1.1"
       sources."@tinyhttp/vary-0.1.3"
       sources."anymatch-3.1.3"
@@ -75446,7 +74499,6 @@ in
       sources."chokidar-3.6.0"
       sources."dot-prop-9.0.0"
       sources."es-escape-html-0.1.1"
-      sources."es-vary-0.1.2"
       sources."eta-3.4.0"
       sources."fill-range-7.1.1"
       sources."glob-parent-5.1.2"
@@ -75460,7 +74512,7 @@ in
       sources."json5-2.2.3"
       sources."lowdb-7.0.1"
       sources."milliparsec-2.3.0"
-      sources."mime-4.0.1"
+      sources."mime-4.0.0-beta.1"
       sources."mrmime-2.0.0"
       sources."negotiator-0.6.3"
       sources."normalize-path-3.0.0"
@@ -75477,7 +74529,7 @@ in
       sources."steno-4.0.2"
       sources."to-regex-range-5.0.1"
       sources."totalist-3.0.1"
-      sources."type-fest-4.20.0"
+      sources."type-fest-4.23.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -75708,7 +74760,7 @@ in
       sources."is-arrayish-0.2.1"
       sources."is-binary-path-1.0.1"
       sources."is-buffer-1.1.6"
-      sources."is-core-module-2.13.1"
+      sources."is-core-module-2.15.0"
       sources."is-data-descriptor-1.0.1"
       sources."is-descriptor-1.0.3"
       sources."is-dotfile-1.0.3"
@@ -75801,7 +74853,7 @@ in
           sources."is-descriptor-0.1.7"
         ];
       })
-      sources."object-inspect-1.13.1"
+      sources."object-inspect-1.13.2"
       (sources."object-visit-1.0.1" // {
         dependencies = [
           sources."isobject-3.0.1"
@@ -76194,7 +75246,7 @@ in
       sources."natural-orderby-2.0.3"
       sources."next-tick-1.1.0"
       sources."node-downloader-helper-1.0.19"
-      sources."object-inspect-1.13.1"
+      sources."object-inspect-1.13.2"
       sources."object-treeify-1.1.33"
       sources."onetime-5.1.2"
       sources."os-tmpdir-1.0.2"
@@ -76208,7 +75260,7 @@ in
       sources."picomatch-2.3.1"
       sources."pkg-up-3.1.0"
       sources."punycode-2.3.1"
-      sources."qs-6.12.1"
+      sources."qs-6.12.3"
       sources."queue-microtask-1.2.3"
       sources."redeyed-2.1.1"
       sources."restore-cursor-3.1.0"
@@ -76221,7 +75273,7 @@ in
         ];
       })
       sources."safer-buffer-2.1.2"
-      sources."semver-7.6.2"
+      sources."semver-7.6.3"
       sources."set-function-length-1.2.2"
       sources."shebang-command-2.0.0"
       sources."shebang-regex-3.0.0"
@@ -76261,10 +75313,10 @@ in
   katex = nodeEnv.buildNodePackage {
     name = "katex";
     packageName = "katex";
-    version = "0.16.10";
+    version = "0.16.11";
     src = fetchurl {
-      url = "https://registry.npmjs.org/katex/-/katex-0.16.10.tgz";
-      sha512 = "ZiqaC04tp2O5utMsl2TEZTXxa6WSC4yo0fv5ML++D3QZv/vx2Mct0mTlRx3O+uUkjfuAgOkzsCmq5MiUEsDDdA==";
+      url = "https://registry.npmjs.org/katex/-/katex-0.16.11.tgz";
+      sha512 = "RQrI8rlHY92OLf3rho/Ts8i/XvjgguEjOkO1BEXcU3N8BqPpSzBNwV/G0Ukr+P/l3ivvJUE/Fa/CwbS6HesGNQ==";
     };
     dependencies = [
       sources."commander-8.3.0"
@@ -76289,17 +75341,22 @@ in
     };
     dependencies = [
       sources."@ampproject/remapping-2.3.0"
-      sources."@babel/cli-7.24.7"
+      (sources."@babel/cli-7.24.8" // {
+        dependencies = [
+          sources."make-dir-2.1.0"
+          sources."semver-5.7.2"
+        ];
+      })
       sources."@babel/code-frame-7.24.7"
-      sources."@babel/compat-data-7.24.7"
-      (sources."@babel/core-7.24.7" // {
+      sources."@babel/compat-data-7.24.9"
+      (sources."@babel/core-7.24.9" // {
         dependencies = [
           sources."semver-6.3.1"
         ];
       })
-      sources."@babel/generator-7.24.7"
+      sources."@babel/generator-7.24.10"
       sources."@babel/helper-annotate-as-pure-7.24.7"
-      (sources."@babel/helper-compilation-targets-7.24.7" // {
+      (sources."@babel/helper-compilation-targets-7.24.8" // {
         dependencies = [
           sources."semver-6.3.1"
         ];
@@ -76308,38 +75365,34 @@ in
       sources."@babel/helper-function-name-7.24.7"
       sources."@babel/helper-hoist-variables-7.24.7"
       sources."@babel/helper-module-imports-7.24.7"
-      sources."@babel/helper-module-transforms-7.24.7"
-      sources."@babel/helper-plugin-utils-7.24.7"
+      sources."@babel/helper-module-transforms-7.24.9"
+      sources."@babel/helper-plugin-utils-7.24.8"
       sources."@babel/helper-simple-access-7.24.7"
       sources."@babel/helper-split-export-declaration-7.24.7"
-      sources."@babel/helper-string-parser-7.24.7"
+      sources."@babel/helper-string-parser-7.24.8"
       sources."@babel/helper-validator-identifier-7.24.7"
-      sources."@babel/helper-validator-option-7.24.7"
-      sources."@babel/helpers-7.24.7"
+      sources."@babel/helper-validator-option-7.24.8"
+      sources."@babel/helpers-7.24.8"
       sources."@babel/highlight-7.24.7"
-      sources."@babel/node-7.24.7"
-      sources."@babel/parser-7.24.7"
+      sources."@babel/node-7.24.8"
+      sources."@babel/parser-7.24.8"
       sources."@babel/plugin-syntax-jsx-7.24.7"
       sources."@babel/plugin-transform-react-jsx-7.24.7"
-      sources."@babel/register-7.24.6"
+      (sources."@babel/register-7.24.6" // {
+        dependencies = [
+          sources."make-dir-2.1.0"
+          sources."semver-5.7.2"
+        ];
+      })
       sources."@babel/template-7.24.7"
-      sources."@babel/traverse-7.24.7"
-      sources."@babel/types-7.24.7"
+      sources."@babel/traverse-7.24.8"
+      sources."@babel/types-7.24.9"
       sources."@jridgewell/gen-mapping-0.3.5"
       sources."@jridgewell/resolve-uri-3.1.2"
       sources."@jridgewell/set-array-1.2.1"
-      sources."@jridgewell/sourcemap-codec-1.4.15"
+      sources."@jridgewell/sourcemap-codec-1.5.0"
       sources."@jridgewell/trace-mapping-0.3.25"
-      (sources."@mapbox/node-pre-gyp-1.0.11" // {
-        dependencies = [
-          (sources."make-dir-3.1.0" // {
-            dependencies = [
-              sources."semver-6.3.1"
-            ];
-          })
-          sources."semver-7.6.2"
-        ];
-      })
+      sources."@mapbox/node-pre-gyp-1.0.11"
       sources."@nodelib/fs.scandir-2.1.5"
       sources."@nodelib/fs.stat-2.0.5"
       sources."@nodelib/fs.walk-1.2.8"
@@ -76374,12 +75427,16 @@ in
       sources."@xmpp/stream-management-0.13.1"
       sources."@xmpp/tcp-0.13.1"
       sources."@xmpp/tls-0.13.1"
-      sources."@xmpp/websocket-0.13.1"
+      (sources."@xmpp/websocket-0.13.1" // {
+        dependencies = [
+          sources."ws-8.18.0"
+        ];
+      })
       sources."@xmpp/xml-0.13.1"
       sources."abab-2.0.6"
       sources."abbrev-1.1.1"
       sources."accepts-1.3.8"
-      sources."acorn-8.12.0"
+      sources."acorn-8.12.1"
       (sources."acorn-globals-6.0.0" // {
         dependencies = [
           sources."acorn-7.4.1"
@@ -76408,13 +75465,11 @@ in
       sources."balanced-match-1.0.2"
       sources."base-64-1.0.0"
       sources."base64-js-1.5.1"
-      sources."bitwise-xor-0.0.0"
       sources."bl-4.1.0"
       sources."bn.js-4.12.0"
       (sources."body-parser-1.20.2" // {
         dependencies = [
           sources."debug-2.6.9"
-          sources."iconv-lite-0.4.24"
           sources."ms-2.0.0"
         ];
       })
@@ -76422,13 +75477,13 @@ in
       sources."braces-3.0.3"
       sources."browser-or-node-1.3.0"
       sources."browser-process-hrtime-1.0.0"
-      sources."browserslist-4.23.1"
+      sources."browserslist-4.23.2"
       sources."buffer-5.7.1"
       sources."buffer-from-1.1.2"
       sources."bufferutil-4.0.8"
       sources."bytes-3.1.2"
       sources."call-bind-1.0.7"
-      sources."caniuse-lite-1.0.30001634"
+      sources."caniuse-lite-1.0.30001643"
       sources."canvas-2.11.2"
       sources."chalk-2.4.2"
       sources."chardet-1.6.1"
@@ -76460,13 +75515,7 @@ in
           sources."cssom-0.3.8"
         ];
       })
-      (sources."data-urls-2.0.0" // {
-        dependencies = [
-          sources."tr46-2.1.0"
-          sources."webidl-conversions-6.1.0"
-          sources."whatwg-url-8.7.0"
-        ];
-      })
+      sources."data-urls-2.0.0"
       sources."data-view-buffer-1.0.1"
       sources."data-view-byte-length-1.0.1"
       sources."data-view-byte-offset-1.0.0"
@@ -76491,10 +75540,14 @@ in
       })
       sources."dotenv-8.6.0"
       sources."ee-first-1.1.1"
-      sources."electron-to-chromium-1.4.802"
+      sources."electron-to-chromium-1.5.1"
       sources."emoji-regex-8.0.0"
       sources."encodeurl-1.0.2"
-      sources."encoding-0.1.13"
+      (sources."encoding-0.1.13" // {
+        dependencies = [
+          sources."iconv-lite-0.6.3"
+        ];
+      })
       sources."end-of-stream-1.4.4"
       sources."enquirer-2.4.1"
       sources."es-abstract-1.23.3"
@@ -76531,7 +75584,12 @@ in
           sources."ms-2.0.0"
         ];
       })
-      sources."find-cache-dir-2.1.0"
+      (sources."find-cache-dir-2.1.0" // {
+        dependencies = [
+          sources."make-dir-2.1.0"
+          sources."semver-5.7.2"
+        ];
+      })
       sources."find-up-3.0.0"
       sources."follow-redirects-1.15.6"
       sources."for-each-0.3.3"
@@ -76555,7 +75613,6 @@ in
       (sources."fs-minipass-2.1.0" // {
         dependencies = [
           sources."minipass-3.3.6"
-          sources."yallist-4.0.0"
         ];
       })
       sources."fs-readdir-recursive-1.1.0"
@@ -76596,7 +75653,7 @@ in
       sources."http-errors-2.0.0"
       sources."http-proxy-agent-4.0.1"
       sources."https-proxy-agent-5.0.1"
-      sources."iconv-lite-0.6.3"
+      sources."iconv-lite-0.4.24"
       sources."ieee754-1.2.1"
       sources."ignore-5.3.1"
       sources."inflight-1.0.6"
@@ -76606,7 +75663,11 @@ in
       sources."into-stream-6.0.0"
       sources."ipaddr.js-1.9.1"
       sources."irc-colors-1.5.0"
-      sources."irc-upd-0.11.0"
+      (sources."irc-upd-0.11.0" // {
+        dependencies = [
+          sources."iconv-lite-0.6.3"
+        ];
+      })
       sources."is-array-buffer-3.0.4"
       sources."is-bigint-1.0.4"
       sources."is-boolean-object-1.1.2"
@@ -76635,15 +75696,7 @@ in
       sources."isexe-2.0.0"
       sources."isobject-3.0.1"
       sources."js-tokens-4.0.0"
-      (sources."jsdom-16.7.0" // {
-        dependencies = [
-          sources."tr46-2.1.0"
-          sources."utf-8-validate-5.0.10"
-          sources."webidl-conversions-6.1.0"
-          sources."whatwg-url-8.7.0"
-          sources."ws-7.5.9"
-        ];
-      })
+      sources."jsdom-16.7.0"
       sources."jsesc-2.5.2"
       sources."json5-2.2.3"
       (sources."jsonfile-6.1.0" // {
@@ -76655,9 +75708,17 @@ in
       sources."koa-compose-4.2.0"
       sources."locate-path-3.0.0"
       sources."lodash-4.17.21"
-      sources."lru-cache-5.1.1"
+      (sources."lru-cache-5.1.1" // {
+        dependencies = [
+          sources."yallist-3.1.1"
+        ];
+      })
       sources."ltx-3.0.0"
-      sources."make-dir-2.1.0"
+      (sources."make-dir-3.1.0" // {
+        dependencies = [
+          sources."semver-6.3.1"
+        ];
+      })
       sources."md5.js-1.3.5"
       sources."media-typer-0.3.0"
       sources."merge-descriptors-1.0.1"
@@ -76676,7 +75737,6 @@ in
       (sources."minizlib-2.1.2" // {
         dependencies = [
           sources."minipass-3.3.6"
-          sources."yallist-4.0.0"
         ];
       })
       sources."mkdirp-1.0.4"
@@ -76686,31 +75746,33 @@ in
       sources."nan-2.20.0"
       sources."napi-build-utils-1.0.2"
       sources."negotiator-0.6.3"
-      (sources."node-abi-3.65.0" // {
+      sources."node-abi-3.65.0"
+      (sources."node-environment-flags-1.0.6" // {
         dependencies = [
-          sources."semver-7.6.2"
+          sources."semver-5.7.2"
+        ];
+      })
+      (sources."node-fetch-2.7.0" // {
+        dependencies = [
+          sources."tr46-0.0.3"
+          sources."webidl-conversions-3.0.1"
+          sources."whatwg-url-5.0.0"
         ];
       })
-      sources."node-environment-flags-1.0.6"
-      sources."node-fetch-2.7.0"
       sources."node-gyp-build-4.8.1"
-      (sources."node-notifier-10.0.1" // {
-        dependencies = [
-          sources."semver-7.6.2"
-        ];
-      })
-      sources."node-releases-2.0.14"
+      sources."node-notifier-10.0.1"
+      sources."node-releases-2.0.18"
       sources."nopt-5.0.0"
       sources."npmlog-5.0.1"
-      sources."nwsapi-2.2.10"
+      sources."nwsapi-2.2.12"
       sources."object-assign-4.1.1"
-      sources."object-inspect-1.13.1"
+      sources."object-inspect-1.13.2"
       sources."object-keys-1.1.1"
       sources."object.assign-4.1.5"
       sources."object.getownpropertydescriptors-2.1.8"
       sources."on-finished-2.4.1"
       sources."once-1.4.0"
-      sources."openpgp-5.11.1"
+      sources."openpgp-5.11.2"
       sources."p-is-promise-3.0.0"
       sources."p-limit-2.3.0"
       sources."p-locate-3.0.0"
@@ -76748,7 +75810,6 @@ in
           sources."color-convert-2.0.1"
           sources."color-name-1.1.4"
           sources."has-flag-4.0.0"
-          sources."semver-7.6.2"
           sources."supports-color-7.2.0"
         ];
       })
@@ -76774,11 +75835,7 @@ in
       sources."queue-microtask-1.2.3"
       sources."randombytes-2.1.0"
       sources."range-parser-1.2.1"
-      (sources."raw-body-2.5.2" // {
-        dependencies = [
-          sources."iconv-lite-0.4.24"
-        ];
-      })
+      sources."raw-body-2.5.2"
       sources."rc-1.2.8"
       sources."readable-stream-3.6.2"
       sources."regenerator-runtime-0.14.1"
@@ -76787,7 +75844,7 @@ in
       sources."requires-port-1.0.0"
       (sources."resolve-1.22.8" // {
         dependencies = [
-          sources."is-core-module-2.13.1"
+          sources."is-core-module-2.15.0"
         ];
       })
       sources."reusify-1.0.4"
@@ -76800,10 +75857,10 @@ in
       sources."safer-buffer-2.1.2"
       sources."sasl-anonymous-0.1.0"
       sources."sasl-plain-0.1.0"
-      sources."sasl-scram-sha-1-1.2.1"
+      sources."sasl-scram-sha-1-1.3.0"
       sources."saslmechanisms-0.1.1"
       sources."saxes-5.0.1"
-      sources."semver-5.7.2"
+      sources."semver-7.6.3"
       (sources."send-0.18.0" // {
         dependencies = [
           (sources."debug-2.6.9" // {
@@ -76850,11 +75907,7 @@ in
       sources."supports-color-5.5.0"
       sources."supports-preserve-symlinks-flag-1.0.0"
       sources."symbol-tree-3.2.4"
-      (sources."tar-6.2.1" // {
-        dependencies = [
-          sources."yallist-4.0.0"
-        ];
-      })
+      sources."tar-6.2.1"
       (sources."tar-fs-2.1.1" // {
         dependencies = [
           sources."chownr-1.1.4"
@@ -76865,7 +75918,7 @@ in
       sources."to-regex-range-5.0.1"
       sources."toidentifier-1.0.1"
       sources."tough-cookie-4.1.4"
-      sources."tr46-0.0.3"
+      sources."tr46-2.1.0"
       sources."tslib-2.6.3"
       sources."tunnel-agent-0.6.0"
       sources."type-is-1.6.18"
@@ -76876,9 +75929,9 @@ in
       sources."unbox-primitive-1.0.2"
       sources."universalify-0.2.0"
       sources."unpipe-1.0.0"
-      sources."update-browserslist-db-1.0.16"
+      sources."update-browserslist-db-1.1.0"
       sources."url-parse-1.5.10"
-      sources."utf-8-validate-6.0.4"
+      sources."utf-8-validate-5.0.10"
       sources."util-deprecate-1.0.2"
       sources."utils-merge-1.0.1"
       sources."uuid-8.3.2"
@@ -76889,14 +75942,10 @@ in
       sources."w3c-hr-time-1.0.2"
       sources."w3c-xmlserializer-2.0.0"
       sources."webcrypto-core-1.8.0"
-      sources."webidl-conversions-3.0.1"
-      (sources."whatwg-encoding-1.0.5" // {
-        dependencies = [
-          sources."iconv-lite-0.4.24"
-        ];
-      })
+      sources."webidl-conversions-6.1.0"
+      sources."whatwg-encoding-1.0.5"
       sources."whatwg-mimetype-2.3.0"
-      sources."whatwg-url-5.0.0"
+      sources."whatwg-url-8.7.0"
       sources."which-2.0.2"
       sources."which-boxed-primitive-1.0.2"
       sources."which-typed-array-1.1.15"
@@ -76909,11 +75958,11 @@ in
         ];
       })
       sources."wrappy-1.0.2"
-      sources."ws-8.17.0"
+      sources."ws-7.5.10"
       sources."xml-name-validator-3.0.0"
       sources."xmlchars-2.2.0"
       sources."y18n-5.0.8"
-      sources."yallist-3.1.1"
+      sources."yallist-4.0.0"
       sources."yargs-16.2.0"
       sources."yargs-parser-20.2.9"
     ];
@@ -76984,10 +76033,10 @@ in
   lerna = nodeEnv.buildNodePackage {
     name = "lerna";
     packageName = "lerna";
-    version = "8.1.3";
+    version = "8.1.7";
     src = fetchurl {
-      url = "https://registry.npmjs.org/lerna/-/lerna-8.1.3.tgz";
-      sha512 = "Dg/r1dGnRCXKsOUC3lol7o6ggYTA6WWiPQzZJNKqyygn4fzYGuA3Dro2d5677pajaqFnFA72mdCjzSyF16Vi2Q==";
+      url = "https://registry.npmjs.org/lerna/-/lerna-8.1.7.tgz";
+      sha512 = "v2kkBn8Vqtroo30Pr5/JQ9MygRhnCsoI1jSOf3DxWmcTbkpC5U7c6rGr+7NPK6QrxKbC0/Cj4kuIBMb/7f79sQ==";
     };
     dependencies = [
       sources."@babel/code-frame-7.24.7"
@@ -77002,48 +76051,76 @@ in
           sources."supports-color-5.5.0"
         ];
       })
+      sources."@babel/runtime-7.24.8"
+      sources."@emnapi/core-1.2.0"
+      sources."@emnapi/runtime-1.2.0"
+      sources."@emnapi/wasi-threads-1.0.1"
       sources."@hutson/parse-repository-url-3.0.2"
       (sources."@isaacs/cliui-8.0.2" // {
         dependencies = [
-          sources."ansi-regex-6.0.1"
           sources."ansi-styles-6.2.1"
-          sources."emoji-regex-9.2.2"
           sources."string-width-5.1.2"
           sources."strip-ansi-7.1.0"
           sources."wrap-ansi-8.1.0"
         ];
       })
+      sources."@isaacs/string-locale-compare-1.1.0"
       sources."@jest/schemas-29.6.3"
-      sources."@lerna/create-8.1.3"
+      sources."@lerna/create-8.1.7"
+      sources."@napi-rs/wasm-runtime-0.2.4"
       sources."@nodelib/fs.scandir-2.1.5"
       sources."@nodelib/fs.stat-2.0.5"
       sources."@nodelib/fs.walk-1.2.8"
       sources."@npmcli/agent-2.2.2"
-      sources."@npmcli/fs-3.1.1"
-      (sources."@npmcli/git-5.0.7" // {
+      (sources."@npmcli/arborist-7.5.3" // {
         dependencies = [
+          sources."json-parse-even-better-errors-3.0.2"
+          sources."minimatch-9.0.5"
+        ];
+      })
+      sources."@npmcli/fs-3.1.1"
+      (sources."@npmcli/git-5.0.8" // {
+        dependencies = [
+          sources."ini-4.1.3"
           sources."isexe-3.1.1"
           sources."which-4.0.0"
         ];
       })
       sources."@npmcli/installed-package-contents-2.1.0"
+      (sources."@npmcli/map-workspaces-3.0.6" // {
+        dependencies = [
+          sources."minimatch-9.0.5"
+        ];
+      })
+      (sources."@npmcli/metavuln-calculator-7.1.1" // {
+        dependencies = [
+          sources."json-parse-even-better-errors-3.0.2"
+        ];
+      })
+      sources."@npmcli/name-from-folder-2.0.0"
       sources."@npmcli/node-gyp-3.0.0"
+      (sources."@npmcli/package-json-5.2.0" // {
+        dependencies = [
+          sources."json-parse-even-better-errors-3.0.2"
+        ];
+      })
       (sources."@npmcli/promise-spawn-7.0.2" // {
         dependencies = [
           sources."isexe-3.1.1"
           sources."which-4.0.0"
         ];
       })
-      sources."@npmcli/redact-1.1.0"
-      (sources."@npmcli/run-script-7.0.2" // {
+      sources."@npmcli/query-3.1.0"
+      sources."@npmcli/redact-2.0.1"
+      (sources."@npmcli/run-script-8.1.0" // {
         dependencies = [
           sources."isexe-3.1.1"
           sources."which-4.0.0"
         ];
       })
-      sources."@nrwl/devkit-19.3.0"
-      sources."@nrwl/tao-19.3.0"
-      (sources."@nx/devkit-19.3.0" // {
+      sources."@nrwl/devkit-19.5.3"
+      sources."@nrwl/tao-19.5.3"
+      (sources."@nx/devkit-19.5.3" // {
         dependencies = [
           sources."minimatch-9.0.3"
         ];
@@ -77081,23 +76158,24 @@ in
       sources."@sigstore/tuf-2.3.4"
       sources."@sigstore/verify-1.2.1"
       sources."@sinclair/typebox-0.27.8"
-      sources."@swc-node/core-1.13.1"
-      sources."@swc-node/register-1.9.2"
-      sources."@swc-node/sourcemap-support-0.5.0"
-      sources."@swc/core-1.5.29"
+      sources."@swc-node/core-1.13.3"
+      sources."@swc-node/register-1.10.9"
+      sources."@swc-node/sourcemap-support-0.5.1"
+      sources."@swc/core-1.7.1"
       sources."@swc/counter-0.1.3"
-      sources."@swc/helpers-0.5.11"
-      sources."@swc/types-0.1.8"
-      sources."@tootallnate/once-2.0.0"
+      sources."@swc/helpers-0.5.12"
+      sources."@swc/types-0.1.12"
       sources."@tufjs/canonical-json-2.0.0"
       (sources."@tufjs/models-2.0.1" // {
         dependencies = [
-          sources."minimatch-9.0.4"
+          sources."minimatch-9.0.5"
         ];
       })
+      sources."@tybys/wasm-util-0.9.0"
       sources."@types/minimatch-3.0.5"
       sources."@types/minimist-1.2.5"
       sources."@types/normalize-package-data-2.4.4"
+      sources."@types/parse-json-4.0.2"
       sources."@yarnpkg/lockfile-1.1.0"
       (sources."@yarnpkg/parsers-3.0.0-rc.46" // {
         dependencies = [
@@ -77113,14 +76191,12 @@ in
       sources."abbrev-2.0.0"
       sources."add-stream-1.0.0"
       sources."agent-base-7.1.1"
-      sources."agentkeepalive-4.5.0"
       sources."aggregate-error-3.1.0"
       sources."ansi-colors-4.1.3"
       sources."ansi-escapes-4.3.2"
-      sources."ansi-regex-5.0.1"
+      sources."ansi-regex-6.0.1"
       sources."ansi-styles-4.3.0"
       sources."aproba-2.0.0"
-      sources."are-we-there-yet-3.0.1"
       sources."argparse-1.0.10"
       sources."array-differ-3.0.0"
       sources."array-ify-1.0.0"
@@ -77129,21 +76205,25 @@ in
       sources."async-3.2.5"
       sources."asynckit-0.4.0"
       sources."axios-1.7.2"
+      (sources."babel-plugin-macros-3.1.0" // {
+        dependencies = [
+          sources."cosmiconfig-7.1.0"
+        ];
+      })
       sources."balanced-match-1.0.2"
       sources."base64-js-1.5.1"
       sources."before-after-hook-2.2.3"
+      sources."bin-links-4.0.4"
       sources."bl-4.1.0"
       sources."brace-expansion-2.0.1"
       sources."braces-3.0.3"
       sources."buffer-5.7.1"
       sources."buffer-from-1.1.2"
-      sources."builtins-1.0.3"
       sources."byte-size-8.1.1"
-      (sources."cacache-18.0.3" // {
+      (sources."cacache-18.0.4" // {
         dependencies = [
           sources."fs-minipass-3.0.3"
           sources."minipass-7.1.2"
-          sources."ssri-10.0.6"
         ];
       })
       sources."callsites-3.1.0"
@@ -77160,13 +76240,14 @@ in
       sources."cliui-8.0.1"
       sources."clone-1.0.4"
       sources."clone-deep-4.0.1"
-      sources."cmd-shim-6.0.1"
+      sources."cmd-shim-6.0.3"
       sources."color-convert-2.0.1"
       sources."color-name-1.1.4"
       sources."color-support-1.1.3"
       sources."colorette-2.0.20"
       sources."columnify-1.6.0"
       sources."combined-stream-1.0.8"
+      sources."common-ancestor-path-1.0.1"
       sources."compare-func-2.0.0"
       sources."concat-map-0.0.1"
       sources."concat-stream-2.0.0"
@@ -77187,6 +76268,7 @@ in
       sources."core-util-is-1.0.3"
       sources."cosmiconfig-8.3.6"
       sources."cross-spawn-7.0.3"
+      sources."cssesc-3.0.0"
       sources."dargs-7.0.0"
       sources."dateformat-3.0.3"
       sources."debug-4.3.5"
@@ -77196,22 +76278,21 @@ in
           sources."map-obj-1.0.1"
         ];
       })
-      sources."dedent-0.7.0"
+      sources."dedent-1.5.3"
       sources."defaults-1.0.4"
       sources."define-lazy-prop-2.0.0"
       sources."delayed-stream-1.0.0"
-      sources."delegates-1.0.0"
       sources."deprecation-2.3.1"
       sources."detect-indent-5.0.0"
       sources."diff-sequences-29.6.3"
       sources."dir-glob-3.0.1"
       sources."dot-prop-5.3.0"
-      sources."dotenv-16.3.2"
-      sources."dotenv-expand-10.0.0"
+      sources."dotenv-16.4.5"
+      sources."dotenv-expand-11.0.6"
       sources."duplexer-0.1.2"
       sources."eastasianwidth-0.2.0"
       sources."ejs-3.1.10"
-      sources."emoji-regex-8.0.0"
+      sources."emoji-regex-9.2.2"
       (sources."encoding-0.1.13" // {
         dependencies = [
           sources."iconv-lite-0.6.3"
@@ -77220,7 +76301,7 @@ in
       sources."end-of-stream-1.4.4"
       sources."enquirer-2.3.6"
       sources."env-paths-2.2.1"
-      sources."envinfo-7.8.1"
+      sources."envinfo-7.13.0"
       sources."err-code-2.0.3"
       sources."error-ex-1.3.2"
       sources."escalade-3.1.2"
@@ -77234,7 +76315,11 @@ in
           sources."tmp-0.0.33"
         ];
       })
-      sources."fast-glob-3.3.2"
+      (sources."fast-glob-3.3.2" // {
+        dependencies = [
+          sources."glob-parent-5.1.2"
+        ];
+      })
       sources."fastq-1.17.1"
       sources."figures-3.2.0"
       (sources."filelist-1.0.4" // {
@@ -77246,7 +76331,7 @@ in
       sources."find-up-4.1.0"
       sources."flat-5.0.2"
       sources."follow-redirects-1.15.6"
-      (sources."foreground-child-3.2.0" // {
+      (sources."foreground-child-3.2.1" // {
         dependencies = [
           sources."signal-exit-4.1.0"
         ];
@@ -77266,7 +76351,6 @@ in
       })
       sources."fs.realpath-1.0.0"
       sources."function-bind-1.1.2"
-      sources."gauge-4.0.4"
       sources."get-caller-file-2.0.5"
       (sources."get-pkg-repo-4.2.1" // {
         dependencies = [
@@ -77287,15 +76371,15 @@ in
       })
       sources."git-semver-tags-5.0.1"
       sources."git-up-7.0.0"
-      sources."git-url-parse-13.1.0"
+      sources."git-url-parse-14.0.0"
       sources."gitconfiglocal-1.0.0"
-      (sources."glob-10.4.1" // {
+      (sources."glob-10.4.5" // {
         dependencies = [
-          sources."minimatch-9.0.4"
+          sources."minimatch-9.0.5"
           sources."minipass-7.1.2"
         ];
       })
-      sources."glob-parent-5.1.2"
+      sources."glob-parent-6.0.2"
       sources."globby-11.1.0"
       sources."graceful-fs-4.2.11"
       sources."handlebars-4.7.8"
@@ -77306,15 +76390,14 @@ in
       sources."hosted-git-info-7.0.2"
       sources."http-cache-semantics-4.1.1"
       sources."http-proxy-agent-7.0.2"
-      sources."https-proxy-agent-7.0.4"
+      sources."https-proxy-agent-7.0.5"
       sources."human-signals-2.1.0"
-      sources."humanize-ms-1.2.1"
       sources."iconv-lite-0.4.24"
       sources."ieee754-1.2.1"
       sources."ignore-5.3.1"
       (sources."ignore-walk-6.0.5" // {
         dependencies = [
-          sources."minimatch-9.0.4"
+          sources."minimatch-9.0.5"
         ];
       })
       (sources."import-fresh-3.3.0" // {
@@ -77325,17 +76408,9 @@ in
       sources."import-local-3.1.0"
       sources."imurmurhash-0.1.4"
       sources."indent-string-4.0.0"
-      sources."inflight-1.0.6"
       sources."inherits-2.0.4"
       sources."ini-1.3.8"
-      (sources."init-package-json-5.0.0" // {
-        dependencies = [
-          sources."hosted-git-info-6.1.1"
-          sources."lru-cache-7.18.3"
-          sources."npm-package-arg-10.1.0"
-          sources."proc-log-3.0.0"
-        ];
-      })
+      sources."init-package-json-6.0.3"
       (sources."inquirer-8.2.6" // {
         dependencies = [
           sources."chalk-4.1.2"
@@ -77350,7 +76425,7 @@ in
       })
       sources."is-arrayish-0.2.1"
       sources."is-ci-3.0.1"
-      sources."is-core-module-2.13.1"
+      sources."is-core-module-2.15.0"
       sources."is-docker-2.2.1"
       sources."is-extglob-2.1.1"
       sources."is-fullwidth-code-point-3.0.0"
@@ -77369,8 +76444,8 @@ in
       sources."isarray-1.0.0"
       sources."isexe-2.0.0"
       sources."isobject-3.0.1"
-      sources."jackspeak-3.4.0"
-      (sources."jake-10.9.1" // {
+      sources."jackspeak-3.4.3"
+      (sources."jake-10.9.2" // {
         dependencies = [
           sources."brace-expansion-1.1.11"
           sources."minimatch-3.1.2"
@@ -77386,55 +76461,20 @@ in
       })
       sources."jsbn-1.1.0"
       sources."json-parse-better-errors-1.0.2"
-      sources."json-parse-even-better-errors-3.0.2"
+      sources."json-parse-even-better-errors-2.3.1"
+      sources."json-stringify-nice-1.1.4"
       sources."json-stringify-safe-5.0.1"
       sources."json5-2.2.3"
       sources."jsonc-parser-3.2.0"
       sources."jsonfile-6.1.0"
       sources."jsonparse-1.3.1"
+      sources."just-diff-6.0.2"
+      sources."just-diff-apply-5.5.0"
       sources."kind-of-6.0.3"
-      (sources."libnpmaccess-7.0.2" // {
+      sources."libnpmaccess-8.0.6"
+      (sources."libnpmpublish-9.0.9" // {
         dependencies = [
-          sources."hosted-git-info-6.1.1"
-          sources."lru-cache-7.18.3"
-          sources."npm-package-arg-10.1.0"
-          sources."proc-log-3.0.0"
-        ];
-      })
-      (sources."libnpmpublish-7.3.0" // {
-        dependencies = [
-          sources."@sigstore/bundle-1.1.0"
-          sources."@sigstore/protobuf-specs-0.2.1"
-          sources."@sigstore/sign-1.0.0"
-          sources."@sigstore/tuf-1.0.3"
-          sources."@tufjs/canonical-json-1.0.0"
-          sources."@tufjs/models-1.0.4"
-          sources."agent-base-6.0.2"
-          sources."cacache-17.1.4"
-          sources."fs-minipass-3.0.3"
-          sources."hosted-git-info-6.1.1"
-          sources."http-proxy-agent-5.0.0"
-          sources."https-proxy-agent-5.0.1"
-          sources."lru-cache-7.18.3"
-          (sources."make-fetch-happen-11.1.1" // {
-            dependencies = [
-              sources."minipass-5.0.0"
-            ];
-          })
-          sources."minimatch-9.0.4"
-          sources."minipass-7.1.2"
-          (sources."minipass-collect-1.0.2" // {
-            dependencies = [
-              sources."minipass-3.3.6"
-            ];
-          })
-          sources."normalize-package-data-5.0.0"
-          sources."npm-package-arg-10.1.0"
-          sources."proc-log-3.0.0"
-          sources."sigstore-1.9.0"
-          sources."socks-proxy-agent-7.0.0"
-          sources."ssri-10.0.6"
-          sources."tuf-js-1.1.7"
+          sources."ci-info-4.0.0"
         ];
       })
       sources."lines-and-columns-2.0.4"
@@ -77448,12 +76488,11 @@ in
       sources."lodash-4.17.21"
       sources."lodash.ismatch-4.4.0"
       sources."log-symbols-4.1.0"
-      sources."lru-cache-10.2.2"
+      sources."lru-cache-10.4.3"
       sources."make-dir-4.0.0"
       (sources."make-fetch-happen-13.0.1" // {
         dependencies = [
           sources."minipass-7.1.2"
-          sources."ssri-10.0.6"
         ];
       })
       sources."map-obj-4.3.0"
@@ -77513,11 +76552,6 @@ in
           sources."minipass-3.3.6"
         ];
       })
-      (sources."minipass-json-stream-1.0.1" // {
-        dependencies = [
-          sources."minipass-3.3.6"
-        ];
-      })
       (sources."minipass-pipeline-1.2.4" // {
         dependencies = [
           sources."minipass-3.3.6"
@@ -77541,76 +76575,28 @@ in
       sources."negotiator-0.6.3"
       sources."neo-async-2.6.2"
       sources."node-fetch-2.6.7"
-      (sources."node-gyp-10.1.0" // {
+      (sources."node-gyp-10.2.0" // {
         dependencies = [
           sources."isexe-3.1.1"
-          sources."proc-log-3.0.0"
           sources."which-4.0.0"
         ];
       })
       sources."node-machine-id-1.1.12"
       sources."nopt-7.2.1"
-      sources."normalize-package-data-6.0.1"
+      sources."normalize-package-data-6.0.2"
       sources."npm-bundled-3.0.1"
       sources."npm-install-checks-6.3.0"
       sources."npm-normalize-package-bin-3.0.1"
-      (sources."npm-package-arg-8.1.1" // {
+      sources."npm-package-arg-11.0.2"
+      sources."npm-packlist-8.0.2"
+      sources."npm-pick-manifest-9.1.0"
+      (sources."npm-registry-fetch-17.1.0" // {
         dependencies = [
-          sources."hosted-git-info-3.0.8"
-          sources."lru-cache-6.0.0"
-          sources."validate-npm-package-name-3.0.0"
-        ];
-      })
-      (sources."npm-packlist-5.1.1" // {
-        dependencies = [
-          sources."glob-8.1.0"
-          sources."ignore-walk-5.0.1"
-          sources."minimatch-5.1.6"
-          sources."npm-bundled-1.1.2"
-          sources."npm-normalize-package-bin-1.0.1"
-        ];
-      })
-      (sources."npm-pick-manifest-9.0.1" // {
-        dependencies = [
-          sources."npm-package-arg-11.0.2"
-        ];
-      })
-      (sources."npm-registry-fetch-14.0.5" // {
-        dependencies = [
-          sources."agent-base-6.0.2"
-          (sources."cacache-17.1.4" // {
-            dependencies = [
-              sources."minipass-7.1.2"
-            ];
-          })
-          (sources."fs-minipass-3.0.3" // {
-            dependencies = [
-              sources."minipass-7.1.2"
-            ];
-          })
-          sources."hosted-git-info-6.1.1"
-          sources."http-proxy-agent-5.0.0"
-          sources."https-proxy-agent-5.0.1"
-          sources."lru-cache-7.18.3"
-          sources."make-fetch-happen-11.1.1"
-          (sources."minipass-collect-1.0.2" // {
-            dependencies = [
-              sources."minipass-3.3.6"
-            ];
-          })
-          sources."npm-package-arg-10.1.0"
-          sources."proc-log-3.0.0"
-          sources."socks-proxy-agent-7.0.0"
-          (sources."ssri-10.0.6" // {
-            dependencies = [
-              sources."minipass-7.1.2"
-            ];
-          })
+          sources."minipass-7.1.2"
         ];
       })
       sources."npm-run-path-4.0.1"
-      sources."npmlog-6.0.2"
-      (sources."nx-19.3.0" // {
+      (sources."nx-19.5.3" // {
         dependencies = [
           sources."minimatch-9.0.3"
         ];
@@ -77620,6 +76606,7 @@ in
       sources."open-8.4.2"
       sources."ora-5.3.0"
       sources."os-tmpdir-1.0.2"
+      sources."oxc-resolver-1.10.2"
       sources."p-finally-1.0.0"
       sources."p-limit-2.3.0"
       sources."p-locate-4.1.0"
@@ -77631,21 +76618,21 @@ in
       sources."p-timeout-3.2.0"
       sources."p-try-2.2.0"
       sources."p-waterfall-2.1.1"
-      (sources."pacote-17.0.7" // {
+      sources."package-json-from-dist-1.0.0"
+      (sources."pacote-18.0.6" // {
         dependencies = [
           sources."fs-minipass-3.0.3"
           sources."minipass-7.1.2"
-          sources."npm-package-arg-11.0.2"
-          sources."npm-packlist-8.0.2"
-          sources."npm-registry-fetch-16.2.1"
-          sources."read-package-json-7.0.1"
-          sources."ssri-10.0.6"
         ];
       })
       sources."parent-module-1.0.1"
+      (sources."parse-conflict-json-3.0.1" // {
+        dependencies = [
+          sources."json-parse-even-better-errors-3.0.2"
+        ];
+      })
       (sources."parse-json-5.2.0" // {
         dependencies = [
-          sources."json-parse-even-better-errors-2.3.1"
           sources."lines-and-columns-1.2.4"
         ];
       })
@@ -77661,6 +76648,7 @@ in
       sources."pify-5.0.0"
       sources."pirates-4.0.6"
       sources."pkg-dir-4.2.0"
+      sources."postcss-selector-parser-6.1.1"
       (sources."pretty-format-29.7.0" // {
         dependencies = [
           sources."ansi-styles-5.2.0"
@@ -77668,33 +76656,28 @@ in
       })
       sources."proc-log-4.2.0"
       sources."process-nextick-args-2.0.1"
+      sources."proggy-2.0.0"
+      sources."promise-all-reject-late-1.0.1"
+      sources."promise-call-limit-3.0.1"
       sources."promise-inflight-1.0.1"
       sources."promise-retry-2.0.1"
-      (sources."promzard-1.0.2" // {
-        dependencies = [
-          sources."mute-stream-1.0.0"
-          sources."read-3.0.1"
-        ];
-      })
+      sources."promzard-1.0.2"
       sources."protocols-2.0.1"
       sources."proxy-from-env-1.1.0"
       sources."queue-microtask-1.2.3"
       sources."quick-lru-4.0.1"
       sources."react-is-18.3.1"
-      (sources."read-2.1.0" // {
+      (sources."read-3.0.1" // {
         dependencies = [
           sources."mute-stream-1.0.0"
         ];
       })
       sources."read-cmd-shim-4.0.0"
-      (sources."read-package-json-6.0.4" // {
+      (sources."read-package-json-fast-3.0.2" // {
         dependencies = [
-          sources."hosted-git-info-6.1.1"
-          sources."lru-cache-7.18.3"
-          sources."normalize-package-data-5.0.0"
+          sources."json-parse-even-better-errors-3.0.2"
         ];
       })
-      sources."read-package-json-fast-3.0.2"
       (sources."read-pkg-3.0.0" // {
         dependencies = [
           sources."hosted-git-info-2.8.9"
@@ -77718,6 +76701,7 @@ in
       })
       sources."readable-stream-3.6.2"
       sources."redent-3.0.0"
+      sources."regenerator-runtime-0.14.1"
       sources."require-directory-2.1.1"
       sources."resolve-1.22.8"
       sources."resolve-cwd-3.0.0"
@@ -77737,7 +76721,7 @@ in
       sources."rxjs-7.8.1"
       sources."safe-buffer-5.2.1"
       sources."safer-buffer-2.1.2"
-      sources."semver-7.6.2"
+      sources."semver-7.6.3"
       sources."set-blocking-2.0.0"
       sources."shallow-clone-3.0.1"
       sources."shebang-command-2.0.0"
@@ -77747,7 +76731,7 @@ in
       sources."slash-3.0.0"
       sources."smart-buffer-4.2.0"
       sources."socks-2.8.3"
-      sources."socks-proxy-agent-8.0.3"
+      sources."socks-proxy-agent-8.0.4"
       sources."sort-keys-2.0.0"
       sources."source-map-0.6.1"
       sources."source-map-support-0.5.21"
@@ -77758,16 +76742,32 @@ in
       sources."split-1.0.1"
       sources."split2-3.2.2"
       sources."sprintf-js-1.0.3"
-      (sources."ssri-9.0.1" // {
+      (sources."ssri-10.0.6" // {
         dependencies = [
-          sources."minipass-3.3.6"
+          sources."minipass-7.1.2"
+        ];
+      })
+      (sources."string-width-4.2.3" // {
+        dependencies = [
+          sources."emoji-regex-8.0.0"
+        ];
+      })
+      (sources."string-width-cjs-4.2.3" // {
+        dependencies = [
+          sources."emoji-regex-8.0.0"
         ];
       })
-      sources."string-width-4.2.3"
-      sources."string-width-cjs-4.2.3"
       sources."string_decoder-1.3.0"
-      sources."strip-ansi-6.0.1"
-      sources."strip-ansi-cjs-6.0.1"
+      (sources."strip-ansi-6.0.1" // {
+        dependencies = [
+          sources."ansi-regex-5.0.1"
+        ];
+      })
+      (sources."strip-ansi-cjs-6.0.1" // {
+        dependencies = [
+          sources."ansi-regex-5.0.1"
+        ];
+      })
       sources."strip-bom-3.0.0"
       sources."strip-final-newline-2.0.0"
       sources."strip-indent-3.0.0"
@@ -77789,27 +76789,25 @@ in
       sources."tmp-0.2.3"
       sources."to-regex-range-5.0.1"
       sources."tr46-0.0.3"
+      sources."treeverse-3.0.0"
       sources."trim-newlines-3.0.1"
       sources."tsconfig-paths-4.2.0"
       sources."tslib-2.6.3"
       sources."tuf-js-2.2.1"
       sources."type-fest-0.21.3"
       sources."typedarray-0.0.6"
-      sources."typescript-5.4.5"
-      sources."uglify-js-3.18.0"
+      sources."typescript-5.5.4"
+      sources."uglify-js-3.19.0"
       sources."unique-filename-3.0.0"
       sources."unique-slug-4.0.0"
       sources."universal-user-agent-6.0.1"
       sources."universalify-2.0.1"
       sources."upath-2.0.1"
       sources."util-deprecate-1.0.2"
-      sources."uuid-9.0.1"
+      sources."uuid-10.0.0"
       sources."validate-npm-package-license-3.0.4"
-      (sources."validate-npm-package-name-5.0.0" // {
-        dependencies = [
-          sources."builtins-5.1.0"
-        ];
-      })
+      sources."validate-npm-package-name-5.0.1"
+      sources."walk-up-path-3.0.1"
       sources."wcwidth-1.0.1"
       sources."webidl-conversions-3.0.1"
       sources."whatwg-url-5.0.0"
@@ -77840,6 +76838,7 @@ in
       sources."xtend-4.0.2"
       sources."y18n-5.0.8"
       sources."yallist-4.0.0"
+      sources."yaml-1.10.2"
       sources."yargs-17.7.2"
       sources."yargs-parser-21.1.1"
     ];
@@ -77893,22 +76892,20 @@ in
   less-plugin-clean-css = nodeEnv.buildNodePackage {
     name = "less-plugin-clean-css";
     packageName = "less-plugin-clean-css";
-    version = "1.5.1";
+    version = "1.6.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/less-plugin-clean-css/-/less-plugin-clean-css-1.5.1.tgz";
-      sha512 = "Pc68AFHAEJO3aAoRvnUTW5iAiAv6y+TQsWLTTwVNqjiDno6xCvxz1AtfQl7Y0MZSpHPalFajM1EU4RB5UVINpw==";
+      url = "https://registry.npmjs.org/less-plugin-clean-css/-/less-plugin-clean-css-1.6.0.tgz";
+      sha512 = "jwXX6WlXT57OVCXa5oBJBaJq1b4s1BOKeEEoAL2UTeEitogQWfTcBbLT/vow9pl0N0MXV8Mb4KyhTGG0YbEKyQ==";
     };
     dependencies = [
-      sources."amdefine-1.0.1"
-      sources."clean-css-3.4.28"
-      sources."commander-2.8.1"
-      sources."graceful-readlink-1.0.1"
-      sources."source-map-0.4.4"
+      sources."clean-css-5.3.3"
+      sources."source-map-0.6.1"
     ];
     buildInputs = globalBuildInputs;
     meta = {
       description = "clean-css plugin for less.js";
-      homepage = "http://lesscss.org";
+      homepage = "https://lesscss.org";
+      license = "Apache-2.0";
     };
     production = true;
     bypassCache = true;
@@ -78288,14 +77285,14 @@ in
       sources."ecc-jsbn-0.1.2"
       sources."ee-first-1.1.1"
       sources."encodeurl-1.0.2"
-      (sources."engine.io-3.6.1" // {
+      (sources."engine.io-3.6.2" // {
         dependencies = [
           sources."cookie-0.4.2"
           sources."debug-4.1.1"
           sources."ms-2.1.3"
         ];
       })
-      (sources."engine.io-client-3.5.3" // {
+      (sources."engine.io-client-3.5.4" // {
         dependencies = [
           sources."debug-3.1.0"
         ];
@@ -78450,7 +77447,7 @@ in
           sources."is-descriptor-0.1.7"
         ];
       })
-      sources."object-inspect-1.13.1"
+      sources."object-inspect-1.13.2"
       (sources."object-visit-1.0.1" // {
         dependencies = [
           sources."isobject-3.0.1"
@@ -78568,7 +77565,7 @@ in
         ];
       })
       sources."snapdragon-util-3.0.1"
-      (sources."socket.io-2.5.0" // {
+      (sources."socket.io-2.5.1" // {
         dependencies = [
           sources."debug-4.1.1"
           sources."ms-2.1.3"
@@ -78579,7 +77576,7 @@ in
         dependencies = [
           sources."debug-3.1.0"
           sources."isarray-2.0.1"
-          sources."socket.io-parser-3.3.3"
+          sources."socket.io-parser-3.3.4"
         ];
       })
       (sources."socket.io-parser-3.4.3" // {
@@ -78644,7 +77641,7 @@ in
           sources."core-util-is-1.0.2"
         ];
       })
-      sources."ws-7.4.6"
+      sources."ws-7.5.10"
       sources."xmlhttprequest-ssl-1.6.3"
       sources."yeast-0.1.2"
     ];
@@ -78729,7 +77726,7 @@ in
       sources."@types/commander-2.12.2"
       sources."@types/diff-3.5.8"
       sources."@types/get-stdin-5.0.1"
-      sources."@types/node-20.14.2"
+      sources."@types/node-20.14.12"
       sources."commander-2.20.3"
       sources."diff-3.5.0"
       sources."get-stdin-5.0.1"
@@ -78767,7 +77764,7 @@ in
       sources."mkdirp-0.3.5"
       sources."once-1.4.0"
       sources."path-is-absolute-1.0.1"
-      sources."requirejs-2.3.6"
+      sources."requirejs-2.3.7"
       sources."rimraf-3.0.2"
       sources."wrappy-1.0.2"
     ];
@@ -78868,7 +77865,7 @@ in
       sources."esniff-2.0.1"
       sources."espree-3.5.4"
       sources."esprima-4.0.1"
-      (sources."esquery-1.5.0" // {
+      (sources."esquery-1.6.0" // {
         dependencies = [
           sources."estraverse-5.3.0"
         ];
@@ -78937,7 +77934,7 @@ in
         ];
       })
       sources."interpret-1.4.0"
-      sources."is-core-module-2.13.1"
+      sources."is-core-module-2.15.0"
       sources."is-fullwidth-code-point-2.0.0"
       sources."is-my-ip-valid-1.0.1"
       sources."is-my-json-valid-2.20.6"
@@ -79154,13 +78151,13 @@ in
   mocha = nodeEnv.buildNodePackage {
     name = "mocha";
     packageName = "mocha";
-    version = "10.4.0";
+    version = "10.7.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/mocha/-/mocha-10.4.0.tgz";
-      sha512 = "eqhGB8JKapEYcC4ytX/xrzKforgEc3j1pGlAXVy3eRwrtAy5/nIfT1SvgGzfN0XZZxeLq0aQWkOUAmqIJiv+bA==";
+      url = "https://registry.npmjs.org/mocha/-/mocha-10.7.0.tgz";
+      sha512 = "v8/rBWr2VO5YkspYINnvu81inSz2y3ODJrhO175/Exzor1RcEZZkizgE2A+w/CAXXoESS8Kys5E62dOHGHzULA==";
     };
     dependencies = [
-      sources."ansi-colors-4.1.1"
+      sources."ansi-colors-4.1.3"
       sources."ansi-regex-5.0.1"
       sources."ansi-styles-4.3.0"
       sources."anymatch-3.1.3"
@@ -79176,17 +78173,17 @@ in
           sources."supports-color-7.2.0"
         ];
       })
-      sources."chokidar-3.5.3"
+      sources."chokidar-3.6.0"
       sources."cliui-7.0.4"
       sources."color-convert-2.0.1"
       sources."color-name-1.1.4"
-      (sources."debug-4.3.4" // {
+      (sources."debug-4.3.5" // {
         dependencies = [
           sources."ms-2.1.2"
         ];
       })
       sources."decamelize-4.0.0"
-      sources."diff-5.0.0"
+      sources."diff-5.2.0"
       sources."emoji-regex-8.0.0"
       sources."escalade-3.1.2"
       sources."escape-string-regexp-4.0.0"
@@ -79194,7 +78191,6 @@ in
       sources."find-up-5.0.0"
       sources."flat-5.0.2"
       sources."fs.realpath-1.0.0"
-      sources."fsevents-2.3.3"
       sources."get-caller-file-2.0.5"
       sources."glob-8.1.0"
       sources."glob-parent-5.1.2"
@@ -79212,7 +78208,7 @@ in
       sources."js-yaml-4.1.0"
       sources."locate-path-6.0.0"
       sources."log-symbols-4.1.0"
-      sources."minimatch-5.0.1"
+      sources."minimatch-5.1.6"
       sources."ms-2.1.3"
       sources."normalize-path-3.0.0"
       sources."once-1.4.0"
@@ -79224,18 +78220,18 @@ in
       sources."readdirp-3.6.0"
       sources."require-directory-2.1.1"
       sources."safe-buffer-5.2.1"
-      sources."serialize-javascript-6.0.0"
+      sources."serialize-javascript-6.0.2"
       sources."string-width-4.2.3"
       sources."strip-ansi-6.0.1"
       sources."strip-json-comments-3.1.1"
       sources."supports-color-8.1.1"
       sources."to-regex-range-5.0.1"
-      sources."workerpool-6.2.1"
+      sources."workerpool-6.5.1"
       sources."wrap-ansi-7.0.0"
       sources."wrappy-1.0.2"
       sources."y18n-5.0.8"
       sources."yargs-16.2.0"
-      sources."yargs-parser-20.2.4"
+      sources."yargs-parser-20.2.9"
       sources."yargs-unparser-2.0.0"
       sources."yocto-queue-0.1.0"
     ];
@@ -79299,14 +78295,14 @@ in
       sources."mime-types-2.1.35"
       sources."ms-2.1.2"
       sources."native-promise-only-0.8.1"
-      sources."object-inspect-1.13.1"
+      sources."object-inspect-1.13.2"
       sources."once-1.4.0"
       sources."path-loader-1.0.12"
       sources."punycode-2.3.1"
-      sources."qs-6.12.1"
+      sources."qs-6.12.3"
       sources."readable-stream-3.6.2"
       sources."safe-buffer-5.2.1"
-      sources."semver-7.6.2"
+      sources."semver-7.6.3"
       sources."set-function-length-1.2.2"
       sources."side-channel-1.0.6"
       sources."slash-3.0.0"
@@ -79352,7 +78348,7 @@ in
       sources."is-arrayish-0.3.2"
       sources."is-stream-2.0.1"
       sources."kuler-2.0.0"
-      sources."logform-2.6.0"
+      sources."logform-2.6.1"
       sources."ms-2.1.3"
       sources."one-time-1.0.0"
       sources."readable-stream-3.6.2"
@@ -79365,7 +78361,7 @@ in
       sources."triple-beam-1.4.1"
       sources."util-deprecate-1.0.2"
       sources."winston-3.11.0"
-      sources."winston-transport-4.7.0"
+      sources."winston-transport-4.7.1"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -79402,10 +78398,10 @@ in
   node-gyp = nodeEnv.buildNodePackage {
     name = "node-gyp";
     packageName = "node-gyp";
-    version = "10.1.0";
+    version = "10.2.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-gyp/-/node-gyp-10.1.0.tgz";
-      sha512 = "B4J5M1cABxPc5PwfjhbV5hoy2DP9p8lFXASnEN6hugXOa61416tnTZ29x9sSwAd0o99XNIcpvDDy1swAExsVKA==";
+      url = "https://registry.npmjs.org/node-gyp/-/node-gyp-10.2.0.tgz";
+      sha512 = "sp3FonBAaFe4aYTcFdZUn2NYkbP7xroPGYvQmP4Nl5PxamznItBnNCgjrVTKrEfQynInMsJvZrdmqUnysCJ8rw==";
     };
     dependencies = [
       sources."@isaacs/cliui-8.0.2"
@@ -79418,7 +78414,7 @@ in
       sources."ansi-styles-6.2.1"
       sources."balanced-match-1.0.2"
       sources."brace-expansion-2.0.1"
-      sources."cacache-18.0.3"
+      sources."cacache-18.0.4"
       sources."chownr-2.0.0"
       sources."clean-stack-2.2.0"
       sources."color-convert-2.0.1"
@@ -79434,28 +78430,24 @@ in
       sources."env-paths-2.2.1"
       sources."err-code-2.0.3"
       sources."exponential-backoff-3.1.1"
-      sources."foreground-child-3.2.0"
+      sources."foreground-child-3.2.1"
       sources."fs-minipass-3.0.3"
-      sources."glob-10.4.1"
+      sources."glob-10.4.5"
       sources."graceful-fs-4.2.11"
       sources."http-cache-semantics-4.1.1"
       sources."http-proxy-agent-7.0.2"
-      sources."https-proxy-agent-7.0.4"
+      sources."https-proxy-agent-7.0.5"
       sources."imurmurhash-0.1.4"
       sources."indent-string-4.0.0"
       sources."ip-address-9.0.5"
       sources."is-fullwidth-code-point-3.0.0"
       sources."is-lambda-1.0.1"
       sources."isexe-2.0.0"
-      sources."jackspeak-3.4.0"
+      sources."jackspeak-3.4.3"
       sources."jsbn-1.1.0"
-      sources."lru-cache-10.2.2"
-      (sources."make-fetch-happen-13.0.1" // {
-        dependencies = [
-          sources."proc-log-4.2.0"
-        ];
-      })
-      sources."minimatch-9.0.4"
+      sources."lru-cache-10.4.3"
+      sources."make-fetch-happen-13.0.1"
+      sources."minimatch-9.0.5"
       sources."minipass-7.1.2"
       sources."minipass-collect-2.0.1"
       sources."minipass-fetch-3.0.5"
@@ -79484,18 +78476,19 @@ in
       sources."negotiator-0.6.3"
       sources."nopt-7.2.1"
       sources."p-map-4.0.0"
+      sources."package-json-from-dist-1.0.0"
       sources."path-key-3.1.1"
       sources."path-scurry-1.11.1"
-      sources."proc-log-3.0.0"
+      sources."proc-log-4.2.0"
       sources."promise-retry-2.0.1"
       sources."retry-0.12.0"
-      sources."semver-7.6.2"
+      sources."semver-7.6.3"
       sources."shebang-command-2.0.0"
       sources."shebang-regex-3.0.0"
       sources."signal-exit-4.1.0"
       sources."smart-buffer-4.2.0"
       sources."socks-2.8.3"
-      sources."socks-proxy-agent-8.0.3"
+      sources."socks-proxy-agent-8.0.4"
       sources."sprintf-js-1.1.3"
       sources."ssri-10.0.6"
       sources."string-width-5.1.2"
@@ -79659,52 +78652,84 @@ in
   node-red = nodeEnv.buildNodePackage {
     name = "node-red";
     packageName = "node-red";
-    version = "3.1.10";
+    version = "4.0.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/node-red/-/node-red-3.1.10.tgz";
-      sha512 = "EjjcdgWat7wNcSCyxmSc0uHM5UV2eXEJRbTCzR/xi87Dt0E1gSl/YDAopyu590sz1YybExNk3jQRLmQVjx0POw==";
+      url = "https://registry.npmjs.org/node-red/-/node-red-4.0.2.tgz";
+      sha512 = "19AC1zouBYxaobzkpPb5PdqQptgO1fI9NRcrasFAYoG6wB8S53khFeuy1qiNaggo2JFu6TSJk2zLR+y4wksU1w==";
     };
     dependencies = [
-      sources."@babel/runtime-7.24.7"
-      sources."@mapbox/node-pre-gyp-1.0.11"
-      sources."@node-red/editor-api-3.1.10"
-      sources."@node-red/editor-client-3.1.10"
-      (sources."@node-red/nodes-3.1.10" // {
+      sources."@babel/runtime-7.24.8"
+      sources."@emnapi/core-1.2.0"
+      sources."@emnapi/runtime-1.2.0"
+      sources."@emnapi/wasi-threads-1.0.1"
+      (sources."@isaacs/cliui-8.0.2" // {
+        dependencies = [
+          sources."ansi-regex-6.0.1"
+          sources."strip-ansi-7.1.0"
+        ];
+      })
+      sources."@isaacs/fs-minipass-4.0.1"
+      sources."@napi-rs/wasm-runtime-0.2.4"
+      (sources."@node-red/editor-api-4.0.2" // {
+        dependencies = [
+          sources."mime-3.0.0"
+        ];
+      })
+      sources."@node-red/editor-client-4.0.2"
+      (sources."@node-red/nodes-4.0.2" // {
         dependencies = [
-          sources."cookie-0.5.0"
           sources."iconv-lite-0.6.3"
           sources."media-typer-1.1.0"
         ];
       })
-      sources."@node-red/registry-3.1.10"
-      sources."@node-red/runtime-3.1.10"
-      sources."@node-red/util-3.1.10"
+      sources."@node-red/registry-4.0.2"
+      sources."@node-red/runtime-4.0.2"
+      sources."@node-red/util-4.0.2"
+      sources."@node-rs/bcrypt-1.10.4"
+      sources."@node-rs/bcrypt-android-arm-eabi-1.10.4"
+      sources."@node-rs/bcrypt-android-arm64-1.10.4"
+      sources."@node-rs/bcrypt-darwin-arm64-1.10.4"
+      sources."@node-rs/bcrypt-darwin-x64-1.10.4"
+      sources."@node-rs/bcrypt-freebsd-x64-1.10.4"
+      sources."@node-rs/bcrypt-linux-arm-gnueabihf-1.10.4"
+      sources."@node-rs/bcrypt-linux-arm64-gnu-1.10.4"
+      sources."@node-rs/bcrypt-linux-arm64-musl-1.10.4"
+      sources."@node-rs/bcrypt-linux-x64-gnu-1.10.4"
+      sources."@node-rs/bcrypt-linux-x64-musl-1.10.4"
+      sources."@node-rs/bcrypt-wasm32-wasi-1.10.4"
+      sources."@node-rs/bcrypt-win32-arm64-msvc-1.10.4"
+      sources."@node-rs/bcrypt-win32-ia32-msvc-1.10.4"
+      sources."@node-rs/bcrypt-win32-x64-msvc-1.10.4"
       sources."@sindresorhus/is-5.6.0"
       sources."@szmarczak/http-timer-5.0.1"
+      sources."@tybys/wasm-util-0.9.0"
       sources."@types/http-cache-semantics-4.0.4"
+      sources."@types/node-20.14.12"
+      (sources."@types/readable-stream-4.0.15" // {
+        dependencies = [
+          sources."safe-buffer-5.1.2"
+        ];
+      })
+      sources."@types/ws-8.5.11"
       sources."abbrev-1.1.1"
+      sources."abort-controller-3.0.0"
       sources."accepts-1.3.8"
-      sources."acorn-8.8.2"
-      sources."acorn-walk-8.2.0"
+      sources."acorn-8.11.3"
+      sources."acorn-walk-8.3.2"
       (sources."agent-base-6.0.2" // {
         dependencies = [
           sources."debug-4.3.5"
           sources."ms-2.1.2"
         ];
       })
-      sources."ajv-8.12.0"
+      sources."ajv-8.14.0"
       sources."ansi-colors-4.1.3"
       sources."ansi-regex-5.0.1"
+      sources."ansi-styles-6.2.1"
       sources."append-field-1.0.0"
-      sources."aproba-2.0.0"
-      (sources."are-we-there-yet-2.0.0" // {
-        dependencies = [
-          sources."readable-stream-3.6.2"
-        ];
-      })
       sources."argparse-2.0.1"
       sources."array-flatten-1.1.1"
-      sources."async-mutex-0.4.0"
+      sources."async-mutex-0.5.0"
       sources."asynckit-0.4.0"
       sources."axios-1.7.2"
       sources."balanced-match-1.0.2"
@@ -79714,17 +78739,12 @@ in
           sources."safe-buffer-5.1.2"
         ];
       })
-      sources."bcrypt-5.1.0"
       sources."bcryptjs-2.4.3"
-      (sources."bl-4.1.0" // {
-        dependencies = [
-          sources."readable-stream-3.6.2"
-        ];
-      })
+      sources."bl-6.0.14"
       sources."body-parser-1.20.2"
       sources."boolbase-1.0.0"
-      sources."brace-expansion-1.1.11"
-      sources."buffer-5.7.1"
+      sources."brace-expansion-2.0.1"
+      sources."buffer-6.0.3"
       sources."buffer-from-1.1.2"
       sources."bufferutil-4.0.8"
       sources."busboy-1.6.0"
@@ -79734,19 +78754,22 @@ in
       sources."call-bind-1.0.7"
       sources."cheerio-1.0.0-rc.10"
       sources."cheerio-select-1.6.0"
-      sources."chownr-2.0.0"
+      sources."chownr-3.0.0"
       sources."cli-table-0.3.11"
       sources."clone-2.1.2"
-      sources."color-support-1.1.3"
+      sources."color-convert-2.0.1"
+      sources."color-name-1.1.4"
       sources."colors-1.0.3"
       sources."combined-stream-1.0.8"
-      sources."commist-1.1.0"
-      sources."concat-map-0.0.1"
-      sources."concat-stream-1.6.2"
-      sources."console-control-strings-1.1.0"
+      sources."commist-3.2.0"
+      (sources."concat-stream-2.0.0" // {
+        dependencies = [
+          sources."readable-stream-3.6.2"
+        ];
+      })
       sources."content-disposition-0.5.4"
       sources."content-type-1.0.5"
-      sources."cookie-0.4.2"
+      sources."cookie-0.6.0"
       (sources."cookie-parser-1.4.6" // {
         dependencies = [
           sources."cookie-0.4.1"
@@ -79756,9 +78779,14 @@ in
       sources."core-util-is-1.0.3"
       sources."cors-2.8.5"
       sources."cronosjs-1.7.1"
+      sources."cross-spawn-7.0.3"
       sources."css-select-4.3.0"
       sources."css-what-6.1.0"
-      sources."debug-2.6.9"
+      (sources."debug-2.6.9" // {
+        dependencies = [
+          sources."ms-2.0.0"
+        ];
+      })
       (sources."decompress-response-6.0.0" // {
         dependencies = [
           sources."mimic-response-3.1.0"
@@ -79767,79 +78795,54 @@ in
       sources."defer-to-connect-2.0.1"
       sources."define-data-property-1.1.4"
       sources."delayed-stream-1.0.0"
-      sources."delegates-1.0.0"
       sources."denque-2.1.0"
       sources."depd-2.0.0"
       sources."destroy-1.2.0"
-      sources."detect-libc-2.0.3"
       sources."dom-serializer-1.4.1"
       sources."domelementtype-2.3.0"
       sources."domhandler-4.3.1"
       sources."domutils-2.8.0"
-      (sources."duplexify-4.1.3" // {
-        dependencies = [
-          sources."readable-stream-3.6.2"
-        ];
-      })
+      sources."eastasianwidth-0.2.0"
       sources."ee-first-1.1.1"
-      sources."emoji-regex-8.0.0"
+      sources."emoji-regex-9.2.2"
       sources."encodeurl-1.0.2"
-      (sources."encoding-0.1.13" // {
-        dependencies = [
-          sources."iconv-lite-0.6.3"
-        ];
-      })
-      sources."end-of-stream-1.4.4"
       sources."enquirer-2.4.1"
       sources."entities-2.2.0"
       sources."es-define-property-1.0.0"
       sources."es-errors-1.3.0"
       sources."escape-html-1.0.3"
       sources."etag-1.8.1"
-      (sources."express-4.19.2" // {
+      sources."event-target-shim-5.0.1"
+      sources."events-3.3.0"
+      sources."express-4.19.2"
+      (sources."express-session-1.18.0" // {
         dependencies = [
-          sources."cookie-0.6.0"
+          sources."cookie-signature-1.0.7"
         ];
       })
-      sources."express-session-1.17.3"
       sources."fast-deep-equal-3.1.3"
+      sources."fast-unique-numbers-8.0.13"
       sources."finalhandler-1.2.0"
       sources."follow-redirects-1.15.6"
+      sources."foreground-child-3.2.1"
       sources."form-data-4.0.0"
       sources."form-data-encoder-2.1.4"
       sources."forwarded-0.2.0"
       sources."fresh-0.5.2"
-      (sources."fs-extra-11.1.1" // {
-        dependencies = [
-          sources."universalify-2.0.1"
-        ];
-      })
-      (sources."fs-minipass-2.1.0" // {
-        dependencies = [
-          sources."minipass-3.3.6"
-          sources."yallist-4.0.0"
-        ];
-      })
-      sources."fs.realpath-1.0.0"
+      sources."fs-extra-11.2.0"
       sources."function-bind-1.1.2"
-      sources."gauge-3.0.2"
       sources."get-intrinsic-1.2.4"
       sources."get-stream-6.0.1"
-      sources."glob-7.2.3"
+      sources."glob-10.4.5"
       sources."gopd-1.0.1"
       sources."got-12.6.0"
       sources."graceful-fs-4.2.11"
       sources."has-property-descriptors-1.0.2"
       sources."has-proto-1.0.3"
       sources."has-symbols-1.0.3"
-      sources."has-unicode-2.0.1"
       sources."hash-sum-2.0.0"
       sources."hasown-2.0.2"
-      (sources."help-me-3.0.0" // {
-        dependencies = [
-          sources."readable-stream-3.6.2"
-        ];
-      })
+      sources."help-me-5.0.0"
       sources."hpagent-1.2.0"
       sources."htmlparser2-6.1.0"
       sources."http-cache-semantics-4.1.1"
@@ -79854,87 +78857,77 @@ in
       sources."i18next-21.10.0"
       sources."iconv-lite-0.4.24"
       sources."ieee754-1.2.1"
-      sources."inflight-1.0.6"
       sources."inherits-2.0.4"
       sources."ipaddr.js-1.9.1"
       sources."is-fullwidth-code-point-3.0.0"
       sources."is-utf8-0.2.1"
       sources."isarray-1.0.0"
+      sources."isexe-2.0.0"
+      sources."jackspeak-3.4.3"
       sources."js-sdsl-4.3.0"
       sources."js-yaml-4.1.0"
       sources."json-buffer-3.0.1"
       sources."json-schema-traverse-1.0.0"
       sources."json-stringify-safe-5.0.1"
-      sources."jsonata-1.8.7"
-      (sources."jsonfile-6.1.0" // {
-        dependencies = [
-          sources."universalify-2.0.1"
-        ];
-      })
+      sources."jsonata-2.0.5"
+      sources."jsonfile-6.1.0"
       sources."keyv-4.5.4"
-      sources."leven-2.1.0"
       sources."lodash.clonedeep-4.5.0"
       sources."lowercase-keys-3.0.0"
-      sources."lru-cache-4.1.5"
-      (sources."make-dir-3.1.0" // {
-        dependencies = [
-          sources."semver-6.3.1"
-        ];
-      })
+      sources."lru-cache-6.0.0"
       sources."media-typer-0.3.0"
       (sources."memorystore-1.6.7" // {
         dependencies = [
           sources."debug-4.3.5"
+          sources."lru-cache-4.1.5"
           sources."ms-2.1.2"
+          sources."yallist-2.1.2"
         ];
       })
       sources."merge-descriptors-1.0.1"
       sources."methods-1.1.2"
-      sources."mime-3.0.0"
+      sources."mime-1.6.0"
       sources."mime-db-1.52.0"
       sources."mime-types-2.1.35"
       sources."mimic-response-4.0.0"
-      sources."minimatch-3.1.2"
+      sources."minimatch-9.0.5"
       sources."minimist-1.2.8"
-      sources."minipass-5.0.0"
-      (sources."minizlib-2.1.2" // {
-        dependencies = [
-          sources."minipass-3.3.6"
-          sources."yallist-4.0.0"
-        ];
-      })
+      sources."minipass-7.1.2"
+      sources."minizlib-3.0.1"
       sources."mkdirp-0.5.6"
-      sources."moment-2.29.4"
-      sources."moment-timezone-0.5.43"
-      (sources."mqtt-4.3.7" // {
+      sources."moment-2.30.1"
+      sources."moment-timezone-0.5.45"
+      (sources."mqtt-5.7.0" // {
         dependencies = [
-          sources."concat-stream-2.0.0"
           sources."debug-4.3.5"
-          sources."lru-cache-6.0.0"
+          sources."lru-cache-10.4.3"
           sources."ms-2.1.2"
-          sources."readable-stream-3.6.2"
-          sources."yallist-4.0.0"
+          sources."ws-8.18.0"
         ];
       })
-      (sources."mqtt-packet-6.10.0" // {
+      (sources."mqtt-packet-9.0.0" // {
         dependencies = [
           sources."debug-4.3.5"
           sources."ms-2.1.2"
         ];
       })
-      sources."ms-2.0.0"
-      sources."multer-1.4.5-lts.1"
+      sources."ms-2.1.3"
+      (sources."multer-1.4.5-lts.1" // {
+        dependencies = [
+          sources."concat-stream-1.6.2"
+          sources."readable-stream-2.3.8"
+          sources."safe-buffer-5.1.2"
+          sources."string_decoder-1.1.1"
+        ];
+      })
       sources."mustache-4.2.0"
-      sources."mute-stream-0.0.8"
+      sources."mute-stream-1.0.0"
       sources."negotiator-0.6.3"
-      sources."node-addon-api-5.1.0"
-      sources."node-fetch-2.7.0"
       sources."node-gyp-build-4.8.1"
-      sources."node-red-admin-3.1.3"
+      sources."node-red-admin-4.0.0"
       sources."node-watch-0.7.4"
       sources."nopt-5.0.0"
       sources."normalize-url-8.0.1"
-      sources."npmlog-5.0.1"
       sources."nth-check-2.1.1"
       (sources."number-allocator-1.0.14" // {
         dependencies = [
@@ -79942,29 +78935,34 @@ in
           sources."ms-2.1.2"
         ];
       })
-      sources."oauth2orize-1.11.1"
+      sources."oauth2orize-1.12.0"
       sources."object-assign-4.1.1"
-      sources."object-inspect-1.13.1"
+      sources."object-inspect-1.13.2"
       sources."on-finished-2.4.1"
       sources."on-headers-1.0.2"
-      sources."once-1.4.0"
       sources."p-cancelable-3.0.0"
+      sources."package-json-from-dist-1.0.0"
       sources."parse5-6.0.1"
       sources."parse5-htmlparser2-tree-adapter-6.0.1"
       sources."parseurl-1.3.3"
-      sources."passport-0.6.0"
+      sources."passport-0.7.0"
       sources."passport-http-bearer-1.0.1"
       sources."passport-oauth2-client-password-0.1.2"
       sources."passport-strategy-1.0.0"
-      sources."path-is-absolute-1.0.1"
+      sources."path-key-3.1.1"
+      (sources."path-scurry-1.11.1" // {
+        dependencies = [
+          sources."lru-cache-10.4.3"
+        ];
+      })
       sources."path-to-regexp-0.1.7"
       sources."pause-0.0.1"
+      sources."process-0.11.10"
       sources."process-nextick-args-2.0.1"
       sources."proxy-addr-2.0.7"
       sources."proxy-from-env-1.1.0"
       sources."pseudomap-1.0.2"
       sources."psl-1.9.0"
-      sources."pump-3.0.0"
       sources."punycode-2.3.1"
       sources."qs-6.11.0"
       sources."querystringify-2.2.0"
@@ -79972,12 +78970,8 @@ in
       sources."random-bytes-1.0.0"
       sources."range-parser-1.2.1"
       sources."raw-body-2.5.2"
-      sources."read-1.0.7"
-      (sources."readable-stream-2.3.8" // {
-        dependencies = [
-          sources."safe-buffer-5.1.2"
-        ];
-      })
+      sources."read-3.0.1"
+      sources."readable-stream-4.5.2"
       sources."regenerator-runtime-0.14.1"
       sources."reinterval-1.1.0"
       sources."require-from-string-2.0.2"
@@ -79985,76 +78979,86 @@ in
       sources."resolve-alpn-1.2.1"
       sources."responselike-3.0.0"
       sources."rfdc-1.4.1"
-      sources."rimraf-3.0.2"
+      sources."rimraf-5.0.9"
       sources."safe-buffer-5.2.1"
       sources."safer-buffer-2.1.2"
       sources."sax-1.4.1"
-      (sources."semver-7.5.4" // {
-        dependencies = [
-          sources."lru-cache-6.0.0"
-          sources."yallist-4.0.0"
-        ];
-      })
-      (sources."send-0.18.0" // {
-        dependencies = [
-          sources."mime-1.6.0"
-          sources."ms-2.1.3"
-        ];
-      })
+      sources."semver-7.5.4"
+      sources."send-0.18.0"
       sources."serve-static-1.15.0"
-      sources."set-blocking-2.0.0"
       sources."set-function-length-1.2.2"
       sources."setprototypeof-1.2.0"
+      sources."shebang-command-2.0.0"
+      sources."shebang-regex-3.0.0"
       sources."side-channel-1.0.6"
-      sources."signal-exit-3.0.7"
-      (sources."split2-3.2.2" // {
-        dependencies = [
-          sources."readable-stream-3.6.2"
-        ];
-      })
+      sources."signal-exit-4.1.0"
+      sources."split2-4.2.0"
       sources."statuses-2.0.1"
-      sources."stream-shift-1.0.3"
       sources."streamsearch-1.1.0"
-      sources."string-width-4.2.3"
-      (sources."string_decoder-1.1.1" // {
+      (sources."string-width-5.1.2" // {
         dependencies = [
-          sources."safe-buffer-5.1.2"
+          sources."ansi-regex-6.0.1"
+          sources."strip-ansi-7.1.0"
         ];
       })
-      sources."strip-ansi-6.0.1"
-      (sources."tar-6.2.1" // {
+      (sources."string-width-cjs-4.2.3" // {
         dependencies = [
-          sources."mkdirp-1.0.4"
-          sources."yallist-4.0.0"
+          sources."emoji-regex-8.0.0"
+        ];
+      })
+      sources."string_decoder-1.3.0"
+      sources."strip-ansi-6.0.1"
+      sources."strip-ansi-cjs-6.0.1"
+      (sources."tar-7.2.0" // {
+        dependencies = [
+          sources."mkdirp-3.0.1"
+          sources."yallist-5.0.0"
         ];
       })
       sources."toidentifier-1.0.1"
-      sources."tough-cookie-4.1.3"
-      sources."tr46-0.0.3"
+      (sources."tough-cookie-4.1.4" // {
+        dependencies = [
+          sources."universalify-0.2.0"
+        ];
+      })
       sources."tslib-2.6.3"
       sources."type-is-1.6.18"
       sources."typedarray-0.0.6"
       sources."uglify-js-3.17.4"
       sources."uid-safe-2.1.5"
       sources."uid2-0.0.4"
-      sources."universalify-0.2.0"
+      sources."undici-types-5.26.5"
+      sources."universalify-2.0.1"
       sources."unpipe-1.0.0"
       sources."uri-js-4.4.1"
       sources."url-parse-1.5.10"
       sources."utf-8-validate-5.0.10"
       sources."util-deprecate-1.0.2"
       sources."utils-merge-1.0.1"
-      sources."uuid-9.0.0"
+      sources."uuid-9.0.1"
       sources."vary-1.1.2"
-      sources."webidl-conversions-3.0.1"
-      sources."whatwg-url-5.0.0"
-      sources."wide-align-1.1.5"
-      sources."wrappy-1.0.2"
-      sources."ws-7.5.6"
+      sources."which-2.0.2"
+      sources."worker-timers-7.1.8"
+      sources."worker-timers-broker-6.1.8"
+      sources."worker-timers-worker-7.0.71"
+      (sources."wrap-ansi-8.1.0" // {
+        dependencies = [
+          sources."ansi-regex-6.0.1"
+          sources."strip-ansi-7.1.0"
+        ];
+      })
+      (sources."wrap-ansi-cjs-7.0.0" // {
+        dependencies = [
+          sources."ansi-styles-4.3.0"
+          sources."emoji-regex-8.0.0"
+          sources."string-width-4.2.3"
+        ];
+      })
+      sources."ws-7.5.10"
       sources."xml2js-0.6.2"
       sources."xmlbuilder-11.0.1"
       sources."xtend-4.0.2"
-      sources."yallist-2.1.2"
+      sources."yallist-4.0.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -80134,7 +79138,7 @@ in
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
       sources."ini-1.3.8"
-      sources."is-core-module-2.13.1"
+      sources."is-core-module-2.15.0"
       sources."is-fullwidth-code-point-1.0.0"
       sources."is-typedarray-1.0.0"
       sources."isarray-1.0.0"
@@ -80273,10 +79277,10 @@ in
   np = nodeEnv.buildNodePackage {
     name = "np";
     packageName = "np";
-    version = "10.0.5";
+    version = "10.0.7";
     src = fetchurl {
-      url = "https://registry.npmjs.org/np/-/np-10.0.5.tgz";
-      sha512 = "Tu270vVvsh92uh6XDXrGS6D94PhzxQYqM8uUxftYVp0B8qXl78dJRYwQ9wfYMOBB9ynlF79eWlUtPUxPzKGddQ==";
+      url = "https://registry.npmjs.org/np/-/np-10.0.7.tgz";
+      sha512 = "vIPKQwOYKpQU40PU5x/vLfN2haj8ObxMvR1QGt7EZnBPWdm4WEbHdumYAnMV7AeR9kACsMqcqAP37sAo5cW5jA==";
     };
     dependencies = [
       sources."@babel/code-frame-7.24.7"
@@ -80287,8 +79291,7 @@ in
           sources."escape-string-regexp-1.0.5"
         ];
       })
-      sources."@inquirer/figures-1.0.3"
-      sources."@ljharb/through-2.3.13"
+      sources."@inquirer/figures-1.0.5"
       sources."@nodelib/fs.scandir-2.1.5"
       sources."@nodelib/fs.stat-2.0.5"
       sources."@nodelib/fs.walk-1.2.8"
@@ -80300,9 +79303,6 @@ in
       })
       sources."@pnpm/npm-conf-2.2.2"
       sources."@samverschueren/stream-to-observable-0.3.1"
-      sources."@sindresorhus/is-5.6.0"
-      sources."@szmarczak/http-timer-5.0.1"
-      sources."@types/http-cache-semantics-4.0.4"
       sources."@types/normalize-package-data-2.4.4"
       sources."aggregate-error-4.0.1"
       sources."ansi-align-3.0.1"
@@ -80329,13 +79329,6 @@ in
       sources."braces-3.0.3"
       sources."buffer-5.7.1"
       sources."bundle-name-4.1.0"
-      sources."cacheable-lookup-7.0.0"
-      (sources."cacheable-request-10.2.14" // {
-        dependencies = [
-          sources."get-stream-6.0.1"
-        ];
-      })
-      sources."call-bind-1.0.7"
       sources."callsites-3.1.0"
       sources."camelcase-7.0.1"
       sources."chalk-5.3.0"
@@ -80373,17 +79366,10 @@ in
         ];
       })
       sources."date-fns-1.30.1"
-      (sources."decompress-response-6.0.0" // {
-        dependencies = [
-          sources."mimic-response-3.1.0"
-        ];
-      })
       sources."deep-extend-0.6.0"
       sources."default-browser-5.2.1"
       sources."default-browser-id-5.0.0"
       sources."defaults-1.0.4"
-      sources."defer-to-connect-2.0.1"
-      sources."define-data-property-1.1.4"
       sources."define-lazy-prop-3.0.0"
       sources."del-7.1.0"
       sources."dir-glob-3.0.1"
@@ -80392,8 +79378,6 @@ in
       sources."elegant-spinner-1.0.1"
       sources."emoji-regex-8.0.0"
       sources."error-ex-1.3.2"
-      sources."es-define-property-1.0.0"
-      sources."es-errors-1.3.0"
       sources."escape-goat-4.0.0"
       sources."escape-string-regexp-5.0.0"
       (sources."execa-8.0.1" // {
@@ -80417,27 +79401,13 @@ in
         ];
       })
       sources."find-up-simple-1.0.0"
-      sources."form-data-encoder-2.1.4"
       sources."fs.realpath-1.0.0"
-      sources."function-bind-1.1.2"
-      sources."get-intrinsic-1.2.4"
       sources."get-stream-8.0.1"
       sources."github-url-from-git-1.5.0"
       sources."glob-7.2.3"
       sources."glob-parent-5.1.2"
       sources."global-directory-4.0.1"
-      (sources."global-dirs-3.0.1" // {
-        dependencies = [
-          sources."ini-2.0.0"
-        ];
-      })
       sources."globby-13.2.2"
-      sources."gopd-1.0.1"
-      (sources."got-12.6.1" // {
-        dependencies = [
-          sources."get-stream-6.0.1"
-        ];
-      })
       sources."graceful-fs-4.2.11"
       (sources."has-ansi-2.0.0" // {
         dependencies = [
@@ -80445,13 +79415,7 @@ in
         ];
       })
       sources."has-flag-3.0.0"
-      sources."has-property-descriptors-1.0.2"
-      sources."has-proto-1.0.3"
-      sources."has-symbols-1.0.3"
-      sources."hasown-2.0.2"
       sources."hosted-git-info-7.0.2"
-      sources."http-cache-semantics-4.1.1"
-      sources."http2-wrapper-2.2.1"
       sources."human-signals-5.0.0"
       sources."iconv-lite-0.4.24"
       sources."ieee754-1.2.1"
@@ -80459,12 +79423,12 @@ in
       (sources."ignore-walk-6.0.5" // {
         dependencies = [
           sources."brace-expansion-2.0.1"
-          sources."minimatch-9.0.4"
+          sources."minimatch-9.0.5"
         ];
       })
       sources."import-fresh-3.3.0"
       sources."import-lazy-4.0.0"
-      (sources."import-local-3.1.0" // {
+      (sources."import-local-3.2.0" // {
         dependencies = [
           sources."pkg-dir-4.2.0"
         ];
@@ -80475,7 +79439,7 @@ in
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
       sources."ini-4.1.1"
-      sources."inquirer-9.2.23"
+      sources."inquirer-9.3.6"
       (sources."inquirer-autosubmit-prompt-0.2.0" // {
         dependencies = [
           sources."ansi-escapes-3.2.0"
@@ -80504,7 +79468,6 @@ in
         ];
       })
       sources."is-arrayish-0.2.1"
-      sources."is-core-module-2.13.1"
       sources."is-docker-3.0.0"
       sources."is-extglob-2.1.1"
       sources."is-fullwidth-code-point-3.0.0"
@@ -80534,11 +79497,9 @@ in
       sources."issue-regex-4.1.0"
       sources."js-tokens-4.0.0"
       sources."js-yaml-4.1.0"
-      sources."json-buffer-3.0.1"
       sources."json-parse-even-better-errors-2.3.1"
-      sources."keyv-4.5.4"
-      sources."ky-1.3.0"
-      sources."latest-version-7.0.0"
+      sources."ky-1.4.0"
+      sources."latest-version-9.0.0"
       sources."lines-and-columns-1.2.4"
       (sources."listr-0.14.3" // {
         dependencies = [
@@ -80612,15 +79573,13 @@ in
           sources."wrap-ansi-3.0.1"
         ];
       })
-      sources."lowercase-keys-3.0.0"
-      sources."lru-cache-10.2.2"
+      sources."lru-cache-10.4.3"
       sources."meow-13.2.0"
       sources."merge-stream-2.0.0"
       sources."merge2-1.4.1"
       sources."micromatch-4.0.7"
       sources."mimic-fn-4.0.0"
       sources."mimic-function-5.0.1"
-      sources."mimic-response-4.0.0"
       sources."minimatch-3.1.2"
       sources."minimist-1.2.8"
       sources."mute-stream-1.0.0"
@@ -80629,8 +79588,7 @@ in
           sources."type-fest-2.19.0"
         ];
       })
-      sources."normalize-package-data-6.0.1"
-      sources."normalize-url-8.0.1"
+      sources."normalize-package-data-6.0.2"
       (sources."npm-name-8.0.0" // {
         dependencies = [
           sources."p-map-7.0.2"
@@ -80660,7 +79618,6 @@ in
       })
       sources."org-regex-1.0.0"
       sources."os-tmpdir-1.0.2"
-      sources."p-cancelable-3.0.0"
       sources."p-limit-2.3.0"
       sources."p-locate-4.1.0"
       sources."p-map-5.5.0"
@@ -80671,7 +79628,7 @@ in
       })
       sources."p-timeout-6.1.2"
       sources."p-try-2.2.0"
-      sources."package-json-8.1.1"
+      sources."package-json-10.0.1"
       sources."parent-module-1.0.1"
       sources."parse-json-5.2.0"
       sources."path-exists-5.0.0"
@@ -80684,7 +79641,6 @@ in
       sources."proto-list-1.2.4"
       sources."pupa-3.1.0"
       sources."queue-microtask-1.2.3"
-      sources."quick-lru-5.1.1"
       (sources."rc-1.2.8" // {
         dependencies = [
           sources."ini-1.3.8"
@@ -80692,26 +79648,24 @@ in
       })
       (sources."read-package-up-11.0.0" // {
         dependencies = [
-          sources."type-fest-4.20.0"
+          sources."type-fest-4.23.0"
         ];
       })
       (sources."read-pkg-9.0.1" // {
         dependencies = [
           sources."parse-json-8.1.0"
-          sources."type-fest-4.20.0"
+          sources."type-fest-4.23.0"
         ];
       })
       sources."readable-stream-3.6.2"
       sources."registry-auth-token-5.0.2"
       sources."registry-url-6.0.1"
-      sources."resolve-alpn-1.2.1"
       (sources."resolve-cwd-3.0.0" // {
         dependencies = [
           sources."resolve-from-5.0.0"
         ];
       })
       sources."resolve-from-4.0.0"
-      sources."responselike-3.0.0"
       (sources."restore-cursor-3.1.0" // {
         dependencies = [
           sources."mimic-fn-2.1.0"
@@ -80732,9 +79686,8 @@ in
       sources."safe-buffer-5.2.1"
       sources."safer-buffer-2.1.2"
       sources."scoped-regex-3.0.0"
-      sources."semver-7.6.2"
+      sources."semver-7.6.3"
       sources."semver-diff-4.0.0"
-      sources."set-function-length-1.2.2"
       sources."shebang-command-2.0.0"
       sources."shebang-regex-3.0.0"
       sources."signal-exit-4.1.0"
@@ -80769,15 +79722,10 @@ in
       sources."tslib-1.14.1"
       sources."type-fest-0.21.3"
       sources."typedarray-to-buffer-3.1.5"
-      sources."typescript-5.4.5"
+      sources."typescript-5.5.4"
       sources."unicorn-magic-0.1.0"
       sources."unique-string-3.0.0"
-      (sources."update-notifier-7.0.0" // {
-        dependencies = [
-          sources."is-installed-globally-0.4.0"
-          sources."is-path-inside-3.0.3"
-        ];
-      })
+      sources."update-notifier-7.1.0"
       sources."util-deprecate-1.0.2"
       sources."validate-npm-package-license-3.0.4"
       sources."validate-npm-package-name-5.0.1"
@@ -80805,6 +79753,7 @@ in
         ];
       })
       sources."xdg-basedir-5.1.0"
+      sources."yoctocolors-cjs-2.1.2"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -80819,10 +79768,10 @@ in
   npm = nodeEnv.buildNodePackage {
     name = "npm";
     packageName = "npm";
-    version = "10.8.1";
+    version = "10.8.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/npm/-/npm-10.8.1.tgz";
-      sha512 = "Dp1C6SvSMYQI7YHq/y2l94uvI+59Eqbu1EpuKQHQ8p16txXRuRit5gH3Lnaagk2aXDIjg/Iru9pd05bnneKgdw==";
+      url = "https://registry.npmjs.org/npm/-/npm-10.8.2.tgz";
+      sha512 = "x/AIjFIKRllrhcb48dqUNAAZl0ig9+qMuN91RpZo3Cb2+zuibfh+KISl6+kVVyktDz230JKc208UkQwwMqyB+w==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -80891,10 +79840,10 @@ in
   orval = nodeEnv.buildNodePackage {
     name = "orval";
     packageName = "orval";
-    version = "6.30.2";
+    version = "6.31.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/orval/-/orval-6.30.2.tgz";
-      sha512 = "bmMfFv9N2iPFAyHxKHVPz9VCJIG4nZI5JnandGCp+W8IqRdVE4M6+XxLS6XTQR0K6pRBhaZYnj/NmCO85qYdgQ==";
+      url = "https://registry.npmjs.org/orval/-/orval-6.31.0.tgz";
+      sha512 = "515KTDQ4VRJCT+4DsMrK/QROWRq4PXrjgxAoEx3jmP7j+aQBGbx8WhidIF6aX1UgbTxw47Lq7QVp9mbnD0lnWA==";
     };
     dependencies = [
       sources."@apidevtools/json-schema-ref-parser-9.0.6"
@@ -80903,7 +79852,7 @@ in
       sources."@apidevtools/swagger-parser-10.1.0"
       sources."@asyncapi/specs-4.3.1"
       sources."@exodus/schemasafe-1.3.0"
-      sources."@ibm-cloud/openapi-ruleset-1.17.1"
+      sources."@ibm-cloud/openapi-ruleset-1.18.2"
       sources."@ibm-cloud/openapi-ruleset-utilities-1.3.2"
       sources."@jsdevtools/ono-7.1.3"
       sources."@jsep-plugin/regex-1.0.3"
@@ -80911,17 +79860,17 @@ in
       sources."@nodelib/fs.scandir-2.1.5"
       sources."@nodelib/fs.stat-2.0.5"
       sources."@nodelib/fs.walk-1.2.8"
-      sources."@orval/angular-6.30.2"
-      sources."@orval/axios-6.30.2"
-      sources."@orval/core-6.30.2"
-      sources."@orval/fetch-6.30.2"
-      sources."@orval/hono-6.30.2"
-      sources."@orval/mock-6.30.2"
-      sources."@orval/query-6.30.2"
-      sources."@orval/swr-6.30.2"
-      sources."@orval/zod-6.30.2"
+      sources."@orval/angular-6.31.0"
+      sources."@orval/axios-6.31.0"
+      sources."@orval/core-6.31.0"
+      sources."@orval/fetch-6.31.0"
+      sources."@orval/hono-6.31.0"
+      sources."@orval/mock-6.31.0"
+      sources."@orval/query-6.31.0"
+      sources."@orval/swr-6.31.0"
+      sources."@orval/zod-6.31.0"
       sources."@stoplight/better-ajv-errors-1.0.3"
-      sources."@stoplight/json-3.21.0"
+      sources."@stoplight/json-3.21.4"
       (sources."@stoplight/json-ref-readers-1.2.2" // {
         dependencies = [
           sources."tslib-1.14.1"
@@ -80960,11 +79909,11 @@ in
       sources."@stoplight/yaml-ast-parser-0.0.50"
       sources."@types/es-aggregate-error-1.0.6"
       sources."@types/json-schema-7.0.15"
-      sources."@types/node-20.14.2"
+      sources."@types/node-20.14.12"
       sources."@types/urijs-1.19.25"
       sources."abort-controller-3.0.0"
-      sources."acorn-8.12.0"
-      sources."ajv-8.16.0"
+      sources."acorn-8.12.1"
+      sources."ajv-8.17.1"
       sources."ajv-draft-04-1.0.0"
       sources."ajv-errors-3.0.0"
       sources."ajv-formats-2.1.1"
@@ -80990,7 +79939,7 @@ in
       sources."cliui-8.0.1"
       sources."color-convert-2.0.1"
       sources."color-name-1.1.4"
-      sources."compare-versions-6.1.0"
+      sources."compare-versions-6.1.1"
       sources."concat-map-0.0.1"
       sources."cross-spawn-7.0.3"
       sources."data-view-buffer-1.0.1"
@@ -81022,6 +79971,7 @@ in
       sources."fast-glob-3.3.2"
       sources."fast-memoize-2.5.2"
       sources."fast-safe-stringify-2.1.1"
+      sources."fast-uri-3.0.1"
       sources."fastq-1.17.1"
       sources."fill-range-7.1.1"
       sources."find-up-5.0.0"
@@ -81075,7 +80025,7 @@ in
       sources."isarray-2.0.5"
       sources."isexe-2.0.0"
       sources."js-yaml-3.14.1"
-      sources."jsep-1.3.8"
+      sources."jsep-1.3.9"
       sources."json-schema-traverse-1.0.0"
       sources."jsonc-parser-2.2.1"
       sources."jsonfile-6.1.0"
@@ -81115,14 +80065,14 @@ in
       sources."oas-resolver-2.5.6"
       sources."oas-schema-walker-1.1.5"
       sources."oas-validator-5.0.8"
-      sources."object-inspect-1.13.1"
+      sources."object-inspect-1.13.2"
       sources."object-keys-1.1.1"
       sources."object.assign-4.1.5"
       sources."onetime-5.1.2"
       sources."openapi-types-12.1.3"
       (sources."openapi3-ts-4.2.2" // {
         dependencies = [
-          sources."yaml-2.4.5"
+          sources."yaml-2.5.0"
         ];
       })
       sources."p-limit-3.1.0"
@@ -81133,7 +80083,6 @@ in
       sources."picomatch-2.3.1"
       sources."pony-cause-1.1.1"
       sources."possible-typed-array-names-1.0.0"
-      sources."punycode-2.3.1"
       sources."queue-microtask-1.2.3"
       sources."readdirp-3.6.0"
       sources."reftools-1.1.9"
@@ -81178,11 +80127,10 @@ in
       sources."typed-array-byte-length-1.0.1"
       sources."typed-array-byte-offset-1.0.2"
       sources."typed-array-length-1.0.6"
-      sources."typescript-5.4.5"
+      sources."typescript-5.5.4"
       sources."unbox-primitive-1.0.2"
       sources."undici-types-5.26.5"
       sources."universalify-2.0.1"
-      sources."uri-js-4.4.1"
       sources."urijs-1.19.11"
       sources."utility-types-3.11.0"
       sources."validator-13.12.0"
@@ -81234,7 +80182,7 @@ in
       sources."@jridgewell/resolve-uri-3.1.2"
       sources."@jridgewell/set-array-1.2.1"
       sources."@jridgewell/source-map-0.3.6"
-      sources."@jridgewell/sourcemap-codec-1.4.15"
+      sources."@jridgewell/sourcemap-codec-1.5.0"
       sources."@jridgewell/trace-mapping-0.3.25"
       sources."@lezer/common-1.2.1"
       sources."@lezer/lr-1.4.1"
@@ -81315,7 +80263,7 @@ in
       (sources."@parcel/watcher-2.4.1" // {
         dependencies = [
           sources."detect-libc-1.0.3"
-          sources."node-addon-api-7.1.0"
+          sources."node-addon-api-7.1.1"
         ];
       })
       sources."@parcel/watcher-android-arm64-2.4.1"
@@ -81331,14 +80279,14 @@ in
       sources."@parcel/watcher-win32-ia32-2.4.1"
       sources."@parcel/watcher-win32-x64-2.4.1"
       sources."@parcel/workers-2.12.0"
-      sources."@swc/core-1.5.29"
+      sources."@swc/core-1.7.1"
       sources."@swc/counter-0.1.3"
-      sources."@swc/helpers-0.5.11"
-      sources."@swc/types-0.1.8"
+      sources."@swc/helpers-0.5.12"
+      sources."@swc/types-0.1.12"
       sources."@trysound/sax-0.2.0"
       sources."abab-2.0.6"
       sources."abortcontroller-polyfill-1.7.5"
-      sources."acorn-8.12.0"
+      sources."acorn-8.12.1"
       (sources."acorn-globals-4.3.4" // {
         dependencies = [
           sources."acorn-6.4.2"
@@ -81357,17 +80305,17 @@ in
       sources."aws-sign2-0.7.0"
       sources."aws4-1.13.0"
       sources."balanced-match-1.0.2"
-      sources."base-x-3.0.9"
+      sources."base-x-3.0.10"
       sources."bcrypt-pbkdf-1.0.2"
       sources."boolbase-1.0.0"
       sources."brace-expansion-2.0.1"
       sources."braces-3.0.3"
       sources."browser-process-hrtime-1.0.0"
-      sources."browserslist-4.23.1"
+      sources."browserslist-4.23.2"
       sources."buffer-from-1.1.2"
       sources."callsites-3.1.0"
       sources."caniuse-api-3.0.0"
-      sources."caniuse-lite-1.0.30001634"
+      sources."caniuse-lite-1.0.30001643"
       sources."caseless-0.12.0"
       sources."chalk-4.1.2"
       sources."chrome-trace-event-1.0.4"
@@ -81386,8 +80334,8 @@ in
       sources."css-tree-1.1.3"
       sources."css-what-6.1.0"
       sources."cssesc-3.0.0"
-      sources."cssnano-7.0.2"
-      sources."cssnano-preset-default-7.0.2"
+      sources."cssnano-7.0.4"
+      sources."cssnano-preset-default-7.0.4"
       sources."cssnano-utils-5.0.0"
       sources."csso-4.2.0"
       sources."cssom-0.3.8"
@@ -81410,7 +80358,7 @@ in
       sources."dotenv-expand-5.1.0"
       sources."eastasianwidth-0.2.0"
       sources."ecc-jsbn-0.1.2"
-      sources."electron-to-chromium-1.4.802"
+      sources."electron-to-chromium-1.5.1"
       sources."emoji-regex-9.2.2"
       sources."entities-3.0.1"
       sources."env-paths-2.2.1"
@@ -81427,13 +80375,13 @@ in
       sources."fast-json-stable-stringify-2.1.0"
       sources."fast-levenshtein-2.0.6"
       sources."fill-range-7.1.1"
-      sources."foreground-child-3.2.0"
+      sources."foreground-child-3.2.1"
       sources."forever-agent-0.6.1"
       sources."form-data-2.3.3"
       sources."fs.realpath-1.0.0"
       sources."get-port-4.2.0"
       sources."getpass-0.1.7"
-      sources."glob-10.4.1"
+      sources."glob-10.4.5"
       sources."globals-13.24.0"
       sources."har-schema-2.0.0"
       sources."har-validator-5.1.5"
@@ -81480,7 +80428,7 @@ in
       sources."is-typedarray-1.0.0"
       sources."isexe-2.0.0"
       sources."isstream-0.1.2"
-      sources."jackspeak-3.4.0"
+      sources."jackspeak-3.4.3"
       sources."js-tokens-4.0.0"
       sources."js-yaml-4.1.0"
       sources."jsbn-0.1.1"
@@ -81508,25 +80456,26 @@ in
       sources."lodash.memoize-4.1.2"
       sources."lodash.sortby-4.7.0"
       sources."lodash.uniq-4.5.0"
-      sources."lru-cache-10.2.2"
+      sources."lru-cache-10.4.3"
       sources."mdn-data-2.0.14"
       sources."micromatch-4.0.7"
       sources."mime-db-1.52.0"
       sources."mime-types-2.1.35"
-      sources."minimatch-9.0.4"
+      sources."minimatch-9.0.5"
       sources."minipass-7.1.2"
-      sources."msgpackr-1.10.2"
+      sources."msgpackr-1.11.0"
       sources."nanoid-3.3.7"
       sources."node-addon-api-6.1.0"
       sources."node-gyp-build-optional-packages-5.1.1"
-      sources."node-releases-2.0.14"
+      sources."node-releases-2.0.18"
       sources."nth-check-2.1.1"
       sources."nullthrows-1.1.1"
-      sources."nwsapi-2.2.10"
+      sources."nwsapi-2.2.12"
       sources."oauth-sign-0.9.0"
       sources."once-1.4.0"
       sources."optionator-0.8.3"
       sources."ordered-binary-1.5.1"
+      sources."package-json-from-dist-1.0.0"
       sources."parent-module-1.0.1"
       sources."parse-json-5.2.0"
       sources."parse5-5.1.0"
@@ -81537,33 +80486,33 @@ in
       sources."picocolors-1.0.1"
       sources."picomatch-2.3.1"
       sources."pn-1.1.0"
-      sources."postcss-8.4.38"
+      sources."postcss-8.4.40"
       sources."postcss-calc-10.0.0"
-      sources."postcss-colormin-7.0.0"
-      sources."postcss-convert-values-7.0.0"
-      sources."postcss-discard-comments-7.0.0"
+      sources."postcss-colormin-7.0.1"
+      sources."postcss-convert-values-7.0.2"
+      sources."postcss-discard-comments-7.0.1"
       sources."postcss-discard-duplicates-7.0.0"
       sources."postcss-discard-empty-7.0.0"
       sources."postcss-discard-overridden-7.0.0"
-      sources."postcss-merge-longhand-7.0.1"
-      sources."postcss-merge-rules-7.0.1"
+      sources."postcss-merge-longhand-7.0.2"
+      sources."postcss-merge-rules-7.0.2"
       sources."postcss-minify-font-values-7.0.0"
       sources."postcss-minify-gradients-7.0.0"
-      sources."postcss-minify-params-7.0.0"
-      sources."postcss-minify-selectors-7.0.1"
+      sources."postcss-minify-params-7.0.1"
+      sources."postcss-minify-selectors-7.0.2"
       sources."postcss-normalize-charset-7.0.0"
       sources."postcss-normalize-display-values-7.0.0"
       sources."postcss-normalize-positions-7.0.0"
       sources."postcss-normalize-repeat-style-7.0.0"
       sources."postcss-normalize-string-7.0.0"
       sources."postcss-normalize-timing-functions-7.0.0"
-      sources."postcss-normalize-unicode-7.0.0"
+      sources."postcss-normalize-unicode-7.0.1"
       sources."postcss-normalize-url-7.0.0"
       sources."postcss-normalize-whitespace-7.0.0"
-      sources."postcss-ordered-values-7.0.0"
-      sources."postcss-reduce-initial-7.0.0"
+      sources."postcss-ordered-values-7.0.1"
+      sources."postcss-reduce-initial-7.0.1"
       sources."postcss-reduce-transforms-7.0.0"
-      sources."postcss-selector-parser-6.1.0"
+      sources."postcss-selector-parser-6.1.1"
       (sources."postcss-svgo-7.0.1" // {
         dependencies = [
           sources."css-select-5.1.0"
@@ -81610,7 +80559,7 @@ in
       sources."safe-buffer-5.2.1"
       sources."safer-buffer-2.1.2"
       sources."saxes-3.1.11"
-      sources."semver-7.6.2"
+      sources."semver-7.6.3"
       sources."shebang-command-2.0.0"
       sources."shebang-regex-3.0.0"
       sources."signal-exit-4.1.0"
@@ -81634,12 +80583,12 @@ in
         ];
       })
       sources."strip-ansi-cjs-6.0.1"
-      sources."stylehacks-7.0.1"
+      sources."stylehacks-7.0.2"
       sources."supports-color-7.2.0"
       sources."svgo-2.8.0"
       sources."symbol-tree-3.2.4"
       sources."term-size-2.2.1"
-      (sources."terser-5.31.1" // {
+      (sources."terser-5.31.3" // {
         dependencies = [
           sources."commander-2.20.3"
         ];
@@ -81653,7 +80602,7 @@ in
       sources."tweetnacl-0.14.5"
       sources."type-check-0.3.2"
       sources."type-fest-0.20.2"
-      sources."typescript-5.4.5"
+      sources."typescript-5.5.4"
       (sources."uncss-0.17.3" // {
         dependencies = [
           sources."brace-expansion-1.1.11"
@@ -81666,7 +80615,7 @@ in
         ];
       })
       sources."uniq-1.0.1"
-      sources."update-browserslist-db-1.0.16"
+      sources."update-browserslist-db-1.1.0"
       sources."uri-js-4.4.1"
       sources."util-deprecate-1.0.2"
       sources."utility-types-3.11.0"
@@ -81694,7 +80643,7 @@ in
         ];
       })
       sources."wrappy-1.0.2"
-      sources."ws-6.2.2"
+      sources."ws-6.2.3"
       sources."xml-name-validator-3.0.0"
       sources."xmlchars-2.2.0"
     ];
@@ -81883,7 +80832,7 @@ in
       sources."neo-async-2.6.2"
       sources."node-gyp-build-4.8.1"
       sources."oauth-sign-0.9.0"
-      sources."object-inspect-1.13.1"
+      sources."object-inspect-1.13.2"
       sources."object-keys-1.1.1"
       sources."object.assign-4.1.5"
       sources."on-finished-2.4.1"
@@ -81944,7 +80893,7 @@ in
       sources."serve-static-1.15.0"
       (sources."service-runner-2.9.0" // {
         dependencies = [
-          sources."semver-7.6.2"
+          sources."semver-7.6.3"
           sources."yargs-14.2.3"
         ];
       })
@@ -81967,7 +80916,7 @@ in
       sources."tunnel-agent-0.6.0"
       sources."tweetnacl-0.14.5"
       sources."type-is-1.6.18"
-      sources."uglify-js-3.18.0"
+      sources."uglify-js-3.19.0"
       sources."unix-dgram-2.0.6"
       sources."unpipe-1.0.0"
       sources."uri-js-4.4.1"
@@ -82067,7 +81016,7 @@ in
       sources."path-key-3.1.1"
       sources."picomatch-2.3.1"
       sources."rimraf-2.7.1"
-      sources."semver-7.6.2"
+      sources."semver-7.6.3"
       sources."set-function-length-1.2.2"
       sources."shebang-command-2.0.0"
       sources."shebang-regex-3.0.0"
@@ -82078,7 +81027,7 @@ in
       sources."universalify-2.0.1"
       sources."which-2.0.2"
       sources."wrappy-1.0.2"
-      sources."yaml-2.4.5"
+      sources."yaml-2.5.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -82233,7 +81182,7 @@ in
       sources."ipaddr.js-2.2.0"
       sources."is-arguments-1.1.1"
       sources."is-arrayish-0.2.1"
-      sources."is-core-module-2.13.1"
+      sources."is-core-module-2.15.0"
       sources."is-date-object-1.0.5"
       sources."is-finite-1.1.0"
       sources."is-fullwidth-code-point-1.0.0"
@@ -82352,6 +81301,7 @@ in
       (sources."simple-websocket-4.3.1" // {
         dependencies = [
           sources."safe-buffer-5.0.1"
+          sources."ultron-1.1.1"
           sources."ws-2.3.1"
         ];
       })
@@ -82389,7 +81339,7 @@ in
       })
       sources."trim-newlines-1.0.0"
       sources."typedarray-0.0.6"
-      sources."ultron-1.1.1"
+      sources."ultron-1.0.2"
       sources."uniq-1.0.1"
       sources."util-deprecate-1.0.2"
       sources."utp-0.0.7"
@@ -82397,11 +81347,7 @@ in
       sources."winreg-1.2.4"
       sources."wordwrap-0.0.3"
       sources."wrappy-1.0.2"
-      (sources."ws-1.1.5" // {
-        dependencies = [
-          sources."ultron-1.0.2"
-        ];
-      })
+      sources."ws-1.1.5"
       sources."xmlbuilder-4.0.0"
       sources."xmldom-0.1.31"
       sources."xtend-4.0.2"
@@ -82456,7 +81402,6 @@ in
       (sources."bittorrent-tracker-7.7.0" // {
         dependencies = [
           sources."bencode-0.8.0"
-          sources."ultron-1.0.2"
           sources."ws-1.1.5"
         ];
       })
@@ -82526,14 +81471,14 @@ in
       sources."ee-first-1.1.1"
       sources."encodeurl-1.0.2"
       sources."end-of-stream-1.4.4"
-      (sources."engine.io-3.6.1" // {
+      (sources."engine.io-3.6.2" // {
         dependencies = [
           sources."cookie-0.4.2"
           sources."debug-4.1.1"
           sources."ms-2.1.3"
         ];
       })
-      (sources."engine.io-client-3.5.3" // {
+      (sources."engine.io-client-3.5.4" // {
         dependencies = [
           sources."debug-3.1.0"
         ];
@@ -82661,7 +81606,7 @@ in
       sources."node-gyp-build-4.8.1"
       sources."normalize-path-3.0.0"
       sources."oauth-sign-0.9.0"
-      sources."object-inspect-1.13.1"
+      sources."object-inspect-1.13.2"
       sources."on-finished-2.4.1"
       sources."on-headers-1.0.2"
       sources."once-1.4.0"
@@ -82737,10 +81682,11 @@ in
         dependencies = [
           sources."readable-stream-2.3.8"
           sources."safe-buffer-5.0.1"
+          sources."ultron-1.1.1"
           sources."ws-2.3.1"
         ];
       })
-      (sources."socket.io-2.5.0" // {
+      (sources."socket.io-2.5.1" // {
         dependencies = [
           sources."debug-4.1.1"
           sources."ms-2.1.3"
@@ -82751,7 +81697,7 @@ in
         dependencies = [
           sources."debug-3.1.0"
           sources."isarray-2.0.1"
-          sources."socket.io-parser-3.3.3"
+          sources."socket.io-parser-3.3.4"
         ];
       })
       (sources."socket.io-parser-3.4.3" // {
@@ -82790,7 +81736,7 @@ in
       sources."tweetnacl-0.14.5"
       sources."type-is-1.6.18"
       sources."uid-safe-2.1.5"
-      sources."ultron-1.1.1"
+      sources."ultron-1.0.2"
       sources."uniq-1.0.1"
       sources."unpipe-1.0.0"
       sources."uri-js-4.4.1"
@@ -82807,7 +81753,7 @@ in
       })
       sources."which-1.3.1"
       sources."wrappy-1.0.2"
-      sources."ws-7.4.6"
+      sources."ws-7.5.10"
       sources."xmlhttprequest-ssl-1.6.3"
       sources."xtend-4.0.2"
       sources."yeast-0.1.2"
@@ -82854,10 +81800,10 @@ in
   postcss = nodeEnv.buildNodePackage {
     name = "postcss";
     packageName = "postcss";
-    version = "8.4.38";
+    version = "8.4.40";
     src = fetchurl {
-      url = "https://registry.npmjs.org/postcss/-/postcss-8.4.38.tgz";
-      sha512 = "Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==";
+      url = "https://registry.npmjs.org/postcss/-/postcss-8.4.40.tgz";
+      sha512 = "YF2kKIUzAofPMpfH6hOi2cGnv/HrUlfucspc7pDyvv7kGdqXrfj8SCl/t8owkEgKEuu8ZcRjSOxFxVLqwChZ2Q==";
     };
     dependencies = [
       sources."nanoid-3.3.7"
@@ -82906,9 +81852,9 @@ in
       sources."fs-extra-11.2.0"
       sources."get-caller-file-2.0.5"
       sources."get-stdin-9.0.0"
-      sources."get-tsconfig-4.7.5"
+      sources."get-tsconfig-4.7.6"
       sources."glob-parent-5.1.2"
-      sources."globby-14.0.1"
+      sources."globby-14.0.2"
       sources."graceful-fs-4.2.11"
       sources."ignore-5.3.1"
       sources."is-binary-path-2.1.0"
@@ -82927,7 +81873,7 @@ in
       sources."picocolors-1.0.1"
       sources."picomatch-2.3.1"
       sources."pify-2.3.0"
-      sources."postcss-8.4.38"
+      sources."postcss-8.4.40"
       sources."postcss-load-config-5.1.0"
       sources."postcss-reporter-7.1.0"
       sources."pretty-hrtime-1.0.3"
@@ -82944,12 +81890,12 @@ in
       sources."strip-ansi-6.0.1"
       sources."thenby-1.3.4"
       sources."to-regex-range-5.0.1"
-      sources."tsx-4.15.4"
+      sources."tsx-4.16.2"
       sources."unicorn-magic-0.1.0"
       sources."universalify-2.0.1"
       sources."wrap-ansi-7.0.0"
       sources."y18n-5.0.8"
-      sources."yaml-2.4.5"
+      sources."yaml-2.5.0"
       sources."yargs-17.7.2"
       sources."yargs-parser-21.1.1"
     ];
@@ -82996,7 +81942,7 @@ in
       sources."rc-1.2.8"
       sources."readable-stream-3.6.2"
       sources."safe-buffer-5.2.1"
-      sources."semver-7.6.2"
+      sources."semver-7.6.3"
       sources."simple-concat-1.0.1"
       sources."simple-get-4.0.1"
       sources."string_decoder-1.3.0"
@@ -83020,10 +81966,10 @@ in
   prettier = nodeEnv.buildNodePackage {
     name = "prettier";
     packageName = "prettier";
-    version = "3.3.2";
+    version = "3.3.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/prettier/-/prettier-3.3.2.tgz";
-      sha512 = "rAVeHYMcv8ATV5d508CFdn+8/pHPpXeIid1DdrPwXnaAdH7cqjVbpJaT5eq4yRAFU/lsbwYwSF/n5iNrdJHPQA==";
+      url = "https://registry.npmjs.org/prettier/-/prettier-3.3.3.tgz";
+      sha512 = "i2tDNA0O5IrMO757lfrdQZCc2jPNDVntV0m/+4whiDfWaTKfMNgR7Qz0NAeGz/nRqF4m5/6CLzbP4/liHt12Ew==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -83046,7 +81992,7 @@ in
     dependencies = [
       sources."@taplo/core-0.1.1"
       sources."@taplo/lib-0.4.0-alpha.2"
-      sources."prettier-3.3.2"
+      sources."prettier-3.3.3"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -83061,17 +82007,17 @@ in
   prisma = nodeEnv.buildNodePackage {
     name = "prisma";
     packageName = "prisma";
-    version = "5.15.0";
+    version = "5.17.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/prisma/-/prisma-5.15.0.tgz";
-      sha512 = "JA81ACQSCi3a7NUOgonOIkdx8PAVkO+HbUOxmd00Yb8DgIIEpr2V9+Qe/j6MLxIgWtE/OtVQ54rVjfYRbZsCfw==";
+      url = "https://registry.npmjs.org/prisma/-/prisma-5.17.0.tgz";
+      sha512 = "m4UWkN5lBE6yevqeOxEvmepnL5cNPEjzMw2IqDB59AcEV6w7D8vGljDLd1gPFH+W6gUxw9x7/RmN5dCS/WTPxA==";
     };
     dependencies = [
-      sources."@prisma/debug-5.15.0"
-      sources."@prisma/engines-5.15.0"
-      sources."@prisma/engines-version-5.15.0-29.12e25d8d06f6ea5a0252864dd9a03b1bb51f3022"
-      sources."@prisma/fetch-engine-5.15.0"
-      sources."@prisma/get-platform-5.15.0"
+      sources."@prisma/debug-5.17.0"
+      sources."@prisma/engines-5.17.0"
+      sources."@prisma/engines-version-5.17.0-31.393aa359c9ad4a4bb28630fb5613f9c281cde053"
+      sources."@prisma/fetch-engine-5.17.0"
+      sources."@prisma/get-platform-5.17.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -83086,14 +82032,14 @@ in
   "@prisma/language-server" = nodeEnv.buildNodePackage {
     name = "_at_prisma_slash_language-server";
     packageName = "@prisma/language-server";
-    version = "5.15.0";
+    version = "5.17.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/@prisma/language-server/-/language-server-5.15.0.tgz";
-      sha512 = "hcYw8VCycw1TPrTVZGs9AaAXepj8tmsyDE7RaOUD8Csydbz9g4fqeNo/zHrY9KPjiTMwVvTNVknArt5nWCvPYQ==";
+      url = "https://registry.npmjs.org/@prisma/language-server/-/language-server-5.17.0.tgz";
+      sha512 = "4XXTBGpwJBUFqvY2WxL/4W1q/OOstxCJER4TYftNgMGjKjnsFkQNme567QTlPwWp7VGw2jcNmyTFOcP4HdohIg==";
     };
     dependencies = [
-      sources."@prisma/prisma-schema-wasm-5.15.0-29.12e25d8d06f6ea5a0252864dd9a03b1bb51f3022"
-      sources."@prisma/schema-files-loader-5.15.0"
+      sources."@prisma/prisma-schema-wasm-5.17.0-31.393aa359c9ad4a4bb28630fb5613f9c281cde053"
+      sources."@prisma/schema-files-loader-5.17.0"
       sources."@types/js-levenshtein-1.1.3"
       sources."fs-extra-11.1.1"
       sources."graceful-fs-4.2.11"
@@ -83142,13 +82088,13 @@ in
       })
       sources."eastasianwidth-0.2.0"
       sources."emoji-regex-9.2.2"
-      sources."foreground-child-3.2.0"
+      sources."foreground-child-3.2.1"
       sources."fs.realpath-1.0.0"
       sources."gaze-1.1.3"
-      (sources."glob-10.4.1" // {
+      (sources."glob-10.4.5" // {
         dependencies = [
           sources."brace-expansion-2.0.1"
-          sources."minimatch-9.0.4"
+          sources."minimatch-9.0.5"
         ];
       })
       (sources."globule-1.3.4" // {
@@ -83160,13 +82106,14 @@ in
       sources."inherits-2.0.4"
       sources."is-fullwidth-code-point-3.0.0"
       sources."isexe-2.0.0"
-      sources."jackspeak-3.4.0"
+      sources."jackspeak-3.4.3"
       sources."keypress-0.2.1"
       sources."lodash-4.17.21"
-      sources."lru-cache-10.2.2"
+      sources."lru-cache-10.4.3"
       sources."minimatch-3.0.8"
       sources."minipass-7.1.2"
       sources."once-1.4.0"
+      sources."package-json-from-dist-1.0.0"
       sources."path-is-absolute-1.0.1"
       sources."path-key-3.1.1"
       sources."path-scurry-1.11.1"
@@ -83303,7 +82250,7 @@ in
       })
       sources."domain-browser-1.2.0"
       sources."duplexer2-0.1.4"
-      (sources."elliptic-6.5.5" // {
+      (sources."elliptic-6.5.6" // {
         dependencies = [
           sources."bn.js-4.12.0"
         ];
@@ -83355,7 +82302,7 @@ in
         ];
       })
       sources."is-buffer-1.1.6"
-      sources."is-core-module-2.13.1"
+      sources."is-core-module-2.15.0"
       sources."isarray-1.0.0"
       sources."isexe-2.0.0"
       sources."json-stable-stringify-0.0.1"
@@ -83389,7 +82336,7 @@ in
       })
       sources."mute-stream-0.0.8"
       sources."node-static-0.7.11"
-      sources."object-inspect-1.13.1"
+      sources."object-inspect-1.13.2"
       sources."object-keys-1.1.1"
       sources."object.assign-4.1.5"
       sources."once-1.4.0"
@@ -83420,7 +82367,7 @@ in
         ];
       })
       sources."punycode-1.4.1"
-      sources."qs-6.12.1"
+      sources."qs-6.12.3"
       sources."querystring-es3-0.2.1"
       sources."randombytes-2.1.0"
       sources."randomfill-1.0.4"
@@ -83532,10 +82479,10 @@ in
   purescript-psa = nodeEnv.buildNodePackage {
     name = "purescript-psa";
     packageName = "purescript-psa";
-    version = "0.8.2";
+    version = "0.9.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/purescript-psa/-/purescript-psa-0.8.2.tgz";
-      sha512 = "4Olf0aQQrNCfcDLXQI3gJgINEQ+3U+4QPLmQ2LHX2L/YOXSwM7fOGIUs/wMm/FQnwERUyQmHKQTJKB4LIjE2fg==";
+      url = "https://registry.npmjs.org/purescript-psa/-/purescript-psa-0.9.0.tgz";
+      sha512 = "yKsPiF4x/LjxOAzeUFIr/f0PtBgRK3IBwh4fNY6Ndz+p12QOEjReeJxqt5wIUo1O6RHPJLmb1Dro2xxc8I9w9w==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -83632,7 +82579,7 @@ in
       sources."ink-2.7.1"
       sources."is-arrayish-0.2.1"
       sources."is-ci-2.0.0"
-      sources."is-core-module-2.13.1"
+      sources."is-core-module-2.15.0"
       sources."is-fullwidth-code-point-3.0.0"
       sources."is-plain-obj-1.1.0"
       sources."js-tokens-4.0.0"
@@ -83748,10 +82695,10 @@ in
   rimraf = nodeEnv.buildNodePackage {
     name = "rimraf";
     packageName = "rimraf";
-    version = "5.0.7";
+    version = "6.0.1";
     src = fetchurl {
-      url = "https://registry.npmjs.org/rimraf/-/rimraf-5.0.7.tgz";
-      sha512 = "nV6YcJo5wbLW77m+8KjH8aB/7/rxQy9SZ0HY5shnwULfS+9nmTtVXAJET5NdZmCzA4fPI/Hm1wo/Po/4mopOdg==";
+      url = "https://registry.npmjs.org/rimraf/-/rimraf-6.0.1.tgz";
+      sha512 = "9dkvaxAsk/xNXSJzMgFqqMCuFgt2+KsOFek3TMLfo8NCPfWpBmqwyNn5Y+NX56QUYfCtsyhF3ayiboEoUmJk/A==";
     };
     dependencies = [
       sources."@isaacs/cliui-8.0.2"
@@ -83764,16 +82711,17 @@ in
       sources."cross-spawn-7.0.3"
       sources."eastasianwidth-0.2.0"
       sources."emoji-regex-9.2.2"
-      sources."foreground-child-3.2.0"
-      sources."glob-10.4.1"
+      sources."foreground-child-3.2.1"
+      sources."glob-11.0.0"
       sources."is-fullwidth-code-point-3.0.0"
       sources."isexe-2.0.0"
-      sources."jackspeak-3.4.0"
-      sources."lru-cache-10.2.2"
-      sources."minimatch-9.0.4"
+      sources."jackspeak-4.0.1"
+      sources."lru-cache-11.0.0"
+      sources."minimatch-10.0.1"
       sources."minipass-7.1.2"
+      sources."package-json-from-dist-1.0.0"
       sources."path-key-3.1.1"
-      sources."path-scurry-1.11.1"
+      sources."path-scurry-2.0.0"
       sources."shebang-command-2.0.0"
       sources."shebang-regex-3.0.0"
       sources."signal-exit-4.1.0"
@@ -83814,10 +82762,10 @@ in
   rollup = nodeEnv.buildNodePackage {
     name = "rollup";
     packageName = "rollup";
-    version = "4.18.0";
+    version = "4.19.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/rollup/-/rollup-4.18.0.tgz";
-      sha512 = "QmJz14PX3rzbJCN1SG4Xe/bAAX2a6NpCP8ab2vfu2GiUr8AQcr2nCV/oEO3yneFarB67zk8ShlIyWb2LGTb3Sg==";
+      url = "https://registry.npmjs.org/rollup/-/rollup-4.19.0.tgz";
+      sha512 = "5r7EYSQIowHsK4eTZ0Y81qpZuJz+MUuYeqmmYmRMl1nwhdmbiYqt5jwzf6u7wyOzJgYqtCRMtVRKOtHANBz7rA==";
     };
     dependencies = [
       sources."@types/estree-1.0.5"
@@ -83849,33 +82797,32 @@ in
           sources."@azure/abort-controller-2.1.2"
         ];
       })
-      (sources."@azure/core-rest-pipeline-1.16.0" // {
+      (sources."@azure/core-rest-pipeline-1.16.2" // {
         dependencies = [
           sources."@azure/abort-controller-2.1.2"
         ];
       })
       sources."@azure/core-tracing-1.1.2"
-      (sources."@azure/core-util-1.9.0" // {
+      (sources."@azure/core-util-1.9.1" // {
         dependencies = [
           sources."@azure/abort-controller-2.1.2"
         ];
       })
-      sources."@azure/identity-4.2.1"
-      sources."@azure/logger-1.1.2"
-      sources."@azure/msal-browser-3.17.0"
-      sources."@azure/msal-common-14.12.0"
-      sources."@azure/msal-node-2.9.2"
+      sources."@azure/identity-4.4.0"
+      sources."@azure/logger-1.1.3"
+      sources."@azure/msal-browser-3.20.0"
+      sources."@azure/msal-common-14.14.0"
+      sources."@azure/msal-node-2.12.0"
       sources."@eslint-community/eslint-utils-4.4.0"
-      sources."@eslint-community/regexpp-4.10.1"
+      sources."@eslint-community/regexpp-4.11.0"
       (sources."@eslint/eslintrc-2.1.4" // {
         dependencies = [
           sources."brace-expansion-1.1.11"
           sources."minimatch-3.1.2"
-          sources."strip-json-comments-3.1.1"
         ];
       })
       sources."@eslint/js-8.57.0"
-      sources."@hpcc-js/wasm-2.16.2"
+      sources."@hpcc-js/wasm-2.18.0"
       (sources."@humanwhocodes/config-array-0.11.14" // {
         dependencies = [
           sources."brace-expansion-1.1.11"
@@ -83884,6 +82831,16 @@ in
       })
       sources."@humanwhocodes/module-importer-1.0.1"
       sources."@humanwhocodes/object-schema-2.0.3"
+      (sources."@isaacs/cliui-8.0.2" // {
+        dependencies = [
+          sources."ansi-regex-6.0.1"
+          sources."ansi-styles-6.2.1"
+          sources."emoji-regex-9.2.2"
+          sources."string-width-5.1.2"
+          sources."strip-ansi-7.1.0"
+          sources."wrap-ansi-8.1.0"
+        ];
+      })
       sources."@nodelib/fs.scandir-2.1.5"
       sources."@nodelib/fs.stat-2.0.5"
       sources."@nodelib/fs.walk-1.2.8"
@@ -83905,8 +82862,8 @@ in
       sources."@typescript-eslint/utils-6.21.0"
       sources."@typescript-eslint/visitor-keys-6.21.0"
       sources."@ungap/structured-clone-1.2.0"
-      sources."@vscode/test-electron-2.4.0"
-      (sources."@vscode/vsce-2.27.0" // {
+      sources."@vscode/test-electron-2.4.1"
+      (sources."@vscode/vsce-2.31.1" // {
         dependencies = [
           sources."ansi-styles-3.2.1"
           sources."brace-expansion-1.1.11"
@@ -83927,7 +82884,7 @@ in
       sources."@vscode/vsce-sign-linux-x64-2.0.2"
       sources."@vscode/vsce-sign-win32-arm64-2.0.2"
       sources."@vscode/vsce-sign-win32-x64-2.0.2"
-      sources."acorn-8.12.0"
+      sources."acorn-8.12.1"
       sources."acorn-jsx-5.3.2"
       sources."agent-base-7.1.1"
       sources."ajv-6.12.6"
@@ -83956,12 +82913,11 @@ in
       sources."chalk-5.3.0"
       sources."cheerio-1.0.0-rc.12"
       sources."cheerio-select-2.1.0"
-      sources."chownr-1.1.4"
       sources."ci-info-2.0.0"
       sources."cli-cursor-4.0.0"
       sources."cli-spinners-2.9.2"
       sources."cliui-8.0.1"
-      sources."cockatiel-3.1.3"
+      sources."cockatiel-3.2.1"
       sources."color-convert-2.0.1"
       sources."color-name-1.1.4"
       sources."combined-stream-1.0.8"
@@ -84004,14 +82960,11 @@ in
       sources."d3-transition-3.0.1"
       sources."d3-zoom-3.0.0"
       sources."debug-4.3.5"
-      sources."decompress-response-6.0.0"
-      sources."deep-extend-0.6.0"
       sources."deep-is-0.1.4"
       sources."define-data-property-1.1.4"
       sources."define-lazy-prop-2.0.0"
       sources."delaunator-5.0.1"
       sources."delayed-stream-1.0.0"
-      sources."detect-libc-2.0.3"
       sources."dir-glob-3.0.1"
       sources."doctrine-3.0.0"
       sources."dom-serializer-2.0.0"
@@ -84021,7 +82974,6 @@ in
       sources."eastasianwidth-0.2.0"
       sources."ecdsa-sig-formatter-1.0.11"
       sources."emoji-regex-8.0.0"
-      sources."end-of-stream-1.4.4"
       sources."entities-4.5.0"
       sources."es-define-property-1.0.0"
       sources."es-errors-1.3.0"
@@ -84042,12 +82994,11 @@ in
       sources."eslint-scope-7.2.2"
       sources."eslint-visitor-keys-3.4.3"
       sources."espree-9.6.1"
-      sources."esquery-1.5.0"
+      sources."esquery-1.6.0"
       sources."esrecurse-4.3.0"
       sources."estraverse-5.3.0"
       sources."esutils-2.0.3"
       sources."events-3.3.0"
-      sources."expand-template-2.0.3"
       sources."fast-deep-equal-3.1.3"
       sources."fast-glob-3.3.2"
       sources."fast-json-stable-stringify-2.1.0"
@@ -84060,17 +83011,19 @@ in
       sources."flat-cache-3.2.0"
       sources."flatted-3.3.1"
       sources."follow-redirects-1.15.6"
+      (sources."foreground-child-3.2.1" // {
+        dependencies = [
+          sources."signal-exit-4.1.0"
+        ];
+      })
       sources."form-data-4.0.0"
-      sources."fs-constants-1.0.0"
       sources."fs.realpath-1.0.0"
       sources."function-bind-1.1.2"
       sources."get-caller-file-2.0.5"
       sources."get-intrinsic-1.2.4"
-      sources."github-from-package-0.0.0"
-      (sources."glob-7.2.3" // {
+      (sources."glob-11.0.0" // {
         dependencies = [
-          sources."brace-expansion-1.1.11"
-          sources."minimatch-3.1.2"
+          sources."minimatch-10.0.1"
         ];
       })
       sources."glob-parent-5.1.2"
@@ -84083,10 +83036,14 @@ in
       sources."has-proto-1.0.3"
       sources."has-symbols-1.0.3"
       sources."hasown-2.0.2"
-      sources."hosted-git-info-4.1.0"
+      (sources."hosted-git-info-4.1.0" // {
+        dependencies = [
+          sources."lru-cache-6.0.0"
+        ];
+      })
       sources."htmlparser2-8.0.2"
       sources."http-proxy-agent-7.0.2"
-      sources."https-proxy-agent-7.0.4"
+      sources."https-proxy-agent-7.0.5"
       sources."iconv-lite-0.6.3"
       sources."ieee754-1.2.1"
       sources."ignore-5.3.1"
@@ -84095,7 +83052,6 @@ in
       sources."imurmurhash-0.1.4"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
-      sources."ini-1.3.8"
       sources."internmap-2.0.3"
       sources."is-ci-2.0.0"
       sources."is-docker-2.2.1"
@@ -84109,24 +83065,21 @@ in
       sources."is-wsl-2.2.0"
       sources."isarray-1.0.0"
       sources."isexe-2.0.0"
+      sources."jackspeak-4.0.1"
       sources."js-yaml-4.1.0"
       sources."json-buffer-3.0.1"
       sources."json-schema-traverse-0.4.1"
       sources."json-stable-stringify-without-jsonify-1.0.1"
-      sources."jsonc-parser-3.2.1"
+      sources."jsonc-parser-3.3.1"
       (sources."jsonwebtoken-9.0.2" // {
         dependencies = [
+          sources."jwa-1.4.1"
           sources."jws-3.2.2"
         ];
       })
       sources."jszip-3.10.1"
-      sources."jwa-1.4.1"
-      (sources."jws-4.0.0" // {
-        dependencies = [
-          sources."jwa-2.0.0"
-        ];
-      })
-      sources."keytar-7.9.0"
+      sources."jwa-2.0.0"
+      sources."jws-4.0.0"
       sources."keyv-4.5.4"
       sources."leven-3.1.0"
       sources."levn-0.4.1"
@@ -84142,7 +83095,7 @@ in
       sources."lodash.merge-4.6.2"
       sources."lodash.once-4.1.1"
       sources."log-symbols-5.1.0"
-      sources."lru-cache-6.0.0"
+      sources."lru-cache-11.0.0"
       (sources."markdown-it-12.3.2" // {
         dependencies = [
           sources."entities-2.1.0"
@@ -84155,18 +83108,13 @@ in
       sources."mime-db-1.52.0"
       sources."mime-types-2.1.35"
       sources."mimic-fn-2.1.0"
-      sources."mimic-response-3.1.0"
       sources."minimatch-5.1.6"
-      sources."minimist-1.2.8"
-      sources."mkdirp-classic-0.5.3"
+      sources."minipass-7.1.2"
       sources."ms-2.1.2"
       sources."mute-stream-0.0.8"
-      sources."napi-build-utils-1.0.2"
       sources."natural-compare-1.4.0"
-      sources."node-abi-3.65.0"
-      sources."node-addon-api-4.3.0"
       sources."nth-check-2.1.1"
-      sources."object-inspect-1.13.1"
+      sources."object-inspect-1.13.2"
       sources."once-1.4.0"
       sources."onetime-5.1.2"
       sources."open-8.4.2"
@@ -84186,6 +83134,7 @@ in
       })
       sources."p-limit-3.1.0"
       sources."p-locate-5.0.0"
+      sources."package-json-from-dist-1.0.0"
       sources."pako-1.0.11"
       sources."parent-module-1.0.1"
       (sources."parse-semver-1.1.1" // {
@@ -84198,69 +83147,64 @@ in
       sources."path-exists-4.0.0"
       sources."path-is-absolute-1.0.1"
       sources."path-key-3.1.1"
+      sources."path-scurry-2.0.0"
       sources."path-type-4.0.0"
       sources."pend-1.2.0"
       sources."picomatch-2.3.1"
-      sources."prebuild-install-7.1.2"
       sources."prelude-ls-1.2.1"
-      sources."prettier-3.3.2"
+      sources."prettier-3.3.3"
       sources."process-nextick-args-2.0.1"
-      sources."pump-3.0.0"
       sources."punycode-2.3.1"
-      sources."qs-6.12.1"
+      sources."qs-6.12.3"
       sources."queue-microtask-1.2.3"
-      sources."rc-1.2.8"
       sources."read-1.0.7"
       sources."readable-stream-2.3.8"
       sources."require-directory-2.1.1"
       sources."resolve-from-4.0.0"
       sources."restore-cursor-4.0.0"
       sources."reusify-1.0.4"
-      sources."rimraf-3.0.2"
+      (sources."rimraf-3.0.2" // {
+        dependencies = [
+          sources."brace-expansion-1.1.11"
+          sources."glob-7.2.3"
+          sources."minimatch-3.1.2"
+        ];
+      })
       sources."robust-predicates-3.0.2"
       sources."run-parallel-1.2.0"
       sources."rw-1.3.3"
       sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
       sources."sax-1.4.1"
-      sources."semver-7.6.2"
+      sources."semver-7.6.3"
       sources."set-function-length-1.2.2"
       sources."setimmediate-1.0.5"
       sources."shebang-command-2.0.0"
       sources."shebang-regex-3.0.0"
       sources."side-channel-1.0.6"
       sources."signal-exit-3.0.7"
-      sources."simple-concat-1.0.1"
-      sources."simple-get-4.0.1"
       sources."slash-3.0.0"
       sources."stdin-discarder-0.1.0"
       sources."stoppable-1.1.0"
       sources."string-width-4.2.3"
+      sources."string-width-cjs-4.2.3"
       sources."string_decoder-1.1.1"
       sources."strip-ansi-6.0.1"
-      sources."strip-json-comments-2.0.1"
+      sources."strip-ansi-cjs-6.0.1"
+      sources."strip-json-comments-3.1.1"
       sources."supports-color-5.5.0"
-      sources."tar-fs-2.1.1"
-      (sources."tar-stream-2.2.0" // {
-        dependencies = [
-          sources."bl-4.1.0"
-          sources."buffer-5.7.1"
-          sources."readable-stream-3.6.2"
-        ];
-      })
       sources."text-table-0.2.0"
       sources."tmp-0.2.3"
       sources."to-regex-range-5.0.1"
       sources."ts-api-utils-1.3.0"
       sources."tslib-2.6.3"
       sources."tunnel-0.0.6"
-      sources."tunnel-agent-0.6.0"
       sources."type-check-0.4.0"
       sources."type-fest-0.20.2"
       sources."typed-rest-client-1.8.11"
-      sources."typescript-5.4.5"
+      sources."typescript-5.5.4"
       sources."uc.micro-1.0.6"
-      sources."underscore-1.13.6"
+      sources."underscore-1.13.7"
       sources."uri-js-4.4.1"
       sources."url-join-4.0.1"
       sources."util-deprecate-1.0.2"
@@ -84272,6 +83216,7 @@ in
       sources."which-2.0.2"
       sources."word-wrap-1.2.5"
       sources."wrap-ansi-7.0.0"
+      sources."wrap-ansi-cjs-7.0.0"
       sources."wrappy-1.0.2"
       sources."xml2js-0.5.0"
       sources."xmlbuilder-11.0.1"
@@ -84293,10 +83238,10 @@ in
   sass = nodeEnv.buildNodePackage {
     name = "sass";
     packageName = "sass";
-    version = "1.77.5";
+    version = "1.77.8";
     src = fetchurl {
-      url = "https://registry.npmjs.org/sass/-/sass-1.77.5.tgz";
-      sha512 = "oDfX1mukIlxacPdQqNb6mV2tVCrnE+P3nVYioy72V5tlk56CPNcO4TCuFcaCRKKfJ1M3lH95CleRS+dVKL2qMg==";
+      url = "https://registry.npmjs.org/sass/-/sass-1.77.8.tgz";
+      sha512 = "4UHg6prsrycW20fqLGPShtEvo/WyHRVRHwOP4DzkUrObWoWI05QBSfzU71TVB7PFaL104TwNaHpjlWXAZbQiNQ==";
     };
     dependencies = [
       sources."anymatch-3.1.3"
@@ -84305,7 +83250,7 @@ in
       sources."chokidar-3.6.0"
       sources."fill-range-7.1.1"
       sources."glob-parent-5.1.2"
-      sources."immutable-4.3.6"
+      sources."immutable-4.3.7"
       sources."is-binary-path-2.1.0"
       sources."is-extglob-2.1.1"
       sources."is-glob-4.0.3"
@@ -84329,10 +83274,10 @@ in
   semver = nodeEnv.buildNodePackage {
     name = "semver";
     packageName = "semver";
-    version = "7.6.2";
+    version = "7.6.3";
     src = fetchurl {
-      url = "https://registry.npmjs.org/semver/-/semver-7.6.2.tgz";
-      sha512 = "FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==";
+      url = "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz";
+      sha512 = "oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -84358,10 +83303,12 @@ in
       sources."ajv-8.12.0"
       (sources."ansi-align-3.0.1" // {
         dependencies = [
+          sources."ansi-regex-5.0.1"
           sources."string-width-4.2.3"
+          sources."strip-ansi-6.0.1"
         ];
       })
-      sources."ansi-regex-5.0.1"
+      sources."ansi-regex-6.0.1"
       sources."ansi-styles-6.2.1"
       sources."arch-2.2.0"
       sources."arg-5.0.2"
@@ -84440,12 +83387,10 @@ in
       sources."signal-exit-3.0.7"
       (sources."string-width-5.1.2" // {
         dependencies = [
-          sources."ansi-regex-6.0.1"
           sources."emoji-regex-9.2.2"
-          sources."strip-ansi-7.1.0"
         ];
       })
-      sources."strip-ansi-6.0.1"
+      sources."strip-ansi-7.1.0"
       sources."strip-final-newline-2.0.0"
       sources."strip-json-comments-2.0.1"
       sources."supports-color-7.2.0"
@@ -84455,12 +83400,7 @@ in
       sources."vary-1.1.2"
       sources."which-2.0.2"
       sources."widest-line-4.0.1"
-      (sources."wrap-ansi-8.1.0" // {
-        dependencies = [
-          sources."ansi-regex-6.0.1"
-          sources."strip-ansi-7.1.0"
-        ];
-      })
+      sources."wrap-ansi-8.1.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -84619,7 +83559,7 @@ in
       sources."negotiator-0.6.3"
       sources."oauth-sign-0.9.0"
       sources."object-component-0.0.3"
-      sources."object-inspect-1.13.1"
+      sources."object-inspect-1.13.2"
       sources."on-finished-2.4.1"
       sources."options-0.0.6"
       sources."parsejson-0.0.1"
@@ -84909,27 +83849,27 @@ in
       sources."@socket.io/component-emitter-3.1.2"
       sources."@types/cookie-0.4.1"
       sources."@types/cors-2.8.17"
-      sources."@types/node-20.14.2"
+      sources."@types/node-20.14.12"
       sources."accepts-1.3.8"
       sources."base64id-2.0.0"
       sources."bufferutil-4.0.8"
       sources."cookie-0.4.2"
       sources."cors-2.8.5"
       sources."debug-4.3.5"
-      sources."engine.io-6.5.4"
-      sources."engine.io-parser-5.2.2"
+      sources."engine.io-6.5.5"
+      sources."engine.io-parser-5.2.3"
       sources."mime-db-1.52.0"
       sources."mime-types-2.1.35"
       sources."ms-2.1.2"
       sources."negotiator-0.6.3"
       sources."node-gyp-build-4.8.1"
       sources."object-assign-4.1.1"
-      sources."socket.io-adapter-2.5.4"
+      sources."socket.io-adapter-2.5.5"
       sources."socket.io-parser-4.2.4"
       sources."undici-types-5.26.5"
-      sources."utf-8-validate-5.0.10"
+      sources."utf-8-validate-6.0.4"
       sources."vary-1.1.2"
-      sources."ws-8.11.0"
+      sources."ws-8.17.1"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -85008,7 +83948,7 @@ in
       sources."indent-string-5.0.0"
       sources."inherits-2.0.4"
       sources."is-arrayish-0.2.1"
-      sources."is-core-module-2.13.1"
+      sources."is-core-module-2.15.0"
       sources."is-fullwidth-code-point-4.0.0"
       sources."is-interactive-2.0.0"
       sources."is-plain-obj-1.1.0"
@@ -85052,7 +83992,7 @@ in
       sources."round-to-6.0.0"
       sources."safe-buffer-5.2.1"
       sources."sax-1.4.1"
-      sources."semver-7.6.2"
+      sources."semver-7.6.3"
       sources."signal-exit-3.0.7"
       (sources."slice-ansi-5.0.0" // {
         dependencies = [
@@ -85108,10 +84048,10 @@ in
   sql-formatter = nodeEnv.buildNodePackage {
     name = "sql-formatter";
     packageName = "sql-formatter";
-    version = "15.3.1";
+    version = "15.3.2";
     src = fetchurl {
-      url = "https://registry.npmjs.org/sql-formatter/-/sql-formatter-15.3.1.tgz";
-      sha512 = "L/dqan+Hrt0PpPdCbHcI9bdfOvqaQZR7v5c5SWMJ3bUGQSezK09Mm9q2I3B4iObjaq7FyoldIM+fDSmfzGRXCA==";
+      url = "https://registry.npmjs.org/sql-formatter/-/sql-formatter-15.3.2.tgz";
+      sha512 = "pNxSMf5DtwhpZ8gUcOGCGZIWtCcyAUx9oLgAtlO4ag7DvlfnETL0BGqXaISc84pNrXvTWmt8Wal1FWKxdTsL3Q==";
     };
     dependencies = [
       sources."argparse-2.0.1"
@@ -85155,24 +84095,24 @@ in
   svelte-check = nodeEnv.buildNodePackage {
     name = "svelte-check";
     packageName = "svelte-check";
-    version = "3.8.0";
+    version = "3.8.4";
     src = fetchurl {
-      url = "https://registry.npmjs.org/svelte-check/-/svelte-check-3.8.0.tgz";
-      sha512 = "7Nxn+3X97oIvMzYJ7t27w00qUf1Y52irE2RU2dQAd5PyvfGp4E7NLhFKVhb6PV2fx7dCRMpNKDIuazmGthjpSQ==";
+      url = "https://registry.npmjs.org/svelte-check/-/svelte-check-3.8.4.tgz";
+      sha512 = "61aHMkdinWyH8BkkTX9jPLYxYzaAAz/FK/VQqdr2FiCQQ/q04WCwDlpGbHff1GdrMYTmW8chlTFvRWL9k0A8vg==";
     };
     dependencies = [
       sources."@ampproject/remapping-2.3.0"
       sources."@babel/code-frame-7.24.7"
-      sources."@babel/compat-data-7.24.7"
-      (sources."@babel/core-7.24.7" // {
+      sources."@babel/compat-data-7.24.9"
+      (sources."@babel/core-7.24.9" // {
         dependencies = [
           sources."debug-4.3.5"
           sources."ms-2.1.2"
           sources."semver-6.3.1"
         ];
       })
-      sources."@babel/generator-7.24.7"
-      (sources."@babel/helper-compilation-targets-7.24.7" // {
+      sources."@babel/generator-7.24.10"
+      (sources."@babel/helper-compilation-targets-7.24.8" // {
         dependencies = [
           sources."semver-6.3.1"
         ];
@@ -85181,56 +84121,52 @@ in
       sources."@babel/helper-function-name-7.24.7"
       sources."@babel/helper-hoist-variables-7.24.7"
       sources."@babel/helper-module-imports-7.24.7"
-      sources."@babel/helper-module-transforms-7.24.7"
+      sources."@babel/helper-module-transforms-7.24.9"
       sources."@babel/helper-simple-access-7.24.7"
       sources."@babel/helper-split-export-declaration-7.24.7"
-      sources."@babel/helper-string-parser-7.24.7"
+      sources."@babel/helper-string-parser-7.24.8"
       sources."@babel/helper-validator-identifier-7.24.7"
-      sources."@babel/helper-validator-option-7.24.7"
-      sources."@babel/helpers-7.24.7"
+      sources."@babel/helper-validator-option-7.24.8"
+      sources."@babel/helpers-7.24.8"
       sources."@babel/highlight-7.24.7"
-      sources."@babel/parser-7.24.7"
+      sources."@babel/parser-7.24.8"
       sources."@babel/template-7.24.7"
-      (sources."@babel/traverse-7.24.7" // {
+      (sources."@babel/traverse-7.24.8" // {
         dependencies = [
           sources."debug-4.3.5"
           sources."ms-2.1.2"
         ];
       })
-      sources."@babel/types-7.24.7"
+      sources."@babel/types-7.24.9"
       sources."@jridgewell/gen-mapping-0.3.5"
       sources."@jridgewell/resolve-uri-3.1.2"
       sources."@jridgewell/set-array-1.2.1"
-      sources."@jridgewell/sourcemap-codec-1.4.15"
+      sources."@jridgewell/sourcemap-codec-1.5.0"
       sources."@jridgewell/trace-mapping-0.3.25"
-      sources."@nodelib/fs.scandir-2.1.5"
-      sources."@nodelib/fs.stat-2.0.5"
-      sources."@nodelib/fs.walk-1.2.8"
       sources."@types/estree-1.0.5"
       sources."@types/pug-2.0.10"
       sources."acorn-7.4.1"
       (sources."acorn-typescript-1.4.13" // {
         dependencies = [
-          sources."acorn-8.12.0"
+          sources."acorn-8.12.1"
         ];
       })
       sources."ansi-styles-3.2.1"
       sources."anymatch-3.1.3"
       sources."aria-query-5.3.0"
       sources."asap-2.0.6"
-      sources."assert-never-1.2.1"
+      sources."assert-never-1.3.0"
       sources."atob-2.1.2"
-      sources."axobject-query-4.0.0"
+      sources."axobject-query-4.1.0"
       sources."babel-walk-3.0.0-canary-5"
       sources."balanced-match-1.0.2"
       sources."binary-extensions-2.3.0"
       sources."brace-expansion-1.1.11"
       sources."braces-3.0.3"
-      sources."browserslist-4.23.1"
+      sources."browserslist-4.23.2"
       sources."buffer-crc32-1.0.0"
       sources."call-bind-1.0.7"
-      sources."callsites-3.1.0"
-      sources."caniuse-lite-1.0.30001634"
+      sources."caniuse-lite-1.0.30001643"
       sources."chalk-2.4.2"
       sources."character-parser-2.2.0"
       sources."chokidar-3.6.0"
@@ -85248,7 +84184,7 @@ in
       sources."dequal-2.0.3"
       sources."detect-indent-6.1.0"
       sources."doctypes-1.1.0"
-      sources."electron-to-chromium-1.4.802"
+      sources."electron-to-chromium-1.5.1"
       sources."errno-0.1.8"
       sources."es-define-property-1.0.0"
       sources."es-errors-1.3.0"
@@ -85258,14 +84194,12 @@ in
       sources."escape-string-regexp-1.0.5"
       sources."esm-env-1.0.0"
       sources."esrap-1.2.2"
-      sources."fast-glob-3.3.2"
-      sources."fastq-1.17.1"
       sources."fill-range-7.1.1"
       sources."fs.realpath-1.0.0"
       sources."function-bind-1.1.2"
       sources."gensync-1.0.0-beta.2"
       sources."get-intrinsic-1.2.4"
-      sources."get-tsconfig-4.7.5"
+      sources."get-tsconfig-4.7.6"
       sources."glob-7.2.3"
       sources."glob-parent-5.1.2"
       sources."globals-11.12.0"
@@ -85279,12 +84213,11 @@ in
       sources."hasown-2.0.2"
       sources."iconv-lite-0.6.3"
       sources."image-size-0.5.5"
-      sources."immutable-4.3.6"
-      sources."import-fresh-3.3.0"
+      sources."immutable-4.3.7"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
       sources."is-binary-path-2.1.0"
-      sources."is-core-module-2.13.1"
+      sources."is-core-module-2.15.0"
       sources."is-expression-4.0.0"
       sources."is-extglob-2.1.1"
       sources."is-glob-4.0.3"
@@ -85305,8 +84238,6 @@ in
       sources."lru-cache-5.1.1"
       sources."magic-string-0.30.10"
       sources."make-dir-2.1.0"
-      sources."merge2-1.4.1"
-      sources."micromatch-4.0.7"
       sources."mime-1.6.0"
       sources."min-indent-1.0.1"
       sources."minimatch-3.1.2"
@@ -85316,18 +84247,17 @@ in
       sources."ms-2.0.0"
       sources."nanoid-3.3.7"
       sources."needle-3.3.1"
-      sources."node-releases-2.0.14"
+      sources."node-releases-2.0.18"
       sources."normalize-path-3.0.0"
       sources."object-assign-4.1.1"
       sources."once-1.4.0"
-      sources."parent-module-1.0.1"
       sources."parse-node-version-1.0.1"
       sources."path-is-absolute-1.0.1"
       sources."path-parse-1.0.7"
       sources."picocolors-1.0.1"
       sources."picomatch-2.3.1"
       sources."pify-4.0.1"
-      sources."postcss-8.4.38"
+      sources."postcss-8.4.40"
       sources."postcss-load-config-5.1.0"
       sources."promise-7.3.1"
       sources."prr-1.0.1"
@@ -85343,18 +84273,14 @@ in
       sources."pug-runtime-3.0.1"
       sources."pug-strip-comments-2.0.0"
       sources."pug-walk-2.0.0"
-      sources."queue-microtask-1.2.3"
       sources."readdirp-3.6.0"
       sources."resolve-1.22.8"
-      sources."resolve-from-4.0.0"
       sources."resolve-pkg-maps-1.0.0"
-      sources."reusify-1.0.4"
       sources."rimraf-2.7.1"
-      sources."run-parallel-1.2.0"
       sources."sade-1.8.1"
       sources."safer-buffer-2.1.2"
       sources."sander-0.5.1"
-      sources."sass-1.77.5"
+      sources."sass-1.77.8"
       sources."sax-1.4.1"
       sources."semver-5.7.2"
       sources."set-function-length-1.2.2"
@@ -85374,9 +84300,9 @@ in
       sources."sugarss-4.0.1"
       sources."supports-color-5.5.0"
       sources."supports-preserve-symlinks-flag-1.0.0"
-      (sources."svelte-5.0.0-next.155" // {
+      (sources."svelte-5.0.0-next.198" // {
         dependencies = [
-          sources."acorn-8.12.0"
+          sources."acorn-8.12.1"
         ];
       })
       sources."svelte-preprocess-5.1.4"
@@ -85384,14 +84310,14 @@ in
       sources."to-regex-range-5.0.1"
       sources."token-stream-1.0.0"
       sources."tslib-2.6.3"
-      sources."tsx-4.15.4"
-      sources."typescript-5.4.5"
-      sources."update-browserslist-db-1.0.16"
+      sources."tsx-4.16.2"
+      sources."typescript-5.5.4"
+      sources."update-browserslist-db-1.1.0"
       sources."void-elements-3.1.0"
       sources."with-7.0.2"
       sources."wrappy-1.0.2"
       sources."yallist-3.1.1"
-      sources."yaml-2.4.5"
+      sources."yaml-2.5.0"
       sources."zimmerframe-1.1.2"
     ];
     buildInputs = globalBuildInputs;
@@ -85451,10 +84377,10 @@ in
   tailwindcss = nodeEnv.buildNodePackage {
     name = "tailwindcss";
     packageName = "tailwindcss";
-    version = "3.4.4";
+    version = "3.4.6";
     src = fetchurl {
-      url = "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.4.tgz";
-      sha512 = "ZoyXOdJjISB7/BcLTR6SEsLgKtDStYyYZVLsUtWChO4Ps20CBad7lfJKVDiejocV4ME1hLmyY0WJE3hSDcmQ2A==";
+      url = "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.6.tgz";
+      sha512 = "1uRHzPB+Vzu57ocybfZ4jh5Q3SdlH7XW23J5sQoM9LhE9eIOlzxer/3XPSsycvih3rboRsvt0QCmzSrqyOYUIA==";
     };
     dependencies = [
       sources."@alloc/quick-lru-5.2.0"
@@ -85467,22 +84393,22 @@ in
       sources."@jridgewell/gen-mapping-0.3.5"
       sources."@jridgewell/resolve-uri-3.1.2"
       sources."@jridgewell/set-array-1.2.1"
-      sources."@jridgewell/sourcemap-codec-1.4.15"
+      sources."@jridgewell/sourcemap-codec-1.5.0"
       sources."@jridgewell/trace-mapping-0.3.25"
       sources."@nodelib/fs.scandir-2.1.5"
       sources."@nodelib/fs.stat-2.0.5"
       sources."@nodelib/fs.walk-1.2.8"
-      sources."@swc/core-1.5.29"
+      sources."@swc/core-1.7.1"
       sources."@swc/counter-0.1.3"
-      sources."@swc/helpers-0.5.11"
-      sources."@swc/types-0.1.8"
-      sources."@swc/wasm-1.5.29"
+      sources."@swc/helpers-0.5.12"
+      sources."@swc/types-0.1.12"
+      sources."@swc/wasm-1.7.1"
       sources."@tsconfig/node10-1.0.11"
       sources."@tsconfig/node12-1.0.11"
       sources."@tsconfig/node14-1.0.3"
       sources."@tsconfig/node16-1.0.4"
-      sources."@types/node-20.14.2"
-      sources."acorn-8.12.0"
+      sources."@types/node-20.14.12"
+      sources."acorn-8.12.1"
       sources."acorn-walk-8.3.3"
       sources."ansi-regex-5.0.1"
       sources."ansi-styles-6.2.1"
@@ -85517,33 +84443,34 @@ in
       })
       sources."fastq-1.17.1"
       sources."fill-range-7.1.1"
-      sources."foreground-child-3.2.0"
+      sources."foreground-child-3.2.1"
       sources."function-bind-1.1.2"
-      sources."glob-10.4.1"
+      sources."glob-10.4.5"
       sources."glob-parent-6.0.2"
       sources."hasown-2.0.2"
       sources."is-binary-path-2.1.0"
-      sources."is-core-module-2.13.1"
+      sources."is-core-module-2.15.0"
       sources."is-extglob-2.1.1"
       sources."is-fullwidth-code-point-3.0.0"
       sources."is-glob-4.0.3"
       sources."is-number-7.0.0"
       sources."isexe-2.0.0"
-      sources."jackspeak-3.4.0"
+      sources."jackspeak-3.4.3"
       sources."jiti-1.21.6"
       sources."lilconfig-2.1.0"
       sources."lines-and-columns-1.2.4"
-      sources."lru-cache-10.2.2"
+      sources."lru-cache-10.4.3"
       sources."make-error-1.3.6"
       sources."merge2-1.4.1"
       sources."micromatch-4.0.7"
-      sources."minimatch-9.0.4"
+      sources."minimatch-9.0.5"
       sources."minipass-7.1.2"
       sources."mz-2.7.0"
       sources."nanoid-3.3.7"
       sources."normalize-path-3.0.0"
       sources."object-assign-4.1.1"
       sources."object-hash-3.0.0"
+      sources."package-json-from-dist-1.0.0"
       sources."path-key-3.1.1"
       sources."path-parse-1.0.7"
       sources."path-scurry-1.11.1"
@@ -85551,7 +84478,7 @@ in
       sources."picomatch-2.3.1"
       sources."pify-2.3.0"
       sources."pirates-4.0.6"
-      sources."postcss-8.4.38"
+      sources."postcss-8.4.40"
       sources."postcss-import-15.1.0"
       sources."postcss-js-4.0.1"
       (sources."postcss-load-config-4.0.2" // {
@@ -85559,8 +84486,8 @@ in
           sources."lilconfig-3.1.2"
         ];
       })
-      sources."postcss-nested-6.0.1"
-      sources."postcss-selector-parser-6.1.0"
+      sources."postcss-nested-6.2.0"
+      sources."postcss-selector-parser-6.1.1"
       sources."postcss-value-parser-4.2.0"
       sources."queue-microtask-1.2.3"
       sources."read-cache-1.0.0"
@@ -85597,7 +84524,7 @@ in
         ];
       })
       sources."tslib-2.6.3"
-      sources."typescript-5.4.5"
+      sources."typescript-5.5.4"
       sources."undici-types-5.26.5"
       sources."util-deprecate-1.0.2"
       sources."v8-compile-cache-lib-3.0.1"
@@ -85611,7 +84538,7 @@ in
           sources."strip-ansi-6.0.1"
         ];
       })
-      sources."yaml-2.4.5"
+      sources."yaml-2.5.0"
       sources."yn-3.1.1"
     ];
     buildInputs = globalBuildInputs;
@@ -85716,7 +84643,7 @@ in
       sources."@types/cors-2.8.17"
       sources."@types/http-cache-semantics-4.0.4"
       sources."@types/keyv-3.1.4"
-      sources."@types/node-20.14.2"
+      sources."@types/node-20.14.12"
       sources."@types/responselike-1.0.3"
       sources."abstract-logging-2.0.1"
       sources."accepts-1.3.8"
@@ -85922,10 +84849,11 @@ in
           sources."ms-2.1.2"
         ];
       })
-      (sources."socket.io-adapter-2.5.4" // {
+      (sources."socket.io-adapter-2.5.5" // {
         dependencies = [
           sources."debug-4.3.5"
           sources."ms-2.1.2"
+          sources."ws-8.17.1"
         ];
       })
       (sources."socket.io-parser-4.2.4" // {
@@ -86278,7 +85206,7 @@ in
       sources."oauth-sign-0.9.0"
       sources."object-assign-4.1.1"
       sources."object-component-0.0.3"
-      sources."object-inspect-1.13.1"
+      sources."object-inspect-1.13.2"
       sources."on-finished-2.3.0"
       sources."once-1.4.0"
       sources."os-homedir-1.0.2"
@@ -86302,7 +85230,7 @@ in
       sources."psl-1.9.0"
       sources."pump-3.0.0"
       sources."punycode-2.3.1"
-      sources."qs-6.12.1"
+      sources."qs-6.12.3"
       sources."range-parser-1.2.1"
       (sources."raw-body-2.4.0" // {
         dependencies = [
@@ -86356,7 +85284,7 @@ in
           sources."base64-arraybuffer-0.1.5"
           sources."debug-4.1.1"
           sources."ms-2.1.3"
-          (sources."socket.io-parser-3.3.3" // {
+          (sources."socket.io-parser-3.3.4" // {
             dependencies = [
               sources."component-emitter-1.3.1"
               sources."debug-3.1.0"
@@ -86419,7 +85347,7 @@ in
       sources."wide-align-1.1.5"
       sources."with-open-file-0.1.7"
       sources."wrappy-1.0.2"
-      sources."ws-7.5.9"
+      sources."ws-7.5.10"
       sources."xmlhttprequest-ssl-1.5.5"
       sources."yallist-3.1.1"
       sources."yarn-1.19.1"
@@ -86684,7 +85612,7 @@ in
       sources."@types/cacheable-request-6.0.3"
       sources."@types/http-cache-semantics-4.0.4"
       sources."@types/keyv-3.1.4"
-      sources."@types/node-20.14.2"
+      sources."@types/node-20.14.12"
       sources."@types/responselike-1.0.3"
       sources."abbrev-1.1.1"
       sources."abstract-logging-2.0.1"
@@ -87055,7 +85983,7 @@ in
           sources."base64-arraybuffer-0.1.5"
           sources."debug-4.1.1"
           sources."ms-2.0.0"
-          (sources."socket.io-parser-3.3.3" // {
+          (sources."socket.io-parser-3.3.4" // {
             dependencies = [
               sources."component-emitter-1.3.1"
               sources."debug-3.1.0"
@@ -87124,7 +86052,7 @@ in
       sources."wide-align-1.1.5"
       sources."with-open-file-0.1.7"
       sources."wrappy-1.0.2"
-      sources."ws-7.5.9"
+      sources."ws-7.5.10"
       sources."xmlhttprequest-ssl-1.5.5"
       sources."yallist-3.1.1"
       sources."yarn-1.22.4"
@@ -87155,7 +86083,7 @@ in
       sources."@types/cacheable-request-6.0.3"
       sources."@types/http-cache-semantics-4.0.4"
       sources."@types/keyv-3.1.4"
-      sources."@types/node-20.14.2"
+      sources."@types/node-20.14.12"
       sources."@types/responselike-1.0.3"
       sources."abbrev-1.1.1"
       sources."abstract-logging-2.0.1"
@@ -87526,7 +86454,7 @@ in
           sources."base64-arraybuffer-0.1.5"
           sources."debug-4.1.1"
           sources."ms-2.0.0"
-          (sources."socket.io-parser-3.3.3" // {
+          (sources."socket.io-parser-3.3.4" // {
             dependencies = [
               sources."component-emitter-1.3.1"
               sources."debug-3.1.0"
@@ -87595,7 +86523,7 @@ in
       sources."wide-align-1.1.5"
       sources."with-open-file-0.1.7"
       sources."wrappy-1.0.2"
-      sources."ws-7.5.9"
+      sources."ws-7.5.10"
       sources."xmlhttprequest-ssl-1.5.5"
       sources."yallist-3.1.1"
       sources."yarn-1.22.4"
@@ -88010,10 +86938,10 @@ in
   tiddlywiki = nodeEnv.buildNodePackage {
     name = "tiddlywiki";
     packageName = "tiddlywiki";
-    version = "5.3.3";
+    version = "5.3.5";
     src = fetchurl {
-      url = "https://registry.npmjs.org/tiddlywiki/-/tiddlywiki-5.3.3.tgz";
-      sha512 = "PkgVfZNpFFHyMmfFw91igXOJn8Z7IWg3NGXOX5EBqJwzGNeYYOIUg4FqCNsWoqBece20HxtkDue/vTf2jDtdZQ==";
+      url = "https://registry.npmjs.org/tiddlywiki/-/tiddlywiki-5.3.5.tgz";
+      sha512 = "8pTmnQdkcHbol9D86Op7OGK4sGDqm19HWT2qgpSxPHfDG0yJ2rSBUTRuOMuh9GoPP0Tcz9+1Pe8A1m6pvd/zYQ==";
     };
     buildInputs = globalBuildInputs;
     meta = {
@@ -88061,7 +86989,7 @@ in
       sources."supports-color-2.0.0"
       sources."temp-0.8.4"
       sources."tslib-1.14.1"
-      sources."typescript-5.4.5"
+      sources."typescript-5.5.4"
       sources."wordwrap-0.0.3"
       sources."wrappy-1.0.2"
     ];
@@ -88086,26 +87014,26 @@ in
     dependencies = [
       sources."@cspotcode/source-map-support-0.8.1"
       sources."@jridgewell/resolve-uri-3.1.2"
-      sources."@jridgewell/sourcemap-codec-1.4.15"
+      sources."@jridgewell/sourcemap-codec-1.5.0"
       sources."@jridgewell/trace-mapping-0.3.9"
-      sources."@swc/core-1.5.29"
+      sources."@swc/core-1.7.1"
       sources."@swc/counter-0.1.3"
-      sources."@swc/helpers-0.5.11"
-      sources."@swc/types-0.1.8"
-      sources."@swc/wasm-1.5.29"
+      sources."@swc/helpers-0.5.12"
+      sources."@swc/types-0.1.12"
+      sources."@swc/wasm-1.7.1"
       sources."@tsconfig/node10-1.0.11"
       sources."@tsconfig/node12-1.0.11"
       sources."@tsconfig/node14-1.0.3"
       sources."@tsconfig/node16-1.0.4"
-      sources."@types/node-20.14.2"
-      sources."acorn-8.12.0"
+      sources."@types/node-20.14.12"
+      sources."acorn-8.12.1"
       sources."acorn-walk-8.3.3"
       sources."arg-4.1.3"
       sources."create-require-1.1.1"
       sources."diff-4.0.2"
       sources."make-error-1.3.6"
       sources."tslib-2.6.3"
-      sources."typescript-5.4.5"
+      sources."typescript-5.5.4"
       sources."undici-types-5.26.5"
       sources."v8-compile-cache-lib-3.0.1"
       sources."yn-3.1.1"
@@ -88154,14 +87082,27 @@ in
       sources."@babel/helper-validator-identifier-7.24.7"
       sources."@babel/highlight-7.24.7"
       sources."@isaacs/cliui-8.0.2"
-      sources."@npmcli/config-8.3.3"
+      sources."@npmcli/config-8.3.4"
+      (sources."@npmcli/git-5.0.8" // {
+        dependencies = [
+          sources."isexe-3.1.1"
+          sources."which-4.0.0"
+        ];
+      })
       sources."@npmcli/map-workspaces-3.0.6"
       sources."@npmcli/name-from-folder-2.0.0"
+      sources."@npmcli/package-json-5.2.0"
+      (sources."@npmcli/promise-spawn-7.0.2" // {
+        dependencies = [
+          sources."isexe-3.1.1"
+          sources."which-4.0.0"
+        ];
+      })
       sources."@types/concat-stream-2.0.3"
       sources."@types/debug-4.1.12"
       sources."@types/is-empty-1.2.3"
       sources."@types/ms-0.7.34"
-      sources."@types/node-20.14.2"
+      sources."@types/node-20.14.12"
       sources."@types/supports-color-8.1.3"
       sources."@types/unist-3.0.2"
       sources."abbrev-2.0.0"
@@ -88185,13 +87126,15 @@ in
       sources."debug-4.3.5"
       sources."eastasianwidth-0.2.0"
       sources."emoji-regex-9.2.2"
+      sources."err-code-2.0.3"
       sources."error-ex-1.3.2"
       sources."escape-string-regexp-1.0.5"
       sources."extend-3.0.2"
       sources."find-up-6.3.0"
-      sources."foreground-child-3.2.0"
-      sources."glob-10.4.1"
+      sources."foreground-child-3.2.1"
+      sources."glob-10.4.5"
       sources."has-flag-3.0.0"
+      sources."hosted-git-info-7.0.2"
       sources."ignore-5.3.1"
       sources."import-meta-resolve-4.1.0"
       sources."inherits-2.0.4"
@@ -88201,33 +87144,45 @@ in
       sources."is-fullwidth-code-point-3.0.0"
       sources."is-plain-obj-4.1.0"
       sources."isexe-2.0.0"
-      sources."jackspeak-3.4.0"
+      sources."jackspeak-3.4.3"
       sources."js-tokens-4.0.0"
       sources."json-parse-even-better-errors-3.0.2"
       sources."lines-and-columns-2.0.4"
       sources."load-plugin-6.0.3"
       sources."locate-path-7.2.0"
-      sources."lru-cache-10.2.2"
-      sources."minimatch-9.0.4"
+      sources."lru-cache-10.4.3"
+      sources."minimatch-9.0.5"
       sources."minipass-7.1.2"
       sources."ms-2.1.2"
       sources."nopt-7.2.1"
+      sources."normalize-package-data-6.0.2"
+      sources."npm-install-checks-6.3.0"
       sources."npm-normalize-package-bin-3.0.1"
+      sources."npm-package-arg-11.0.3"
+      sources."npm-pick-manifest-9.1.0"
       sources."p-limit-4.0.0"
       sources."p-locate-6.0.0"
+      sources."package-json-from-dist-1.0.0"
       sources."parse-json-7.1.1"
       sources."path-exists-5.0.0"
       sources."path-key-3.1.1"
       sources."path-scurry-1.11.1"
       sources."picocolors-1.0.1"
       sources."proc-log-4.2.0"
+      sources."promise-inflight-1.0.1"
+      sources."promise-retry-2.0.1"
       sources."read-package-json-fast-3.0.2"
       sources."readable-stream-3.6.2"
+      sources."retry-0.12.0"
       sources."safe-buffer-5.2.1"
-      sources."semver-7.6.2"
+      sources."semver-7.6.3"
       sources."shebang-command-2.0.0"
       sources."shebang-regex-3.0.0"
       sources."signal-exit-4.1.0"
+      sources."spdx-correct-3.2.0"
+      sources."spdx-exceptions-2.5.0"
+      sources."spdx-expression-parse-3.0.1"
+      sources."spdx-license-ids-3.0.18"
       sources."string-width-5.1.2"
       (sources."string-width-cjs-4.2.3" // {
         dependencies = [
@@ -88248,11 +87203,13 @@ in
       sources."typedarray-0.0.6"
       sources."undici-types-5.26.5"
       sources."unified-engine-11.2.1"
-      sources."unist-util-inspect-8.0.0"
+      sources."unist-util-inspect-8.1.0"
       sources."unist-util-lsp-2.1.0"
       sources."unist-util-stringify-position-4.0.0"
       sources."util-deprecate-1.0.2"
-      sources."vfile-6.0.1"
+      sources."validate-npm-package-license-3.0.4"
+      sources."validate-npm-package-name-5.0.1"
+      sources."vfile-6.0.2"
       sources."vfile-message-4.0.2"
       (sources."vfile-reporter-8.1.1" // {
         dependencies = [
@@ -88279,8 +87236,8 @@ in
           sources."strip-ansi-6.0.1"
         ];
       })
-      sources."yaml-2.4.5"
-      sources."yocto-queue-1.0.0"
+      sources."yaml-2.5.0"
+      sources."yocto-queue-1.1.1"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -88295,10 +87252,10 @@ in
   vega-cli = nodeEnv.buildNodePackage {
     name = "vega-cli";
     packageName = "vega-cli";
-    version = "5.29.0";
+    version = "5.30.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/vega-cli/-/vega-cli-5.29.0.tgz";
-      sha512 = "ndiQEjHrV0DkT7nWEroQerAuZwNZC3c9SZlmVh8a19vY9s/GsPfNdOq2apAN44mtruMtD3tzgajLLxEii7/wEA==";
+      url = "https://registry.npmjs.org/vega-cli/-/vega-cli-5.30.0.tgz";
+      sha512 = "qHlVNh6SU/sV96Zys30t7jtVlDKAn+2Ex2EuiU8xK+DLDB8h2t0IK5/FwR8CxE9rLWHYYXDOuCxkzRqFRzSMQQ==";
     };
     dependencies = [
       sources."@mapbox/node-pre-gyp-1.0.11"
@@ -88393,7 +87350,7 @@ in
       sources."rw-1.3.3"
       sources."safe-buffer-5.2.1"
       sources."safer-buffer-2.1.2"
-      sources."semver-7.6.2"
+      sources."semver-7.6.3"
       sources."set-blocking-2.0.0"
       sources."signal-exit-3.0.7"
       sources."simple-concat-1.0.1"
@@ -88409,7 +87366,7 @@ in
       })
       sources."tr46-0.0.3"
       sources."util-deprecate-1.0.2"
-      sources."vega-5.29.0"
+      sources."vega-5.30.0"
       sources."vega-canvas-1.2.7"
       sources."vega-crossfilter-4.1.2"
       sources."vega-dataflow-5.7.6"
@@ -88418,25 +87375,25 @@ in
       sources."vega-expression-5.1.1"
       sources."vega-force-4.2.1"
       sources."vega-format-1.1.2"
-      sources."vega-functions-5.14.0"
+      sources."vega-functions-5.15.0"
       sources."vega-geo-4.4.2"
       sources."vega-hierarchy-4.1.2"
-      sources."vega-label-1.2.1"
+      sources."vega-label-1.3.0"
       sources."vega-loader-4.5.2"
-      sources."vega-parser-6.3.0"
+      sources."vega-parser-6.4.0"
       sources."vega-projection-1.6.1"
-      sources."vega-regression-1.2.0"
-      sources."vega-runtime-6.1.4"
+      sources."vega-regression-1.3.0"
+      sources."vega-runtime-6.2.0"
       sources."vega-scale-7.4.1"
-      sources."vega-scenegraph-4.12.0"
+      sources."vega-scenegraph-4.13.0"
       sources."vega-selections-5.4.2"
       sources."vega-statistics-1.9.0"
       sources."vega-time-2.1.2"
-      sources."vega-transforms-4.11.1"
-      sources."vega-typings-1.1.0"
+      sources."vega-transforms-4.12.0"
+      sources."vega-typings-1.3.1"
       sources."vega-util-1.17.2"
-      sources."vega-view-5.12.1"
-      sources."vega-view-transforms-4.5.9"
+      sources."vega-view-5.13.0"
+      sources."vega-view-transforms-4.6.0"
       sources."vega-voronoi-4.2.3"
       sources."vega-wordcloud-4.1.5"
       sources."webidl-conversions-3.0.1"
@@ -88568,10 +87525,10 @@ in
   vercel = nodeEnv.buildNodePackage {
     name = "vercel";
     packageName = "vercel";
-    version = "34.2.7";
+    version = "35.2.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/vercel/-/vercel-34.2.7.tgz";
-      sha512 = "cc6NmaPeLhg7UJuuI6jKu92xppVYbuZRtQib/hDEaEPFSZgiUNw0sbtRfbzvXUZjxzJeLNeSGKLwazBbpXOvkQ==";
+      url = "https://registry.npmjs.org/vercel/-/vercel-35.2.0.tgz";
+      sha512 = "ZEdRDfw3kIhcryMOZvVMrFSSS5fkK2qpYr1QNOswW3sHtowuQglpVcvvyqNHrNLAbtETiO/svjNnFKEF22/fhg==";
     };
     dependencies = [
       sources."@cspotcode/source-map-support-0.8.1"
@@ -88582,7 +87539,7 @@ in
       sources."@edge-runtime/vm-3.2.0"
       sources."@fastify/busboy-2.1.1"
       sources."@jridgewell/resolve-uri-3.1.2"
-      sources."@jridgewell/sourcemap-codec-1.4.15"
+      sources."@jridgewell/sourcemap-codec-1.5.0"
       sources."@jridgewell/trace-mapping-0.3.9"
       (sources."@mapbox/node-pre-gyp-1.0.11" // {
         dependencies = [
@@ -88607,11 +87564,11 @@ in
       sources."@nodelib/fs.walk-1.2.8"
       sources."@rollup/pluginutils-4.2.1"
       sources."@sinclair/typebox-0.25.24"
-      sources."@swc/core-1.5.29"
+      sources."@swc/core-1.7.1"
       sources."@swc/counter-0.1.3"
-      sources."@swc/helpers-0.5.11"
-      sources."@swc/types-0.1.8"
-      sources."@swc/wasm-1.5.29"
+      sources."@swc/helpers-0.5.12"
+      sources."@swc/types-0.1.12"
+      sources."@swc/wasm-1.7.1"
       sources."@tootallnate/once-2.0.0"
       (sources."@ts-morph/common-0.11.1" // {
         dependencies = [
@@ -88624,11 +87581,11 @@ in
       sources."@tsconfig/node16-1.0.4"
       sources."@types/json-schema-7.0.15"
       sources."@types/node-16.18.11"
-      sources."@vercel/build-utils-8.2.2"
+      sources."@vercel/build-utils-8.3.5"
       sources."@vercel/error-utils-2.0.2"
       sources."@vercel/fun-1.1.0"
       sources."@vercel/gatsby-plugin-vercel-analytics-1.0.11"
-      (sources."@vercel/gatsby-plugin-vercel-builder-2.0.33" // {
+      (sources."@vercel/gatsby-plugin-vercel-builder-2.0.39" // {
         dependencies = [
           sources."fs-extra-11.1.0"
           sources."jsonfile-6.1.0"
@@ -88636,10 +87593,10 @@ in
         ];
       })
       sources."@vercel/go-3.1.1"
-      sources."@vercel/hydrogen-1.0.2"
-      sources."@vercel/next-4.2.17"
-      sources."@vercel/nft-0.27.2"
-      (sources."@vercel/node-3.1.7" // {
+      sources."@vercel/hydrogen-1.0.4"
+      sources."@vercel/next-4.3.6"
+      sources."@vercel/nft-0.27.3"
+      (sources."@vercel/node-3.2.7" // {
         dependencies = [
           sources."async-listen-3.0.0"
           sources."node-fetch-2.6.9"
@@ -88647,12 +87604,12 @@ in
         ];
       })
       sources."@vercel/python-4.3.0"
-      (sources."@vercel/redwood-2.0.10" // {
+      (sources."@vercel/redwood-2.1.3" // {
         dependencies = [
           sources."semver-6.3.1"
         ];
       })
-      sources."@vercel/remix-builder-2.1.7"
+      sources."@vercel/remix-builder-2.2.1"
       (sources."@vercel/routing-utils-3.1.0" // {
         dependencies = [
           sources."ajv-6.12.6"
@@ -88661,10 +87618,10 @@ in
         ];
       })
       sources."@vercel/ruby-2.1.0"
-      sources."@vercel/static-build-2.5.11"
+      sources."@vercel/static-build-2.5.17"
       sources."@vercel/static-config-3.0.0"
       sources."abbrev-1.1.1"
-      sources."acorn-8.12.0"
+      sources."acorn-8.12.1"
       sources."acorn-import-attributes-1.9.5"
       sources."acorn-walk-8.3.3"
       sources."agent-base-6.0.2"
@@ -88872,7 +87829,7 @@ in
       sources."tslib-2.6.3"
       sources."typescript-4.9.5"
       sources."uid-promise-1.0.0"
-      sources."undici-5.26.5"
+      sources."undici-5.28.4"
       sources."universalify-0.1.2"
       sources."unpipe-1.0.0"
       sources."uri-js-4.4.1"
@@ -88926,7 +87883,7 @@ in
         ];
       })
       sources."@eslint-community/eslint-utils-4.4.0"
-      sources."@eslint-community/regexpp-4.10.1"
+      sources."@eslint-community/regexpp-4.11.0"
       sources."@eslint/eslintrc-2.1.4"
       sources."@eslint/js-8.57.0"
       sources."@humanwhocodes/config-array-0.11.14"
@@ -88936,7 +87893,7 @@ in
       sources."@nodelib/fs.stat-2.0.5"
       sources."@nodelib/fs.walk-1.2.8"
       sources."@ungap/structured-clone-1.2.0"
-      sources."acorn-8.12.0"
+      sources."acorn-8.12.1"
       sources."acorn-jsx-5.3.2"
       sources."ajv-6.12.6"
       sources."ansi-regex-5.0.1"
@@ -88965,12 +87922,12 @@ in
       sources."es-errors-1.3.0"
       sources."escape-string-regexp-4.0.0"
       sources."eslint-8.57.0"
-      sources."eslint-plugin-vue-9.26.0"
+      sources."eslint-plugin-vue-9.27.0"
       sources."eslint-scope-7.2.2"
       sources."eslint-visitor-keys-3.4.3"
       sources."espree-9.6.1"
       sources."esprima-4.0.1"
-      sources."esquery-1.5.0"
+      sources."esquery-1.6.0"
       sources."esrecurse-4.3.0"
       sources."estraverse-5.3.0"
       sources."esutils-2.0.3"
@@ -89001,7 +87958,7 @@ in
       sources."imurmurhash-0.1.4"
       sources."inflight-1.0.6"
       sources."inherits-2.0.4"
-      sources."is-core-module-2.13.1"
+      sources."is-core-module-2.15.0"
       (sources."is-expression-4.0.0" // {
         dependencies = [
           sources."acorn-7.4.1"
@@ -89039,7 +87996,7 @@ in
       sources."path-key-3.1.1"
       sources."path-parse-1.0.7"
       sources."picocolors-1.0.1"
-      sources."postcss-selector-parser-6.1.0"
+      sources."postcss-selector-parser-6.1.1"
       sources."prelude-ls-1.2.1"
       sources."prettier-2.8.8"
       sources."pug-error-2.1.0"
@@ -89051,7 +88008,7 @@ in
       sources."reusify-1.0.4"
       sources."rimraf-3.0.2"
       sources."run-parallel-1.2.0"
-      sources."semver-7.6.2"
+      sources."semver-7.6.3"
       sources."set-function-length-1.2.2"
       sources."shebang-command-2.0.0"
       sources."shebang-regex-3.0.0"
@@ -89114,7 +88071,7 @@ in
       sources."es6-promisify-5.0.0"
       sources."http-proxy-agent-2.1.0"
       sources."https-proxy-agent-2.2.4"
-      sources."jsonc-parser-3.2.1"
+      sources."jsonc-parser-3.3.1"
       sources."ms-2.0.0"
       sources."request-light-0.4.0"
       (sources."vscode-json-languageservice-4.2.1" // {
@@ -89152,7 +88109,7 @@ in
       sha512 = "KX07T/WHnXfmoo2wvjLlx0eKeGIotB0C5GnfWVHylPfSa7BuNo0bktRCL2+zJ3g72IKc1psuRIGZIn7/soexag==";
     };
     dependencies = [
-      (sources."@babel/runtime-7.24.7" // {
+      (sources."@babel/runtime-7.24.8" // {
         dependencies = [
           sources."regenerator-runtime-0.14.1"
         ];
@@ -89201,6 +88158,7 @@ in
       sources."btoa-1.2.1"
       sources."buffer-5.7.1"
       sources."buffer-equal-0.0.1"
+      sources."centra-2.7.0"
       sources."cliui-8.0.1"
       sources."color-convert-2.0.1"
       sources."color-name-1.1.4"
@@ -89210,6 +88168,7 @@ in
       sources."estraverse-5.3.0"
       sources."exif-parser-0.1.12"
       sources."file-type-16.5.4"
+      sources."follow-redirects-1.15.6"
       sources."fs-extra-11.2.0"
       sources."get-caller-file-2.0.5"
       sources."gifwrap-0.9.4"
@@ -89224,7 +88183,11 @@ in
       sources."jpeg-js-0.4.4"
       sources."json5-2.2.3"
       sources."jsonfile-6.1.0"
-      sources."load-bmfont-1.4.1"
+      (sources."load-bmfont-1.4.2" // {
+        dependencies = [
+          sources."phin-3.7.1"
+        ];
+      })
       sources."logidrom-0.3.1"
       sources."mime-1.6.0"
       sources."min-document-2.19.0"
@@ -89284,23 +88247,23 @@ in
   webpack = nodeEnv.buildNodePackage {
     name = "webpack";
     packageName = "webpack";
-    version = "5.92.0";
+    version = "5.93.0";
     src = fetchurl {
-      url = "https://registry.npmjs.org/webpack/-/webpack-5.92.0.tgz";
-      sha512 = "Bsw2X39MYIgxouNATyVpCNVWBCuUwDgWtN78g6lSdPJRLaQ/PUVm/oXcaRAyY/sMFoKFQrsPeqvTizWtq7QPCA==";
+      url = "https://registry.npmjs.org/webpack/-/webpack-5.93.0.tgz";
+      sha512 = "Y0m5oEY1LRuwly578VqluorkXbvXKh7U3rLoQCEO04M97ScRr44afGVkI0FQFsXzysk5OgFAxjZAb9rsGQVihA==";
     };
     dependencies = [
       sources."@jridgewell/gen-mapping-0.3.5"
       sources."@jridgewell/resolve-uri-3.1.2"
       sources."@jridgewell/set-array-1.2.1"
       sources."@jridgewell/source-map-0.3.6"
-      sources."@jridgewell/sourcemap-codec-1.4.15"
+      sources."@jridgewell/sourcemap-codec-1.5.0"
       sources."@jridgewell/trace-mapping-0.3.25"
-      sources."@types/eslint-8.56.10"
+      sources."@types/eslint-9.6.0"
       sources."@types/eslint-scope-3.7.7"
       sources."@types/estree-1.0.5"
       sources."@types/json-schema-7.0.15"
-      sources."@types/node-20.14.2"
+      sources."@types/node-20.14.12"
       sources."@webassemblyjs/ast-1.12.1"
       sources."@webassemblyjs/floating-point-hex-parser-1.11.6"
       sources."@webassemblyjs/helper-api-error-1.11.6"
@@ -89318,18 +88281,18 @@ in
       sources."@webassemblyjs/wast-printer-1.12.1"
       sources."@xtuc/ieee754-1.2.0"
       sources."@xtuc/long-4.2.2"
-      sources."acorn-8.12.0"
+      sources."acorn-8.12.1"
       sources."acorn-import-attributes-1.9.5"
       sources."ajv-6.12.6"
       sources."ajv-keywords-3.5.2"
-      sources."browserslist-4.23.1"
+      sources."browserslist-4.23.2"
       sources."buffer-from-1.1.2"
-      sources."caniuse-lite-1.0.30001634"
+      sources."caniuse-lite-1.0.30001643"
       sources."chrome-trace-event-1.0.4"
       sources."commander-2.20.3"
-      sources."electron-to-chromium-1.4.802"
-      sources."enhanced-resolve-5.17.0"
-      sources."es-module-lexer-1.5.3"
+      sources."electron-to-chromium-1.5.1"
+      sources."enhanced-resolve-5.17.1"
+      sources."es-module-lexer-1.5.4"
       sources."escalade-3.1.2"
       sources."eslint-scope-5.1.1"
       (sources."esrecurse-4.3.0" // {
@@ -89352,7 +88315,7 @@ in
       sources."mime-db-1.52.0"
       sources."mime-types-2.1.35"
       sources."neo-async-2.6.2"
-      sources."node-releases-2.0.14"
+      sources."node-releases-2.0.18"
       sources."picocolors-1.0.1"
       sources."punycode-2.3.1"
       sources."randombytes-2.1.0"
@@ -89363,13 +88326,13 @@ in
       sources."source-map-support-0.5.21"
       sources."supports-color-8.1.1"
       sources."tapable-2.2.1"
-      sources."terser-5.31.1"
+      sources."terser-5.31.3"
       sources."terser-webpack-plugin-5.3.10"
       sources."undici-types-5.26.5"
-      sources."update-browserslist-db-1.0.16"
+      sources."update-browserslist-db-1.1.0"
       sources."uri-js-4.4.1"
       sources."watchpack-2.4.1"
-      sources."webpack-5.92.0"
+      sources."webpack-5.93.0"
       sources."webpack-sources-3.2.3"
     ];
     buildInputs = globalBuildInputs;
@@ -89396,13 +88359,13 @@ in
       sources."@jridgewell/resolve-uri-3.1.2"
       sources."@jridgewell/set-array-1.2.1"
       sources."@jridgewell/source-map-0.3.6"
-      sources."@jridgewell/sourcemap-codec-1.4.15"
+      sources."@jridgewell/sourcemap-codec-1.5.0"
       sources."@jridgewell/trace-mapping-0.3.25"
-      sources."@types/eslint-8.56.10"
+      sources."@types/eslint-9.6.0"
       sources."@types/eslint-scope-3.7.7"
       sources."@types/estree-1.0.5"
       sources."@types/json-schema-7.0.15"
-      sources."@types/node-20.14.2"
+      sources."@types/node-20.14.12"
       sources."@webassemblyjs/ast-1.12.1"
       sources."@webassemblyjs/floating-point-hex-parser-1.11.6"
       sources."@webassemblyjs/helper-api-error-1.11.6"
@@ -89423,22 +88386,22 @@ in
       sources."@webpack-cli/serve-2.0.5"
       sources."@xtuc/ieee754-1.2.0"
       sources."@xtuc/long-4.2.2"
-      sources."acorn-8.12.0"
+      sources."acorn-8.12.1"
       sources."acorn-import-attributes-1.9.5"
       sources."ajv-6.12.6"
       sources."ajv-keywords-3.5.2"
-      sources."browserslist-4.23.1"
+      sources."browserslist-4.23.2"
       sources."buffer-from-1.1.2"
-      sources."caniuse-lite-1.0.30001634"
+      sources."caniuse-lite-1.0.30001643"
       sources."chrome-trace-event-1.0.4"
       sources."clone-deep-4.0.1"
       sources."colorette-2.0.20"
       sources."commander-10.0.1"
       sources."cross-spawn-7.0.3"
-      sources."electron-to-chromium-1.4.802"
-      sources."enhanced-resolve-5.17.0"
+      sources."electron-to-chromium-1.5.1"
+      sources."enhanced-resolve-5.17.1"
       sources."envinfo-7.13.0"
-      sources."es-module-lexer-1.5.3"
+      sources."es-module-lexer-1.5.4"
       sources."escalade-3.1.2"
       sources."eslint-scope-5.1.1"
       (sources."esrecurse-4.3.0" // {
@@ -89458,9 +88421,9 @@ in
       sources."graceful-fs-4.2.11"
       sources."has-flag-4.0.0"
       sources."hasown-2.0.2"
-      sources."import-local-3.1.0"
+      sources."import-local-3.2.0"
       sources."interpret-3.1.1"
-      sources."is-core-module-2.13.1"
+      sources."is-core-module-2.15.0"
       sources."is-plain-object-2.0.4"
       sources."isexe-2.0.0"
       sources."isobject-3.0.1"
@@ -89474,7 +88437,7 @@ in
       sources."mime-db-1.52.0"
       sources."mime-types-2.1.35"
       sources."neo-async-2.6.2"
-      sources."node-releases-2.0.14"
+      sources."node-releases-2.0.18"
       sources."p-limit-2.3.0"
       sources."p-locate-4.1.0"
       sources."p-try-2.2.0"
@@ -89500,17 +88463,17 @@ in
       sources."supports-color-8.1.1"
       sources."supports-preserve-symlinks-flag-1.0.0"
       sources."tapable-2.2.1"
-      (sources."terser-5.31.1" // {
+      (sources."terser-5.31.3" // {
         dependencies = [
           sources."commander-2.20.3"
         ];
       })
       sources."terser-webpack-plugin-5.3.10"
       sources."undici-types-5.26.5"
-      sources."update-browserslist-db-1.0.16"
+      sources."update-browserslist-db-1.1.0"
       sources."uri-js-4.4.1"
       sources."watchpack-2.4.1"
-      sources."webpack-5.92.0"
+      sources."webpack-5.93.0"
       sources."webpack-cli-5.1.4"
       sources."webpack-merge-5.10.0"
       sources."webpack-sources-3.2.3"
@@ -89541,26 +88504,26 @@ in
       sources."@jridgewell/resolve-uri-3.1.2"
       sources."@jridgewell/set-array-1.2.1"
       sources."@jridgewell/source-map-0.3.6"
-      sources."@jridgewell/sourcemap-codec-1.4.15"
+      sources."@jridgewell/sourcemap-codec-1.5.0"
       sources."@jridgewell/trace-mapping-0.3.25"
       sources."@jsonjoy.com/base64-1.1.2"
       sources."@jsonjoy.com/json-pack-1.0.4"
-      sources."@jsonjoy.com/util-1.1.3"
+      sources."@jsonjoy.com/util-1.2.0"
       sources."@leichtgewicht/ip-codec-2.0.5"
       sources."@types/body-parser-1.19.5"
       sources."@types/bonjour-3.5.13"
       sources."@types/connect-3.4.38"
       sources."@types/connect-history-api-fallback-1.5.4"
-      sources."@types/eslint-8.56.10"
+      sources."@types/eslint-9.6.0"
       sources."@types/eslint-scope-3.7.7"
       sources."@types/estree-1.0.5"
       sources."@types/express-4.17.21"
-      sources."@types/express-serve-static-core-4.19.3"
+      sources."@types/express-serve-static-core-4.19.5"
       sources."@types/http-errors-2.0.4"
       sources."@types/http-proxy-1.17.14"
       sources."@types/json-schema-7.0.15"
       sources."@types/mime-1.3.5"
-      sources."@types/node-20.14.2"
+      sources."@types/node-20.14.12"
       sources."@types/node-forge-1.3.11"
       sources."@types/qs-6.9.15"
       sources."@types/range-parser-1.2.7"
@@ -89569,7 +88532,7 @@ in
       sources."@types/serve-index-1.9.4"
       sources."@types/serve-static-1.15.7"
       sources."@types/sockjs-0.3.36"
-      sources."@types/ws-8.5.10"
+      sources."@types/ws-8.5.11"
       sources."@webassemblyjs/ast-1.12.1"
       sources."@webassemblyjs/floating-point-hex-parser-1.11.6"
       sources."@webassemblyjs/helper-api-error-1.11.6"
@@ -89588,9 +88551,9 @@ in
       sources."@xtuc/ieee754-1.2.0"
       sources."@xtuc/long-4.2.2"
       sources."accepts-1.3.8"
-      sources."acorn-8.12.0"
+      sources."acorn-8.12.1"
       sources."acorn-import-attributes-1.9.5"
-      sources."ajv-8.16.0"
+      sources."ajv-8.17.1"
       sources."ajv-formats-2.1.1"
       sources."ajv-keywords-5.1.0"
       sources."ansi-html-community-0.0.8"
@@ -89603,19 +88566,20 @@ in
       sources."binary-extensions-2.3.0"
       (sources."body-parser-1.20.2" // {
         dependencies = [
-          sources."bytes-3.1.2"
+          sources."debug-2.6.9"
+          sources."ms-2.0.0"
         ];
       })
       sources."bonjour-service-1.2.1"
       sources."brace-expansion-2.0.1"
       sources."braces-3.0.3"
-      sources."browserslist-4.23.1"
+      sources."browserslist-4.23.2"
       sources."buffer-from-1.1.2"
       sources."bufferutil-4.0.8"
       sources."bundle-name-4.1.0"
-      sources."bytes-3.0.0"
+      sources."bytes-3.1.2"
       sources."call-bind-1.0.7"
-      sources."caniuse-lite-1.0.30001634"
+      sources."caniuse-lite-1.0.30001643"
       sources."chokidar-3.6.0"
       sources."chrome-trace-event-1.0.4"
       sources."color-convert-2.0.1"
@@ -89623,7 +88587,13 @@ in
       sources."colorette-2.0.20"
       sources."commander-2.20.3"
       sources."compressible-2.0.18"
-      sources."compression-1.7.4"
+      (sources."compression-1.7.4" // {
+        dependencies = [
+          sources."bytes-3.0.0"
+          sources."debug-2.6.9"
+          sources."ms-2.0.0"
+        ];
+      })
       sources."connect-history-api-fallback-2.0.0"
       (sources."content-disposition-0.5.4" // {
         dependencies = [
@@ -89635,7 +88605,7 @@ in
       sources."cookie-signature-1.0.6"
       sources."core-util-is-1.0.3"
       sources."cross-spawn-7.0.3"
-      sources."debug-2.6.9"
+      sources."debug-4.3.5"
       sources."default-browser-5.2.1"
       sources."default-browser-id-5.0.0"
       sources."default-gateway-6.0.3"
@@ -89647,13 +88617,13 @@ in
       sources."dns-packet-5.6.1"
       sources."eastasianwidth-0.2.0"
       sources."ee-first-1.1.1"
-      sources."electron-to-chromium-1.4.802"
+      sources."electron-to-chromium-1.5.1"
       sources."emoji-regex-9.2.2"
       sources."encodeurl-1.0.2"
-      sources."enhanced-resolve-5.17.0"
+      sources."enhanced-resolve-5.17.1"
       sources."es-define-property-1.0.0"
       sources."es-errors-1.3.0"
-      sources."es-module-lexer-1.5.3"
+      sources."es-module-lexer-1.5.4"
       sources."escalade-3.1.2"
       sources."escape-html-1.0.3"
       sources."eslint-scope-5.1.1"
@@ -89666,29 +88636,37 @@ in
       sources."etag-1.8.1"
       sources."eventemitter3-4.0.7"
       sources."events-3.3.0"
-      sources."execa-5.1.1"
+      (sources."execa-5.1.1" // {
+        dependencies = [
+          sources."signal-exit-3.0.7"
+        ];
+      })
       (sources."express-4.19.2" // {
         dependencies = [
+          sources."debug-2.6.9"
+          sources."ms-2.0.0"
           sources."safe-buffer-5.2.1"
         ];
       })
       sources."fast-deep-equal-3.1.3"
       sources."fast-json-stable-stringify-2.1.0"
+      sources."fast-uri-3.0.1"
       sources."faye-websocket-0.11.4"
       sources."fill-range-7.1.1"
-      sources."finalhandler-1.2.0"
-      sources."follow-redirects-1.15.6"
-      (sources."foreground-child-3.2.0" // {
+      (sources."finalhandler-1.2.0" // {
         dependencies = [
-          sources."signal-exit-4.1.0"
+          sources."debug-2.6.9"
+          sources."ms-2.0.0"
         ];
       })
+      sources."follow-redirects-1.15.6"
+      sources."foreground-child-3.2.1"
       sources."forwarded-0.2.0"
       sources."fresh-0.5.2"
       sources."function-bind-1.1.2"
       sources."get-intrinsic-1.2.4"
       sources."get-stream-6.0.1"
-      sources."glob-10.4.1"
+      sources."glob-10.4.5"
       sources."glob-parent-5.1.2"
       sources."glob-to-regexp-0.4.1"
       sources."gopd-1.0.1"
@@ -89728,15 +88706,15 @@ in
       sources."is-wsl-3.1.0"
       sources."isarray-1.0.0"
       sources."isexe-2.0.0"
-      sources."jackspeak-3.4.0"
+      sources."jackspeak-3.4.3"
       sources."jest-worker-27.5.1"
       sources."json-parse-even-better-errors-2.3.1"
       sources."json-schema-traverse-1.0.0"
-      sources."launch-editor-2.6.1"
+      sources."launch-editor-2.8.0"
       sources."loader-runner-4.3.0"
-      sources."lru-cache-10.2.2"
+      sources."lru-cache-10.4.3"
       sources."media-typer-0.3.0"
-      sources."memfs-4.9.2"
+      sources."memfs-4.9.4"
       sources."merge-descriptors-1.0.1"
       sources."merge-stream-2.0.0"
       sources."methods-1.1.2"
@@ -89746,24 +88724,25 @@ in
       sources."mime-types-2.1.35"
       sources."mimic-fn-2.1.0"
       sources."minimalistic-assert-1.0.1"
-      sources."minimatch-9.0.4"
+      sources."minimatch-9.0.5"
       sources."minipass-7.1.2"
-      sources."ms-2.0.0"
+      sources."ms-2.1.2"
       sources."multicast-dns-7.2.5"
       sources."negotiator-0.6.3"
       sources."neo-async-2.6.2"
       sources."node-forge-1.3.1"
       sources."node-gyp-build-4.8.1"
-      sources."node-releases-2.0.14"
+      sources."node-releases-2.0.18"
       sources."normalize-path-3.0.0"
       sources."npm-run-path-4.0.1"
-      sources."object-inspect-1.13.1"
+      sources."object-inspect-1.13.2"
       sources."obuf-1.1.2"
       sources."on-finished-2.4.1"
       sources."on-headers-1.0.2"
       sources."onetime-5.1.2"
       sources."open-10.1.0"
       sources."p-retry-6.2.0"
+      sources."package-json-from-dist-1.0.0"
       sources."parseurl-1.3.3"
       sources."path-key-3.1.1"
       sources."path-scurry-1.11.1"
@@ -89780,17 +88759,13 @@ in
       sources."qs-6.11.0"
       sources."randombytes-2.1.0"
       sources."range-parser-1.2.1"
-      (sources."raw-body-2.5.2" // {
-        dependencies = [
-          sources."bytes-3.1.2"
-        ];
-      })
+      sources."raw-body-2.5.2"
       sources."readable-stream-3.6.2"
       sources."readdirp-3.6.0"
       sources."require-from-string-2.0.2"
       sources."requires-port-1.0.0"
       sources."retry-0.13.1"
-      sources."rimraf-5.0.7"
+      sources."rimraf-5.0.9"
       sources."run-applescript-7.0.0"
       sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
@@ -89799,15 +88774,22 @@ in
       sources."selfsigned-2.4.1"
       (sources."send-0.18.0" // {
         dependencies = [
+          (sources."debug-2.6.9" // {
+            dependencies = [
+              sources."ms-2.0.0"
+            ];
+          })
           sources."ms-2.1.3"
         ];
       })
       sources."serialize-javascript-6.0.2"
       (sources."serve-index-1.9.1" // {
         dependencies = [
+          sources."debug-2.6.9"
           sources."depd-1.1.2"
           sources."http-errors-1.6.3"
           sources."inherits-2.0.3"
+          sources."ms-2.0.0"
           sources."setprototypeof-1.1.0"
           sources."statuses-1.5.0"
         ];
@@ -89819,23 +88801,12 @@ in
       sources."shebang-regex-3.0.0"
       sources."shell-quote-1.8.1"
       sources."side-channel-1.0.6"
-      sources."signal-exit-3.0.7"
+      sources."signal-exit-4.1.0"
       sources."sockjs-0.3.24"
-      sources."sonic-forest-1.0.3"
       sources."source-map-0.6.1"
       sources."source-map-support-0.5.21"
-      (sources."spdy-4.0.2" // {
-        dependencies = [
-          sources."debug-4.3.5"
-          sources."ms-2.1.2"
-        ];
-      })
-      (sources."spdy-transport-3.0.0" // {
-        dependencies = [
-          sources."debug-4.3.5"
-          sources."ms-2.1.2"
-        ];
-      })
+      sources."spdy-4.0.2"
+      sources."spdy-transport-3.0.0"
       sources."statuses-2.0.1"
       sources."string-width-5.1.2"
       (sources."string-width-cjs-4.2.3" // {
@@ -89854,7 +88825,7 @@ in
       sources."strip-final-newline-2.0.0"
       sources."supports-color-8.1.1"
       sources."tapable-2.2.1"
-      sources."terser-5.31.1"
+      sources."terser-5.31.3"
       (sources."terser-webpack-plugin-5.3.10" // {
         dependencies = [
           sources."ajv-6.12.6"
@@ -89867,12 +88838,12 @@ in
       sources."thunky-1.1.0"
       sources."to-regex-range-5.0.1"
       sources."toidentifier-1.0.1"
-      sources."tree-dump-1.0.1"
+      sources."tree-dump-1.0.2"
       sources."tslib-2.6.3"
       sources."type-is-1.6.18"
       sources."undici-types-5.26.5"
       sources."unpipe-1.0.0"
-      sources."update-browserslist-db-1.0.16"
+      sources."update-browserslist-db-1.1.0"
       sources."uri-js-4.4.1"
       sources."utf-8-validate-6.0.4"
       sources."util-deprecate-1.0.2"
@@ -89881,7 +88852,7 @@ in
       sources."vary-1.1.2"
       sources."watchpack-2.4.1"
       sources."wbuf-1.7.3"
-      (sources."webpack-5.92.0" // {
+      (sources."webpack-5.93.0" // {
         dependencies = [
           sources."ajv-6.12.6"
           sources."ajv-keywords-3.5.2"
@@ -89889,7 +88860,7 @@ in
           sources."schema-utils-3.3.0"
         ];
       })
-      sources."webpack-dev-middleware-7.2.1"
+      sources."webpack-dev-middleware-7.3.0"
       sources."webpack-sources-3.2.3"
       sources."websocket-driver-0.7.4"
       sources."websocket-extensions-0.1.4"
@@ -89903,7 +88874,7 @@ in
           sources."strip-ansi-6.0.1"
         ];
       })
-      sources."ws-8.17.0"
+      sources."ws-8.18.0"
     ];
     buildInputs = globalBuildInputs;
     meta = {
@@ -89928,17 +88899,17 @@ in
       sources."@jridgewell/resolve-uri-3.1.2"
       sources."@jridgewell/set-array-1.2.1"
       sources."@jridgewell/source-map-0.3.6"
-      sources."@jridgewell/sourcemap-codec-1.4.15"
+      sources."@jridgewell/sourcemap-codec-1.5.0"
       sources."@jridgewell/trace-mapping-0.3.25"
       sources."@nodelib/fs.scandir-2.1.5"
       sources."@nodelib/fs.stat-2.0.5"
       sources."@nodelib/fs.walk-1.2.8"
       sources."@sindresorhus/merge-streams-2.3.0"
-      sources."@types/eslint-8.56.10"
+      sources."@types/eslint-9.6.0"
       sources."@types/eslint-scope-3.7.7"
       sources."@types/estree-1.0.5"
       sources."@types/json-schema-7.0.15"
-      sources."@types/node-20.14.2"
+      sources."@types/node-20.14.12"
       sources."@webassemblyjs/ast-1.12.1"
       sources."@webassemblyjs/floating-point-hex-parser-1.11.6"
       sources."@webassemblyjs/helper-api-error-1.11.6"
@@ -89956,20 +88927,20 @@ in
       sources."@webassemblyjs/wast-printer-1.12.1"
       sources."@xtuc/ieee754-1.2.0"
       sources."@xtuc/long-4.2.2"
-      sources."acorn-8.12.0"
+      sources."acorn-8.12.1"
       sources."acorn-import-attributes-1.9.5"
-      sources."ajv-8.16.0"
+      sources."ajv-8.17.1"
       sources."ajv-formats-2.1.1"
       sources."ajv-keywords-5.1.0"
       sources."braces-3.0.3"
-      sources."browserslist-4.23.1"
+      sources."browserslist-4.23.2"
       sources."buffer-from-1.1.2"
-      sources."caniuse-lite-1.0.30001634"
+      sources."caniuse-lite-1.0.30001643"
       sources."chrome-trace-event-1.0.4"
       sources."commander-2.20.3"
-      sources."electron-to-chromium-1.4.802"
-      sources."enhanced-resolve-5.17.0"
-      sources."es-module-lexer-1.5.3"
+      sources."electron-to-chromium-1.5.1"
+      sources."enhanced-resolve-5.17.1"
+      sources."es-module-lexer-1.5.4"
       sources."escalade-3.1.2"
       sources."eslint-scope-5.1.1"
       (sources."esrecurse-4.3.0" // {
@@ -89986,11 +88957,12 @@ in
         ];
       })
       sources."fast-json-stable-stringify-2.1.0"
+      sources."fast-uri-3.0.1"
       sources."fastq-1.17.1"
       sources."fill-range-7.1.1"
       sources."glob-parent-6.0.2"
       sources."glob-to-regexp-0.4.1"
-      sources."globby-14.0.1"
+      sources."globby-14.0.2"
       sources."graceful-fs-4.2.11"
       sources."has-flag-4.0.0"
       sources."ignore-5.3.1"
@@ -90007,7 +88979,7 @@ in
       sources."mime-db-1.52.0"
       sources."mime-types-2.1.35"
       sources."neo-async-2.6.2"
-      sources."node-releases-2.0.14"
+      sources."node-releases-2.0.18"
       sources."normalize-path-3.0.0"
       sources."path-type-5.0.0"
       sources."picocolors-1.0.1"
@@ -90026,7 +88998,7 @@ in
       sources."source-map-support-0.5.21"
       sources."supports-color-8.1.1"
       sources."tapable-2.2.1"
-      sources."terser-5.31.1"
+      sources."terser-5.31.3"
       (sources."terser-webpack-plugin-5.3.10" // {
         dependencies = [
           sources."ajv-6.12.6"
@@ -90038,10 +89010,10 @@ in
       sources."to-regex-range-5.0.1"
       sources."undici-types-5.26.5"
       sources."unicorn-magic-0.1.0"
-      sources."update-browserslist-db-1.0.16"
+      sources."update-browserslist-db-1.1.0"
       sources."uri-js-4.4.1"
       sources."watchpack-2.4.1"
-      (sources."webpack-5.92.0" // {
+      (sources."webpack-5.93.0" // {
         dependencies = [
           sources."ajv-6.12.6"
           sources."ajv-keywords-3.5.2"
@@ -90077,20 +89049,20 @@ in
           sources."xml2js-0.6.2"
         ];
       })
-      sources."@thaunknown/idb-chunk-store-1.0.2"
-      (sources."@thaunknown/simple-peer-10.0.7" // {
+      sources."@thaunknown/idb-chunk-store-1.0.4"
+      (sources."@thaunknown/simple-peer-10.0.10" // {
         dependencies = [
           sources."debug-4.3.5"
           sources."ms-2.1.2"
         ];
       })
-      (sources."@thaunknown/simple-websocket-9.1.1" // {
+      (sources."@thaunknown/simple-websocket-9.1.3" // {
         dependencies = [
           sources."debug-4.3.5"
           sources."ms-2.1.2"
         ];
       })
-      sources."@thaunknown/thirty-two-1.0.3"
+      sources."@thaunknown/thirty-two-1.0.5"
       sources."@webtorrent/http-node-1.3.0"
       sources."abort-controller-3.0.0"
       sources."addr-to-ip-port-2.0.0"
@@ -90117,15 +89089,14 @@ in
         ];
       })
       sources."bittorrent-peerid-1.3.6"
-      (sources."bittorrent-protocol-4.1.12" // {
+      (sources."bittorrent-protocol-4.1.13" // {
         dependencies = [
           sources."debug-4.3.5"
           sources."ms-2.1.2"
         ];
       })
-      (sources."bittorrent-tracker-11.1.0" // {
+      (sources."bittorrent-tracker-11.1.1" // {
         dependencies = [
-          sources."clone-2.1.2"
           sources."debug-4.3.5"
           sources."ip-2.0.1"
           sources."ms-2.1.2"
@@ -90166,7 +89137,7 @@ in
       sources."concat-stream-1.6.2"
       sources."core-util-is-1.0.3"
       sources."cpus-1.0.3"
-      sources."create-torrent-6.0.17"
+      sources."create-torrent-6.0.18"
       sources."cross-fetch-ponyfill-1.0.3"
       sources."cross-spawn-7.0.3"
       sources."data-uri-to-buffer-4.0.1"
@@ -90221,9 +89192,9 @@ in
       sources."he-1.2.0"
       sources."http-parser-js-0.4.13"
       sources."human-signals-2.1.0"
-      sources."hybrid-chunk-store-1.2.4"
+      sources."hybrid-chunk-store-1.2.6"
       sources."iconv-lite-0.4.24"
-      sources."idb-6.1.5"
+      sources."idb-7.1.1"
       sources."ieee754-1.2.1"
       sources."immediate-chunk-store-2.2.0"
       sources."inherits-2.0.4"
@@ -90279,7 +89250,7 @@ in
       sources."netmask-2.0.2"
       sources."network-address-1.1.2"
       sources."node-abi-3.65.0"
-      (sources."node-datachannel-0.9.1" // {
+      (sources."node-datachannel-0.10.1" // {
         dependencies = [
           sources."node-domexception-2.0.1"
         ];
@@ -90337,7 +89308,7 @@ in
       sources."safe-buffer-5.1.2"
       sources."safer-buffer-2.1.2"
       sources."sax-1.1.4"
-      sources."semver-7.6.2"
+      sources."semver-7.6.3"
       sources."shebang-command-2.0.0"
       sources."shebang-regex-3.0.0"
       sources."signal-exit-3.0.7"
@@ -90349,7 +89320,7 @@ in
       sources."speed-limiter-1.0.2"
       sources."split-1.0.1"
       sources."sprintf-js-1.1.3"
-      sources."streamx-2.18.0"
+      sources."streamx-2.17.0"
       sources."string-width-4.2.3"
       sources."string2compact-2.0.1"
       sources."string_decoder-1.1.1"
@@ -90363,13 +89334,12 @@ in
           sources."readable-stream-3.6.2"
         ];
       })
-      sources."text-decoder-1.1.0"
       sources."thirty-two-1.0.2"
       sources."through-2.3.8"
       sources."throughput-1.0.1"
       sources."thunky-0.1.0"
       sources."tmp-0.0.33"
-      (sources."torrent-discovery-11.0.6" // {
+      (sources."torrent-discovery-11.0.7" // {
         dependencies = [
           sources."debug-4.3.5"
           sources."ms-2.1.2"
@@ -90397,22 +89367,22 @@ in
       sources."vlc-command-1.2.0"
       sources."wcwidth-1.0.1"
       sources."web-streams-polyfill-3.3.3"
-      sources."webrtc-polyfill-1.1.6"
-      (sources."webtorrent-2.4.1" // {
+      sources."webrtc-polyfill-1.1.8"
+      (sources."webtorrent-2.4.12" // {
         dependencies = [
           sources."bep53-range-2.0.0"
           sources."debug-4.3.5"
           sources."get-stdin-9.0.0"
           sources."magnet-uri-7.0.5"
           sources."ms-2.1.2"
-          sources."parse-torrent-11.0.16"
+          sources."parse-torrent-11.0.17"
         ];
       })
       sources."which-2.0.2"
       sources."winreg-1.2.5"
       sources."wrap-ansi-6.2.0"
       sources."wrappy-1.0.2"
-      sources."ws-8.17.0"
+      sources."ws-8.18.0"
       sources."xml2js-0.4.23"
       sources."xmlbuilder-11.0.1"
       sources."y18n-5.0.8"
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/bisect_ppx/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/bisect_ppx/default.nix
index ae70482fd4..f814cba26b 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/bisect_ppx/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/ocaml-modules/brisk-reconciler/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/brisk-reconciler/default.nix
index 688d78e4c8..e0057f0746 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/brisk-reconciler/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/ocaml-modules/bytestring/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/bytestring/default.nix
index 3714846ee6..8ed2a3ec47 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/bytestring/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/ocaml-modules/bz2/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/bz2/default.nix
index 7e5f256a1a..dbe915468d 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/bz2/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/ocaml-modules/coin/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/coin/default.nix
index 3b746ccfbd..b79a69e432 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/coin/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/ocaml-modules/colors/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/colors/default.nix
index 00ae0ff7cf..2b7f5fbee3 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/colors/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/ocaml-modules/csexp/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/csexp/default.nix
index df0a530e06..f13e239a79 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/csexp/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/ocaml-modules/cudf/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/cudf/default.nix
index 1be0a0e49c..dae074b05f 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/cudf/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/ocaml-modules/dune-rpc/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/dune-rpc/default.nix
index 569be12379..3e83d04d5d 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/dune-rpc/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/ocaml-modules/dune-site/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/dune-site/default.nix
index f17cdd60d2..fc99f4213e 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/dune-site/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/ocaml-modules/fiber/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/fiber/default.nix
index 3a785d5306..a99f10899e 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/fiber/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/ocaml-modules/flex/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/flex/default.nix
index b8a56d5224..99af6da926 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/flex/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/ocaml-modules/junit/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/junit/default.nix
index ff3c31519e..b9ab63ac84 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/junit/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/ocaml-modules/lun/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/lun/default.nix
index c7303d0a00..17dcaead3c 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/lun/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/ocaml-modules/mccs/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mccs/default.nix
index dbd55b2c59..2c0fa7186e 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mccs/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/ocaml-modules/miou/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/miou/default.nix
index 7dd83aaae3..0a5970fe73 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/miou/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/ocaml-modules/mldoc/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mldoc/default.nix
index 6a74ef4cec..b66617f7d2 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mldoc/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/ocaml-modules/mopsa/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mopsa/default.nix
new file mode 100644
index 0000000000..8f084ef961
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mopsa/default.nix
@@ -0,0 +1,80 @@
+{
+  lib,
+  buildDunePackage,
+  fetchFromGitLab,
+  clang,
+  libclang,
+  libllvm,
+  flint,
+  mpfr,
+  pplite,
+  ocaml,
+  menhir,
+  apron,
+  camlidl,
+  yojson,
+  zarith,
+}:
+
+buildDunePackage rec {
+  pname = "mopsa";
+  version = "1.0";
+
+  minimalOCamlVersion = "4.12";
+
+  src = fetchFromGitLab {
+    owner = "mopsa";
+    repo = "mopsa-analyzer";
+    rev = "v${version}";
+    hash = "sha256-nGnWwV7g3SYgShbXGUMooyOdFwXFrQHnQvlc8x9TAS4=";
+  };
+
+  nativeBuildInputs = [
+    clang
+    libllvm
+    menhir
+  ];
+
+  buildInputs = [
+    camlidl
+    flint
+    libclang
+    mpfr
+    pplite
+  ];
+
+  propagatedBuildInputs = [
+    apron
+    yojson
+    zarith
+  ];
+
+  postPatch = ''
+    patchShebangs bin
+  '';
+
+  buildPhase = ''
+    runHook preBuild
+    dune build --profile release -p mopsa
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+    dune install --profile release --prefix=$bin --libdir=$out/lib/ocaml/${ocaml.version}/site-lib
+    runHook postInstall
+  '';
+
+  outputs = [
+    "bin"
+    "out"
+  ];
+
+  meta = {
+    license = lib.licenses.lgpl3Plus;
+    homepage = "https://mopsa.lip6.fr/";
+    description = "A Modular and Open Platform for Static Analysis using Abstract Interpretation";
+    maintainers = [ lib.maintainers.vbgl ];
+  };
+
+}
diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix
index f2b650137e..6ad8420fc1 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/ocaml-modules/ocamlgraph/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocamlgraph/default.nix
index c075fc59be..92b625a4ab 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocamlgraph/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/ocaml-modules/opam-core/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/opam-core/default.nix
index 3106fe83fd..8f9c4bf37a 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/opam-core/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/ocaml-modules/opam-format/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/opam-format/default.nix
index 1360c62816..00d0b146fb 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/opam-format/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/ocaml-modules/opam-repository/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/opam-repository/default.nix
index 008cc28124..c23db8c79f 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/opam-repository/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/ocaml-modules/opam-state/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/opam-state/default.nix
index d841631dfd..a0f2332783 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/opam-state/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/ocaml-modules/pp/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/pp/default.nix
index 5412f8955d..19f446ad85 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/pp/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/ocaml-modules/prettym/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/prettym/default.nix
index a229eb9f35..8d6a855fe7 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/prettym/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/ocaml-modules/ptmap/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ptmap/default.nix
index edc9e1c6dc..6fd6a7d8b9 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ptmap/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/cli.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/cli.nix
index c6c5abfb7f..ebce5ad277 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/cli.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/console.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/console.nix
index 38d95a0c0f..6bede4e59e 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/console.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/dir.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/dir.nix
index 6cd04ece01..9b166beb40 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/dir.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/file-context-printer.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/file-context-printer.nix
index 462b667921..8cfd60d144 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/file-context-printer.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/fp.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/fp.nix
index 35a099771d..5cf7c3d417 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/fp.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/frame.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/frame.nix
index dc845db552..78ccdd2a87 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/frame.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/fs.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/fs.nix
index c553f6a6ad..fc65551a24 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/fs.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/pastel-console.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/pastel-console.nix
index 1a424fad54..82a3ff5505 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/pastel-console.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/pastel.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/pastel.nix
index d8a4d7e0f9..473c6a09e5 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/pastel.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/qcheck-rely.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/qcheck-rely.nix
index 4006df5d90..c587822603 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/qcheck-rely.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/refmterr.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/refmterr.nix
index 3f320fd236..b24fd7c527 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/refmterr.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/rely-junit-reporter.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/rely-junit-reporter.nix
index 46097c45eb..92743f4c2e 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/rely-junit-reporter.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/rely.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/rely.nix
index e3ca4b9ad5..e9870f92b3 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/rely.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/unicode-config.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/unicode-config.nix
index 1b80ae2a71..bb2bbef3c4 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/unicode-config.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/unicode.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/unicode.nix
index 544367424d..7ce536a6e2 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/unicode.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/utf8.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/utf8.nix
index 40c874b5b4..0a18e68a15 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/reason-native/utf8.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/ocaml-modules/rebez/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/rebez/default.nix
index 6a871069eb..ce2e9d3aad 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/rebez/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/ocaml-modules/reperf/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/reperf/default.nix
index 10c6ee6562..ce3164fa19 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/reperf/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/ocaml-modules/riot/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/riot/default.nix
index f7ead9e0a1..7be8d9c21c 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/riot/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/ocaml-modules/rope/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/rope/default.nix
index c6260d713b..975595808a 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/rope/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/ocaml-modules/rosetta/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/rosetta/default.nix
index 492e01ce5d..8e366bda1d 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/rosetta/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/ocaml-modules/spdx_licenses/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/spdx_licenses/default.nix
new file mode 100644
index 0000000000..807de8387f
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/ocaml-modules/spices/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/spices/default.nix
index a1d6b06d15..263d1441e3 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/spices/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/ocaml-modules/swhid_core/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/swhid_core/default.nix
new file mode 100644
index 0000000000..bc9998be2d
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/ocaml-modules/telegraml/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/telegraml/default.nix
index ed0dc49fa9..31eccdcaa6 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/telegraml/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/ocaml-modules/tsdl-image/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tsdl-image/default.nix
index 008822459c..cc9404ed19 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/tsdl-image/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/ocaml-modules/tsdl-mixer/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tsdl-mixer/default.nix
index d2721c5398..888c88029d 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/tsdl-mixer/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/ocaml-modules/tsdl-ttf/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tsdl-ttf/default.nix
index 086b0789a6..33f5f834e0 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/tsdl-ttf/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/ocaml-modules/unstrctrd/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/unstrctrd/default.nix
index b9be734a40..e5959f803c 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/unstrctrd/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/ocaml-modules/xdg/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/xdg/default.nix
index 52543175e0..b626045196 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/xdg/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/ocaml-modules/yuscii/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/yuscii/default.nix
index 3080cb772e..a8b8d7640f 100644
--- a/third_party/nixpkgs/pkgs/development/ocaml-modules/yuscii/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/perl-modules/Po4a/default.nix b/third_party/nixpkgs/pkgs/development/perl-modules/Po4a/default.nix
index 042d9a3a7d..f15697fbf3 100644
--- a/third_party/nixpkgs/pkgs/development/perl-modules/Po4a/default.nix
+++ b/third_party/nixpkgs/pkgs/development/perl-modules/Po4a/default.nix
@@ -101,6 +101,7 @@ buildPerlPackage rec {
     ./Build install
     for f in $out/bin/*; do
       substituteInPlace $f --replace "#! /usr/bin/env perl" "#!${perl}/bin/perl"
+      substituteInPlace $f --replace "exec perl" "exec ${perl}/bin/perl"
     done
   '';
 
diff --git a/third_party/nixpkgs/pkgs/development/perl-modules/XML-LibXML-clang16.patch b/third_party/nixpkgs/pkgs/development/perl-modules/XML-LibXML-clang16.patch
deleted file mode 100644
index 9a19e32bc4..0000000000
--- a/third_party/nixpkgs/pkgs/development/perl-modules/XML-LibXML-clang16.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 8751785951fbde48ffa16a476da3e4adb2bbcde5 Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Mon, 16 Jan 2023 18:50:10 -0800
-Subject: [PATCH] libxml-mm: Fix function prototypes in function pointers
-
-This is now detected with latest clang16+
-
-Fixes
-error: incompatible function pointer types passing 'void (void *, void *, xmlChar *)' (aka 'void (void *, void *, unsigned char *)') to parameter of type 'xmlHashScanner' (aka 'void (*)(void *, void *, const unsigned char *)') [-Wincompatible-function-pointer-types]
-                xmlHashScan(r, PmmRegistryDumpHashScanner, NULL);
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
- perl-libxml-mm.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/perl-libxml-mm.c b/perl-libxml-mm.c
-index a3e78a2..ec2b5ea 100644
---- a/perl-libxml-mm.c
-+++ b/perl-libxml-mm.c
-@@ -121,7 +121,7 @@ PmmFreeHashTable(xmlHashTablePtr table)
- extern SV* PROXY_NODE_REGISTRY_MUTEX;
- 
- /* Utility method used by PmmDumpRegistry */
--void PmmRegistryDumpHashScanner(void * payload, void * data, xmlChar * name)
-+void PmmRegistryDumpHashScanner(void * payload, void * data, const xmlChar * name)
- {
- 	LocalProxyNodePtr lp = (LocalProxyNodePtr) payload;
- 	ProxyNodePtr node = (ProxyNodePtr) lp->proxy;
-@@ -215,7 +215,7 @@ PmmRegisterProxyNode(ProxyNodePtr proxy)
- /* PP: originally this was static inline void, but on AIX the compiler
-    did not chew it, so I'm removing the inline */
- static void
--PmmRegistryHashDeallocator(void *payload, xmlChar *name)
-+PmmRegistryHashDeallocator(void *payload, const xmlChar *name)
- {
- 	Safefree((LocalProxyNodePtr) payload);
- }
-@@ -279,7 +279,7 @@ PmmRegistryREFCNT_dec(ProxyNodePtr proxy)
-  * internal, used by PmmCloneProxyNodes
-  */
- void *
--PmmRegistryHashCopier(void *payload, xmlChar *name)
-+PmmRegistryHashCopier(void *payload, const xmlChar *name)
- {
- 	ProxyNodePtr proxy = ((LocalProxyNodePtr) payload)->proxy;
- 	LocalProxyNodePtr lp;
diff --git a/third_party/nixpkgs/pkgs/development/perl-modules/XML-LibXML-fix-tests-libxml-2.13.0.patch b/third_party/nixpkgs/pkgs/development/perl-modules/XML-LibXML-fix-tests-libxml-2.13.0.patch
new file mode 100644
index 0000000000..330ea88f0d
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/perl-modules/XML-LibXML-fix-tests-libxml-2.13.0.patch
@@ -0,0 +1,145 @@
+From bee8338fd1cbd7aad4bf60c2965833343b6ead6f Mon Sep 17 00:00:00 2001
+From: Nick Wellnhofer <wellnhofer@aevum.de>
+Date: Tue, 21 May 2024 15:17:30 +0200
+Subject: [PATCH] Fix test suite with libxml2 2.13.0
+
+---
+ t/02parse.t                        | 7 ++++++-
+ t/08findnodes.t                    | 8 +++++++-
+ t/19die_on_invalid_utf8_rt_58848.t | 2 +-
+ t/25relaxng.t                      | 4 ++--
+ t/26schema.t                       | 4 ++--
+ t/60error_prev_chain.t             | 8 ++++----
+ 6 files changed, 22 insertions(+), 11 deletions(-)
+
+diff --git a/t/02parse.t b/t/02parse.t
+index b111507b..40aa5f13 100644
+--- a/t/02parse.t
++++ b/t/02parse.t
+@@ -884,7 +884,12 @@ EOXML
+         eval {
+            $doc2    = $parser->parse_string( $xmldoc );
+         };
+-        isnt($@, '', "error parsing $xmldoc");
++        # https://gitlab.gnome.org/GNOME/libxml2/-/commit/b717abdd
++        if (XML::LibXML::LIBXML_RUNTIME_VERSION() < 21300) {
++            isnt($@, '', "error parsing $xmldoc");
++        } else {
++            is( $doc2->documentElement()->firstChild()->nodeName(), "foo" );
++        }
+ 
+         $parser->validation(1);
+ 
+diff --git a/t/08findnodes.t b/t/08findnodes.t
+index 016c85a1..e9417bc5 100644
+--- a/t/08findnodes.t
++++ b/t/08findnodes.t
+@@ -123,7 +123,13 @@ my $docstring = q{
+ my @ns = $root->findnodes('namespace::*');
+ # TEST
+ 
+-is(scalar(@ns), 2, ' TODO : Add test name' );
++# https://gitlab.gnome.org/GNOME/libxml2/-/commit/aca16fb3
++# fixed xmlCopyNamespace with XML namespace.
++if (XML::LibXML::LIBXML_RUNTIME_VERSION() < 21300) {
++    is(scalar(@ns), 2, ' TODO : Add test name' );
++} else {
++    is(scalar(@ns), 3, ' TODO : Add test name' );
++}
+ 
+ # bad xpaths
+ # TEST:$badxpath=4;
+diff --git a/t/19die_on_invalid_utf8_rt_58848.t b/t/19die_on_invalid_utf8_rt_58848.t
+index aa8ad105..4160cb27 100644
+--- a/t/19die_on_invalid_utf8_rt_58848.t
++++ b/t/19die_on_invalid_utf8_rt_58848.t
+@@ -16,7 +16,7 @@ use XML::LibXML;
+     my $err = $@;
+ 
+     # TEST
+-    like ("$err", qr{parser error : Input is not proper UTF-8},
++    like ("$err", qr{not proper UTF-8|Invalid bytes in character encoding},
+         'Parser error.',
+     );
+ }
+diff --git a/t/25relaxng.t b/t/25relaxng.t
+index 93e61883..71383b2a 100644
+--- a/t/25relaxng.t
++++ b/t/25relaxng.t
+@@ -132,7 +132,7 @@ print "# 6 check that no_network => 1 works\n";
+ {
+     my $rng = eval { XML::LibXML::RelaxNG->new( location => $netfile, no_network => 1 ) };
+     # TEST
+-    like( $@, qr{I/O error : Attempt to load network entity}, 'RNG from file location with external import and no_network => 1 throws an exception.' );
++    like( $@, qr{Attempt to load network entity}, 'RNG from file location with external import and no_network => 1 throws an exception.' );
+     # TEST
+     ok( !defined $rng, 'RNG from file location with external import and no_network => 1 is not loaded.' );
+ }
+@@ -152,7 +152,7 @@ print "# 6 check that no_network => 1 works\n";
+ </grammar>
+ EOF
+     # TEST
+-    like( $@, qr{I/O error : Attempt to load network entity}, 'RNG from buffer with external import and no_network => 1 throws an exception.' );
++    like( $@, qr{Attempt to load network entity}, 'RNG from buffer with external import and no_network => 1 throws an exception.' );
+     # TEST
+     ok( !defined $rng, 'RNG from buffer with external import and no_network => 1 is not loaded.' );
+ }
+diff --git a/t/26schema.t b/t/26schema.t
+index 17f641e4..c404cedd 100644
+--- a/t/26schema.t
++++ b/t/26schema.t
+@@ -117,7 +117,7 @@ EOF
+ {
+     my $schema = eval { XML::LibXML::Schema->new( location => $netfile, no_network => 1 ) };
+     # TEST
+-    like( $@, qr{I/O error : Attempt to load network entity}, 'Schema from file location with external import and no_network => 1 throws an exception.' );
++    like( $@, qr{Attempt to load network entity}, 'Schema from file location with external import and no_network => 1 throws an exception.' );
+     # TEST
+     ok( !defined $schema, 'Schema from file location with external import and no_network => 1 is not loaded.' );
+ }
+@@ -129,7 +129,7 @@ EOF
+ </xsd:schema>
+ EOF
+     # TEST
+-    like( $@, qr{I/O error : Attempt to load network entity}, 'Schema from buffer with external import and no_network => 1 throws an exception.' );
++    like( $@, qr{Attempt to load network entity}, 'Schema from buffer with external import and no_network => 1 throws an exception.' );
+     # TEST
+     ok( !defined $schema, 'Schema from buffer with external import and no_network => 1 is not loaded.' );
+ }
+diff --git a/t/60error_prev_chain.t b/t/60error_prev_chain.t
+index e48215c4..55ac0b2e 100644
+--- a/t/60error_prev_chain.t
++++ b/t/60error_prev_chain.t
+@@ -16,13 +16,11 @@ use XML::LibXML;
+ 
+ {
+     my $parser = XML::LibXML->new();
+-    $parser->validation(0);
+-    $parser->load_ext_dtd(0);
+ 
+     eval
+     {
+         local $^W = 0;
+-        $parser->parse_file('example/JBR-ALLENtrees.htm');
++        $parser->parse_string('<doc>&ldquo;&nbsp;&rdquo;</doc>');
+     };
+ 
+     my $err = $@;
+@@ -31,7 +29,7 @@ use XML::LibXML;
+     if( $err && !ref($err) ) {
+       plan skip_all => 'The local libxml library does not support errors as objects to $@';
+     }
+-    plan tests => 1;
++    plan tests => 2;
+ 
+     while (defined($err) && $count < 200)
+     {
+@@ -44,6 +42,8 @@ use XML::LibXML;
+ 
+     # TEST
+     ok ((!$err), "Reached the end of the chain.");
++    # TEST
++    is ($count, 3, "Correct number of errors reported")
+ }
+ 
+ =head1 COPYRIGHT & LICENSE
diff --git a/third_party/nixpkgs/pkgs/development/php-packages/phpinsights/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/phpinsights/default.nix
index b571de2b9b..b702ba73c5 100644
--- a/third_party/nixpkgs/pkgs/development/php-packages/phpinsights/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/php-packages/spx/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/spx/default.nix
index 5fa060223d..caab4d5933 100644
--- a/third_party/nixpkgs/pkgs/development/php-packages/spx/default.nix
+++ b/third_party/nixpkgs/pkgs/development/php-packages/spx/default.nix
@@ -6,7 +6,7 @@
 }:
 
 let
-  version = "0.4.15";
+  version = "0.4.16";
 in
 buildPecl {
   inherit version;
@@ -16,7 +16,7 @@ buildPecl {
     owner = "NoiseByNorthwest";
     repo = "php-spx";
     rev = "v${version}";
-    hash = "sha256-gw6wbPt1Qy0vNfT0flq7bxpnGU3SgJvPVhk8H0Imvx4=";
+    hash = "sha256-1HOLMbCuV1bxi4DV26QOhi93VsBF3NJymk4SMn2ze4g=";
   };
 
   configureFlags = [ "--with-zlib-dir=${zlib.dev}" ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/absl-py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/absl-py/default.nix
index 9447d53ae6..4b1bfa9109 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/absl-py/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/accessible-pygments/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/accessible-pygments/default.nix
index 74bd2d1e09..177b3529ec 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/accessible-pygments/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/actdiag/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/actdiag/default.nix
index cf84a064b5..84fe615845 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/actdiag/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/actdiag/default.nix
@@ -3,7 +3,6 @@
   blockdiag,
   buildPythonPackage,
   fetchFromGitHub,
-  nose,
   pytestCheckHook,
   pythonOlder,
   setuptools,
@@ -23,17 +22,13 @@ buildPythonPackage rec {
     hash = "sha256-WmprkHOgvlsOIg8H77P7fzEqxGnj6xaL7Df7urRkg3o=";
   };
 
+  patches = [ ./fix_test_generate.patch ];
+
   build-system = [ setuptools ];
 
   propagatedBuildInputs = [ blockdiag ];
 
-  # tests rely on nose
-  doCheck = pythonOlder "3.12";
-
-  nativeCheckInputs = [
-    nose
-    pytestCheckHook
-  ];
+  nativeCheckInputs = [ pytestCheckHook ];
 
   pytestFlagsArray = [ "src/actdiag/tests/" ];
 
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/actdiag/fix_test_generate.patch b/third_party/nixpkgs/pkgs/development/python-modules/actdiag/fix_test_generate.patch
new file mode 100644
index 0000000000..95dbf58872
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/actdiag/fix_test_generate.patch
@@ -0,0 +1,22 @@
+diff --git a/src/actdiag/tests/test_generate_diagram.py b/src/actdiag/tests/test_generate_diagram.py
+index c5ee3d5..a74a151 100644
+--- a/src/actdiag/tests/test_generate_diagram.py
++++ b/src/actdiag/tests/test_generate_diagram.py
+@@ -16,16 +16,6 @@
+ import os
+ 
+ from blockdiag.tests.test_generate_diagram import (get_diagram_files,
+-                                                   testcase_generator)
++                                                   test_generate_with_separate)
+ 
+-import actdiag.command
+ 
+-
+-def test_generate():
+-    mainfunc = actdiag.command.main
+-    basepath = os.path.dirname(__file__)
+-    files = get_diagram_files(basepath)
+-    options = []
+-
+-    for testcase in testcase_generator(basepath, mainfunc, files, options):
+-        yield testcase
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/adal/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/adal/default.nix
index 9025dd327f..bb6b018fd8 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/adal/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/adb-shell/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/adb-shell/default.nix
index ed62a53046..a7347c080d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/adb-shell/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/adb-shell/default.nix
@@ -9,7 +9,6 @@
   libusb1,
   mock,
   pyasn1,
-  pythonAtLeast,
   pycryptodome,
   pytestCheckHook,
   rsa,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aenum/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aenum/default.nix
index cc50b3b216..7639b8ac9f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/aenum/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/agate-dbf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/agate-dbf/default.nix
index 1d122ce63f..38e7f713f9 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/agate-dbf/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/agate-excel/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/agate-excel/default.nix
index 5615b4a9aa..5e346cbb95 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/agate-excel/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/agate-sql/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/agate-sql/default.nix
index e5a723d2e2..5d63ef863e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/agate-sql/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/agate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/agate/default.nix
index f5a0e1f19b..00bbf90ffb 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/agate/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/aioamqp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioamqp/default.nix
index 8184e3e311..4beaeb6ce2 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/aioamqp/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/aioapns/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioapns/default.nix
index 30e08af915..6bb210a1ef 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/aioapns/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/aioaseko/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioaseko/default.nix
index c8f6a896c9..54ab5e62bc 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/aioaseko/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/aiobiketrax/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiobiketrax/default.nix
index b07dda7f51..83daf70e02 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/aiobiketrax/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/aiobiketrax/default.nix
@@ -6,7 +6,6 @@
   fetchFromGitHub,
   poetry-core,
   pyjwt,
-  pytest-aiohttp,
   pytestCheckHook,
   python-dateutil,
   pythonOlder,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioftp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioftp/default.nix
index 89906cb458..bd448f41c8 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/aioftp/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-apispec/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-apispec/default.nix
index 9284686d3c..95d1ee3d30 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-apispec/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-apispec/default.nix
@@ -45,6 +45,6 @@ buildPythonPackage rec {
     description = "Build and document REST APIs with aiohttp and apispec";
     homepage = "https://github.com/maximdanilchenko/aiohttp-apispec/";
     license = licenses.mit;
-    maintainers = with maintainers; [ viric ];
+    maintainers = [ ];
   };
 }
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-fast-zlib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-fast-zlib/default.nix
index e770098d63..e320648df3 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-fast-zlib/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-jinja2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-jinja2/default.nix
index 490dea94e0..580db1e840 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-jinja2/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-openmetrics/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-openmetrics/default.nix
index 8f11cfb849..f91f30c396 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/aiohttp-openmetrics/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/aiohue/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiohue/default.nix
index 39468b2116..6ba83412a6 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/aiohue/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/aiokafka/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiokafka/default.nix
index 347a4a5f78..d1d208b5f6 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/aiokafka/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/aiolifx-themes/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiolifx-themes/default.nix
index 7d70d83694..cfad7ea83e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/aiolifx-themes/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/aiolifx-themes/default.nix
@@ -8,7 +8,6 @@
   pytest-asyncio,
   pytestCheckHook,
   pythonOlder,
-  typer,
 }:
 
 buildPythonPackage rec {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiolifx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiolifx/default.nix
index 34a10cb96c..c4421a071f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/aiolifx/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/aiolifx/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "aiolifx";
-  version = "1.0.5";
+  version = "1.0.6";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-95cCfmaYe8RgmkzqPlV4cufNS6Eb01304S2sSliRpQ0=";
+    hash = "sha256-DA949hZogSY3KkLSeILvB5Ay6rXZoLe8ndbOtagTtvM=";
   };
 
   build-system = [ setuptools ];
@@ -40,8 +40,8 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Module for local communication with LIFX devices over a LAN";
-    homepage = "https://github.com/frawau/aiolifx";
-    changelog = "https://github.com/frawau/aiolifx/releases/tag/${version}";
+    homepage = "https://github.com/aiolifx/aiolifx";
+    changelog = "https://github.com/aiolifx/aiolifx/releases/tag/${version}";
     license = licenses.mit;
     maintainers = with maintainers; [ netixx ];
     mainProgram = "aiolifx";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiomqtt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiomqtt/default.nix
index 6e074397fa..69963a4650 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/aiomqtt/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/aiomysql/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiomysql/default.nix
index 093b6f0b96..62abc53330 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/aiomysql/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/aiorun/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiorun/default.nix
index 318411ae9a..26d02803c4 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/aiorun/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/aiorwlock/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiorwlock/default.nix
index 1a1de43c08..f5033ae343 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/aiorwlock/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/aiorwlock/default.nix
@@ -3,7 +3,6 @@
   fetchPypi,
   lib,
   pytest-asyncio,
-  pytest-cov,
   pytestCheckHook,
 }:
 
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiosqlite/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiosqlite/default.nix
index 3bad4e1870..4fdd1c6a67 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/aiosqlite/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/aiounifi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiounifi/default.nix
index 41b58f12fb..b9c3534c36 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/aiounifi/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/albumentations/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/albumentations/default.nix
index 570f6aedfc..a7bc2d5251 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/albumentations/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/albumentations/default.nix
@@ -16,8 +16,6 @@
   pyyaml,
   scikit-image,
   scikit-learn,
-  scipy,
-  typing-extensions,
 
   deepdiff,
   pytestCheckHook,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/alembic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/alembic/default.nix
index 039f03baac..4d41cc11a6 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/alembic/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/androguard/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/androguard/default.nix
index cc1789963e..c5a4300736 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/androguard/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/androguard/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  setuptools,
   future,
   networkx,
   pygments,
@@ -12,11 +13,9 @@
   click,
   pydot,
   ipython,
-  packaging,
   pyqt5,
   pyperclip,
-  nose,
-  nose-timer,
+  pytestCheckHook,
   mock,
   python-magic,
   codecov,
@@ -25,15 +24,16 @@
   # This is usually used as a library, and it'd be a shame to force the GUI
   # libraries to the closure if GUI is not desired.
   withGui ? false,
-  # Tests take a very long time, and currently fail, but next release' tests
-  # shouldn't fail
-  doCheck ? false,
+  # Deprecated in 24.11.
+  doCheck ? true,
 }:
 
+assert lib.warnIf (!doCheck) "python3Packages.androguard: doCheck is deprecated" true;
+
 buildPythonPackage rec {
   pname = "androguard";
   version = "3.4.0a1";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     repo = pname;
@@ -42,9 +42,16 @@ buildPythonPackage rec {
     sha256 = "1aparxiq11y0hbvkayp92w684nyxyyx7mi0n1x6x51g5z6c58vmy";
   };
 
-  nativeBuildInputs = [ packaging ] ++ lib.optionals withGui [ qt5.wrapQtAppsHook ];
+  patches = [
+    ./drop-removed-networkx-formats.patch
+    ./fix-tests.patch
+  ];
 
-  propagatedBuildInputs =
+  build-system = [ setuptools ];
+
+  nativeBuildInputs = lib.optionals withGui [ qt5.wrapQtAppsHook ];
+
+  dependencies =
     [
       asn1crypto
       click
@@ -57,29 +64,25 @@ buildPythonPackage rec {
       pydot
       pygments
     ]
+    ++ networkx.optional-dependencies.default
+    ++ networkx.optional-dependencies.extra
     ++ lib.optionals withGui [
       pyqt5
       pyperclip
     ];
 
   nativeCheckInputs = [
+    pytestCheckHook
     codecov
     coverage
     mock
-    nose
-    nose-timer
     pyperclip
     pyqt5
     python-magic
   ];
-  inherit doCheck;
 
   # If it won't be verbose, you'll see nothing going on for a long time.
-  checkPhase = ''
-    runHook preCheck
-    nosetests --verbosity=3
-    runHook postCheck
-  '';
+  pytestFlagsArray = [ "--verbose" ];
 
   preFixup = lib.optionalString withGui ''
     makeWrapperArgs+=("''${qtWrapperArgs[@]}")
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/androguard/drop-removed-networkx-formats.patch b/third_party/nixpkgs/pkgs/development/python-modules/androguard/drop-removed-networkx-formats.patch
new file mode 100644
index 0000000000..214fbaa2da
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/androguard/drop-removed-networkx-formats.patch
@@ -0,0 +1,14 @@
+diff --git a/androguard/cli/main.py b/androguard/cli/main.py
+index 13bc1d0ab7..a79b4fe5fa 100644
+--- a/androguard/cli/main.py
++++ b/androguard/cli/main.py
+@@ -110,9 +110,7 @@
+ 
+     write_methods = dict(gml=_write_gml,
+                          gexf=nx.write_gexf,
+-                         gpickle=nx.write_gpickle,
+                          graphml=nx.write_graphml,
+-                         yaml=nx.write_yaml,
+                          net=nx.write_pajek,
+                          )
+ 
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/androguard/fix-tests.patch b/third_party/nixpkgs/pkgs/development/python-modules/androguard/fix-tests.patch
new file mode 100644
index 0000000000..b971b46c62
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/androguard/fix-tests.patch
@@ -0,0 +1,13 @@
+diff --git a/tests/test_types.py b/tests/test_types.py
+index 127dfc20eb..f1c89f0712 100644
+--- a/tests/test_types.py
++++ b/tests/test_types.py
+@@ -182,7 +182,7 @@
+             for i in filter(lambda x: 'const' in x.get_name(), method.get_instructions()):
+                 i.show(0)
+                 # ins should only have one literal
+-                self.assertEquals(len(i.get_literals()), 1)
++                self.assertEqual(len(i.get_literals()), 1)
+ 
+                 fmt, value = VALUES[method.full_name].pop(0)
+                 converted = format_value(i.get_literals()[0], i, fmt)
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ansible-navigator/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ansible-navigator/default.nix
index 5d767a4fab..96e6330f38 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/ansible-navigator/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/ansible-navigator/default.nix
@@ -3,7 +3,6 @@
   pkgs,
   python3Packages,
   podman,
-  oniguruma,
   fetchPypi,
   buildPythonPackage,
 }:
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ansible-runner/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ansible-runner/default.nix
index 0c6ed904a4..746877f57e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/ansible-runner/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/ansible/core.nix b/third_party/nixpkgs/pkgs/development/python-modules/ansible/core.nix
index 8caf7e1e62..9a83bfebd7 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/ansible/core.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/ansible/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ansible/default.nix
index 2dd2567589..cf484c1f07 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/ansible/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/ansicolor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ansicolor/default.nix
index 95f78fcec2..83f3b3207e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/ansicolor/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/ansimarkup/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ansimarkup/default.nix
index 2f0a1f8501..8be72615a2 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/ansimarkup/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/ansiwrap/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ansiwrap/default.nix
index c80d24d1c9..f45f8c0cca 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/ansiwrap/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/anthropic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/anthropic/default.nix
index ad79271688..ed26deaabd 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/anthropic/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/apipkg/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/apipkg/default.nix
index e3cf3a0c77..60a34a3e03 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/apipkg/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/apispec/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/apispec/default.nix
index f64100ce67..2ca9be416c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/apispec/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/apispec/default.nix
@@ -11,7 +11,6 @@
   pytestCheckHook,
   pythonOlder,
   pyyaml,
-  setuptools,
 }:
 
 buildPythonPackage rec {
@@ -51,6 +50,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/third_party/nixpkgs/pkgs/development/python-modules/applicationinsights/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/applicationinsights/default.nix
index b199051111..a4329ff4dc 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/applicationinsights/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/apprise/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/apprise/default.nix
index 76396668ae..657537bbc5 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/apprise/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/approvaltests/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/approvaltests/default.nix
index 598ad64870..2b3ed4f45c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/approvaltests/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/apscheduler/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/apscheduler/default.nix
index 6d038d28ec..d409a535b4 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/apscheduler/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/aresponses/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aresponses/default.nix
index f5d268fcf2..5c8c98177b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/aresponses/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/argon2-cffi-bindings/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/argon2-cffi-bindings/default.nix
index c3abfb0c28..0df49f5835 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/argon2-cffi-bindings/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/asana/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asana/default.nix
index f63bd17297..60aa3520e7 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/asana/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/asdf-astropy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asdf-astropy/default.nix
index 1ee09ad983..a883fc87af 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/asdf-astropy/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/asdf-astropy/default.nix
@@ -15,8 +15,6 @@
   scipy,
   setuptools-scm,
   setuptools,
-  tomli,
-  wheel,
 }:
 
 buildPythonPackage rec {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asdf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asdf/default.nix
index 09e00d7ae8..6e936c6635 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/asdf/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/ase/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ase/default.nix
index f99b201842..326d51f55a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/ase/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/asgiref/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asgiref/default.nix
index 10cfbf571b..fecc4b98f4 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/asgiref/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/asgiref/default.nix
@@ -10,7 +10,7 @@
 }:
 
 buildPythonPackage rec {
-  version = "3.7.2";
+  version = "3.8.1";
   pname = "asgiref";
   format = "setuptools";
 
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "django";
     repo = "asgiref";
     rev = "refs/tags/${version}";
-    hash = "sha256-VW1PBh6+nLMD7qxmL83ymuxCPYKVY3qGKsB7ZiMqMu8=";
+    hash = "sha256-xepMbxglBpHL7mnJYlnvNUgixrFwf/Tc6b1zL4Wy+to=";
   };
 
   propagatedBuildInputs = [ typing-extensions ];
@@ -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/third_party/nixpkgs/pkgs/development/python-modules/asn1tools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asn1tools/default.nix
index 4895e713cd..cd0b3a0895 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/asn1tools/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/aspell-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aspell-python/default.nix
index 37c708bed5..3f66a9a2bf 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/aspell-python/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/astropy-iers-data/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/astropy-iers-data/default.nix
index 9d7a88369a..e1cdd1febe 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/astropy-iers-data/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/asyncarve/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asyncarve/default.nix
new file mode 100644
index 0000000000..dc760169c2
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/asyncssh/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asyncssh/default.nix
index 1b77638073..427178dfa0 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/asyncssh/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/atom/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/atom/default.nix
index 3e7bb3e990..f858eb07be 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/atom/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/atom/default.nix
@@ -3,7 +3,6 @@
   buildPythonPackage,
   fetchFromGitHub,
   setuptools-scm,
-  future,
   cppy,
   pytestCheckHook,
   pythonOlder,
@@ -11,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "atom";
-  version = "0.10.4";
+  version = "0.10.5";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -20,7 +19,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/third_party/nixpkgs/pkgs/development/python-modules/atomman/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/atomman/default.nix
index 6728f39269..9974661182 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/atomman/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/atomman/default.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  ase,
   buildPythonPackage,
   cython,
   datamodeldict,
@@ -11,35 +10,31 @@
   pandas,
   phonopy,
   potentials,
-  pymatgen,
   pytestCheckHook,
   pythonOlder,
   requests,
   scipy,
   setuptools,
   toolz,
-  wheel,
   xmltodict,
 }:
 
-buildPythonPackage {
+buildPythonPackage rec {
   pname = "atomman";
-  version = "1.4.6-unstable-2023-07-28";
+  version = "1.4.11";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "usnistgov";
     repo = "atomman";
-    rev = "b8af21a9285959d38ee26173081db1b4488401bc";
-    hash = "sha256-WfB+OY61IPprT6OCVHl8VA60p7lLVkRGuyYX+nm7bbA=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-2yxHv9fSgLM5BeUkXV9NX+xyplXtyfWodwS9sVUVzqU=";
   };
 
-
   build-system = [
     setuptools
-    wheel
     numpy
     cython
   ];
@@ -57,7 +52,7 @@ buildPythonPackage {
     xmltodict
   ];
 
-  pythonRelaxDeps = [ "potentials" ];
+  pythonRelaxDeps = [ "atomman" ];
 
   preCheck = ''
     # By default, pytestCheckHook imports atomman from the current directory
@@ -68,9 +63,7 @@ buildPythonPackage {
   '';
 
   nativeCheckInputs = [
-    ase
     phonopy
-    pymatgen
     pytestCheckHook
   ];
 
@@ -81,9 +74,10 @@ buildPythonPackage {
   pythonImportsCheck = [ "atomman" ];
 
   meta = with lib; {
+    changelog = "https://github.com/usnistgov/atomman/blob/${src.rev}/UPDATES.rst";
     description = "Atomistic Manipulation Toolkit";
     homepage = "https://github.com/usnistgov/atomman/";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/attrdict/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/attrdict/default.nix
index c6d6352559..b20f0065df 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/attrdict/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/attrs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/attrs/default.nix
index 6a9884beca..96d6b5d0c9 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/attrs/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/aubio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aubio/default.nix
index a5b03baad8..88d2d9af34 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/aubio/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/audiotools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/audiotools/default.nix
index 4bd7594b5f..a6b485d7b2 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/audiotools/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/auditok/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/auditok/default.nix
index cad60d8619..d6735c9c79 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/auditok/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/auth0-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/auth0-python/default.nix
index 69d4fdedfd..b292153e7d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/auth0-python/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/authheaders/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/authheaders/default.nix
index 77df68b23c..ed3a469d31 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/authheaders/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/autobahn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/autobahn/default.nix
index 1efc211fcc..08187be3a2 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/autobahn/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/autocommand/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/autocommand/default.nix
index fd4a0f22d4..8df21385cf 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/autocommand/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/automat/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/automat/default.nix
index af707983b5..05d612256e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/automat/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/av/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/av/default.nix
index c126a8ab1f..e50028415d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/av/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/av/default.nix
@@ -4,8 +4,9 @@
   buildPythonPackage,
   cython,
   fetchFromGitHub,
-  fetchpatch,
-  ffmpeg_5-headless,
+  fetchurl,
+  linkFarm,
+  ffmpeg_6-headless,
   numpy,
   pillow,
   pkg-config,
@@ -16,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "av";
-  version = "11.0.0";
+  version = "12.2.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -25,30 +26,29 @@ buildPythonPackage rec {
     owner = "mikeboers";
     repo = "PyAV";
     rev = "refs/tags/v${version}";
-    hash = "sha256-pCKP+4ZmZCJcG7/Qy9H6aS4svQdgaRA9S1QVNWFYhSQ=";
+    hash = "sha256-yPVAtL71pL/ok3bli+r/IruCrmmhNyv98pr7z3m8sbo=";
   };
 
-  patches = [
-    # merged upstream PR: https://github.com/PyAV-Org/PyAV/pull/1387
-    (fetchpatch {
-      name = "use-pkg-config-env-var-fix-cross.patch";
-      url = "https://github.com/PyAV-Org/PyAV/commit/ba7a2c9f716af506838d399e6ed27ed6d64d2435.patch";
-      sha256 = "sha256-oH+g8sVoVCQe6DimRN38VT2GdziriwHYRAhldNxz9/E=";
-    })
-  ];
-
   nativeBuildInputs = [
     cython
     pkg-config
     setuptools
   ];
 
-  buildInputs = [ ffmpeg_5-headless ];
+  buildInputs = [ ffmpeg_6-headless ];
 
-  preCheck = ''
-    # ensure we import the built version
-    rm -r av
-  '';
+  preCheck =
+    let
+      # Update with `./update-test-samples.bash` if necessary.
+      testSamples = linkFarm "pyav-test-samples" (
+        lib.mapAttrs (_: fetchurl) (lib.importTOML ./test-samples.toml)
+      );
+    in
+    ''
+      # ensure we import the built version
+      rm -r av
+      ln -s ${testSamples} tests/assets
+    '';
 
   nativeCheckInputs = [
     numpy
@@ -56,61 +56,13 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  disabledTests =
-    [
-      # urlopen fails during DNS resolution
-      "test_writing_to_custom_io"
-      "test_decode_close_then_use"
-      # Tests that want to download FATE data, https://github.com/PyAV-Org/PyAV/issues/955
-      "test_vobsub"
-      "test_transcode"
-      "test_stream_tuples"
-      "test_stream_seek"
-      "test_stream_probing"
-      "test_seek_start"
-      "test_seek_middle"
-      "test_seek_int64"
-      "test_seek_float"
-      "test_seek_end"
-      "test_roundtrip"
-      "test_reading_from_write_readonl"
-      "test_reading_from_pipe_readonly"
-      "test_reading_from_file"
-      "test_reading_from_buffer"
-      "test_reading_from_buffer_no_see"
-      "test_parse"
-      "test_movtext"
-      "test_encoding_xvid"
-      "test_encoding_tiff"
-      "test_encoding_png"
-      "test_encoding_pcm_s24le"
-      "test_encoding_mpeg4"
-      "test_encoding_mpeg1video"
-      "test_encoding_mp2"
-      "test_encoding_mjpeg"
-      "test_encoding_h264"
-      "test_encoding_dvvideo"
-      "test_encoding_dnxhd"
-      "test_encoding_aac"
-      "test_decoded_video_frame_count"
-      "test_decoded_time_base"
-      "test_decoded_motion_vectors"
-      "test_decode_half"
-      "test_decode_audio_sample_count"
-      "test_data"
-      "test_container_probing"
-      "test_codec_tag"
-      "test_selection"
-    ]
-    ++ lib.optionals (stdenv.isDarwin) [
-      # Segmentation Faults
-      "test_encoding_with_pts"
-      "test_bayer_write"
-    ];
+  disabledTests = [
+    # av.error.InvalidDataError: [Errno 1094995529] Invalid data found when processing input: 'custom_io_output.mpd'
+    "test_writing_to_custom_io_dash"
+  ];
 
-  disabledTestPaths = [
-    # urlopen fails during DNS resolution
-    "tests/test_doctests.py"
+  # `__darwinAllowLocalNetworking` doesn’t work for these; not sure why.
+  disabledTestPaths = lib.optionals stdenv.isDarwin [
     "tests/test_timeout.py"
   ];
 
@@ -146,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/third_party/nixpkgs/pkgs/development/python-modules/av/test-samples.toml b/third_party/nixpkgs/pkgs/development/python-modules/av/test-samples.toml
new file mode 100644
index 0000000000..cdc1d93362
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/av/test-samples.toml
@@ -0,0 +1,17 @@
+"fate-suite/aac/latm_stereo_to_51.ts" = { url = "http://fate.ffmpeg.org/fate-suite/aac/latm_stereo_to_51.ts", hash = "sha256-lVz0iby2IEUVdwKYamv4HVm8EUGHJS/cWY+QFBMaCBY=" }
+"fate-suite/amv/MTV_high_res_320x240_sample_Penguin_Joke_MTV_from_WMV.amv" = { url = "http://fate.ffmpeg.org/fate-suite/amv/MTV_high_res_320x240_sample_Penguin_Joke_MTV_from_WMV.amv", hash = "sha256-O9YMj0+0bM4YyZNGgkZJL8E2aG+Y3lq8/c+DVht0McI=" }
+"fate-suite/audio-reference/chorusnoise_2ch_44kHz_s16.wav" = { url = "http://fate.ffmpeg.org/fate-suite/audio-reference/chorusnoise_2ch_44kHz_s16.wav", hash = "sha256-KodB5hQkBFtfkI+L7hnkSonPM+IuOCNrTV3Vsy1bvhs=" }
+"fate-suite/h264/interlaced_crop.mp4" = { url = "http://fate.ffmpeg.org/fate-suite/h264/interlaced_crop.mp4", hash = "sha256-SVWWaOcfOp718dvgkpgOWCYoV9Ylomv8MBYzbRqvbBE=" }
+"fate-suite/hap/HAPQA_NoSnappy_127x1.mov" = { url = "http://fate.ffmpeg.org/fate-suite/hap/HAPQA_NoSnappy_127x1.mov", hash = "sha256-WMUqg9o84ki2AIIsGhY8P10KBc3qgCsmljqJXXRHbs8=" }
+"fate-suite/mkv/codec_delay_opus.mkv" = { url = "http://fate.ffmpeg.org/fate-suite/mkv/codec_delay_opus.mkv", hash = "sha256-GanpfRyGKN36NLAa7pZehcM1F2VDCW3g6hhO26vFg1I=" }
+"fate-suite/mov/displaymatrix.mov" = { url = "http://fate.ffmpeg.org/fate-suite/mov/displaymatrix.mov", hash = "sha256-Aq0/zcKKHI2dgThIKfYMXCjNI6WoVwy7VtD5Bke6krQ=" }
+"fate-suite/mov/mov-1elist-ends-last-bframe.mov" = { url = "http://fate.ffmpeg.org/fate-suite/mov/mov-1elist-ends-last-bframe.mov", hash = "sha256-1g488WPvvzzeHXoQg7xZnrVCoGCz7sOUSpzZj6qWnhI=" }
+"fate-suite/mov/white_zombie_scrunch-part.mov" = { url = "http://fate.ffmpeg.org/fate-suite/mov/white_zombie_scrunch-part.mov", hash = "sha256-apoPuBxsjqkjCaSdtgTJhpYFXMp5LbtZQz+lo3o9jx8=" }
+"fate-suite/mpeg2/mpeg2_field_encoding.ts" = { url = "http://fate.ffmpeg.org/fate-suite/mpeg2/mpeg2_field_encoding.ts", hash = "sha256-logzOhRbniwhObnKts1JZqzRl4j9YgtLMdtcKJFUfLg=" }
+"fate-suite/mxf/track_01_v02.mxf" = { url = "http://fate.ffmpeg.org/fate-suite/mxf/track_01_v02.mxf", hash = "sha256-AQ+UxFVfBgQwbEtoMautd02BL5kC6pAbsXD3SVRd9xE=" }
+"fate-suite/png1/55c99e750a5fd6_50314226.png" = { url = "http://fate.ffmpeg.org/fate-suite/png1/55c99e750a5fd6_50314226.png", hash = "sha256-yADmkBgeMB5wv140gwnaDMjvErRTXZhXdBz02HZSMBc=" }
+"fate-suite/qtrle/aletrek-rle.mov" = { url = "http://fate.ffmpeg.org/fate-suite/qtrle/aletrek-rle.mov", hash = "sha256-uXUvVkwuPbfs/rzT896ty3RZfvGoSPj3su+sjLPU09g=" }
+"fate-suite/sub/MovText_capability_tester.mp4" = { url = "http://fate.ffmpeg.org/fate-suite/sub/MovText_capability_tester.mp4", hash = "sha256-Y2uhvfGrZaPebD6ZsJemzpOk+XHX6ukBceVauEit9h8=" }
+"fate-suite/sub/vobsub.sub" = { url = "http://fate.ffmpeg.org/fate-suite/sub/vobsub.sub", hash = "sha256-X2rEMyTlo1xuUlqgx2uvqd2WWhfOCID9fraeGbaFPIs=" }
+"pyav-curated/pexels/time-lapse-video-of-night-sky-857195.mp4" = { url = "https://pyav.org/datasets/pexels/time-lapse-video-of-night-sky-857195.mp4", hash = "sha256-6307VwepfoVNKeGm8WEMZtfowJZ27Hv2fwgp6J/Q0oE=" }
+"pyav-curated/pexels/time-lapse-video-of-sunset-by-the-sea-854400.mp4" = { url = "https://pyav.org/datasets/pexels/time-lapse-video-of-sunset-by-the-sea-854400.mp4", hash = "sha256-2RWphhz5KWPSnJh8ARrC7aPjBa77DJO1Fv0/I4kWxYg=" }
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/av/update-test-samples.bash b/third_party/nixpkgs/pkgs/development/python-modules/av/update-test-samples.bash
new file mode 100755
index 0000000000..5b0b1966d4
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/av/update-test-samples.bash
@@ -0,0 +1,44 @@
+#!/usr/bin/env bash
+
+set -o errexit
+set -o nounset
+
+if test "$#" != 1; then
+  printf >&2 'usage: update-test-samples.bash /path/to/PyAV/source\n'
+  exit 2
+fi
+
+pyav_source=$1
+
+exec > "$(dirname "$(readlink -f "$0")")/test-samples.toml"
+
+fetch() {
+  path=$1
+  url=$2
+  prefetch_json=$(nix store prefetch-file --json "${url}")
+  sri_hash=$(jq -r .hash <<< "${prefetch_json}")
+  printf '"%s" = { url = "%s", hash = "%s" }\n' "${path}" "${url}" "${sri_hash}"
+}
+
+fetch_all() {
+  function=$1
+  base_path=$2
+  base_url=$3
+
+  samples=$(
+    rg \
+      --only-matching \
+      --no-filename \
+      "\\b${function}\\([\"']([^\"']+)[\"']\\)" \
+      --replace '$1' \
+      "${pyav_source}"
+  )
+  unique_samples=$(sort -u <<< "${samples}")
+
+  while IFS= read -r sample; do
+    fetch "${base_path}/${sample}" "${base_url}/${sample}"
+  done <<< "${unique_samples}"
+}
+
+fetch_all fate_suite fate-suite "http://fate.ffmpeg.org/fate-suite"
+fetch_all curated pyav-curated "https://pyav.org/datasets"
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aws-sam-translator/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aws-sam-translator/default.nix
index e672317cc7..c36c24553e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/aws-sam-translator/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/aws-xray-sdk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aws-xray-sdk/default.nix
index 418a938dc7..6774d1fefc 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/aws-xray-sdk/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/awswrangler/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/awswrangler/default.nix
index b2766add2d..6ad84623a6 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/awswrangler/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/awswrangler/default.nix
@@ -1,5 +1,4 @@
 {
-  backoff,
   sparqlwrapper,
   boto3,
   buildPythonPackage,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-appconfiguration/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-appconfiguration/default.nix
index 7fb7cda0d3..33f24c827f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/azure-appconfiguration/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/azure-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-core/default.nix
index d5bc90eaf5..67178fac58 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/azure-core/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/azure-cosmos/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-cosmos/default.nix
index 71e97c27e8..aea8112015 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/azure-cosmos/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/azure-data-tables/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-data-tables/default.nix
index 7e030a049f..7b2dd03ad0 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/azure-data-tables/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/azure-functions-devops-build/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-functions-devops-build/default.nix
index 1b1683d5bf..a07ca228b9 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/azure-functions-devops-build/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/azure-keyvault-administration/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-keyvault-administration/default.nix
index 83ac87a09e..f8bf2b1c83 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/azure-keyvault-administration/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/azure-keyvault-certificates/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-keyvault-certificates/default.nix
index 61d295e1b1..66e16fbee1 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/azure-keyvault-certificates/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/azure-keyvault-keys/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-keyvault-keys/default.nix
index 2cf1f5a023..54200ab0e0 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/azure-keyvault-keys/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/azure-keyvault-secrets/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-keyvault-secrets/default.nix
index b9766e0a93..916897d5bf 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/azure-keyvault-secrets/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/azure-keyvault/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-keyvault/default.nix
index 895ba9f289..8b6a3524a0 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/azure-keyvault/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-apimanagement/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-apimanagement/default.nix
index de7c2fa6bb..5262587ba1 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-apimanagement/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix
index 4415da9527..9fc23174d6 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-appconfiguration/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-botservice/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-botservice/default.nix
index f29c1c1ad2..12379092c4 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-botservice/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix
index 3b0c9ecfe2..aa25c6ad0e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerinstance/default.nix
@@ -6,7 +6,6 @@
   msrestazure,
   azure-common,
   azure-mgmt-core,
-  azure-mgmt-nspkg,
   pythonOlder,
 }:
 
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix
index 98f652cf1f..aa05085d19 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix
index 0244ab07e7..68d45218f7 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix
@@ -2,7 +2,6 @@
   lib,
   azure-common,
   azure-mgmt-core,
-  azure-mgmt-nspkg,
   buildPythonPackage,
   fetchPypi,
   isodate,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-core/default.nix
index 5dc2f51e7f..62b1b1cc28 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-core/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-databoxedge/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-databoxedge/default.nix
index 2d486d0156..0d3d97aa0b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-databoxedge/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-deploymentmanager/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-deploymentmanager/default.nix
index de759e933b..6370b33bd3 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-deploymentmanager/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-deploymentmanager/default.nix
@@ -5,7 +5,6 @@
   buildPythonPackage,
   fetchPypi,
   msrest,
-  msrestazure,
   pythonOlder,
   setuptools,
 }:
@@ -44,6 +43,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/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-extendedlocation/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-extendedlocation/default.nix
index ba9c4cacb4..b24b2e0d3c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-extendedlocation/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix
index 4a80dc7e36..2007e304f3 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-imagebuilder/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-imagebuilder/default.nix
index d919e7c616..f565ddcd76 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-imagebuilder/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-kusto/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-kusto/default.nix
index 186258f84a..9892b1c34d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-kusto/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-managedservices/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-managedservices/default.nix
index aa2f41d6f7..61f8804afa 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-managedservices/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-netapp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-netapp/default.nix
index 8490dd2888..8d12b418a1 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-netapp/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-privatedns/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-privatedns/default.nix
index 20bed84580..9e3f437ced 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-privatedns/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-redhatopenshift/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-redhatopenshift/default.nix
index 02208c8265..33ac1de82d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-redhatopenshift/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-security/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-security/default.nix
index ea1eeecdef..d28b485bfc 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-security/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-servicefabricmanagedclusters/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-servicefabricmanagedclusters/default.nix
index 8ed3ef2a37..f506c38f2f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-servicefabricmanagedclusters/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-servicelinker/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-servicelinker/default.nix
index e38d0f6cc1..16b8fd1a9f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-servicelinker/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-sqlvirtualmachine/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-sqlvirtualmachine/default.nix
index 34a562f4e4..8a17230abf 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-sqlvirtualmachine/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-synapse/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-synapse/default.nix
index dbf4388710..a544959940 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-synapse/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/azure-multiapi-storage/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-multiapi-storage/default.nix
index 7308578dfd..994394d3ae 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/azure-multiapi-storage/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/azure-search-documents/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-search-documents/default.nix
index 63672e0c69..b6c26610b2 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/azure-search-documents/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-search-documents/default.nix
@@ -6,7 +6,6 @@
   azure-common,
   azure-core,
   isodate,
-  pytestCheckHook,
 }:
 
 buildPythonPackage rec {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-storage-file-share/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-storage-file-share/default.nix
index 12d69e33ac..9a3ed6f0a1 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/azure-storage-file-share/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-storage-file-share/default.nix
@@ -5,7 +5,6 @@
   cryptography,
   fetchPypi,
   isodate,
-  msrest,
   pythonOlder,
   setuptools,
   typing-extensions,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-synapse-accesscontrol/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-synapse-accesscontrol/default.nix
index a3b59c446c..0e3b8ce8c4 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/azure-synapse-accesscontrol/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/azure-synapse-artifacts/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-synapse-artifacts/default.nix
index 45150bfc85..a952c215ab 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/azure-synapse-artifacts/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/azure-synapse-managedprivateendpoints/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-synapse-managedprivateendpoints/default.nix
index 829577e636..dfceb84958 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/azure-synapse-managedprivateendpoints/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/azure-synapse-spark/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-synapse-spark/default.nix
index fbb9233538..8c6e244e37 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/azure-synapse-spark/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/b2sdk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/b2sdk/default.nix
index 5c67b77e78..3bcca268da 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/b2sdk/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/babelfish/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/babelfish/default.nix
index 64cd431822..9c7a990cbc 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/babelfish/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/babelgladeextractor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/babelgladeextractor/default.nix
index e0b4d3c8eb..901f4e1e02 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/babelgladeextractor/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/backports-datetime-fromisoformat/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/backports-datetime-fromisoformat/default.nix
index d79b11eeb6..a9aa34ec01 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/backports-datetime-fromisoformat/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/backports-entry-points-selectable/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/backports-entry-points-selectable/default.nix
index 9a0baed50a..7e5046f6b6 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/backports-entry-points-selectable/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/backports-tarfile/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/backports-tarfile/default.nix
index 1b1c7790a9..49c5c7458c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/backports-tarfile/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/backports-zoneinfo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/backports-zoneinfo/default.nix
index 5c525685d6..8dbefd22d2 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/backports-zoneinfo/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/base2048/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/base2048/default.nix
index 3f8ecf0c58..e092fecc1c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/base2048/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/base2048/default.nix
@@ -6,7 +6,6 @@
   fetchFromGitHub,
   frelatage,
   libiconv,
-  maturin,
   pytestCheckHook,
   pythonOlder,
   rustc,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/basemap-data/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/basemap-data/default.nix
index 17963e1da7..f50feac37d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/basemap-data/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/basemap-data/default.nix
@@ -1,16 +1,7 @@
 {
   lib,
   buildPythonPackage,
-  pythonAtLeast,
   basemap,
-  cython,
-  geos,
-  numpy,
-  matplotlib,
-  pyproj,
-  pyshp,
-  python,
-  setuptools,
 }:
 
 buildPythonPackage rec {
@@ -32,6 +23,6 @@ buildPythonPackage rec {
       mit
       lgpl3Plus
     ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/basemap/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/basemap/default.nix
index 74759f2a0d..7e435d08fa 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/basemap/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/basemap/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonAtLeast,
   basemap-data,
   cython,
   geos,
@@ -68,7 +67,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/third_party/nixpkgs/pkgs/development/python-modules/batchspawner/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/batchspawner/default.nix
index d1844aaa14..c9499f7c34 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/batchspawner/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/baycomp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/baycomp/default.nix
index 3eb45a2808..34a7a81333 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/baycomp/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/baycomp/default.nix
@@ -4,7 +4,6 @@
   fetchPypi,
   numpy,
   scipy,
-  scikit-learn,
   matplotlib,
   unittestCheckHook,
 }:
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bcrypt/3.nix b/third_party/nixpkgs/pkgs/development/python-modules/bcrypt/3.nix
index 86b9361ff4..7d0f423527 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/bcrypt/3.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/bcrypt/3.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   setuptools,
-  isPyPy,
   fetchPypi,
   pythonOlder,
   cffi,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/before-after/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/before-after/default.nix
index 6756580f5a..c1dce2b1a4 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/before-after/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/bencode-py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bencode-py/default.nix
index 7221c1e42c..3620f34fa7 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/bencode-py/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/bencode-py/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchPypi,
-  python,
   pbr,
   pytestCheckHook,
 }:
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bencoder/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bencoder/default.nix
index 9715882823..f8be50a99e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/bencoder/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/bencoder/default.nix
@@ -2,7 +2,6 @@
   lib,
   fetchPypi,
   buildPythonPackage,
-  setuptools,
 }:
 buildPythonPackage rec {
   pname = "bencoder";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bids-validator/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bids-validator/default.nix
index 8a3ebaf0b6..f954d7c4ab 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/bids-validator/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/billiard/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/billiard/default.nix
index 8162c9fe5e..d3358fe645 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/billiard/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/binary/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/binary/default.nix
index 93cb6d24da..ef2135e83f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/binary/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/binary/default.nix
@@ -35,6 +35,6 @@ buildPythonPackage rec {
       asl20
       mit
     ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/biopandas/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/biopandas/default.nix
index be59f3638d..998974d90e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/biopandas/default.nix
+++ b/third_party/nixpkgs/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,14 +50,7 @@ buildPythonPackage rec {
     looseversion
   ];
 
-  # tests rely on nose
-  # resolved in 0.5.1: https://github.com/BioPandas/biopandas/commit/67aa2f237c70c826cd9ab59d6ae114582da2112f
-  doCheck = pythonOlder "3.12";
-
-  nativeCheckInputs = [
-    nose
-    pytestCheckHook
-  ];
+  nativeCheckInputs = [ pytestCheckHook ];
 
   disabledTests = [
     # require network access
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bitbox02/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bitbox02/default.nix
index 0217979d31..69b2b258e1 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/bitbox02/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/blinker/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/blinker/default.nix
index 72cb3205e1..c32e23e56a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/blinker/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/blockdiag/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/blockdiag/default.nix
index 8b43fd2c90..7acdf490ac 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/blockdiag/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/blockdiag/default.nix
@@ -5,9 +5,9 @@
   ephem,
   fetchFromGitHub,
   fetchpatch,
+  fetchpatch2,
   funcparserlib,
   pillow,
-  nose,
   pytestCheckHook,
   pythonOlder,
   reportlab,
@@ -36,8 +36,21 @@ buildPythonPackage rec {
       url = "https://github.com/blockdiag/blockdiag/commit/20d780cad84e7b010066cb55f848477957870165.patch";
       hash = "sha256-t1zWFzAsLL2EUa0nD4Eui4Y5AhAZLRmp/yC9QpzzeUA=";
     })
+    # https://github.com/blockdiag/blockdiag/pull/175
+    (fetchpatch2 {
+      name = "migrate-to-pytest.patch";
+      url = "https://github.com/blockdiag/blockdiag/commit/4f4f726252084f17ecc6c524592222af09d37da4.patch";
+      hash = "sha256-OkfKJwJtb2DJRXE/8thYnisTFwcfstUFTTJHdM/qBzg=";
+    })
   ];
 
+  postPatch = ''
+    # requires network access the url-based icon
+    # and path-based icon is set to debian logo (/usr/share/pixmaps/debian-logo.png)
+    rm src/blockdiag/tests/diagrams/node_icon.diag
+    # note: this is a postPatch as `seqdiag` uses them directly
+  '';
+
   build-system = [ setuptools ];
 
   dependencies = [
@@ -48,12 +61,8 @@ buildPythonPackage rec {
     webcolors
   ];
 
-  # tests rely on nose
-  doCheck = pythonOlder "3.12";
-
   nativeCheckInputs = [
     ephem
-    nose
     pytestCheckHook
   ];
 
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/boltztrap2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/boltztrap2/default.nix
index 16e9c8f76d..a9a437af05 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/boltztrap2/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/boolean-py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/boolean-py/default.nix
index 8fd6b60311..fde2993613 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/boolean-py/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/boto/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/boto/default.nix
index 9d676c3612..0d352c9e2c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/boto/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/boto/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchPypi,
-  pythonAtLeast,
   python,
   nose,
   mock,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/botorch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/botorch/default.nix
index 06f0922af4..9a5d003475 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/botorch/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/botorch/default.nix
@@ -32,7 +32,7 @@ buildPythonPackage rec {
     wheel
   ];
 
-  dependenciess = [
+  dependencies = [
     gpytorch
     linear-operator
     multipledispatch
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bottleneck/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bottleneck/default.nix
index 8b84fc8c12..18aa852cd7 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/bottleneck/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/bpycv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bpycv/default.nix
index a04cb8c79d..97fd086b1f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/bpycv/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/bpycv/default.nix
@@ -4,16 +4,13 @@
   beautifulsoup4,
   blender,
   boxx,
-  bpycv,
   buildPythonPackage,
   fetchFromGitHub,
   fetchPypi,
   minexr,
   opencv4,
-  python3Packages,
   requests,
   runCommand,
-  writeText,
   zcs,
 }:
 
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bpython/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bpython/default.nix
index e6dd4a3f08..15f562185e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/bpython/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/bpython/default.nix
@@ -12,7 +12,6 @@
   pyperclip,
   pyxdg,
   requests,
-  substituteAll,
   typing-extensions,
   urwid,
   watchdog,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bracex/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bracex/default.nix
index 7e341d4c1c..547adcd099 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/bracex/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/branca/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/branca/default.nix
index 4c16cd2a88..aca3fcd645 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/branca/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/breathe/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/breathe/default.nix
index d9033c4fd3..2281fbe3b3 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/breathe/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/brelpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/brelpy/default.nix
index 96e0d47265..b5edbe1e1a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/brelpy/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/brelpy/default.nix
@@ -3,7 +3,6 @@
   buildPythonPackage,
   fetchPypi,
   pycryptodome,
-  pygithub,
   pythonOlder,
 }:
 
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bring-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bring-api/default.nix
index 479e8b5884..596b173151 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/bring-api/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/bring-api/default.nix
@@ -13,16 +13,16 @@
 
 buildPythonPackage rec {
   pname = "bring-api";
-  version = "0.7.3";
+  version = "0.8.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
+  disabled = pythonOlder "3.11";
 
   src = fetchFromGitHub {
     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/third_party/nixpkgs/pkgs/development/python-modules/brother-ql/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/brother-ql/default.nix
index ccf512a05d..10d0a020d3 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/brother-ql/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/brother-ql/default.nix
@@ -6,8 +6,6 @@
   packbits,
   pillow,
   pyusb,
-  pytest,
-  mock,
   click,
   attrs,
   lib,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/brotli/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/brotli/default.nix
index afe4e9e3fd..f429478eca 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/brotli/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/brotli/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
     owner = "google";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-MvceRcle2dSkkucC2PlsCizsIf8iv95d8Xjqew266wc=";
+    hash = "sha256-U1vAupUthD5W0xvlOKdgm9MAVLqsVyZUaFdeLsDAbDM=";
     # .gitattributes is not correct or GitHub does not parse it correct and the archive is missing the test data
     forceFetchGit = true;
   };
@@ -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/third_party/nixpkgs/pkgs/development/python-modules/bthomehub5-devicelist/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bthomehub5-devicelist/default.nix
new file mode 100644
index 0000000000..2c4b9562c1
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/btrees/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/btrees/default.nix
index 52aafcf554..e6d92d31f3 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/btrees/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/bugsnag/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bugsnag/default.nix
index 18466cb31c..bfb6f582dd 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/bugsnag/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/bunch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bunch/default.nix
index 54659c6110..ff64e723cd 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/bunch/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/bundlewrap-keepass/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bundlewrap-keepass/default.nix
index a738b0aa9e..d69580a00d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/bundlewrap-keepass/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/bundlewrap-pass/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bundlewrap-pass/default.nix
index c4b5857570..40014fbe65 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/bundlewrap-pass/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/bundlewrap-teamvault/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bundlewrap-teamvault/default.nix
index a8dd57f15b..cf13c27302 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/bundlewrap-teamvault/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/bundlewrap/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bundlewrap/default.nix
index dcafcf1408..35790227d5 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/bundlewrap/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/bundlewrap/default.nix
@@ -7,7 +7,6 @@
   jinja2,
   mako,
   passlib,
-  pytest,
   pyyaml,
   requests,
   rtoml,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cached-ipaddress/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cached-ipaddress/default.nix
index a16488b81d..985a2ada9b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/cached-ipaddress/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/cairocffi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cairocffi/default.nix
index 11a6555411..b871515bc4 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/cairocffi/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/cairocffi/default.nix
@@ -6,8 +6,6 @@
   fetchPypi,
   lib,
   substituteAll,
-  makeFontsConf,
-  freefont_ttf,
   pikepdf,
   pytestCheckHook,
   cairo,
@@ -63,7 +61,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/third_party/nixpkgs/pkgs/development/python-modules/cairosvg/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cairosvg/default.nix
index de52748606..a2f64cb79c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/cairosvg/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/canonicaljson/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/canonicaljson/default.nix
index fa1130778b..2dffe4fbec 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/canonicaljson/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/canonicaljson/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchPypi,
-  frozendict,
   pytestCheckHook,
   pythonOlder,
   setuptools,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/casbin/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/casbin/default.nix
index 440ac99954..49c9b30562 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/casbin/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/catalogue/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/catalogue/default.nix
index 8b864b6c2b..0ad13f1f28 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/catalogue/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/catalogue/default.nix
@@ -3,7 +3,6 @@
   buildPythonPackage,
   fetchPypi,
   pytestCheckHook,
-  pythonAtLeast,
   pythonOlder,
   setuptools,
   typing-extensions,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cbor2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cbor2/default.nix
index e0230c0072..aee2824d29 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/cbor2/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/certbot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/certbot/default.nix
index a922e5a69d..ea1873e2c5 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/certbot/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/certbot/default.nix
@@ -12,12 +12,7 @@
   josepy,
   parsedatetime,
   pyrfc3339,
-  pyopenssl,
   pytz,
-  requests,
-  six,
-  zope-component,
-  zope-interface,
   setuptools,
   dialog,
   gnureadline,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cffsubr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cffsubr/default.nix
index 988af2d302..2498e6b5a7 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/cffsubr/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/cfn-lint/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cfn-lint/default.nix
index 0e182eafcd..d0325a5c21 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/cfn-lint/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/cfn-lint/default.nix
@@ -15,7 +15,6 @@
   pyyaml,
   regex,
   sarif-om,
-  setuptools,
   sympy,
 }:
 
@@ -79,6 +78,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/third_party/nixpkgs/pkgs/development/python-modules/cfscrape/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cfscrape/default.nix
index 4a1e79f898..f4d6bc7a38 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/cfscrape/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/cftime/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cftime/default.nix
index 739d828ef2..443a7e8c1d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/cftime/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/chalice/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/chalice/default.nix
index dec0cbca53..b91eb29a08 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/chalice/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/changefinder/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/changefinder/default.nix
index fc34238f00..4405fa8a85 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/changefinder/default.nix
+++ b/third_party/nixpkgs/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 ];
 
-  propagatedBuildInputs = [
-    nose # not actually required during runtime, but specified as required in `setup.py`
+  build-system = [ setuptools ];
+
+  pythonRemoveDeps = [ "nose" ];
+
+  dependencies = [
     numpy
     scipy
     statsmodels
   ];
 
+  nativeCheckInputs = [ pytestCheckHook ];
+  pytestFlagsArray = [ "test/test.py" ];
+
   pythonImportsCheck = [ "changefinder" ];
 
   meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/changefinder/fix_test_invocation.patch b/third_party/nixpkgs/pkgs/development/python-modules/changefinder/fix_test_invocation.patch
new file mode 100644
index 0000000000..f02e2e36d4
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/chart-studio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/chart-studio/default.nix
index 09ecb4f986..d9091be138 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/chart-studio/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/chat-downloader/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/chat-downloader/default.nix
index 95e09e8db6..e19dd60a92 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/chat-downloader/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/checkdmarc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/checkdmarc/default.nix
index bed41e7d9f..4a17afb2f1 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/checkdmarc/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/checkdmarc/default.nix
@@ -8,7 +8,6 @@
   hatchling,
   publicsuffixlist,
   pyleri,
-  iana-etc,
   pytestCheckHook,
   pythonOlder,
   requests,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cheroot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cheroot/default.nix
index b4d7daab17..01773d1c20 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/cheroot/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/cherrypy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cherrypy/default.nix
index f0f6ea8edc..71d9a9aedf 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/cherrypy/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/cinemagoer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cinemagoer/default.nix
index 3aeb0be954..d87df62837 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/cinemagoer/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/circus/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/circus/default.nix
index 9f36998e98..b87e4c4256 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/circus/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/clarifai/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/clarifai/default.nix
index b11af61ee1..13654b2a92 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/clarifai/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/clarifai/default.nix
@@ -4,13 +4,9 @@
   clarifai-grpc,
   fetchFromGitHub,
   inquirerpy,
-  llama-index-core,
   numpy,
-  opencv4,
-  pandas,
   pillow,
   pycocotools,
-  pypdf,
   pytestCheckHook,
   pythonOlder,
   pyyaml,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cli-helpers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cli-helpers/default.nix
index 106e4dac7c..1d1e2c741b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/cli-helpers/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/cli-helpers/default.nix
@@ -8,8 +8,6 @@
   pytestCheckHook,
   pygments,
   tabulate,
-  terminaltables,
-  wcwidth,
 }:
 
 buildPythonPackage rec {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cliche/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cliche/default.nix
index 596ea43962..4b0e63ed21 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/cliche/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/click-configfile/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/click-configfile/default.nix
index 2d19a760e5..47d43ca1fa 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/click-configfile/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/click-log/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/click-log/default.nix
index 348620d910..fbf67e9b2a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/click-log/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/click-spinner/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/click-spinner/default.nix
index dd9ee1c021..c022a33608 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/click-spinner/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/cliff/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cliff/default.nix
index cca72fa51e..416a34be30 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/cliff/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/clifford/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/clifford/default.nix
index 7c19348d32..3b6e68710b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/clifford/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/clintermission/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/clintermission/default.nix
index 5fed44529a..721b7cadb6 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/clintermission/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/clize/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/clize/default.nix
index f87471c62c..fdd26fa0fd 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/clize/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/cloudflare/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cloudflare/default.nix
index 8765dc9e39..1935151a78 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/cloudflare/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/cloudpickle/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cloudpickle/default.nix
index b957df2991..d8ebf82cf2 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/cloudpickle/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/cloudsmith-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cloudsmith-api/default.nix
index bb2499c258..8fd6f490f0 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/cloudsmith-api/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/cloup/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cloup/default.nix
index 3d21118aca..e5564a7800 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/cloup/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/cma/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cma/default.nix
index f5bec35c1c..fb9835b8e8 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/cma/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/cmsis-svd/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cmsis-svd/default.nix
index 030b6d2822..b3197b6f89 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/cmsis-svd/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/cocotb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cocotb/default.nix
index e7a322dad4..271ad52a95 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/cocotb/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/cocotb/default.nix
@@ -45,11 +45,6 @@ buildPythonPackage rec {
 
       # remove circular dependency cocotb-bus from setup.py
       substituteInPlace setup.py --replace "'cocotb-bus<1.0'" ""
-    ''
-    + lib.optionalString stdenv.isDarwin ''
-      # disable lto on darwin
-      # https://github.com/NixOS/nixpkgs/issues/19098
-      substituteInPlace cocotb_build_libs.py --replace "-flto" ""
     '';
 
   patches = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/coincurve/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/coincurve/default.nix
index 6516cfce16..d7f9b8a36f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/coincurve/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/coincurve/default.nix
@@ -81,6 +81,6 @@ buildPythonPackage rec {
       asl20
       mit
     ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/colorama/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/colorama/default.nix
index d907499caf..901750de1f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/colorama/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/colorcet/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/colorcet/default.nix
index dbffade589..b335897207 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/colorcet/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/colored/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/colored/default.nix
index c9db3719d3..18306a65bb 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/colored/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/colorlover/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/colorlover/default.nix
index 0befe12cd8..f5efbbf134 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/colorlover/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/comm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/comm/default.nix
index 130b6e9084..f18517eca1 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/comm/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/commentjson/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/commentjson/default.nix
index defdc1aa3b..f410d16628 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/commentjson/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/applications/version-management/commitizen/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/commitizen/default.nix
similarity index 74%
rename from third_party/nixpkgs/pkgs/applications/version-management/commitizen/default.nix
rename to third_party/nixpkgs/pkgs/development/python-modules/commitizen/default.nix
index 472a0e04b8..7f2870ae49 100644
--- a/third_party/nixpkgs/pkgs/applications/version-management/commitizen/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/commoncode/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/commoncode/default.nix
index 8df7ef380a..7cc96f4d85 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/commoncode/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/compreffor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/compreffor/default.nix
index d318e031fb..76cd8caa1a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/compreffor/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/conda-libmamba-solver/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/conda-libmamba-solver/default.nix
index 4c99fc866c..c2038f77e1 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/conda-libmamba-solver/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/configobj/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/configobj/default.nix
index ad3ce46736..02228f5f2f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/configobj/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/configparser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/configparser/default.nix
index efe6362da4..d078fceee3 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/configparser/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/configshell/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/configshell/default.nix
index cc3c7002a4..c2eabec513 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/configshell/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/consonance/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/consonance/default.nix
index 6b835fd44c..dca06fcf55 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/consonance/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/constantly/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/constantly/default.nix
index 0e0b19ecdd..89c3283254 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/constantly/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/contextlib2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/contextlib2/default.nix
index 18b18e917d..b72e9a2ec9 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/contextlib2/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/contextlib2/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchPypi,
-  python,
   pythonAtLeast,
   pythonOlder,
   unittestCheckHook,
@@ -30,6 +29,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/third_party/nixpkgs/pkgs/development/python-modules/contourpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/contourpy/default.nix
index 652fbbef72..4d668412f6 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/contourpy/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/convertertools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/convertertools/default.nix
index bf58e95a9e..17739bd661 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/convertertools/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/coordinates/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/coordinates/default.nix
index 454a2b7083..f055b52ee2 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/coordinates/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/coreapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/coreapi/default.nix
index ad172b2961..d620f6fb4e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/coreapi/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/coreschema/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/coreschema/default.nix
index 8d597e5303..1aede8b9f5 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/coreschema/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/cot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cot/default.nix
index 4bf8d77513..ac144b2645 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/cot/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/cot/default.nix
@@ -8,7 +8,6 @@
   pytest-mock,
   pytestCheckHook,
   pythonAtLeast,
-  pythonOlder,
   pyvmomi,
   qemu,
   requests,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cppe/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cppe/default.nix
index e3b007d480..f313e3a97e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/cppe/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/cppe/default.nix
@@ -5,7 +5,6 @@
   cmake,
   cppe,
   eigen,
-  python,
   pybind11,
   numpy,
   h5py,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/craft-application/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/craft-application/default.nix
index 0c1fcdeb1f..7f986dd9fd 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/craft-application/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/craft-application/default.nix
@@ -21,7 +21,6 @@
   pyyaml,
   responses,
   setuptools-scm,
-  setuptools,
   snap-helpers,
 }:
 
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/craft-grammar/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/craft-grammar/default.nix
index 82c0fef4b0..6b920aaa7a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/craft-grammar/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/craft-grammar/default.nix
@@ -5,8 +5,6 @@
   nix-update-script,
   overrides,
   setuptools,
-  pytest-check,
-  pytest-mock,
   pytestCheckHook,
   pydantic_1,
   pyyaml,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/craft-parts/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/craft-parts/default.nix
index bd0ae84ecd..2ad66a7d4a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/craft-parts/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/craft-parts/default.nix
@@ -19,7 +19,6 @@
   hypothesis,
   git,
   squashfsTools,
-  setuptools,
   setuptools-scm,
   stdenv,
 }:
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/crashtest/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/crashtest/default.nix
index 5b0df404ee..e6c1395785 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/crashtest/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/crccheck/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/crccheck/default.nix
index 2bf31ea69c..63f6e570d7 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/crccheck/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/credstash/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/credstash/default.nix
index 930cbedd56..97987cda53 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/credstash/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/croniter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/croniter/default.nix
index 00f59b7990..eb2a088653 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/croniter/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/cryptodatahub/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cryptodatahub/default.nix
index 2c2bad80e2..9fe0ad7aca 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/cryptodatahub/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/cryptography/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cryptography/default.nix
index 0d7cdb92a6..a440e7e480 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/cryptography/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/cryptography/default.nix
@@ -26,21 +26,21 @@
 
 buildPythonPackage rec {
   pname = "cryptography";
-  version = "42.0.5"; # Also update the hash in vectors.nix
+  version = "42.0.8"; # Also update the hash in vectors.nix
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-b+B+7JXf1HfrlTCu9b6tNP7IGbOq9sW9bSBWXaYHv+E=";
+    hash = "sha256-jQnQVDnOe6qOnpWwfsW2yIb1SN634Pae8l9ks7zoQvI=";
   };
 
   cargoDeps = rustPlatform.fetchCargoTarball {
     inherit src;
     sourceRoot = "${pname}-${version}/${cargoRoot}";
     name = "${pname}-${version}";
-    hash = "sha256-Pw3ftpcDMfZr/w6US5fnnyPVsFSB9+BuIKazDocYjTU=";
+    hash = "sha256-PgxPcFocEhnQyrsNtCN8YHiMptBmk1PUhEDQFdUR1nU=";
   };
 
   patches = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cryptography/vectors.nix b/third_party/nixpkgs/pkgs/development/python-modules/cryptography/vectors.nix
index 85476ca492..8d1bb48d62 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/cryptography/vectors.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/cryptography/vectors.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "cryptography_vectors";
     inherit version;
-    hash = "sha256-UFzV47DLMtoVJvBwQrf8OKS2w1ZxDLc9K192sDejjtE=";
+    hash = "sha256-31ZXNnvAqQw3QwnLJhAJosU8rpGkWHgTOaD3JPgZpGo=";
   };
 
   nativeBuildInputs = [ flit-core ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cssselect/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cssselect/default.nix
index a85aa4345c..41dfed02e7 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/cssselect/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/cssselect2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cssselect2/default.nix
index 0eabd5ca83..3f92e6567f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/cssselect2/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/csvw/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/csvw/default.nix
index d37d7819ec..be429844d1 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/csvw/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/cu2qu/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cu2qu/default.nix
index 8cc3b4a34b..27faeab92b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/cu2qu/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/cufflinks/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cufflinks/default.nix
index 9e2e8df44a..6f550580a2 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/cufflinks/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/cupy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cupy/default.nix
index 7c0e0ed364..8435c1e988 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/cupy/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/cupy/default.nix
@@ -10,7 +10,7 @@
   mock,
   setuptools,
   cudaPackages,
-  addOpenGLRunpath,
+  addDriverRunpath,
   pythonOlder,
   symlinkJoin,
   fetchpatch
@@ -76,7 +76,7 @@ buildPythonPackage rec {
   nativeBuildInputs = [
     setuptools
     wheel
-    addOpenGLRunpath
+    addDriverRunpath
     cython_0
     cudaPackages.cuda_nvcc
   ];
@@ -107,7 +107,7 @@ buildPythonPackage rec {
 
   postFixup = ''
     find $out -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do
-      addOpenGLRunpath "$lib"
+      addDriverRunpath "$lib"
     done
   '';
 
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/curve25519-donna/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/curve25519-donna/default.nix
index 10bd11bc84..8ff358be69 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/curve25519-donna/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/cvxopt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cvxopt/default.nix
index e90fc29092..7b4b0c564e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/cvxopt/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/cvxopt/default.nix
@@ -3,7 +3,6 @@
   buildPythonPackage,
   fetchPypi,
   isPyPy,
-  python,
   blas,
   lapack,
   suitesparse,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cwcwidth/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cwcwidth/default.nix
index b01a4f7242..75b8b091c3 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/cwcwidth/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/cx-freeze/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cx-freeze/default.nix
index 854e75f08b..44dc7e32fd 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/cx-freeze/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/cyclonedx-python-lib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cyclonedx-python-lib/default.nix
index 1dec715710..53637a465a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/cyclonedx-python-lib/default.nix
+++ b/third_party/nixpkgs/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}
   '';
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cython-test-exception-raiser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cython-test-exception-raiser/default.nix
index 66adf36686..70a2746b1c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/cython-test-exception-raiser/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/daiquiri/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/daiquiri/default.nix
index 735131d935..172253d600 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/daiquiri/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/daphne/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/daphne/default.nix
index 0965dacd42..aee5251191 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/daphne/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/darkdetect/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/darkdetect/default.nix
index e8dfaf086b..fe38977f2a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/darkdetect/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/dask-gateway-server/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dask-gateway-server/default.nix
index 9d90d292ea..8935e53699 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/dask-gateway-server/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/dask-gateway/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dask-gateway/default.nix
index 79a1d54f4d..b3f63835c3 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/dask-gateway/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/dask-glm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dask-glm/default.nix
index ec4c90b5de..a4bead52b4 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/dask-glm/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/dask-mpi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dask-mpi/default.nix
index 2bd7d06003..f51dccdc03 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/dask-mpi/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/databases/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/databases/default.nix
index 44e356bdf1..33fd15cded 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/databases/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/datadiff/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/datadiff/default.nix
index b020a279a0..926f8a9f08 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/datadiff/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/datadog/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/datadog/default.nix
index 5103cc4df9..6df2f77721 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/datadog/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/datadog/default.nix
@@ -9,7 +9,6 @@
   pytest-vcr,
   pytestCheckHook,
   python-dateutil,
-  pythonAtLeast,
   pythonOlder,
   requests,
   vcrpy,
@@ -62,6 +61,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/third_party/nixpkgs/pkgs/development/python-modules/datamodeldict/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/datamodeldict/default.nix
index 8ab7fd4c0b..e7c8f0b3af 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/datamodeldict/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/datasets/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/datasets/default.nix
index 3718c4db7e..14779ee62c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/datasets/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/datasette-template-sql/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/datasette-template-sql/default.nix
index ca77a27ca6..5bdb48aa28 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/datasette-template-sql/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/datasette-template-sql/default.nix
@@ -3,7 +3,6 @@
   buildPythonPackage,
   datasette,
   fetchFromGitHub,
-  pytest-asyncio,
   pythonOlder,
 }:
 
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/datasette/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/datasette/default.nix
index d5976e2a92..fd31d3bbf1 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/datasette/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/datashader/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/datashader/default.nix
index 1fc9b1e80d..c7e3237a1f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/datashader/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/datatable/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/datatable/default.nix
index 1ecc3d89e1..6a7c80ada3 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/datatable/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/datatable/default.nix
@@ -4,7 +4,6 @@
   buildPythonPackage,
   fetchFromGitHub,
   pipInstallHook,
-  writeText,
   blessed,
   docutils,
   libcxx,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dateutils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dateutils/default.nix
index 9dbe3654a4..f52c467fd3 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/dateutils/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/dawg-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dawg-python/default.nix
index 639b8baa21..997600122d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/dawg-python/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/db-dtypes/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/db-dtypes/default.nix
index 0b6eb890fb..4f7eff5b9a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/db-dtypes/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/dbf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dbf/default.nix
index 760f5c8d50..0be997c9fc 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/dbf/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/dbfread/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dbfread/default.nix
index 0f8b29bce1..26d8046ea8 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/dbfread/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/dbt-adapters/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dbt-adapters/default.nix
index 04e52796cf..776725659d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/dbt-adapters/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/dbt-bigquery/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dbt-bigquery/default.nix
index eb5f6ad2b5..e9eb98b93c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/dbt-bigquery/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/dbt-bigquery/default.nix
@@ -10,7 +10,6 @@
   pytestCheckHook,
   pythonOlder,
   setuptools,
-  urllib3,
 }:
 
 buildPythonPackage rec {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dbt-common/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dbt-common/default.nix
index 22bd2e4079..bf9a93abaf 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/dbt-common/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/dbt-semantic-interfaces/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dbt-semantic-interfaces/default.nix
index 1c25c806de..9eb306074a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/dbt-semantic-interfaces/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/dbt-semantic-interfaces/default.nix
@@ -3,7 +3,6 @@
   buildPythonPackage,
   click,
   dateutils,
-  dbt-postgres,
   fetchFromGitHub,
   hatchling,
   hypothesis,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dbus-deviation/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dbus-deviation/default.nix
index f49197cc90..3f455b68a9 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/dbus-deviation/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/dbus-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dbus-python/default.nix
index 937ec9511e..b6664daa25 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/dbus-python/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/ddt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ddt/default.nix
index cbe1451875..541ac2a3cd 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/ddt/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/debtcollector/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/debtcollector/default.nix
index 5174c46c44..d9b2011b17 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/debtcollector/default.nix
+++ b/third_party/nixpkgs/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
+  ];
 
-  propagatedBuildInputs = [
+  sphinxBuilders = [ "man" ];
+
+  dependencies = [
     six
     wrapt
   ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/debugpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/debugpy/default.nix
index 13e26f7d45..ddbf84a511 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/debugpy/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/debugpy/default.nix
@@ -22,7 +22,7 @@
 
 buildPythonPackage rec {
   pname = "debugpy";
-  version = "1.8.1";
+  version = "1.8.2";
   format = "setuptools";
 
   disabled = pythonOlder "3.8";
@@ -31,7 +31,7 @@ buildPythonPackage rec {
     owner = "microsoft";
     repo = "debugpy";
     rev = "refs/tags/v${version}";
-    hash = "sha256-2TkieSQYxnlUroSD9wNKNaHUTLRksFWL/6XmSNGTCA4=";
+    hash = "sha256-J63izrJX7/el36kMHv+IyqDQ1C13CKb40HLOVgOzHEw=";
   };
 
   patches =
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/decorator/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/decorator/default.nix
index 0836e284a9..5a0bc26763 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/decorator/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/deebot-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/deebot-client/default.nix
index 4b002da52a..ed70dd9846 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/deebot-client/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/deebot-client/default.nix
@@ -21,7 +21,7 @@
 
 buildPythonPackage rec {
   pname = "deebot-client";
-  version = "8.1.1";
+  version = "8.2.0";
   pyproject = true;
 
   disabled = pythonOlder "3.12";
@@ -30,7 +30,7 @@ buildPythonPackage rec {
     owner = "DeebotUniverse";
     repo = "client.py";
     rev = "refs/tags/${version}";
-    hash = "sha256-q52dMygpBzL92yW8DFIKpjxykGqW86CNM1xqxGf/JJ0=";
+    hash = "sha256-foIRWZcv+i/UZMMr1LjNiUpvJVD9UOWHPKHpcGHXfxQ=";
   };
 
   build-system = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/deemix/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/deemix/default.nix
index 6e2c89df3a..40ee84f52a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/deemix/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/dek/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dek/default.nix
index 811c406480..4f528b8551 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/dek/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/delegator-py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/delegator-py/default.nix
index b51ff53751..0e4fc71161 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/delegator-py/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/derpconf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/derpconf/default.nix
index c7e67c6eaa..a3fbc61e2c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/derpconf/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/detect-secrets/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/detect-secrets/default.nix
index a678a2bb69..820e204e11 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/detect-secrets/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/devito/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/devito/default.nix
index 759e96b34a..95ec86ff5e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/devito/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/devito/default.nix
@@ -3,6 +3,7 @@
   stdenv,
   anytree,
   buildPythonPackage,
+  setuptools,
   cached-property,
   cgen,
   click,
@@ -26,7 +27,7 @@
 buildPythonPackage rec {
   pname = "devito";
   version = "4.8.11";
-  format = "setuptools";
+  pyproject = true;
 
   disabled = pythonOlder "3.8";
 
@@ -37,15 +38,18 @@ buildPythonPackage rec {
     hash = "sha256-c8/b2dRwfH4naSVRaRon6/mBDva7RSDmi/TJUJp26g0=";
   };
 
-  pythonRemoveDeps = [
-    "codecov"
-    "flake8"
-    "pytest-runner"
-    "pytest-cov"
-  ];
+  # packaging.metadata.InvalidMetadata: 'python_version_3.8_' is invalid for 'provides-extra'
+  postPatch = ''
+    substituteInPlace requirements-testing.txt \
+      --replace-fail 'pooch; python_version >= "3.8"' "pooch"
+  '';
+
+  pythonRemoveDeps = [ "pip" ];
 
   pythonRelaxDeps = true;
 
+  build-system = [ setuptools ];
+
   dependencies = [
     anytree
     cached-property
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/diff-match-patch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/diff-match-patch/default.nix
index 93ce2b7de1..7c7936ec88 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/diff-match-patch/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/discordpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/discordpy/default.nix
index c2cb7a49df..023b141136 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/discordpy/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/diskcache/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/diskcache/default.nix
index 4fe4bad03a..c2a18535a7 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/diskcache/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/distro/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/distro/default.nix
index 9c4a7a9e70..0de0aee0c1 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/distro/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/dj-database-url/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dj-database-url/default.nix
index aec84b9102..aee96dfd6c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/dj-database-url/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/dj-email-url/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dj-email-url/default.nix
index e557c99927..1214234bf8 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/dj-email-url/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/dj-rest-auth/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dj-rest-auth/default.nix
index 49e0c49e75..1f0ac3747c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/dj-rest-auth/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/django-appconf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-appconf/default.nix
index c7dae91356..2715638ed9 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/django-appconf/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/django-appconf/default.nix
@@ -4,7 +4,6 @@
   fetchFromGitHub,
   pythonOlder,
   django,
-  six,
   python,
 }:
 
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-celery-results/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-celery-results/default.nix
index 92d2bf2355..e2a0a47a7f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/django-celery-results/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/django-classy-tags/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-classy-tags/default.nix
index 3f4fd07ae0..a115015fac 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/django-classy-tags/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/django-compressor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-compressor/default.nix
index 668c36f5de..0344868d2c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/django-compressor/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/django-compressor/default.nix
@@ -25,13 +25,13 @@
 
 buildPythonPackage rec {
   pname = "django-compressor";
-  version = "4.5";
+  version = "4.5.1";
   pyproject = true;
 
   src = fetchPypi {
     pname = "django_compressor";
     inherit version;
-    hash = "sha256-nZjJBbdBvmywmtgowdIqn/kkTdCII+KSavjd0YccPGU=";
+    hash = "sha256-wdikii7k2LfyPEEeucl+LYjbGKGLocnoF41fW4NmqCI=";
   };
 
   build-system = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-configurations/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-configurations/default.nix
index 5200ef0afc..a7c944f981 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/django-configurations/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/django-cors-headers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-cors-headers/default.nix
index 27c0974e23..6271f6ade6 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/django-cors-headers/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/django-graphiql-debug-toolbar/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-graphiql-debug-toolbar/default.nix
index 63140be2e2..ec3ee3975f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/django-graphiql-debug-toolbar/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/django-graphiql-debug-toolbar/default.nix
@@ -13,7 +13,6 @@
   graphene-django,
 
   # tests
-  python,
   pytest-django,
   pytestCheckHook
 }:
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-guardian/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-guardian/default.nix
index c9111e8be7..a6727b8f05 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/django-guardian/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/django-guardian/default.nix
@@ -37,6 +37,6 @@ buildPythonPackage rec {
       mit
       bsd2
     ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-haystack/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-haystack/default.nix
index 122df1713d..f74215dd1e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/django-haystack/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/django-import-export/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-import-export/default.nix
index 6cde0dae20..52f1ff4d5b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/django-import-export/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/django-ipware/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-ipware/default.nix
index 8a10b0675b..b778e0a93d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/django-ipware/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/django-leaflet/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-leaflet/default.nix
index 99e7e47ca8..628cae9403 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/django-leaflet/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/django-model-utils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-model-utils/default.nix
index 14b53943eb..1dbbeff2cb 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/django-model-utils/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/django-ninja/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-ninja/default.nix
index b94438b983..04f582bd9f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/django-ninja/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/django-ninja/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "django-ninja";
-  version = "1.2.1";
+  version = "1.2.2";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "vitalik";
     repo = "django-ninja";
     rev = "refs/tags/v${version}";
-    hash = "sha256-43yLhiDpksTPNh9Q8T8rSBzaZ99XCXIrNkTSdWk0gLc=";
+    hash = "sha256-wD2ZizvMEY9oDQZTr4KzbNY5sStf7lCyPPJBoaa4trU=";
   };
 
   propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-oauth-toolkit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-oauth-toolkit/default.nix
index 139a0d022c..ae4a56d879 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/django-oauth-toolkit/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/django-oauth-toolkit/default.nix
@@ -12,7 +12,6 @@
   # tests
   djangorestframework,
   pytest-django,
-  pytest-xdist,
   pytest-mock,
   pytestCheckHook,
 }:
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-otp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-otp/default.nix
index 67395fa588..fa38355d1e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/django-otp/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/django-parler/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-parler/default.nix
index 8f444bd88f..b963f709a4 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/django-parler/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/django-parler/default.nix
@@ -3,8 +3,6 @@
   buildPythonPackage,
   django,
   fetchFromGitHub,
-  pytest,
-  pytest-django,
   pythonOlder,
   python,
 }:
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-picklefield/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-picklefield/default.nix
index 7feb633839..25b9e1c34c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/django-picklefield/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/django-picklefield/default.nix
@@ -3,8 +3,6 @@
   buildPythonPackage,
   fetchFromGitHub,
   django,
-  pytest,
-  pytest-django,
   python,
 }:
 
@@ -33,6 +31,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/third_party/nixpkgs/pkgs/development/python-modules/django-polymorphic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-polymorphic/default.nix
index 9030630a78..b313276bbf 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/django-polymorphic/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/django-postgresql-netfields/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-postgresql-netfields/default.nix
index e1282e8802..d3fb086fc4 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/django-postgresql-netfields/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/django-rest-auth/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-rest-auth/default.nix
index 3757f96c67..316b07a274 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/django-rest-auth/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/django-rest-polymorphic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-rest-polymorphic/default.nix
index 8430161948..73196ccfbc 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/django-rest-polymorphic/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/django-reversion/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-reversion/default.nix
index 4513056064..9d795c9346 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/django-reversion/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/django-scheduler/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-scheduler/default.nix
index 0635f69631..f03dd71d0e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/django-scheduler/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/django-scheduler/default.nix
@@ -4,8 +4,6 @@
   django,
   fetchFromGitHub,
   icalendar,
-  pytest,
-  pytest-django,
   python,
   python-dateutil,
   pythonOlder,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-storages/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-storages/default.nix
index f7524810f4..84378ee311 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/django-storages/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/django-storages/default.nix
@@ -19,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "django-storages";
-  version = "1.14.2";
+  version = "1.14.4";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     owner = "jschneier";
     repo = "django-storages";
     rev = "refs/tags/${version}";
-    hash = "sha256-V0uFZvnBi0B31b/j/u3Co6dd9XcdVefiSkl3XmCTJG4=";
+    hash = "sha256-nlM/XPot3auLzNsnHCVtog2WmiaibDRgbPOw9A5F9QI=";
   };
 
   nativeBuildInputs = [ setuptools ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-stubs-ext/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-stubs-ext/default.nix
index 1176f2ba09..2e11561ddc 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/django-stubs-ext/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/django-stubs-ext/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "django-stubs-ext";
-  version = "5.0.2";
+  version = "5.0.3";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "django_stubs_ext";
     inherit version;
-    hash = "sha256-QJxiWF1/mWzvXHYObifqP/KflhyUN0fmdRnIN0IsrTI=";
+    hash = "sha256-zTYfW5Ucar34Z8VdJHVB8GCdHoM0zLCcehKRARFCUjQ=";
   };
 
   nativeBuildInputs = [ setuptools ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-types/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-types/default.nix
index 523e155a68..bbcf238a10 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/django-types/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/django/4.nix b/third_party/nixpkgs/pkgs/development/python-modules/django/4.nix
index 2bc86f7579..34f2075a44 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/django/4.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/django/4.nix
@@ -44,7 +44,7 @@
 
 buildPythonPackage rec {
   pname = "django";
-  version = "4.2.12";
+  version = "4.2.14";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
@@ -53,7 +53,7 @@ buildPythonPackage rec {
     owner = "django";
     repo = "django";
     rev = "refs/tags/${version}";
-    hash = "sha256-n6esWUpZpCP4J4bNckNKJ9E61qFjTPS7XF+WgxNS2JE=";
+    hash = "sha256-Nt+dVIikfe7gJY6/qJzkolkXeSFNBCbCEMSaKYmvCz4=";
   };
 
   patches =
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/djangorestframework-camel-case/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/djangorestframework-camel-case/default.nix
index 3e036dfe98..1c1a0c1474 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/djangorestframework-camel-case/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/djangorestframework-dataclasses/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/djangorestframework-dataclasses/default.nix
index 51c169ab92..3fa7cbb024 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/djangorestframework-dataclasses/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/djangorestframework-guardian/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/djangorestframework-guardian/default.nix
index d04cd24f54..4d4a1d45fc 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/djangorestframework-guardian/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/djangorestframework-recursive/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/djangorestframework-recursive/default.nix
index cc75d77a48..cdb68b5164 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/djangorestframework-recursive/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/dm-control/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dm-control/default.nix
index af8c7bdbee..8295c2de2b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/dm-control/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/dm-tree/0003-don-t-configure-apple.patch b/third_party/nixpkgs/pkgs/development/python-modules/dm-tree/0003-don-t-configure-apple.patch
new file mode 100644
index 0000000000..ac51e3bd50
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/dm-tree/cmake.patch b/third_party/nixpkgs/pkgs/development/python-modules/dm-tree/cmake.patch
deleted file mode 100644
index 28f201a30f..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/dm-tree/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dm-tree/default.nix
index 0cf64bc5da..6062d202a3 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/dm-tree/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/dnslib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dnslib/default.nix
index 49a59efc70..65d908605b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/dnslib/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/docker/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/docker/default.nix
index c26f5f656d..7a36c27e8e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/docker/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/dockerspawner/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dockerspawner/default.nix
index 199f73afee..d90710fc3d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/dockerspawner/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/docrep/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/docrep/default.nix
index 20b77a521e..2aeb00ebe3 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/docrep/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/dodgy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dodgy/default.nix
index 2e08bfc613..3e4569f303 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/dodgy/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/dogpile-cache/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dogpile-cache/default.nix
index 8fa2509927..c6b78aa050 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/dogpile-cache/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/dogtail/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dogtail/default.nix
index ae4babf0c2..04067083b5 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/dogtail/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/dominate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dominate/default.nix
index 5e1db9ff75..f2eae14e99 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/dominate/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/dragonfly/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dragonfly/default.nix
index 8b74363689..072192a23b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/dragonfly/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/drf-spectacular-sidecar/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/drf-spectacular-sidecar/default.nix
index af92467176..426a9e4400 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/drf-spectacular-sidecar/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/drf-spectacular/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/drf-spectacular/default.nix
index 9b957b53d4..cb9adc5405 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/drf-spectacular/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/drf-yasg/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/drf-yasg/default.nix
index d6692b1f78..1463ae7880 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/drf-yasg/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/drms/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/drms/default.nix
index 3ab19124eb..e2f2c295a3 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/drms/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/duckdb-engine/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/duckdb-engine/default.nix
index eeafbbd1cd..1282fdfc99 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/duckdb-engine/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/duckdb-engine/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "duckdb-engine";
-  version = "0.13.0";
+  version = "0.13.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     repo = "duckdb_engine";
     owner = "Mause";
     rev = "refs/tags/v${version}";
-    hash = "sha256-XbO9LyweJ+pYQvEbdmiUJnVNr2BQAgwu9Imq7rAFEYg=";
+    hash = "sha256-6aVVs3ii8pJOSaLx0maoFmiMvbUh/LOdizmPSpqPiM4=";
   };
 
   nativeBuildInputs = [ poetry-core ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dugong/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dugong/default.nix
index 95939d5ad8..345161c835 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/dugong/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/dugong/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
       psfl
       asl20
     ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dukpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dukpy/default.nix
index e6a4444910..453d68e853 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/dukpy/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/dukpy/default.nix
@@ -6,7 +6,6 @@
   mutf8,
   webassets,
   pytestCheckHook,
-  pytest-cov,
   mock,
 }:
 
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/duo-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/duo-client/default.nix
index 1c71b925e9..fe5fd07044 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/duo-client/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/dvc-task/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dvc-task/default.nix
index cbdc820633..39dafd2a9a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/dvc-task/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/dyn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dyn/default.nix
index f16d9d4d55..bd40c29d8d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/dyn/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/e3-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/e3-core/default.nix
index 2701b84523..3c001d3939 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/e3-core/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/e3-core/default.nix
@@ -2,16 +2,11 @@
   autoPatchelfHook,
   buildPythonPackage,
   colorama,
-  coverage,
   distro,
   fetchFromGitHub,
-  httpretty,
   lib,
-  mock,
   packaging,
   psutil,
-  pytest,
-  pytest-socket,
   python-dateutil,
   pyyaml,
   requests,
@@ -20,10 +15,7 @@
   stdenv,
   setuptools,
   stevedore,
-  tomlkit,
-  tox,
   tqdm,
-  typeguard,
 }:
 
 buildPythonPackage rec {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/easy-thumbnails/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/easy-thumbnails/default.nix
index df95a000ef..9c801e132f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/easy-thumbnails/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/easygui/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/easygui/default.nix
index 18e720fbc2..d19d378fde 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/easygui/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/editor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/editor/default.nix
index d2256da395..5cf8a6d2de 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/editor/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/edk2-pytool-library/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/edk2-pytool-library/default.nix
index c53e939a66..73085f92bb 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/edk2-pytool-library/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/edk2-pytool-library/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "edk2-pytool-library";
-  version = "0.21.8";
+  version = "0.21.9";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "tianocore";
     repo = "edk2-pytool-library";
     rev = "refs/tags/v${version}";
-    hash = "sha256-ffKteff4Xsg9kxJukVlSnwmKowRN35bMfDJo/9mV6s8=";
+    hash = "sha256-397YJotA5PxyrOU+xwaOakPHf6Hynd7bdro/HIBDPHo=";
   };
 
   build-system = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/effect/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/effect/default.nix
index 8de9fda503..fbc88f69d8 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/effect/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/elasticsearch8/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/elasticsearch8/default.nix
index 8c36c4af08..3d3594ae4b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/elasticsearch8/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/elasticsearch8/default.nix
@@ -8,7 +8,6 @@
   pythonOlder,
   requests,
   setuptools,
-  urllib3,
 }:
 
 buildPythonPackage rec {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/elementpath/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/elementpath/default.nix
index b30a370628..d8a89c437a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/elementpath/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/emailthreads/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/emailthreads/default.nix
index 44ea2d3aa8..b18d0f1e6d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/emailthreads/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/emailthreads/default.nix
@@ -2,7 +2,6 @@
   lib,
   fetchFromGitHub,
   buildPythonPackage,
-  python,
   isPy3k,
   unittestCheckHook,
 }:
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/emcee/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/emcee/default.nix
index be4fd02424..cefe2c87cd 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/emcee/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/empty-files/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/empty-files/default.nix
index da51b198ef..4cd481da50 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/empty-files/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/enrich/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/enrich/default.nix
index 4210283b3e..bccb74b2f8 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/enrich/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/entrypoints/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/entrypoints/default.nix
index 20b44c5fbd..5277106f01 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/entrypoints/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/entrypoints/default.nix
@@ -4,7 +4,6 @@
   pythonOlder,
   fetchPypi,
   flit-core,
-  configparser,
   pytestCheckHook,
 }:
 
@@ -28,6 +27,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/third_party/nixpkgs/pkgs/development/python-modules/envisage/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/envisage/default.nix
index 30b450719b..9c6e90c8d0 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/envisage/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/envisage/default.nix
@@ -3,10 +3,8 @@
   apptools,
   buildPythonPackage,
   fetchPypi,
-  ipython,
   pyface,
   pytestCheckHook,
-  pythonAtLeast,
   pythonOlder,
   setuptools,
   traits,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/essentials-openapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/essentials-openapi/default.nix
index f63b1dfa7a..7438c2ef6e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/essentials-openapi/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/essentials-openapi/default.nix
@@ -11,7 +11,6 @@
   markupsafe,
   pydantic,
   pytestCheckHook,
-  pythonImportsCheckHook,
   pyyaml,
   rich,
   setuptools,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/essentials/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/essentials/default.nix
index 7dd8adcccd..e94a3ccf98 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/essentials/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/essentials/default.nix
@@ -3,7 +3,6 @@
   fetchFromGitHub,
   setuptools,
   pytestCheckHook,
-  pythonImportsCheckHook,
   lib,
 }:
 buildPythonPackage rec {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/et-xmlfile/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/et-xmlfile/default.nix
index 8d647852df..67d26aa36a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/et-xmlfile/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/etcd/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/etcd/default.nix
index 355d6cd4fb..d9dc4fcd07 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/etcd/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/etcd3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/etcd3/default.nix
index 31ff0eb6dc..e105afb48a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/etcd3/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/ete3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ete3/default.nix
index 2aa4e65dce..ee58811283 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/ete3/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/ete3/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchPypi,
-  isPy3k,
   numpy,
   six,
   withTreeVisualization ? false,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/etebase/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/etebase/default.nix
index bb23e85534..ffdad63476 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/etebase/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/etelemetry/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/etelemetry/default.nix
index c61159a4e1..8227fb9536 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/etelemetry/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/eth-abi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/eth-abi/default.nix
index 61ba458104..2b5d280562 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/eth-abi/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/eth-account/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/eth-account/default.nix
index 059fd610cb..7be6722f23 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/eth-account/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/eth-hash/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/eth-hash/default.nix
index 7d75ccf165..c53e052b76 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/eth-hash/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/eth-keyfile/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/eth-keyfile/default.nix
index 8ed0657104..8175b2cfe7 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/eth-keyfile/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/eth-keys/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/eth-keys/default.nix
index e599a21546..964f4f0832 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/eth-keys/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/eth-rlp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/eth-rlp/default.nix
index d70ede6773..3bc8d7c35b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/eth-rlp/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/eth-typing/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/eth-typing/default.nix
index 6e437a5418..cbf0c4df19 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/eth-typing/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/eth-utils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/eth-utils/default.nix
index c45aec1726..2167c3e1ab 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/eth-utils/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/eventlet/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/eventlet/default.nix
index c73cb2a049..5fa638dddd 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/eventlet/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/eventlet/default.nix
@@ -3,7 +3,6 @@
   stdenv,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonAtLeast,
 
   # build-system
   hatch-vcs,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/events/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/events/default.nix
index 8b2be68973..ecf7fa96bc 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/events/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/exdown/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/exdown/default.nix
index 4d303a64c2..9221ae0a16 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/exdown/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/exifread/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/exifread/default.nix
index 16497817b4..942b5b761a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/exifread/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/expiring-dict/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/expiring-dict/default.nix
index 59608910e5..ba846ebbab 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/expiring-dict/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/extension-helpers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/extension-helpers/default.nix
index 56f6a8f4d0..d8429d0869 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/extension-helpers/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/extension-helpers/default.nix
@@ -1,7 +1,6 @@
 {
   lib,
   buildPythonPackage,
-  cython,
   fetchFromGitHub,
   pip,
   pytestCheckHook,
@@ -9,7 +8,6 @@
   setuptools-scm,
   setuptools,
   tomli,
-  wheel,
 }:
 
 buildPythonPackage rec {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/eyed3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/eyed3/default.nix
index 3b9c528b85..7efaaa6493 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/eyed3/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/eyed3/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchPypi,
-  python,
   isPyPy,
   six,
   filetype,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/face-recognition/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/face-recognition/default.nix
index ff50cce91d..6385b51b93 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/face-recognition/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/face-recognition/models.nix b/third_party/nixpkgs/pkgs/development/python-modules/face-recognition/models.nix
index ba704dbbeb..cc7dbe6481 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/face-recognition/models.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/faiss/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/faiss/default.nix
new file mode 100644
index 0000000000..f6eee8cc5e
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/faiss/default.nix
@@ -0,0 +1,55 @@
+{
+  lib,
+  buildPythonPackage,
+  callPackage,
+  faiss-build,
+  numpy,
+  packaging,
+  setuptools,
+  pip,
+  wheel,
+}:
+
+buildPythonPackage {
+  inherit (faiss-build) pname version;
+  pyproject = true;
+
+  src = "${lib.getOutput "dist" faiss-build}";
+
+  postPatch = ''
+    mkdir dist
+    mv *.whl dist/
+  '';
+
+  build-system = [
+    setuptools
+    pip
+    wheel
+  ];
+
+  dependencies = [
+    numpy
+    packaging
+  ];
+
+  # E.g. cuda libraries; needed because reference scanning
+  # can't see inside the wheels
+  inherit (faiss-build) buildInputs;
+
+  dontBuild = true;
+
+  pythonImportsCheck = [ "faiss" ];
+
+  passthru = {
+    inherit (faiss-build) cudaSupport cudaPackages pythonSupport;
+
+    tests = {
+      pytest = callPackage ./pytest.nix { inherit faiss-build; };
+    };
+  };
+
+  meta = lib.pipe (faiss-build.meta or { }) [
+    (lib.flip builtins.removeAttrs [ "mainProgram" ])
+    (m: m // { description = "Bindings for faiss, the similarity search library"; })
+  ];
+}
diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/faiss/tests.nix b/third_party/nixpkgs/pkgs/development/python-modules/faiss/pytest.nix
similarity index 61%
rename from third_party/nixpkgs/pkgs/development/libraries/science/math/faiss/tests.nix
rename to third_party/nixpkgs/pkgs/development/python-modules/faiss/pytest.nix
index 858a980bfe..b90ee9c244 100644
--- a/third_party/nixpkgs/pkgs/development/libraries/science/math/faiss/tests.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/faiss/pytest.nix
@@ -1,8 +1,10 @@
-{ lib
-, buildPythonPackage
-, faiss
-, scipy
-, pytestCheckHook
+{
+  lib,
+  buildPythonPackage,
+  faiss,
+  faiss-build,
+  scipy,
+  pytestCheckHook,
 }:
 
 assert faiss.pythonSupport;
@@ -13,15 +15,13 @@ buildPythonPackage {
 
   format = "other";
 
-  src = "${faiss.src}/tests";
+  src = "${faiss-build.src}/tests";
 
   dontBuild = true;
   dontInstall = true;
 
   # Tests that need GPUs and would fail in the sandbox
-  disabledTestPaths = lib.optionals faiss.cudaSupport [
-    "test_contrib.py"
-  ];
+  disabledTestPaths = lib.optionals faiss.cudaSupport [ "test_contrib.py" ];
 
   disabledTests = [
     # https://github.com/facebookresearch/faiss/issues/2836
@@ -32,6 +32,9 @@ buildPythonPackage {
     faiss
     pytestCheckHook
     scipy
-  ] ++
-  faiss.extra-requires.all;
+  ];
+
+  meta = faiss.meta // {
+    description = "Faiss test suite";
+  };
 }
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fakeredis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fakeredis/default.nix
index 61f90aee21..b2f0b9c08f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/fakeredis/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/fakeredis/default.nix
@@ -6,7 +6,6 @@
   jsonpath-ng,
   lupa,
   poetry-core,
-  pybloom-live,
   pyprobables,
   pytest-asyncio,
   pytest-mock,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/farama-notifications/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/farama-notifications/default.nix
index 1fc964a560..c04c3a50a5 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/farama-notifications/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/farama-notifications/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  numpy,
   setuptools,
 }:
 
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fastai/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fastai/default.nix
index 884c51f65e..620b992fb2 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/fastai/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/fastai/default.nix
@@ -5,7 +5,6 @@
   fastprogress,
   fastcore,
   fastdownload,
-  torch,
   torchvision,
   matplotlib,
   pillow,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fastapi-cli/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fastapi-cli/default.nix
index 66aefe6671..b802b058df 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/fastapi-cli/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/fastbencode/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fastbencode/default.nix
index 92eb19e0a0..195491ec8a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/fastbencode/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/fastcore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fastcore/default.nix
index 1c5823e8f9..2dad1964f6 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/fastcore/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/fastcore/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "fastcore";
-  version = "1.5.54";
+  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-42HEyxufJrzc5T6t6ixA5I0n8rh8wZ8MTfsjnmhbUfk=";
+    hash = "sha256-dVzJtYnsezk7Pb5Y59BUY8TQ/3Z5JLntqjld2zJk6pA=";
   };
 
   build-system = [ setuptools ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fastdiff/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fastdiff/default.nix
index 9ddf94d502..1096add5b6 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/fastdiff/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/fasteners/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fasteners/default.nix
index 494a384849..4460c71f3c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/fasteners/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/fasttext/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fasttext/default.nix
index 0b54f1022f..11d5ef13a2 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/fasttext/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/feedgenerator/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/feedgenerator/default.nix
index d561911cd4..725150b18f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/feedgenerator/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/fiblary3-fork/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fiblary3-fork/default.nix
index ac7d321559..ab971979d6 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/fiblary3-fork/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/fiblary3-fork/default.nix
@@ -1,7 +1,6 @@
 {
   lib,
   buildPythonPackage,
-  isPy3k,
   fetchPypi,
   fixtures,
   jsonpatch,
@@ -12,7 +11,6 @@
   requests,
   requests-mock,
   six,
-  sphinx,
   testtools,
 }:
 
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/finalfusion/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/finalfusion/default.nix
index 17dde1d670..2452a6cbf0 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/finalfusion/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/finetuning-scheduler/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/finetuning-scheduler/default.nix
new file mode 100644
index 0000000000..d4a2752c8e
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/fingerprints/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fingerprints/default.nix
index cf12acd2ad..6b3bf80810 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/fingerprints/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/firebase-messaging/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/firebase-messaging/default.nix
index dc9bee90b3..0d6118e44c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/firebase-messaging/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/fitbit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fitbit/default.nix
index a479e66246..f53eba81b2 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/fitbit/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/flake8-import-order/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flake8-import-order/default.nix
index 476491873e..ea860b563e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/flake8-import-order/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/flake8-import-order/default.nix
@@ -40,6 +40,6 @@ buildPythonPackage rec {
       lgpl3
       mit
     ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flasgger/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flasgger/default.nix
index be5b422f14..7d52055c89 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/flasgger/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/flask-appbuilder/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-appbuilder/default.nix
index b35020f88e..64efa21f8c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/flask-appbuilder/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/flask-bootstrap/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-bootstrap/default.nix
index a34a1c2673..4c4e24aa72 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/flask-bootstrap/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/flask-caching/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-caching/default.nix
index e679bf16e8..0f733a1b9a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/flask-caching/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/flask-limiter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-limiter/default.nix
index 3ccf3d41fc..77f07f3910 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/flask-limiter/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/flask-mongoengine/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-mongoengine/default.nix
index 32f8642212..65ba830e91 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/flask-mongoengine/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/flask-paginate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-paginate/default.nix
index ee15641a9d..5624141f67 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/flask-paginate/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/flask-restful/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-restful/default.nix
index e1f15d6fad..55bb0160b4 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/flask-restful/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/flask-security-too/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-security-too/default.nix
index cf5e161f9a..98eb553794 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/flask-security-too/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-security-too/default.nix
@@ -48,18 +48,18 @@
 
 buildPythonPackage rec {
   pname = "flask-security-too";
-  version = "5.4.3";
+  version = "5.5.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.8";
 
   src = fetchPypi {
-    pname = "Flask-Security-Too";
+    pname = "flask_security_too";
     inherit version;
-    hash = "sha256-YrGTl+jXGo1MuNwNRAnMehSXmCVJAwOWlgruUYdV5YM=";
+    hash = "sha256-nuYOqKgH3Wfk2IFEDUhWUB6aP1xZ+c4DK7n0zB01TSk=";
   };
 
-   build-system = [ setuptools ];
+  build-system = [ setuptools ];
 
   # flask-login>=0.6.2 not satisfied by version 0.7.0.dev0
   pythonRelaxDeps = [ "flask-login" ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-versioned/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-versioned/default.nix
index 9541e74148..07bb5cbe40 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/flask-versioned/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/flexmock/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flexmock/default.nix
index 154c9f97ec..5088c3bcd6 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/flexmock/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/flufl/bounce.nix b/third_party/nixpkgs/pkgs/development/python-modules/flufl/bounce.nix
index b514947d8e..c527d03620 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/flufl/bounce.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/flufl/i18n.nix b/third_party/nixpkgs/pkgs/development/python-modules/flufl/i18n.nix
index a592c4a4dd..3a7295e0a0 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/flufl/i18n.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/foolscap/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/foolscap/default.nix
index 5db308aa20..246c97aa9c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/foolscap/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/formencode/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/formencode/default.nix
index 58a2fe4d77..216e48dd1f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/formencode/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/formulaic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/formulaic/default.nix
index 93f7777467..ee149c9683 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/formulaic/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/formulaic/default.nix
@@ -3,7 +3,6 @@
   astor,
   buildPythonPackage,
   fetchFromGitHub,
-  git,
   hatch-vcs,
   hatchling,
   interface-meta,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/freertos-gdb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/freertos-gdb/default.nix
index 70a7c8efa3..f932925762 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/freertos-gdb/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/freertos-gdb/default.nix
@@ -1,4 +1,4 @@
-{ lib, pkg-config, fetchPypi, buildPythonPackage }:
+{ lib, fetchPypi, buildPythonPackage }:
 
 buildPythonPackage rec {
   pname = "freertos-gdb";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/frozendict/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/frozendict/default.nix
index fa2441e829..6e1d469ba3 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/frozendict/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/frozendict/default.nix
@@ -4,7 +4,6 @@
   fetchFromGitHub,
   setuptools,
   pytestCheckHook,
-  pythonAtLeast,
   pythonOlder,
 }:
 
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fs-s3fs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fs-s3fs/default.nix
index 5913bb656e..5372eb0b6d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/fs-s3fs/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/fsspec/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fsspec/default.nix
index 735d0b115c..e423f32d79 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/fsspec/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/ftputil/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ftputil/default.nix
index 0a3329b02c..01ec0e9d61 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/ftputil/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/func-timeout/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/func-timeout/default.nix
index 4c3c342f32..33446197f5 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/func-timeout/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/funcparserlib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/funcparserlib/default.nix
index abe8fb25d6..4c67565fd5 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/funcparserlib/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/funcparserlib/default.nix
@@ -3,7 +3,6 @@
   buildPythonPackage,
   fetchFromGitHub,
   poetry-core,
-  python,
   pytestCheckHook,
   pythonOlder,
   six,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/funcsigs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/funcsigs/default.nix
index 63fcb20522..bafdd58d56 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/funcsigs/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/funcy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/funcy/default.nix
index a6bb66a173..45359c9adc 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/funcy/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/fx2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fx2/default.nix
index 29809ebdfa..7e99404d94 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/fx2/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/fx2/default.nix
@@ -1,7 +1,6 @@
 {
   lib,
   buildPythonPackage,
-  python,
   fetchFromGitHub,
   sdcc,
   libusb1,
@@ -50,6 +49,6 @@ buildPythonPackage rec {
     mainProgram = "fx2tool";
     homepage = "https://github.com/whitequark/libfx2";
     license = licenses.bsd0;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gatt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gatt/default.nix
index 6437deacd4..5a928d5c79 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/gatt/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/gcs-oauth2-boto-plugin/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gcs-oauth2-boto-plugin/default.nix
index 87f9e361fe..0cb900cffb 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/gcs-oauth2-boto-plugin/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/gcs-oauth2-boto-plugin/default.nix
@@ -2,7 +2,6 @@
   lib,
   boto,
   buildPythonPackage,
-  fasteners,
   fetchFromGitHub,
   freezegun,
   google-reauth,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gemfileparser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gemfileparser/default.nix
index b1b7d034ff..057898dded 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/gemfileparser/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/gemfileparser/default.nix
@@ -32,7 +32,7 @@ buildPythonPackage rec {
       gpl3Plus
       mit
     ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "parsegemfile";
   };
 }
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gensim/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gensim/default.nix
index c005662068..61ce59689b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/gensim/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/gensim/default.nix
@@ -8,7 +8,6 @@
   numpy,
   scipy,
   smart-open,
-  testfixtures,
   pyemd,
   pytestCheckHook,
   pythonOlder,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/geographiclib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/geographiclib/default.nix
index 14433fe94f..4d91f5fb8a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/geographiclib/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/geoip2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/geoip2/default.nix
index 179ed9888c..b4a4583275 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/geoip2/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/gerbonara/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gerbonara/default.nix
index 0aba56617e..46a226f563 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/gerbonara/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/gerbonara/default.nix
@@ -4,7 +4,6 @@
   fetchFromGitHub,
   gitUpdater,
   setuptools,
-  pytest,
   click,
   numpy,
   scipy,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gevent-socketio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gevent-socketio/default.nix
index 29f1714039..aa592a876e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/gevent-socketio/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/gevent-socketio/default.nix
@@ -4,7 +4,6 @@
   fetchPypi,
   gevent,
   gevent-websocket,
-  mock,
   versiontools,
   pythonOlder,
 }:
@@ -36,6 +35,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/third_party/nixpkgs/pkgs/development/python-modules/gevent-websocket/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gevent-websocket/default.nix
index 9fad31860e..a93c3dc6b9 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/gevent-websocket/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/geventhttpclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/geventhttpclient/default.nix
index 478faeaeb3..230d8f300e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/geventhttpclient/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/geventhttpclient/default.nix
@@ -6,11 +6,9 @@
   dpkt,
   fetchFromGitHub,
   gevent,
-  llhttp,
   pytestCheckHook,
   pythonOlder,
   setuptools,
-  six,
   stdenv,
   urllib3,
 }:
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gipc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gipc/default.nix
index 7a0529cc89..aed16c67ce 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/gipc/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/git-annex-adapter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/git-annex-adapter/default.nix
index 07f546d415..7778ecd9ca 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/git-annex-adapter/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/git-annex-adapter/default.nix
@@ -8,7 +8,6 @@
   gitMinimal,
   pygit2,
   pytestCheckHook,
-  python,
   pythonOlder,
   setuptools,
   substituteAll,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gitdb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gitdb/default.nix
index 422b7b52c3..6de58d1edd 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/gitdb/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/gitpython/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gitpython/default.nix
index a7f45bd7b3..8b6e93e2fe 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/gitpython/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/gitpython/default.nix
@@ -6,7 +6,6 @@
   gitdb,
   pkgs,
   pythonOlder,
-  substituteAll,
   typing-extensions,
 }:
 
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/glad/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/glad/default.nix
index 56eeb3f904..8c9b40345a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/glad/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/glcontext/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/glcontext/default.nix
index 4ad9fa3060..a62e403fc2 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/glcontext/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/glean-parser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/glean-parser/default.nix
index bf22e5bce9..8196b35ce3 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/glean-parser/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/glueviz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/glueviz/default.nix
index 1db27a1d72..4f13f73214 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/glueviz/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/glueviz/default.nix
@@ -3,69 +3,66 @@
   buildPythonPackage,
   fetchFromGitHub,
   pythonOlder,
-  dill,
   astropy,
+  dill,
+  echo,
+  fast-histogram,
+  h5py,
+  ipython,
+  matplotlib,
+  mpl-scatter-density,
   numpy,
+  openpyxl,
   pandas,
-  qt6,
-  pyqt6,
   pyqt-builder,
-  qtconsole,
+  pytestCheckHook,
+  qt6,
+  scipy,
   setuptools,
   setuptools-scm,
-  scipy,
-  ipython,
-  ipykernel,
-  h5py,
-  matplotlib,
+  shapely,
   xlrd,
-  mpl-scatter-density,
-  pvextractor,
-  openpyxl,
-  echo,
-  pytest,
-  pytest-flakes,
-  pytest-cov,
 }:
 
 buildPythonPackage rec {
   pname = "glueviz";
-  version = "1.21.0";
-  format = "setuptools";
+  version = "1.21.1";
+  pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "glue-viz";
     repo = "glue";
     rev = "refs/tags/v${version}";
-    sha256 = "sha256-C9UqDdhPcaznidiDlQO27Vgct2MT9gVlH740hoYg3Bc=";
+    hash = "sha256-/awIgfKbDFKM2WFlfpo5f/Px/N1aMXkV9eSTXts0aGo=";
   };
 
   buildInputs = [ pyqt-builder ];
-  nativeBuildInputs = [
+
+  nativeBuildInputs = [ qt6.wrapQtAppsHook ];
+
+  build-system = [
     setuptools
     setuptools-scm
-    qt6.wrapQtAppsHook
   ];
-  propagatedBuildInputs = [
+
+  dependencies = [
     astropy
     dill
-    setuptools
-    scipy
-    numpy
-    matplotlib
-    pandas
-    pyqt6
-    qtconsole
-    ipython
-    ipykernel
-    h5py
-    xlrd
-    mpl-scatter-density
-    pvextractor
-    openpyxl
     echo
+    fast-histogram
+    h5py
+    ipython
+    matplotlib
+    mpl-scatter-density
+    numpy
+    openpyxl
+    pandas
+    scipy
+    setuptools
+    shapely
+    xlrd
   ];
 
   dontConfigure = true;
@@ -74,14 +71,12 @@ buildPythonPackage rec {
   # qt.qpa.plugin: Could not load the Qt platform plugin "xcb" in "" even though it was found.
   doCheck = false;
 
-  nativeCheckInputs = [
-    pytest
-    pytest-flakes
-    pytest-cov
-  ];
+  nativeCheckInputs = [ pytestCheckHook ];
 
   pythonImportsCheck = [ "glue" ];
 
+  dontWrapQtApps = true;
+
   preFixup = ''
     makeWrapperArgs+=("''${qtWrapperArgs[@]}")
   '';
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-api-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-api-core/default.nix
index cbff06c5d8..ccfeaa3deb 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-api-core/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/google-api-python-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-api-python-client/default.nix
index c31e4c8135..3cb93fc574 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-api-python-client/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/google-auth-httplib2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-auth-httplib2/default.nix
index cfa2a0ba47..ef1ad2a2fa 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-auth-httplib2/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/google-auth/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-auth/default.nix
index d086f02de5..5556429082 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-auth/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-asset/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-asset/default.nix
index 7126dc489c..350faaddb7 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-asset/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-audit-log/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-audit-log/default.nix
index 93907bcf7e..113e8a0c3d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-audit-log/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-automl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-automl/default.nix
index 7b05f46dbd..43c6da42b4 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-automl/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix
index 9e643cded4..7830d012c7 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-datatransfer/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix
index 2326fb6804..807c9c8acb 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery-storage/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix
index 7062b2b2e3..d9ea0eba51 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigtable/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigtable/default.nix
index 30c5087f0d..116e83effc 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigtable/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-container/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-container/default.nix
index 884a337e56..16794b8df6 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-container/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-core/default.nix
index 3213156bb4..bd5fbf7ee0 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-core/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-datacatalog/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-datacatalog/default.nix
index 56f6363de1..2aab9d33f9 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-datacatalog/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dataproc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dataproc/default.nix
index 05040c6ae1..456411f13f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dataproc/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-datastore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-datastore/default.nix
index fbce5713a5..44f38f1e9b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-datastore/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dlp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dlp/default.nix
index 42f7a3e0b2..6a7ddacb06 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dlp/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dns/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dns/default.nix
index 0ab6d3f677..12da5d31a7 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dns/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-error-reporting/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-error-reporting/default.nix
index 5c60a79bd6..56e898a15b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-error-reporting/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-firestore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-firestore/default.nix
index db55f1afd4..ce88d28953 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-firestore/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-iot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-iot/default.nix
index 7fe73ddf3c..4cd4dc257f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-iot/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-kms/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-kms/default.nix
index 5a9c25bfc2..ff28fe3dfc 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-kms/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-language/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-language/default.nix
index 1fe089ce8d..04f8877803 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-language/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-logging/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-logging/default.nix
index 95b237af99..9fbd08a308 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-logging/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-monitoring/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-monitoring/default.nix
index 437034e401..5b6c969a9c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-monitoring/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-netapp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-netapp/default.nix
index 4dee8f473d..66b341273f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-netapp/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-os-config/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-os-config/default.nix
index 2612fb157f..e4c45f2e3f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-os-config/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-pubsub/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-pubsub/default.nix
index 4f4877e358..5f7618c3af 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-pubsub/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-redis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-redis/default.nix
index 851697c0df..83a14eb68c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-redis/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-resource-manager/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-resource-manager/default.nix
index add940196f..6cb795d073 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-resource-manager/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix
index 82cd2b45ec..7f6cc83c1c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-runtimeconfig/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-securitycenter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-securitycenter/default.nix
index 772cef5957..1a45f67cb5 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-securitycenter/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-spanner/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-spanner/default.nix
index 671c5fc37e..2da0cc9811 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-spanner/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-speech/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-speech/default.nix
index f8c1684c4e..fd1d084cd1 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-speech/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-storage/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-storage/default.nix
index 3d47efcfcf..4a5081468f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-storage/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-tasks/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-tasks/default.nix
index 7b7c3660f0..144f568cd4 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-tasks/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-testutils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-testutils/default.nix
index 15d8d226d5..e62d47e372 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-testutils/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-texttospeech/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-texttospeech/default.nix
index c5830b8d93..80b22fb2ec 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-texttospeech/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-trace/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-trace/default.nix
index 3d6c8b78b4..caf839ce54 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-trace/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-translate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-translate/default.nix
index e25cf74a49..f3cbe6abc8 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-translate/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-videointelligence/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-videointelligence/default.nix
index c11cc40af3..bf5358dce4 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-videointelligence/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-vision/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-vision/default.nix
index 2ee0682090..75cc08070a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-vision/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix
index 7a962443f3..5c55dd7416 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/google-i18n-address/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-i18n-address/default.nix
index 47355a45ff..d13183bacf 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-i18n-address/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/google-resumable-media/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-resumable-media/default.nix
index f597558673..504987669e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/google-resumable-media/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/googleapis-common-protos/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/googleapis-common-protos/default.nix
index 9e62755a0e..eb4d8e5944 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/googleapis-common-protos/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/gpapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gpapi/default.nix
index da55f64055..cd6ce736d2 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/gpapi/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/gphoto2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gphoto2/default.nix
index a7535c813b..7f1e5ce0e4 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/gphoto2/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/gplaycli/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gplaycli/default.nix
index cf427d0560..9303ef9d14 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/gplaycli/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/gpt-2-simple/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gpt-2-simple/default.nix
index e2908da74f..6d12f26297 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/gpt-2-simple/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/gradio/client.nix b/third_party/nixpkgs/pkgs/development/python-modules/gradio/client.nix
index 1c7a51dd2a..1e87a7ad65 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/gradio/client.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/gradio/client.nix
@@ -14,7 +14,6 @@
   httpx,
   huggingface-hub,
   packaging,
-  requests,
   typing-extensions,
   websockets,
   # checkInputs
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gradio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gradio/default.nix
index 5cc026cd3f..b59ba637d7 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/gradio/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/gradio/default.nix
@@ -123,7 +123,7 @@ buildPythonPackage rec {
     uvicorn
     typer
     tomlkit
-  ] ++ typer.passthru.optional-dependencies.all;
+  ];
 
   passthru.optional-dependencies.oauth = [
     authlib
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/graphene/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/graphene/default.nix
index bea97bea98..db44239de0 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/graphene/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/graphql-relay/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/graphql-relay/default.nix
index 75b0471211..a358ab4fe9 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/graphql-relay/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/greatfet/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/greatfet/default.nix
index 147cd19164..9383ec9037 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/greatfet/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/green/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/green/default.nix
index 4d632b21ca..96792daa62 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/green/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/green/default.nix
@@ -3,7 +3,6 @@
   buildPythonPackage,
   pythonOlder,
   fetchPypi,
-  django,
   colorama,
   coverage,
   unidecode,
@@ -50,6 +49,6 @@ buildPythonPackage rec {
     description = "Python test runner";
     homepage = "https://github.com/CleanCut/green";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/grpc-google-iam-v1/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/grpc-google-iam-v1/default.nix
index 111678f0b9..17ede6dee3 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/grpc-google-iam-v1/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/grpcio-tools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/grpcio-tools/default.nix
index fa204c0489..7d859b3af7 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/grpcio-tools/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/grpcio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/grpcio/default.nix
index dca383e92a..44c591d783 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/grpcio/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/gsd/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gsd/default.nix
index 48b8694650..e280a1de73 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/gsd/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/gspread/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gspread/default.nix
index d07e08d3eb..efcc03f3bc 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/gspread/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/gst-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gst-python/default.nix
index ccb4c30f24..27d4d0f869 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/gst-python/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/gstools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gstools/default.nix
new file mode 100644
index 0000000000..e110489539
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/gstools/default.nix
@@ -0,0 +1,64 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  setuptools-scm,
+  numpy,
+  cython,
+  extension-helpers,
+  hankel,
+  emcee,
+  meshio,
+  pyevtk,
+  scipy,
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "gstools";
+  version = "1.6.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "GeoStat-Framework";
+    repo = "GSTools";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-QpdOARzcSRVFl/DbnE2JLBFZmTSh/fBOmzweuf+zfEs=";
+  };
+
+  build-system = [
+    setuptools
+    setuptools-scm
+    numpy
+    cython
+    extension-helpers
+  ];
+
+  dependencies = [
+    emcee
+    hankel
+    meshio
+    numpy
+    pyevtk
+    scipy
+  ];
+
+  # scipy derivation dont support numpy_2 and is patched to use version 1
+  # Using numpy_2 in the derivation will cause a clojure duplicate error
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail 'numpy>=2.0.0rc1,' 'numpy' \
+  '';
+
+  pythonImportsCheck = [ "gstools" ];
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  meta = {
+    description = "Geostatistical toolbox";
+    homepage = "https://github.com/GeoStat-Framework/GSTools";
+    changelog = "https://github.com/GeoStat-Framework/GSTools/blob/${src.rev}/CHANGELOG.md";
+    license = lib.licenses.lgpl3Only;
+    maintainers = with lib.maintainers; [ sigmanificient ];
+  };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/guessit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/guessit/default.nix
index ec73362550..c86ecb59ef 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/guessit/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/gwcs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gwcs/default.nix
index a6dd4fcae5..07b235b410 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/gwcs/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/gwcs/default.nix
@@ -13,7 +13,6 @@
   scipy,
   setuptools-scm,
   setuptools,
-  tomli,
 }:
 
 buildPythonPackage rec {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/h11/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/h11/default.nix
index a385f55ca8..a7e4271006 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/h11/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/h2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/h2/default.nix
index 7e216c2c8f..3666c7db9e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/h2/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/h5netcdf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/h5netcdf/default.nix
index f5128692ce..cc43f6d6df 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/h5netcdf/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/h5py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/h5py/default.nix
index 6a1dd926f0..80eb055a1d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/h5py/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/h5py/default.nix
@@ -14,6 +14,7 @@
   pytestCheckHook,
   pytest-mpi,
   cached-property,
+  stdenv,
 }:
 
 assert hdf5.mpiSupport -> mpi4py != null && hdf5.mpi == mpi4py.mpi;
@@ -46,9 +47,7 @@ buildPythonPackage rec {
     substituteInPlace pyproject.toml \
       --replace-fail "numpy >=2.0.0rc1" "numpy"
   '';
-  pythonRelaxDeps = [
-    "mpi4py"
-  ];
+  pythonRelaxDeps = [ "mpi4py" ];
 
   HDF5_DIR = "${hdf5}";
   HDF5_MPI = if mpiSupport then "ON" else "OFF";
@@ -100,5 +99,9 @@ buildPythonPackage rec {
     homepage = "http://www.h5py.org/";
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ doronbehar ];
+    # When importing `h5py` during the build, we get:
+    #
+    # ValueError: Not a datatype (not a datatype)
+    broken = stdenv.isDarwin && stdenv.isx86_64;
   };
 }
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/habanero/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/habanero/default.nix
index 613b6a8315..c08ffcd121 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/habanero/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/hahomematic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hahomematic/default.nix
index 9e48a5da5b..8f4bece714 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/hahomematic/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/hahomematic/default.nix
@@ -12,8 +12,6 @@
   pythonOlder,
   setuptools,
   voluptuous,
-  websocket-client,
-  xmltodict,
 }:
 
 buildPythonPackage rec {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hankel/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hankel/default.nix
new file mode 100644
index 0000000000..ae04ed26f3
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/hankel/default.nix
@@ -0,0 +1,49 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  setuptools-scm,
+  mpmath,
+  numpy,
+  scipy,
+  pytestCheckHook,
+  pytest-xdist,
+}:
+
+buildPythonPackage rec {
+  pname = "hankel";
+  version = "1.2.2";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "steven-murray";
+    repo = "hankel";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-/5PvbH8zz2siLS1YJYRSrl/Cpi0WToBu1TJhlek8VEE=";
+  };
+
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
+  dependencies = [
+    mpmath
+    numpy
+    scipy
+  ];
+
+  pythonImportsCheck = [ "hankel" ];
+  nativeCheckInputs = [
+    pytestCheckHook
+    pytest-xdist
+  ];
+
+  meta = {
+    description = "Implementation of Ogata's (2005) method for Hankel transforms";
+    homepage = "https://github.com/steven-murray/hankel";
+    changelog = "https://github.com/steven-murray/hankel/${src.rev}/CHANGELOG.rst";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ sigmanificient ];
+  };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hatch-jupyter-builder/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hatch-jupyter-builder/default.nix
index 731aeeba52..7a070285d3 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/hatch-jupyter-builder/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/hatch-regex-commit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hatch-regex-commit/default.nix
index 9cd936d579..5c8afe4630 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/hatch-regex-commit/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/hatch-regex-commit/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  hatch-regex-commit,
   hatchling,
   pythonOlder,
 }:
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hatch-requirements-txt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hatch-requirements-txt/default.nix
index 12e304475c..3d4c69fec0 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/hatch-requirements-txt/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/hawkauthlib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hawkauthlib/default.nix
index b7c6c73820..ae7933207c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/hawkauthlib/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/hexbytes/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hexbytes/default.nix
index 311644b15c..5d0845c972 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/hexbytes/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/highdicom/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/highdicom/default.nix
index 65ba5d8bd7..25148892a0 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/highdicom/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/highdicom/default.nix
@@ -10,7 +10,6 @@
   pydicom,
   pylibjpeg,
   pylibjpeg-libjpeg,
-  pylibjpeg-openjpeg,
 }:
 
 let
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hkdf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hkdf/default.nix
index 176322d932..f04e486fd7 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/hkdf/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/hkdf/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonOlder,
   nose,
   setuptools,
 }:
@@ -23,9 +22,6 @@ buildPythonPackage {
 
   pythonImportsCheck = [ "hkdf" ];
 
-  # tests rely on nose
-  doCheck = pythonOlder "3.12";
-
   nativeCheckInputs = [ nose ];
 
   checkPhase = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/holoviews/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/holoviews/default.nix
index 78633fe9ef..eb17dd0534 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/holoviews/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/howdoi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/howdoi/default.nix
index dc614456f8..53995d2de5 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/howdoi/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/hpack/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hpack/default.nix
index a6042315c3..df23b4ec3c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/hpack/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/hsh/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hsh/default.nix
index 0b724c03d0..f7efbc14e8 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/hsh/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/hsh/default.nix
@@ -6,7 +6,6 @@
   unittestCheckHook,
   pexpect,
   naked,
-  nix-update-script,
   setuptools,
   wheel,
 }:
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hstspreload/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hstspreload/default.nix
index e0943982dc..5ef5504c84 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/hstspreload/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/html-table-parser-python3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/html-table-parser-python3/default.nix
new file mode 100644
index 0000000000..c4f3f8fc46
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/html2text/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/html2text/default.nix
index 236b312e34..b114029aad 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/html2text/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/html5-parser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/html5-parser/default.nix
index 6658642d4a..2a3e0dfb42 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/html5-parser/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/html5tagger/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/html5tagger/default.nix
index cf3b6ac8bf..527e366048 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/html5tagger/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/htmllistparse/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/htmllistparse/default.nix
index f2f6b21106..5bd467bed3 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/htmllistparse/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/httpauth/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/httpauth/default.nix
index 2fb598918a..80362a801d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/httpauth/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/httpbin/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/httpbin/default.nix
index a4e867d981..4b670b4c17 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/httpbin/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/httpie/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/httpie/default.nix
index 9802b96070..381eba4f5f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/httpie/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/httpie/default.nix
@@ -5,7 +5,6 @@
   fetchFromGitHub,
   installShellFiles,
   pandoc,
-  pythonOlder,
   # BuildInputs
   charset-normalizer,
   defusedxml,
@@ -16,7 +15,6 @@
   setuptools,
   rich,
   pysocks,
-  # CheckInputs
   pip,
   pytest-httpbin,
   pytest-lazy-fixture,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/httplib2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/httplib2/default.nix
index 303fccac56..67e38601cf 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/httplib2/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/httplib2/default.nix
@@ -4,7 +4,6 @@
   buildPythonPackage,
   cryptography,
   fetchFromGitHub,
-  isPy27,
   mock,
   pyparsing,
   pytest-forked,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/httpretty/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/httpretty/default.nix
index 38a386dc19..ea38f414e3 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/httpretty/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/httpretty/default.nix
@@ -4,7 +4,6 @@
   fetchPypi,
   sure,
   six,
-  pytest,
   freezegun,
   pytestCheckHook,
 }:
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/httptools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/httptools/default.nix
index cc91c40429..c6d2c176a5 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/httptools/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/httpx-socks/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/httpx-socks/default.nix
index 1e93ee5ac7..6404923500 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/httpx-socks/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/httpx-socks/default.nix
@@ -2,7 +2,6 @@
   lib,
   async-timeout,
   buildPythonPackage,
-  curio,
   fetchFromGitHub,
   flask,
   httpcore,
@@ -14,7 +13,6 @@
   python-socks,
   pythonOlder,
   setuptools,
-  sniffio,
   starlette,
   tiny-proxy,
   trio,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/huggingface-hub/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/huggingface-hub/default.nix
index 4d9045e786..2787f4a173 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/huggingface-hub/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/huggingface-hub/default.nix
@@ -3,7 +3,11 @@
   buildPythonPackage,
   pythonOlder,
   fetchFromGitHub,
+
+  # build-system
   setuptools,
+
+  # dependencies
   filelock,
   fsspec,
   packaging,
@@ -15,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "huggingface-hub";
-  version = "0.24.2";
+  version = "0.24.3";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -24,7 +28,7 @@ buildPythonPackage rec {
     owner = "huggingface";
     repo = "huggingface_hub";
     rev = "refs/tags/v${version}";
-    hash = "sha256-tbv5ri37udhx9qhPhCRFe0GOc62n0e7uF0EjDpF2TIQ=";
+    hash = "sha256-na4oZ9UDzUy96obe5ZSD+WUWnGVZPuxXMlP6IdExWyY=";
   };
 
   build-system = [ setuptools ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hupper/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hupper/default.nix
index 0f46eef1ee..a7a6525e94 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/hupper/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/hvac/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hvac/default.nix
index 74002cade8..67429f81ef 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/hvac/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/hvplot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hvplot/default.nix
index 675e82cf2e..7884f61cbc 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/hvplot/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/hypchat/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hypchat/default.nix
index 81bcf358ef..a1e3a70395 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/hypchat/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/hypchat/default.nix
@@ -1,5 +1,6 @@
 {
   buildPythonPackage,
+  pythonAtLeast,
   fetchPypi,
   requests,
   six,
@@ -11,6 +12,8 @@ buildPythonPackage rec {
   version = "0.21";
   format = "setuptools";
 
+  disabled = pythonAtLeast "3.12";
+
   src = fetchPypi {
     inherit pname version;
     sha256 = "1sd8f3gihagaqd848dqy6xw457fa4f9bla1bfyni7fq3h76sjdzg";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hyperframe/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hyperframe/default.nix
index 5842ced668..e82b3b21c8 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/hyperframe/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/hyperion-py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hyperion-py/default.nix
index faaacf939f..6c0285e8ca 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/hyperion-py/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/hyperion-py/default.nix
@@ -6,7 +6,6 @@
   fetchpatch,
   pytestCheckHook,
   pythonOlder,
-  pythonAtLeast,
   poetry-core,
   pytest-aiohttp,
   pytest-asyncio,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hypothesis-auto/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hypothesis-auto/default.nix
index 6067efde3e..eca2ca1014 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/hypothesis-auto/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/hypothesis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hypothesis/default.nix
index a76b8e2ff2..9590857b34 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/hypothesis/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/hypothesmith/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hypothesmith/default.nix
index be40b4375e..a69c0c0821 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/hypothesmith/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/ibis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ibis/default.nix
index 84eedf9e3b..2300af2347 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/ibis/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/ics/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ics/default.nix
index 2f973a6dc9..b1d4dd9a1f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/ics/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/ijson/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ijson/default.nix
index 7a16b64e86..c23fc8ad87 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/ijson/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/image-diff/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/image-diff/default.nix
index ac5a22947a..1b64799cb0 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/image-diff/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/image-diff/default.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  python,
   buildPythonPackage,
   fetchFromGitHub,
   pillow,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/imap-tools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/imap-tools/default.nix
index 04368c8e75..35a1e8a426 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/imap-tools/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/imbalanced-learn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/imbalanced-learn/default.nix
index ee070a5169..e3bdcc2a05 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/imbalanced-learn/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/imbalanced-learn/default.nix
@@ -12,7 +12,6 @@
   scipy,
   tensorflow,
   threadpoolctl,
-  pytest-xdist,
   pytestCheckHook,
 }:
 
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/import-expression/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/import-expression/default.nix
index 69a93830c5..7dec7e5dad 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/import-expression/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/import-expression/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchPypi,
-  fetchpatch,
   pytestCheckHook,
   astunparse,
   setuptools,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/incremental/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/incremental/default.nix
index 9077ddae4b..db600c27aa 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/incremental/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/iniconfig/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/iniconfig/default.nix
index ada4397a03..fcf045c944 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/iniconfig/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/iniconfig/default.nix
@@ -3,7 +3,6 @@
   buildPythonPackage,
   substituteAll,
   fetchPypi,
-  hatch-vcs,
   hatchling,
 }:
 
@@ -37,6 +36,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/third_party/nixpkgs/pkgs/development/python-modules/inifile/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/inifile/default.nix
index b3ade47dca..a03e407032 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/inifile/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/inlinestyler/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/inlinestyler/default.nix
index 3228d0f5b4..2fd63571eb 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/inlinestyler/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/inscriptis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/inscriptis/default.nix
index 5de7c6e10b..b98b7fdfa0 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/inscriptis/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/intake/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/intake/default.nix
index 0951b6218b..80907730ff 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/intake/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/invoke/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/invoke/default.nix
index 5ac98f31c5..019ebd243f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/invoke/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/iocsearcher/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/iocsearcher/default.nix
index 0d91a2cc76..26d3939d17 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/iocsearcher/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/ionoscloud/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ionoscloud/default.nix
index 5c296986b5..a9942a3758 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/ionoscloud/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/irc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/irc/default.nix
index 7d6fa662f0..c7408868ad 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/irc/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/isbnlib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/isbnlib/default.nix
index 520b7f6159..8bf7e67b9e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/isbnlib/default.nix
+++ b/third_party/nixpkgs/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
   ];
 
-  # requires network connection
-  doCheck = false;
+  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"
+  ];
+
+  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/third_party/nixpkgs/pkgs/development/python-modules/isosurfaces/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/isosurfaces/default.nix
index b72476e774..79de8ce0df 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/isosurfaces/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/isounidecode/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/isounidecode/default.nix
index 9ac5d454b2..c8b0607b02 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/isounidecode/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/itemadapter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/itemadapter/default.nix
index ac9250637a..b501fa5927 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/itemadapter/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/itemloaders/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/itemloaders/default.nix
index ac904ef152..bd6e8b884a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/itemloaders/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/iteration-utilities/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/iteration-utilities/default.nix
index 5dc9382baa..ae4db9f10b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/iteration-utilities/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/itypes/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/itypes/default.nix
index 771f91a461..a1e83de89c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/itypes/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/jaeger-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jaeger-client/default.nix
index 61755ada57..c976fca5d6 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/jaeger-client/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/jaraco-collections/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jaraco-collections/default.nix
index 9992250b4c..5b08f94e98 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/jaraco-collections/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/jaraco-functools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jaraco-functools/default.nix
index 722d707a18..4af7e125b8 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/jaraco-functools/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/jaraco-logging/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jaraco-logging/default.nix
index aeb99584cc..3368ac4ae1 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/jaraco-logging/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/jaraco-text/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jaraco-text/default.nix
index a3656f5cfb..5ff8b117eb 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/jaraco-text/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/javaproperties/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/javaproperties/default.nix
index 2c26ec97ae..bd8c9085a2 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/javaproperties/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/jaxlib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jaxlib/default.nix
index 1e7cf125ef..0fc50fa924 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/jaxlib/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/jaxlib/default.nix
@@ -4,7 +4,7 @@
   stdenv,
 
   # Build-time dependencies:
-  addOpenGLRunpath,
+  addDriverRunpath,
   autoAddDriverRunpath,
   bazel_6,
   binutils,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jdatetime/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jdatetime/default.nix
index fa774a40b7..553500c47b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/jdatetime/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/jedi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jedi/default.nix
index 26bd4a173d..a47398cb9c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/jedi/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/jenkins-job-builder/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jenkins-job-builder/default.nix
index a74c54dc41..6e4cb647e8 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/jenkins-job-builder/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/jinja2-ansible-filters/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jinja2-ansible-filters/default.nix
index 2f0dcad69c..3e007d326d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/jinja2-ansible-filters/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/jinja2-time/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jinja2-time/default.nix
index 5a2a020af9..b0783c69f4 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/jinja2-time/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/jira/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jira/default.nix
index 5e0a57983b..2e2ff91c8b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/jira/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/jmespath/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jmespath/default.nix
index f6a15f0156..a01dc0b798 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/jmespath/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/joblib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/joblib/default.nix
index f56aa7a391..65b728b34e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/joblib/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/joserfc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/joserfc/default.nix
index a48098db4a..a54844be92 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/joserfc/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/jschema-to-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jschema-to-python/default.nix
index 998b841e37..773327b85c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/jschema-to-python/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/jsmin/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jsmin/default.nix
index 44b508af55..3a15b321e5 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/jsmin/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/json2html/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/json2html/default.nix
index d775450ecf..8a7ef46d72 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/json2html/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/json2html/default.nix
@@ -2,7 +2,6 @@
   buildPythonPackage,
   fetchFromGitHub,
   lib,
-  python3,
   setuptools,
 }:
 
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jsonable/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jsonable/default.nix
index 4dd7c96221..705ff95a2d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/jsonable/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/jsonargparse/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jsonargparse/default.nix
index 5097a370e8..a7d0d2ece3 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/jsonargparse/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/jsonargparse/default.nix
@@ -1,7 +1,6 @@
 {
   lib,
   argcomplete,
-  attrs,
   buildPythonPackage,
   docstring-parser,
   fetchFromGitHub,
@@ -9,14 +8,12 @@
   jsonnet,
   jsonschema,
   omegaconf,
-  pydantic,
   pytest-subtests,
   pytestCheckHook,
   pythonOlder,
   pyyaml,
   reconplogger,
   requests,
-  responses,
   ruyaml,
   setuptools,
   types-pyyaml,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jsonlines/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jsonlines/default.nix
index 1e8a94e8e1..fbe7007b24 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/jsonlines/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/jsonmerge/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jsonmerge/default.nix
index 5879be3b53..208d4dd78f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/jsonmerge/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/jsonpatch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jsonpatch/default.nix
index 09c61d7089..42712f4e54 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/jsonpatch/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/jsonref/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jsonref/default.nix
index 9c5ce75a89..fbae39f1b5 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/jsonref/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/jsonrpclib-pelix/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jsonrpclib-pelix/default.nix
index 5cf7fe1f5b..314e3433da 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/jsonrpclib-pelix/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/jsonschema-path/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jsonschema-path/default.nix
index 153c584047..9add473d07 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/jsonschema-path/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/jsonschema-path/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "jsonschema-path";
-  version = "0.3.2";
+  version = "0.3.3";
 
   disabled = pythonOlder "3.8";
 
@@ -22,19 +22,15 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "p1c2u";
     repo = "jsonschema-path";
-    rev = version;
-    hash = "sha256-HC0yfACKFIQEQoIa8/FUKyV8YS8TQ0BY7i3n9xCdKz8=";
+    rev = "refs/tags/${version}";
+    hash = "sha256-oBzB6Ke19QDcMQm4MpnaS132/prrtnCekAXuPMloZx4=";
   };
 
   postPatch = ''
     sed -i '/--cov/d' pyproject.toml
   '';
 
-  nativeBuildInputs = [
-    poetry-core
-  ];
-
-  pythonRelaxDeps = [ "referencing" ];
+  build-system = [ poetry-core ];
 
   propagatedBuildInputs = [
     pathable
@@ -50,6 +46,7 @@ buildPythonPackage rec {
   ];
 
   meta = {
+    changelog = "https://github.com/p1c2u/jsonschema-path/releases/tag/${version}";
     description = "JSONSchema Spec with object-oriented paths";
     homepage = "https://github.com/p1c2u/jsonschema-path";
     license = lib.licenses.asl20;
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-book/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-book/default.nix
index e0cc52123c..727d5afa83 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-book/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/jupyter-cache/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-cache/default.nix
index 1d57a7a5d8..2815d9ee81 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-cache/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/jupyter-events/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-events/default.nix
index 0451a3fb74..66de5a91ff 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-events/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/jupyter-lsp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-lsp/default.nix
index 90ed978eba..54ce115af8 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-lsp/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/jupyter-repo2docker/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-repo2docker/default.nix
index 6341f29b85..059de94c69 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-repo2docker/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/jupyter-server-mathjax/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-server-mathjax/default.nix
index 58e1763006..a3937b5d8b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-server-mathjax/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/jupyter-server-terminals/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-server-terminals/default.nix
index 91ca1fb692..1d216f7b88 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-server-terminals/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/jupyterhub-systemdspawner/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyterhub-systemdspawner/default.nix
index 56712d25f4..216beb5fc5 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/jupyterhub-systemdspawner/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab-lsp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab-lsp/default.nix
index 408a48c7fa..4f39d7fdc5 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab-lsp/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab-pygments/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab-pygments/default.nix
index 53c03dbdac..204516e39d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab-pygments/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab-widgets/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab-widgets/default.nix
index e57ec6de67..cd538beade 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab-widgets/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/jwcrypto/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jwcrypto/default.nix
index 1a418d128d..80e4159a03 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/jwcrypto/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/jxmlease/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jxmlease/default.nix
index 480bddc93d..3364b86686 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/jxmlease/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/k5test/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/k5test/default.nix
index 982accf145..676fea31f8 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/k5test/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/kaa-base/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/kaa-base/default.nix
index cacf76a6cb..ac4b1cf52f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/kaa-base/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/kaa-metadata/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/kaa-metadata/default.nix
index 669060fa2a..bb8fe831c2 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/kaa-metadata/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/kafka-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/kafka-python/default.nix
index 730c796c95..67e7febd7f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/kafka-python/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/kaggle/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/kaggle/default.nix
index f20a03e6df..ec647cf649 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/kaggle/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/kaldi-active-grammar/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/kaldi-active-grammar/default.nix
index caed3ddfcf..14795b0c12 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/kaldi-active-grammar/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/kaldi-active-grammar/fork.nix b/third_party/nixpkgs/pkgs/development/python-modules/kaldi-active-grammar/fork.nix
index b5c785d2b1..00d2e2802f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/kaldi-active-grammar/fork.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/kaptan/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/kaptan/default.nix
index 248a09630f..c27221611b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/kaptan/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/kbcstorage/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/kbcstorage/default.nix
index aeccbe3757..eea875bc39 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/kbcstorage/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/kbcstorage/default.nix
@@ -11,7 +11,6 @@
   setuptools,
   setuptools-git-versioning,
   setuptools-scm,
-  unittestCheckHook,
   urllib3,
 }:
 
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/kitchen/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/kitchen/default.nix
index 8aba622aee..931017a198 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/kitchen/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/kiwisolver/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/kiwisolver/default.nix
index e68ff83c46..d71b613b58 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/kiwisolver/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/knack/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/knack/default.nix
index 20d00b4c47..f61fe242da 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/knack/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/knx-frontend/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/knx-frontend/default.nix
index 060062891d..2ef44b3cfc 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/knx-frontend/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/knx-frontend/default.nix
@@ -7,14 +7,14 @@
 
 buildPythonPackage rec {
   pname = "knx-frontend";
-  version = "2024.1.20.105944";
+  version = "2024.7.25.204106";
   format = "pyproject";
 
   # TODO: source build, uses yarn.lock
   src = fetchPypi {
     pname = "knx_frontend";
     inherit version;
-    hash = "sha256-5u+BaZjbGpIpQd3k+u5NC099TQuiwGKdE/EoIWny01I=";
+    hash = "sha256-uy5by/abVeYTLpZM4fh1+3AUxhnkFtzcabf86LnC9SY=";
   };
 
   nativeBuildInputs = [ setuptools ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/kserve/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/kserve/default.nix
index 962ba7d837..bb071fc3f0 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/kserve/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/kurbopy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/kurbopy/default.nix
index d084fd43fa..3542fb60b2 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/kurbopy/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/kurbopy/default.nix
@@ -4,9 +4,7 @@
   fetchPypi,
   fonttools,
   pytestCheckHook,
-  python,
   rustPlatform,
-  unzip,
 }:
 
 buildPythonPackage rec {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lacuscore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lacuscore/default.nix
index 27faa7f1e7..04e18825cf 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/lacuscore/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/lacuscore/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "lacuscore";
-  version = "1.10.7";
+  version = "1.10.8";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "ail-project";
     repo = "LacusCore";
     rev = "refs/tags/v${version}";
-    hash = "sha256-n2aEKTOPztrWV9/qxRzk5G/9I2JBSHa2I4JZWWMR3wA=";
+    hash = "sha256-LErxBhTajXHPDC2oZqygKRs6MLp6PLq4XoaluCeadcQ=";
   };
 
   pythonRelaxDeps = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/langchain-mongodb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/langchain-mongodb/default.nix
index 12c7612cf2..360fa099f9 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/langchain-mongodb/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/langchain-mongodb/default.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  azure-identity,
   buildPythonPackage,
   fetchFromGitHub,
   freezegun,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/langchain-openai/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/langchain-openai/default.nix
index de21629f02..58eecb2a9f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/langchain-openai/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/langchain-openai/default.nix
@@ -1,7 +1,5 @@
 {
   lib,
-  async-timeout,
-  bash,
   buildPythonPackage,
   fetchFromGitHub,
   freezegun,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/lazy-loader/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lazy-loader/default.nix
index 974288e365..ad51358ccb 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/lazy-loader/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/ldap3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ldap3/default.nix
index 7cf35cfe2c..14534ef1d1 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/ldap3/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/ldapdomaindump/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ldapdomaindump/default.nix
index 8b7ba42902..e154108d06 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/ldapdomaindump/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/ldaptor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ldaptor/default.nix
index 1b9c9f6ec8..ead49289a3 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/ldaptor/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/ldaptor/default.nix
@@ -5,11 +5,9 @@
   twisted,
   passlib,
   pyparsing,
-  service-identity,
   six,
   zope-interface,
   pythonOlder,
-  python,
 }:
 
 buildPythonPackage rec {
@@ -46,6 +44,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/third_party/nixpkgs/pkgs/development/python-modules/leather/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/leather/default.nix
index 3af76888e4..6cac747614 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/leather/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/legacy-cgi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/legacy-cgi/default.nix
new file mode 100644
index 0000000000..e7c3e0a198
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/legacy-cgi/default.nix
@@ -0,0 +1,36 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  poetry-core,
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "legacy-cgi";
+  version = "2.6.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "jackrosenthal";
+    repo = "legacy-cgi";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-hhWZoRswkuwvgkcKthNhMkPPhhoRH4TjdNp+orluQTQ=";
+  };
+
+  build-system = [ poetry-core ];
+
+  pythonImportsCheck = [
+    "cgi"
+    "cgitb"
+  ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  meta = {
+    description = "Fork of the standard library cgi and cgitb modules, being deprecated in PEP-594";
+    homepage = "https://github.com/jackrosenthal/legacy-cgi";
+    license = lib.licenses.psfl;
+    maintainers = with lib.maintainers; [ dotlambda ];
+  };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/levenshtein/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/levenshtein/default.nix
index a7913fd5b0..4f04a810bd 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/levenshtein/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/levenshtein/default.nix
@@ -37,12 +37,6 @@ buildPythonPackage rec {
 
   buildInputs = [ rapidfuzz-cpp ];
 
-  env.NIX_CFLAGS_COMPILE = toString (
-    lib.optionals (stdenv.cc.isClang && stdenv.isDarwin) [
-      "-fno-lto" # work around https://github.com/NixOS/nixpkgs/issues/19098
-    ]
-  );
-
   dependencies = [ rapidfuzz ];
 
   nativeCheckInputs = [ pytestCheckHook ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/libais/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/libais/default.nix
index 5422e877ba..b68c21f7c7 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/libais/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/libclang/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/libclang/default.nix
index fb66d88b94..b60c3992fa 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/libclang/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/libcloud/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/libcloud/default.nix
index 8c3481cdec..8fe46bd957 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/libcloud/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/libcst/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/libcst/default.nix
index 140c919d70..ab176fd825 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/libcst/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/libcst/default.nix
@@ -95,6 +95,6 @@ buildPythonPackage rec {
       asl20
       psfl
     ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/libgpuarray/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/libgpuarray/default.nix
index 7645f8bc74..751d9b2f70 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/libgpuarray/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/libgpuarray/default.nix
@@ -1,7 +1,7 @@
 {
   stdenv,
   lib,
-  addOpenGLRunpath,
+  addDriverRunpath,
   buildPythonPackage,
   fetchFromGitHub,
   cmake,
@@ -68,7 +68,7 @@ buildPythonPackage rec {
       fixRunPath $out/lib/libgpuarray.so
     ''
     + lib.optionalString cudaSupport ''
-      addOpenGLRunpath $out/lib/libgpuarray.so
+      addDriverRunpath $out/lib/libgpuarray.so
     '';
 
   propagatedBuildInputs = [
@@ -80,7 +80,7 @@ buildPythonPackage rec {
   nativeBuildInputs = [
     cmake
     cython_0
-  ] ++ lib.optionals cudaSupport [ addOpenGLRunpath ];
+  ] ++ lib.optionals cudaSupport [ addDriverRunpath ];
 
   buildInputs = [ nose ];
 
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/libthumbor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/libthumbor/default.nix
index 40650afa0e..f53bf2e565 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/libthumbor/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/lightgbm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lightgbm/default.nix
index 16465624d6..1b5cd17415 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/lightgbm/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/lightgbm/default.nix
@@ -39,14 +39,14 @@ assert cudaSupport -> gpuSupport != true;
 
 buildPythonPackage rec {
   pname = "lightgbm";
-  version = "4.4.0";
+  version = "4.5.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-nop2QJEUgRNOYJh9XR4c0Vf0MMO0s43o02/FXDArwpk=";
+    hash = "sha256-4c17rwMY1OMIomV1pjpGNfCN+GatNiKp2OPXHZY3obo=";
   };
 
   nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/limits/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/limits/default.nix
index 9edaed6ee6..cf53ab4a50 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/limits/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/linode/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/linode/default.nix
index 07143b4c30..ce34a64ee9 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/linode/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/lit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lit/default.nix
index ac518e81ff..bce9db1f7e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/lit/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/lml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lml/default.nix
index 6024da51f2..6bb69be09f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/lml/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/localstack-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/localstack-client/default.nix
index 10cfa9c895..638f4328ab 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/localstack-client/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/localstack-ext/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/localstack-ext/default.nix
index b0287a226a..4ebb8c0b41 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/localstack-ext/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/localstack/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/localstack/default.nix
index 7bcb46fa59..28653b4438 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/localstack/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/lockfile/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lockfile/default.nix
index 0a0b906e91..5423a1abb3 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/lockfile/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/lockfile/default.nix
@@ -5,7 +5,6 @@
   setuptools,
   pbr,
   nose,
-  pythonOlder,
 }:
 
 buildPythonPackage rec {
@@ -23,9 +22,6 @@ buildPythonPackage rec {
     setuptools
   ];
 
-  # tests rely on nose
-  doCheck = pythonOlder "3.12";
-
   nativeCheckInputs = [ nose ];
 
   checkPhase = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/logbook/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/logbook/default.nix
index 1d7de41098..62a00fa1c8 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/logbook/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/logilab/common.nix b/third_party/nixpkgs/pkgs/development/python-modules/logilab/common.nix
index 3e2797b6d6..cac45f9dd0 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/logilab/common.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/logilab/constraint.nix b/third_party/nixpkgs/pkgs/development/python-modules/logilab/constraint.nix
index 419ef5b4d1..fb98ada28f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/logilab/constraint.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/logutils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/logutils/default.nix
index b79e6af6c9..eb0e1ebd53 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/logutils/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/lottie/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lottie/default.nix
new file mode 100644
index 0000000000..a1ced236e8
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/lxml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lxml/default.nix
index f53979f98d..bc09e20503 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/lxml/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/lz4/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/lz4/default.nix
index c37eeab5cc..627aa8a446 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/lz4/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/m2crypto/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/m2crypto/default.nix
index 88f0971015..75f1e94f3b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/m2crypto/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/maestral/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/maestral/default.nix
index 11750dd12b..52ebece153 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/maestral/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/maestral/default.nix
@@ -25,7 +25,6 @@
   typing-extensions,
   watchdog,
   xattr,
-  fetchpatch,
   pytestCheckHook,
   nixosTests,
 }:
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/manifestoo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/manifestoo/default.nix
index 4ee80ef7fd..45c59f1c23 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/manifestoo/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/manifestoo/default.nix
@@ -2,15 +2,12 @@
   buildPythonPackage,
   fetchPypi,
   hatch-vcs,
-  importlib-metadata,
   lib,
   manifestoo-core,
   nix-update-script,
   pytestCheckHook,
-  pythonOlder,
   textual,
   typer,
-  typing-extensions,
 }:
 
 buildPythonPackage rec {
@@ -32,9 +29,7 @@ buildPythonPackage rec {
       manifestoo-core
       textual
       typer
-    ]
-    ++ typer.passthru.optional-dependencies.all
-    ++ lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
+    ];
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/manim/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/manim/default.nix
index 545f9df3c5..d96b03dfd3 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/manim/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/mapbox-earcut/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mapbox-earcut/default.nix
index b7fe03e24f..e86a3760bc 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/mapbox-earcut/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/marimo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/marimo/default.nix
index 44b702a127..2639001081 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/marimo/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/markdown-include/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/markdown-include/default.nix
index 3ee1e47666..dbc7a43d30 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/markdown-include/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix
index ab0025afd9..587e819855 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/marshmallow-sqlalchemy/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/mat2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mat2/default.nix
index f1ca3d6d68..7dc7dcd2d4 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/mat2/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/mat2/default.nix
@@ -9,7 +9,6 @@
   bubblewrap,
   exiftool,
   ffmpeg,
-  mailcap,
   wrapGAppsHook3,
   gdk-pixbuf,
   gobject-introspection,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/matchpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/matchpy/default.nix
index aab6d31a18..304f143b88 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/matchpy/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/matplotlib-inline/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/matplotlib-inline/default.nix
index 603809455f..e12969a95c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/matplotlib-inline/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/maxcube-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/maxcube-api/default.nix
index e87568c88e..f82fc861bb 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/maxcube-api/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/maxminddb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/maxminddb/default.nix
index 0457ad15cd..d510be3b3a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/maxminddb/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/maya/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/maya/default.nix
index ccb9936a71..05b5367517 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/maya/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/mccabe/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mccabe/default.nix
index c8cb357cdc..7c556d0b38 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/mccabe/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/mccabe/default.nix
@@ -3,9 +3,6 @@
   buildPythonPackage,
   fetchPypi,
   pytest,
-  hypothesis,
-  hypothesmith,
-  python,
 }:
 
 buildPythonPackage rec {
@@ -27,6 +24,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/third_party/nixpkgs/pkgs/development/python-modules/mdformat-footnote/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mdformat-footnote/default.nix
index 759fced980..9b0e35c2ee 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/mdformat-footnote/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/mdformat-footnote/default.nix
@@ -3,8 +3,6 @@
   buildPythonPackage,
   fetchFromGitHub,
   flit-core,
-  linkify-it-py,
-  markdown-it-py,
   mdformat,
   mdit-py-plugins,
   pythonOlder,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mdformat-frontmatter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mdformat-frontmatter/default.nix
index 335aaae953..85c054258d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/mdformat-frontmatter/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/mdformat-frontmatter/default.nix
@@ -3,8 +3,6 @@
   buildPythonPackage,
   fetchFromGitHub,
   flit-core,
-  linkify-it-py,
-  markdown-it-py,
   mdformat,
   mdit-py-plugins,
   ruamel-yaml,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mdformat-mkdocs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mdformat-mkdocs/default.nix
index cd5a89c825..d7cf61de83 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/mdformat-mkdocs/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/mdformat-mkdocs/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "mdformat-mkdocs";
-  version = "2.1.1";
+  version = "3.0.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "KyleKing";
     repo = "mdformat-mkdocs";
     rev = "refs/tags/v${version}";
-    hash = "sha256-hBkHVYlcHCXfE8Z2gLv6Rt0tQSkx2LYqbEtCncDByrI=";
+    hash = "sha256-Af15Xs8K/QSeIxQNgi1n8xZ+SyyzNs5JL3wse0+LoyE=";
   };
 
   nativeBuildInputs = [ flit-core ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mdformat-simple-breaks/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mdformat-simple-breaks/default.nix
index 29a3709441..caeb23a214 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/mdformat-simple-breaks/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/mdformat-simple-breaks/default.nix
@@ -4,7 +4,6 @@
   fetchFromGitHub,
   flit-core,
   mdformat,
-  mdit-py-plugins,
   pythonOlder,
 }:
 
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mdformat-tables/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mdformat-tables/default.nix
index cf97895b53..713eefc5ec 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/mdformat-tables/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/mdformat-tables/default.nix
@@ -4,7 +4,6 @@
   fetchFromGitHub,
   flit-core,
   mdformat,
-  mdit-py-plugins,
   pytestCheckHook,
   pythonOlder,
 }:
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mdformat-toc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mdformat-toc/default.nix
index c48467077d..c97e29248c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/mdformat-toc/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/mdformat-toc/default.nix
@@ -3,7 +3,6 @@
   buildPythonPackage,
   fetchFromGitHub,
   mdformat,
-  mdit-py-plugins,
   poetry-core,
   pytestCheckHook,
   pythonOlder,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mdformat/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mdformat/default.nix
index 5d8233dcf2..28df80388d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/mdformat/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/mdformat/default.nix
@@ -1,16 +1,13 @@
 {
   lib,
-  buildPythonApplication,
   buildPythonPackage,
   fetchFromGitHub,
   importlib-metadata,
-  makeWrapper,
   markdown-it-py,
   pytestCheckHook,
   pythonOlder,
   setuptools,
   tomli,
-  typing-extensions,
 }:
 
 buildPythonPackage rec {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mechanize/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mechanize/default.nix
index a84fe51da4..97fa01697e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/mechanize/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/merge3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/merge3/default.nix
index 22d02db447..b40b9aca05 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/merge3/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/meson-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/meson-python/default.nix
index a263120941..33cc35411b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/meson-python/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/meson-python/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchPypi,
-  colorama,
   meson,
   ninja,
   pyproject-metadata,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/metawear/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/metawear/default.nix
index e142beb7b9..526e216a23 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/metawear/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/metawear/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchPypi,
-  gcc,
   cython,
   boost,
   bluez,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mido/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mido/default.nix
index 270604f782..33b06eadfb 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/mido/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/migen/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/migen/default.nix
index 76c1cbba0d..910b46a512 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/migen/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/mike/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mike/default.nix
index 55c7f7d573..934c774405 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/mike/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/misoc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/misoc/default.nix
index a7b2198041..e573760769 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/misoc/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/mitmproxy-rs/Cargo.lock b/third_party/nixpkgs/pkgs/development/python-modules/mitmproxy-rs/Cargo.lock
index 9efa735690..d9eb863ad0 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/mitmproxy-rs/Cargo.lock
+++ b/third_party/nixpkgs/pkgs/development/python-modules/mitmproxy-rs/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",
 ]
@@ -29,9 +29,9 @@ dependencies = [
 
 [[package]]
 name = "aho-corasick"
-version = "1.1.1"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea5d730647d4fadd988536d06fecce94b7b4f2a7efdae548f1cf4b63205518ab"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
 dependencies = [
  "memchr",
 ]
@@ -43,48 +43,68 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299"
 
 [[package]]
-name = "anstyle"
-version = "1.0.3"
+name = "anstream"
+version = "0.6.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b84bf0a05bbb2a83e5eb6fa36bb6e87baa08193c35ff52bbf6b38d8af2890e46"
+checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b"
+dependencies = [
+ "anstyle",
+ "anstyle-parse",
+ "anstyle-query",
+ "anstyle-wincon",
+ "colorchoice",
+ "is_terminal_polyfill",
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b"
+
+[[package]]
+name = "anstyle-parse"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4"
+dependencies = [
+ "utf8parse",
+]
+
+[[package]]
+name = "anstyle-query"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ad186efb764318d35165f1758e7dcef3b10628e26d41a44bc5550652e6804391"
+dependencies = [
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "anstyle-wincon"
+version = "3.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19"
+dependencies = [
+ "anstyle",
+ "windows-sys 0.52.0",
+]
 
 [[package]]
 name = "anyhow"
-version = "1.0.75"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6"
+checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
 dependencies = [
  "backtrace",
 ]
 
-[[package]]
-name = "apple-security-framework"
-version = "2.9.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07831f002eaa83d94f7e2c1300f3268a8f949c35a41dd99faceb6575c191d871"
-dependencies = [
- "apple-security-framework-sys",
- "bitflags 2.4.0",
- "core-foundation",
- "core-foundation-sys",
- "libc",
-]
-
-[[package]]
-name = "apple-security-framework-sys"
-version = "2.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09acfa027e87e9f590474e9ef19d0f12158bf1c72af80ac76806f17e84959a42"
-dependencies = [
- "core-foundation-sys",
- "libc",
-]
-
 [[package]]
 name = "arc-swap"
-version = "1.6.0"
+version = "1.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6"
+checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457"
 
 [[package]]
 name = "arrayvec"
@@ -111,34 +131,25 @@ checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.37",
+ "syn 2.0.68",
 ]
 
 [[package]]
 name = "async-trait"
-version = "0.1.74"
+version = "0.1.80"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9"
+checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.37",
-]
-
-[[package]]
-name = "atomic-polyfill"
-version = "0.1.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3ff7eb3f316534d83a8a2c3d1674ace8a5a71198eba31e2e2b597833f699b28"
-dependencies = [
- "critical-section",
+ "syn 2.0.68",
 ]
 
 [[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 = "axum"
@@ -187,9 +198,9 @@ dependencies = [
 
 [[package]]
 name = "backtrace"
-version = "0.3.69"
+version = "0.3.73"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837"
+checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a"
 dependencies = [
  "addr2line",
  "cc",
@@ -208,15 +219,9 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
 
 [[package]]
 name = "base64"
-version = "0.21.4"
+version = "0.21.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2"
-
-[[package]]
-name = "bit_field"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61"
+checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
 
 [[package]]
 name = "bitflags"
@@ -226,9 +231,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.4.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "blake2"
@@ -239,6 +244,12 @@ dependencies = [
  "digest",
 ]
 
+[[package]]
+name = "block"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"
+
 [[package]]
 name = "block-buffer"
 version = "0.10.4"
@@ -274,27 +285,27 @@ dependencies = [
 
 [[package]]
 name = "bumpalo"
-version = "3.14.0"
+version = "3.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec"
+checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
 
 [[package]]
 name = "bytemuck"
-version = "1.14.0"
+version = "1.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6"
+checksum = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e"
 
 [[package]]
 name = "byteorder"
-version = "1.4.3"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "bytes"
-version = "1.5.0"
+version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223"
+checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9"
 
 [[package]]
 name = "cast"
@@ -304,12 +315,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
 
 [[package]]
 name = "cc"
-version = "1.0.83"
+version = "1.0.104"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
-dependencies = [
- "libc",
-]
+checksum = "74b6a57f98764a267ff415d50a25e6e166f3831a5071af4995296ea97d210490"
 
 [[package]]
 name = "cfg-if"
@@ -317,6 +325,12 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
 
+[[package]]
+name = "cfg_aliases"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
+
 [[package]]
 name = "chacha20"
 version = "0.9.1"
@@ -343,9 +357,9 @@ dependencies = [
 
 [[package]]
 name = "ciborium"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "effd91f6c78e5a4ace8a5d3c0b6bfaec9e2baaef55f3efc00e45fb2e477ee926"
+checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e"
 dependencies = [
  "ciborium-io",
  "ciborium-ll",
@@ -354,18 +368,18 @@ dependencies = [
 
 [[package]]
 name = "ciborium-io"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cdf919175532b369853f5d5e20b26b43112613fd6fe7aee757e35f7a44642656"
+checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757"
 
 [[package]]
 name = "ciborium-ll"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "defaa24ecc093c77630e6c15e17c51f5e187bf35ee514f4e2d67baaa96dae22b"
+checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9"
 dependencies = [
  "ciborium-io",
- "half 1.8.2",
+ "half",
 ]
 
 [[package]]
@@ -381,18 +395,18 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.4.4"
+version = "4.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1d7b8d5ec32af0fadc644bf1fd509a688c2103b185644bb1e29d164e0703136"
+checksum = "84b3edb18336f4df585bc9aa31dd99c036dfa5dc5e9a2939a722a188f3a8970d"
 dependencies = [
  "clap_builder",
 ]
 
 [[package]]
 name = "clap_builder"
-version = "4.4.4"
+version = "4.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5179bb514e4d7c2051749d8fcefa2ed6d06a9f4e6d69faf3805f5d80b8cf8d56"
+checksum = "c1c09dd5ada6c6c78075d6fd0da3f90d8080651e2d6cc8eb2f1aaa4034ced708"
 dependencies = [
  "anstyle",
  "clap_lex",
@@ -400,21 +414,51 @@ dependencies = [
 
 [[package]]
 name = "clap_lex"
-version = "0.5.1"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961"
+checksum = "4b82cf0babdbd58558212896d1a4272303a57bdb245c2bf1147185fb45640e70"
 
 [[package]]
-name = "color_quant"
-version = "1.1.0"
+name = "cocoa"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
+checksum = "f6140449f97a6e97f9511815c5632d84c8aacf8ac271ad77c559218161a1373c"
+dependencies = [
+ "bitflags 1.3.2",
+ "block",
+ "cocoa-foundation",
+ "core-foundation",
+ "core-graphics",
+ "foreign-types",
+ "libc",
+ "objc",
+]
+
+[[package]]
+name = "cocoa-foundation"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8c6234cbb2e4c785b456c0644748b1ac416dd045799740356f8363dfe00c93f7"
+dependencies = [
+ "bitflags 1.3.2",
+ "block",
+ "core-foundation",
+ "core-graphics-types",
+ "libc",
+ "objc",
+]
+
+[[package]]
+name = "colorchoice"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422"
 
 [[package]]
 name = "console-api"
-version = "0.6.0"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd326812b3fd01da5bb1af7d340d0d555fd3d4b641e7f1dfcf5962a902952787"
+checksum = "a257c22cd7e487dd4a13d413beabc512c5052f0bc048db0da6a84c3d8a6142fd"
 dependencies = [
  "futures-core",
  "prost",
@@ -425,9 +469,9 @@ dependencies = [
 
 [[package]]
 name = "console-subscriber"
-version = "0.2.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7481d4c57092cd1c19dd541b92bdce883de840df30aa5d03fd48a3935c01842e"
+checksum = "31c4cc54bae66f7d9188996404abdf7fdfa23034ef8e43478c8810828abad758"
 dependencies = [
  "console-api",
  "crossbeam-channel",
@@ -435,6 +479,7 @@ dependencies = [
  "futures-task",
  "hdrhistogram",
  "humantime",
+ "prost",
  "prost-types",
  "serde",
  "serde_json",
@@ -449,9 +494,9 @@ dependencies = [
 
 [[package]]
 name = "core-foundation"
-version = "0.9.3"
+version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146"
+checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -459,24 +504,48 @@ dependencies = [
 
 [[package]]
 name = "core-foundation-sys"
-version = "0.8.4"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
+checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
+
+[[package]]
+name = "core-graphics"
+version = "0.23.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c07782be35f9e1140080c6b96f0d44b739e2278479f64e02fdab4e32dfd8b081"
+dependencies = [
+ "bitflags 1.3.2",
+ "core-foundation",
+ "core-graphics-types",
+ "foreign-types",
+ "libc",
+]
+
+[[package]]
+name = "core-graphics-types"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "45390e6114f68f718cc7a830514a96f903cccd70d02a8f6d9f643ac4ba45afaf"
+dependencies = [
+ "bitflags 1.3.2",
+ "core-foundation",
+ "libc",
+]
 
 [[package]]
 name = "cpufeatures"
-version = "0.2.9"
+version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1"
+checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504"
 dependencies = [
  "libc",
 ]
 
 [[package]]
 name = "crc32fast"
-version = "1.3.2"
+version = "1.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
+checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
 dependencies = [
  "cfg-if",
 ]
@@ -517,54 +586,39 @@ dependencies = [
  "itertools 0.10.5",
 ]
 
-[[package]]
-name = "critical-section"
-version = "1.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7059fff8937831a9ae6f0fe4d658ffabf58f2ca96aa9dec1c889f936f705f216"
-
 [[package]]
 name = "crossbeam-channel"
-version = "0.5.8"
+version = "0.5.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200"
+checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2"
 dependencies = [
- "cfg-if",
  "crossbeam-utils",
 ]
 
 [[package]]
 name = "crossbeam-deque"
-version = "0.8.3"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef"
+checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d"
 dependencies = [
- "cfg-if",
  "crossbeam-epoch",
  "crossbeam-utils",
 ]
 
 [[package]]
 name = "crossbeam-epoch"
-version = "0.9.15"
+version = "0.9.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7"
+checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
 dependencies = [
- "autocfg",
- "cfg-if",
  "crossbeam-utils",
- "memoffset",
- "scopeguard",
 ]
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.16"
+version = "0.8.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294"
-dependencies = [
- "cfg-if",
-]
+checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
 
 [[package]]
 name = "crunchy"
@@ -601,26 +655,26 @@ dependencies = [
 
 [[package]]
 name = "curve25519-dalek-derive"
-version = "0.1.0"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83fdaf97f4804dcebfa5862639bc9ce4121e82140bec2a987ac5140294865b5b"
+checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.37",
+ "syn 2.0.68",
 ]
 
 [[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 = "defmt"
-version = "0.3.5"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8a2d011b2fee29fb7d659b83c43fce9a2cb4df453e16d441a51448e448f3f98"
+checksum = "a99dd22262668b887121d4672af5a64b238f026099f1a2a1b322066c9ecfe9e0"
 dependencies = [
  "bitflags 1.3.2",
  "defmt-macros",
@@ -628,26 +682,35 @@ dependencies = [
 
 [[package]]
 name = "defmt-macros"
-version = "0.3.6"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54f0216f6c5acb5ae1a47050a6645024e6edafc2ee32d421955eccfef12ef92e"
+checksum = "e3a9f309eff1f79b3ebdf252954d90ae440599c26c2c553fe87a2d17195f2dcb"
 dependencies = [
  "defmt-parser",
  "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn 2.0.37",
+ "syn 2.0.68",
 ]
 
 [[package]]
 name = "defmt-parser"
-version = "0.3.3"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "269924c02afd7f94bc4cecbfa5c379f6ffcf9766b3408fe63d22c728654eccd0"
+checksum = "ff4a5fefe330e8d7f31b16a318f9ce81000d8e35e69b93eae154d16d2278f70f"
 dependencies = [
  "thiserror",
 ]
 
+[[package]]
+name = "deranged"
+version = "0.3.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
+dependencies = [
+ "powerfmt",
+]
+
 [[package]]
 name = "digest"
 version = "0.10.7"
@@ -661,42 +724,59 @@ dependencies = [
 
 [[package]]
 name = "either"
-version = "1.9.0"
+version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
+checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
+
+[[package]]
+name = "enum-as-inner"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a"
+dependencies = [
+ "heck",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.68",
+]
+
+[[package]]
+name = "env_filter"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a009aa4810eb158359dda09d0c87378e4bbb89b5a801f016885a4707ba24f7ea"
+dependencies = [
+ "log",
+ "regex",
+]
 
 [[package]]
 name = "env_logger"
-version = "0.10.1"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95b3f3e67048839cb0d0781f445682a35113da7121f7c949db0e2be96a4fbece"
+checksum = "38b35839ba51819680ba087cd351788c9a3c476841207e0b8cee0b04722343b9"
 dependencies = [
+ "anstream",
+ "anstyle",
+ "env_filter",
  "humantime",
- "is-terminal",
  "log",
- "regex",
- "termcolor",
 ]
 
+[[package]]
+name = "equivalent"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+
 [[package]]
 name = "errno"
-version = "0.3.3"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd"
+checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
 dependencies = [
- "errno-dragonfly",
- "libc",
- "windows-sys",
-]
-
-[[package]]
-name = "errno-dragonfly"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
-dependencies = [
- "cc",
  "libc",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -708,27 +788,11 @@ dependencies = [
  "arrayvec",
 ]
 
-[[package]]
-name = "exr"
-version = "1.71.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "832a761f35ab3e6664babfbdc6cef35a4860e816ec3916dcfd0882954e98a8a8"
-dependencies = [
- "bit_field",
- "flume",
- "half 2.2.1",
- "lebe",
- "miniz_oxide",
- "rayon-core",
- "smallvec",
- "zune-inflate",
-]
-
 [[package]]
 name = "fdeflate"
-version = "0.3.0"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d329bdeac514ee06249dabc27877490f17f5d371ec693360768b838e19f3ae10"
+checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645"
 dependencies = [
  "simd-adler32",
 ]
@@ -741,35 +805,26 @@ checksum = "e825f6987101665dea6ec934c09ec6d721de7bc1bf92248e1d5810c8cd636b77"
 
 [[package]]
 name = "filetime"
-version = "0.2.22"
+version = "0.2.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0"
+checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd"
 dependencies = [
  "cfg-if",
  "libc",
- "redox_syscall",
- "windows-sys",
+ "redox_syscall 0.4.1",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "flate2"
-version = "1.0.27"
+version = "1.0.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010"
+checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae"
 dependencies = [
  "crc32fast",
  "miniz_oxide",
 ]
 
-[[package]]
-name = "flume"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55ac459de2512911e4b674ce33cf20befaba382d05b62b008afc1c8b57cbf181"
-dependencies = [
- "spin 0.9.8",
-]
-
 [[package]]
 name = "fnv"
 version = "1.0.7"
@@ -777,10 +832,46 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
 [[package]]
-name = "futures"
-version = "0.3.28"
+name = "foreign-types"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40"
+checksum = "d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965"
+dependencies = [
+ "foreign-types-macros",
+ "foreign-types-shared",
+]
+
+[[package]]
+name = "foreign-types-macros"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.68",
+]
+
+[[package]]
+name = "foreign-types-shared"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aa9a19cbb55df58761df49b23516a86d432839add4af60fc256da840f66ed35b"
+
+[[package]]
+name = "form_urlencoded"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
+dependencies = [
+ "percent-encoding",
+]
+
+[[package]]
+name = "futures"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -793,9 +884,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb"
+checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -803,15 +894,15 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c"
+checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.28"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0"
+checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -820,38 +911,38 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa"
+checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
 
 [[package]]
 name = "futures-macro"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb"
+checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.37",
+ "syn 2.0.68",
 ]
 
 [[package]]
 name = "futures-sink"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817"
+checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
 
 [[package]]
 name = "futures-task"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2"
+checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
 
 [[package]]
 name = "futures-util"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104"
+checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -877,36 +968,26 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.2.10"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427"
+checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
 dependencies = [
  "cfg-if",
  "libc",
  "wasi",
 ]
 
-[[package]]
-name = "gif"
-version = "0.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80792593675e051cf94a4b111980da2ba60d4a83e43e0048c5693baab3977045"
-dependencies = [
- "color_quant",
- "weezl",
-]
-
 [[package]]
 name = "gimli"
-version = "0.28.0"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0"
+checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd"
 
 [[package]]
 name = "h2"
-version = "0.3.21"
+version = "0.3.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833"
+checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8"
 dependencies = [
  "bytes",
  "fnv",
@@ -914,7 +995,7 @@ dependencies = [
  "futures-sink",
  "futures-util",
  "http",
- "indexmap",
+ "indexmap 2.2.6",
  "slab",
  "tokio",
  "tokio-util",
@@ -923,24 +1004,19 @@ dependencies = [
 
 [[package]]
 name = "half"
-version = "1.8.2"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7"
-
-[[package]]
-name = "half"
-version = "2.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02b4af3693f1b705df946e9fe5631932443781d0aabb423b62fcd4d73f6d2fd0"
+checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888"
 dependencies = [
+ "cfg-if",
  "crunchy",
 ]
 
 [[package]]
 name = "hash32"
-version = "0.2.1"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0c35f58762feb77d74ebe43bdbc3210f09be9fe6742234d573bacc26ed92b67"
+checksum = "47d60b12902ba28e2730cd37e95b8c9223af2808df9e902d4df49588d1470606"
 dependencies = [
  "byteorder",
 ]
@@ -952,12 +1028,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
 
 [[package]]
-name = "hdrhistogram"
-version = "7.5.2"
+name = "hashbrown"
+version = "0.14.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f19b9f54f7c7f55e31401bb647626ce0cf0f67b0004982ce815b3ee72a02aa8"
+checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
+
+[[package]]
+name = "hdrhistogram"
+version = "7.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "765c9198f173dd59ce26ff9f95ef0aafd0a0fe01fb9d72841bc5066a4c06511d"
 dependencies = [
- "base64 0.13.1",
+ "base64 0.21.7",
  "byteorder",
  "flate2",
  "nom",
@@ -966,22 +1048,25 @@ dependencies = [
 
 [[package]]
 name = "heapless"
-version = "0.7.16"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db04bc24a18b9ea980628ecf00e6c0264f3c1426dac36c00cb49b6fbad8b0743"
+checksum = "0bfb9eb618601c89945a70e254898da93b13be0388091d42117462b265bb3fad"
 dependencies = [
- "atomic-polyfill",
  "hash32",
- "rustc_version",
- "spin 0.9.8",
  "stable_deref_trait",
 ]
 
 [[package]]
-name = "hermit-abi"
-version = "0.3.3"
+name = "heck"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7"
+checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
+
+[[package]]
+name = "hermit-abi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
 
 [[package]]
 name = "hex"
@@ -989,6 +1074,71 @@ version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
+[[package]]
+name = "hickory-proto"
+version = "0.24.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "07698b8420e2f0d6447a436ba999ec85d8fbf2a398bbd737b82cac4a2e96e512"
+dependencies = [
+ "async-trait",
+ "cfg-if",
+ "data-encoding",
+ "enum-as-inner",
+ "futures-channel",
+ "futures-io",
+ "futures-util",
+ "idna 0.4.0",
+ "ipnet",
+ "once_cell",
+ "rand",
+ "thiserror",
+ "tinyvec",
+ "tokio",
+ "tracing",
+ "url",
+]
+
+[[package]]
+name = "hickory-resolver"
+version = "0.24.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28757f23aa75c98f254cf0405e6d8c25b831b32921b050a66692427679b1f243"
+dependencies = [
+ "cfg-if",
+ "futures-util",
+ "hickory-proto",
+ "ipconfig",
+ "lru-cache",
+ "once_cell",
+ "parking_lot",
+ "rand",
+ "resolv-conf",
+ "smallvec",
+ "thiserror",
+ "tokio",
+ "tracing",
+]
+
+[[package]]
+name = "hickory-server"
+version = "0.24.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9be0e43c556b9b3fdb6c7c71a9a32153a2275d02419e3de809e520bfcfe40c37"
+dependencies = [
+ "async-trait",
+ "bytes",
+ "cfg-if",
+ "enum-as-inner",
+ "futures-util",
+ "hickory-proto",
+ "serde",
+ "thiserror",
+ "time",
+ "tokio",
+ "tokio-util",
+ "tracing",
+]
+
 [[package]]
 name = "hmac"
 version = "0.12.1"
@@ -999,10 +1149,21 @@ dependencies = [
 ]
 
 [[package]]
-name = "http"
-version = "0.2.9"
+name = "hostname"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482"
+checksum = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867"
+dependencies = [
+ "libc",
+ "match_cfg",
+ "winapi",
+]
+
+[[package]]
+name = "http"
+version = "0.2.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1"
 dependencies = [
  "bytes",
  "fnv",
@@ -1011,9 +1172,9 @@ dependencies = [
 
 [[package]]
 name = "http-body"
-version = "0.4.5"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1"
+checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2"
 dependencies = [
  "bytes",
  "http",
@@ -1022,9 +1183,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"
@@ -1040,9 +1201,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 
 [[package]]
 name = "hyper"
-version = "0.14.27"
+version = "0.14.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468"
+checksum = "f361cde2f109281a220d4307746cdfd5ee3f410da58a70377762396775634b33"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -1055,7 +1216,7 @@ dependencies = [
  "httpdate",
  "itoa",
  "pin-project-lite",
- "socket2 0.4.9",
+ "socket2",
  "tokio",
  "tower-service",
  "tracing",
@@ -1075,21 +1236,35 @@ dependencies = [
 ]
 
 [[package]]
-name = "image"
-version = "0.24.7"
+name = "idna"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f3dfdbdd72063086ff443e297b61695500514b1e41095b6fb9a5ab48a70a711"
+checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c"
+dependencies = [
+ "unicode-bidi",
+ "unicode-normalization",
+]
+
+[[package]]
+name = "idna"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
+dependencies = [
+ "unicode-bidi",
+ "unicode-normalization",
+]
+
+[[package]]
+name = "image"
+version = "0.25.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fd54d660e773627692c524beaad361aca785a4f9f5730ce91f42aabe5bce3d11"
 dependencies = [
  "bytemuck",
  "byteorder",
- "color_quant",
- "exr",
- "gif",
- "jpeg-decoder",
- "num-rational",
  "num-traits",
  "png",
- "qoi",
  "tiff",
 ]
 
@@ -1100,14 +1275,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
 dependencies = [
  "autocfg",
- "hashbrown",
+ "hashbrown 0.12.3",
+]
+
+[[package]]
+name = "indexmap"
+version = "2.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
+dependencies = [
+ "equivalent",
+ "hashbrown 0.14.5",
 ]
 
 [[package]]
 name = "indoc"
-version = "1.0.9"
+version = "2.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa799dd5ed20a7e349f3b4639aa80d74549c81716d9ec4f994c9b5815598306"
+checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5"
 
 [[package]]
 name = "inout"
@@ -1126,9 +1311,9 @@ checksum = "fc6d6206008e25125b1f97fbe5d309eb7b85141cf9199d52dbd3729a1584dd16"
 
 [[package]]
 name = "internet-packet"
-version = "0.2.0"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95d8d20ad61a92e71edf571fa568e14aeba0c5f00548acd491fbf694ce9a5ad8"
+checksum = "f0273209b868758e751e5db7f59f72d152750d3e30f08f6eb06722357dcfe453"
 dependencies = [
  "internet-checksum",
  "smoltcp",
@@ -1157,16 +1342,40 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8e537132deb99c0eb4b752f0346b6a836200eaaa3516dd7e5514b63930a09e5d"
 
 [[package]]
-name = "is-terminal"
-version = "0.4.9"
+name = "ipconfig"
+version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b"
+checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f"
+dependencies = [
+ "socket2",
+ "widestring",
+ "windows-sys 0.48.0",
+ "winreg",
+]
+
+[[package]]
+name = "ipnet"
+version = "2.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"
+
+[[package]]
+name = "is-terminal"
+version = "0.4.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b"
 dependencies = [
  "hermit-abi",
- "rustix",
- "windows-sys",
+ "libc",
+ "windows-sys 0.52.0",
 ]
 
+[[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.10.5"
@@ -1178,66 +1387,63 @@ dependencies = [
 
 [[package]]
 name = "itertools"
-version = "0.11.0"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57"
+checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
 dependencies = [
  "either",
 ]
 
 [[package]]
 name = "itoa"
-version = "1.0.9"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38"
+checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
 
 [[package]]
 name = "jpeg-decoder"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e"
-dependencies = [
- "rayon",
-]
+checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0"
 
 [[package]]
 name = "js-sys"
-version = "0.3.64"
+version = "0.3.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a"
+checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d"
 dependencies = [
  "wasm-bindgen",
 ]
 
 [[package]]
 name = "lazy_static"
-version = "1.4.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-
-[[package]]
-name = "lebe"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8"
+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
 [[package]]
 name = "libc"
-version = "0.2.150"
+version = "0.2.155"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c"
+checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
+
+[[package]]
+name = "linked-hash-map"
+version = "0.5.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.4.7"
+version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a9bad9f94746442c783ca431b22403b519cd7fbeed0533fdd6328b2f2212128"
+checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
 
 [[package]]
 name = "lock_api"
-version = "0.4.10"
+version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16"
+checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
 dependencies = [
  "autocfg",
  "scopeguard",
@@ -1245,9 +1451,18 @@ 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 = "lru-cache"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "31e24f1ad8321ca0e8a1e0ac13f23cb668e6f5466c2c57319f6a5cf1cc8e3b1c"
+dependencies = [
+ "linked-hash-map",
+]
 
 [[package]]
 name = "lru_time_cache"
@@ -1257,9 +1472,18 @@ checksum = "9106e1d747ffd48e6be5bb2d97fa706ed25b144fbee4d5c02eae110cd8d6badd"
 
 [[package]]
 name = "macos-certificate-truster"
-version = "0.5.1"
+version = "0.6.2"
 dependencies = [
- "apple-security-framework",
+ "security-framework",
+]
+
+[[package]]
+name = "malloc_buf"
+version = "0.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb"
+dependencies = [
+ "libc",
 ]
 
 [[package]]
@@ -1268,6 +1492,12 @@ version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0ca88d725a0a943b096803bd34e73a4437208b6077654cc4ecb2947a5f91618d"
 
+[[package]]
+name = "match_cfg"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4"
+
 [[package]]
 name = "matchers"
 version = "0.1.0"
@@ -1285,15 +1515,15 @@ checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94"
 
 [[package]]
 name = "memchr"
-version = "2.6.3"
+version = "2.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c"
+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",
 ]
@@ -1312,9 +1542,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
 [[package]]
 name = "miniz_oxide"
-version = "0.7.1"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
+checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
 dependencies = [
  "adler",
  "simd-adler32",
@@ -1322,18 +1552,18 @@ dependencies = [
 
 [[package]]
 name = "mio"
-version = "0.8.9"
+version = "0.8.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3dce281c5e46beae905d4de1870d8b1509a9142b62eedf18b443b011ca8343d0"
+checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
 dependencies = [
  "libc",
  "wasi",
- "windows-sys",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
 name = "mitm-wg-test-client"
-version = "0.5.1"
+version = "0.6.2"
 dependencies = [
  "anyhow",
  "boringtun",
@@ -1344,36 +1574,43 @@ dependencies = [
 
 [[package]]
 name = "mitmproxy"
-version = "0.5.1"
+version = "0.6.2"
 dependencies = [
  "anyhow",
- "apple-security-framework",
- "async-trait",
  "boringtun",
+ "cocoa",
  "console-subscriber",
+ "core-foundation",
+ "core-graphics",
  "criterion",
+ "data-encoding",
  "env_logger",
  "futures-util",
+ "hickory-resolver",
+ "hickory-server",
  "image",
  "internet-packet",
  "log",
  "lru_time_cache",
- "nix 0.27.1",
+ "nix 0.29.0",
+ "objc",
  "once_cell",
  "pretty-hex",
  "prost",
  "rand",
  "rand_core",
+ "security-framework",
  "smoltcp",
+ "sysinfo",
  "tokio",
  "tokio-util",
- "windows 0.52.0",
+ "windows 0.57.0",
  "x25519-dalek",
 ]
 
 [[package]]
 name = "mitmproxy_rs"
-version = "0.5.1"
+version = "0.6.2"
 dependencies = [
  "anyhow",
  "boringtun",
@@ -1384,7 +1621,7 @@ dependencies = [
  "mitmproxy",
  "once_cell",
  "pyo3",
- "pyo3-asyncio",
+ "pyo3-asyncio-0-21",
  "pyo3-log",
  "rand_core",
  "tar",
@@ -1405,12 +1642,13 @@ dependencies = [
 
 [[package]]
 name = "nix"
-version = "0.27.1"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053"
+checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
 dependencies = [
- "bitflags 2.4.0",
+ "bitflags 2.6.0",
  "cfg-if",
+ "cfg_aliases",
  "libc",
 ]
 
@@ -1425,31 +1663,25 @@ dependencies = [
 ]
 
 [[package]]
-name = "num-integer"
-version = "0.1.45"
+name = "ntapi"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
+checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4"
 dependencies = [
- "autocfg",
- "num-traits",
+ "winapi",
 ]
 
 [[package]]
-name = "num-rational"
-version = "0.4.1"
+name = "num-conv"
+version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0"
-dependencies = [
- "autocfg",
- "num-integer",
- "num-traits",
-]
+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
 
 [[package]]
 name = "num-traits"
-version = "0.2.16"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
 ]
@@ -1465,19 +1697,28 @@ dependencies = [
 ]
 
 [[package]]
-name = "object"
-version = "0.32.1"
+name = "objc"
+version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0"
+checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1"
+dependencies = [
+ "malloc_buf",
+]
+
+[[package]]
+name = "object"
+version = "0.36.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "081b846d1d56ddfc18fdf1a922e4f6e07a11768ea1b92dec44e42b72712ccfce"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
 
 [[package]]
 name = "oorandom"
@@ -1487,15 +1728,15 @@ checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575"
 
 [[package]]
 name = "opaque-debug"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
+checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381"
 
 [[package]]
 name = "parking_lot"
-version = "0.12.1"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
+checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
 dependencies = [
  "lock_api",
  "parking_lot_core",
@@ -1503,48 +1744,48 @@ dependencies = [
 
 [[package]]
 name = "parking_lot_core"
-version = "0.9.8"
+version = "0.9.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447"
+checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
 dependencies = [
  "cfg-if",
  "libc",
- "redox_syscall",
+ "redox_syscall 0.5.2",
  "smallvec",
- "windows-targets 0.48.5",
+ "windows-targets 0.52.5",
 ]
 
 [[package]]
 name = "percent-encoding"
-version = "2.3.0"
+version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94"
+checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
 [[package]]
 name = "pin-project"
-version = "1.1.3"
+version = "1.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422"
+checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3"
 dependencies = [
  "pin-project-internal",
 ]
 
 [[package]]
 name = "pin-project-internal"
-version = "1.1.3"
+version = "1.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405"
+checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.37",
+ "syn 2.0.68",
 ]
 
 [[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"
@@ -1554,15 +1795,15 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
 [[package]]
 name = "platforms"
-version = "3.1.2"
+version = "3.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4503fa043bf02cee09a9582e9554b4c6403b2ef55e4612e96561d294419429f8"
+checksum = "0e4c7666f2019727f9e8e14bf14456e99c707d780922869f1ba473eee101fa49"
 
 [[package]]
 name = "plotters"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2c224ba00d7cadd4d5c660deaf2098e5e80e07846537c51f9cfa4be50c1fd45"
+checksum = "a15b6eccb8484002195a3e44fe65a4ce8e93a625797a063735536fd59cb01cf3"
 dependencies = [
  "num-traits",
  "plotters-backend",
@@ -1573,24 +1814,24 @@ dependencies = [
 
 [[package]]
 name = "plotters-backend"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e76628b4d3a7581389a35d5b6e2139607ad7c75b17aed325f210aa91f4a9609"
+checksum = "414cec62c6634ae900ea1c56128dfe87cf63e7caece0852ec76aba307cebadb7"
 
 [[package]]
 name = "plotters-svg"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38f6d39893cca0701371e3c27294f09797214b86f1fb951b89ade8ec04e2abab"
+checksum = "81b30686a7d9c3e010b84284bdd26a29f2138574f52f5eb6f794fc0ad924e705"
 dependencies = [
  "plotters-backend",
 ]
 
 [[package]]
 name = "png"
-version = "0.17.10"
+version = "0.17.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64"
+checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1"
 dependencies = [
  "bitflags 1.3.2",
  "crc32fast",
@@ -1610,6 +1851,18 @@ dependencies = [
  "universal-hash",
 ]
 
+[[package]]
+name = "portable-atomic"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0"
+
+[[package]]
+name = "powerfmt"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
+
 [[package]]
 name = "ppv-lite86"
 version = "0.2.17"
@@ -1618,9 +1871,9 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
 
 [[package]]
 name = "pretty-hex"
-version = "0.4.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23c6b968ed37d62e35b4febaba13bfa231b0b7929d68b8a94e65445a17e2d35f"
+checksum = "bbc83ee4a840062f368f9096d80077a9841ec117e17e7f700df81958f1451254"
 
 [[package]]
 name = "proc-macro-error"
@@ -1648,18 +1901,18 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.67"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
 
 [[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",
@@ -1667,31 +1920,31 @@ dependencies = [
 
 [[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 0.12.1",
  "proc-macro2",
  "quote",
- "syn 2.0.37",
+ "syn 2.0.68",
 ]
 
 [[package]]
 name = "prost-types"
-version = "0.12.1"
+version = "0.12.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e081b29f63d83a4bc75cfc9f3fe424f9156cf92d8a4f0c9407cce9a1b67327cf"
+checksum = "9091c90b0a32608e984ff2fa4091273cbdd755d54935c51d520887f4a1dbd5b0"
 dependencies = [
  "prost",
 ]
 
 [[package]]
 name = "pyo3"
-version = "0.19.2"
+version = "0.21.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e681a6cfdc4adcc93b4d3cf993749a4552018ee0a9b65fc0ccfad74352c72a38"
+checksum = "a5e00b96a521718e08e03b1a622f01c8a8deb50719335de3f60b3b3950f069d8"
 dependencies = [
  "anyhow",
  "cfg-if",
@@ -1699,6 +1952,7 @@ dependencies = [
  "libc",
  "memoffset",
  "parking_lot",
+ "portable-atomic",
  "pyo3-build-config",
  "pyo3-ffi",
  "pyo3-macros",
@@ -1706,10 +1960,10 @@ dependencies = [
 ]
 
 [[package]]
-name = "pyo3-asyncio"
-version = "0.19.0"
+name = "pyo3-asyncio-0-21"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2cc34c1f907ca090d7add03dc523acdd91f3a4dab12286604951e2f5152edad"
+checksum = "8fde289486f7d5cee0ac7c20b2637a0657654681079cc5eedc90d9a2a79af1e5"
 dependencies = [
  "futures",
  "once_cell",
@@ -1720,9 +1974,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-build-config"
-version = "0.19.2"
+version = "0.21.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "076c73d0bc438f7a4ef6fdd0c3bb4732149136abd952b110ac93e4edb13a6ba5"
+checksum = "7883df5835fafdad87c0d888b266c8ec0f4c9ca48a5bed6bbb592e8dedee1b50"
 dependencies = [
  "once_cell",
  "target-lexicon",
@@ -1730,9 +1984,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-ffi"
-version = "0.19.2"
+version = "0.21.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e53cee42e77ebe256066ba8aa77eff722b3bb91f3419177cf4cd0f304d3284d9"
+checksum = "01be5843dc60b916ab4dad1dca6d20b9b4e6ddc8e15f50c47fe6d85f1fb97403"
 dependencies = [
  "libc",
  "pyo3-build-config",
@@ -1740,9 +1994,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-log"
-version = "0.9.0"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c10808ee7250403bedb24bc30c32493e93875fef7ba3e4292226fe924f398bd"
+checksum = "3ac84e6eec1159bc2a575c9ae6723baa6ee9d45873e9bebad1e3ad7e8d28a443"
 dependencies = [
  "arc-swap",
  "log",
@@ -1751,41 +2005,40 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros"
-version = "0.19.2"
+version = "0.21.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfeb4c99597e136528c6dd7d5e3de5434d1ceaf487436a3f03b2d56b6fc9efd1"
+checksum = "77b34069fc0682e11b31dbd10321cbf94808394c56fd996796ce45217dfac53c"
 dependencies = [
  "proc-macro2",
  "pyo3-macros-backend",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.68",
 ]
 
 [[package]]
 name = "pyo3-macros-backend"
-version = "0.19.2"
+version = "0.21.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "947dc12175c254889edc0c02e399476c2f652b4b9ebd123aa655c224de259536"
+checksum = "08260721f32db5e1a5beae69a55553f56b99bd0e1c3e6e0a5e8851a9d0f5a85c"
 dependencies = [
+ "heck",
  "proc-macro2",
+ "pyo3-build-config",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.68",
 ]
 
 [[package]]
-name = "qoi"
-version = "0.4.1"
+name = "quick-error"
+version = "1.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f6d64c71eb498fe9eae14ce4ec935c555749aef511cca85b5568910d6e48001"
-dependencies = [
- "bytemuck",
-]
+checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
 
 [[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",
 ]
@@ -1822,9 +2075,9 @@ dependencies = [
 
 [[package]]
 name = "rayon"
-version = "1.8.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1"
+checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
 dependencies = [
  "either",
  "rayon-core",
@@ -1832,9 +2085,9 @@ dependencies = [
 
 [[package]]
 name = "rayon-core"
-version = "1.12.0"
+version = "1.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed"
+checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
 dependencies = [
  "crossbeam-deque",
  "crossbeam-utils",
@@ -1842,23 +2095,32 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.3.5"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
+checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
 dependencies = [
  "bitflags 1.3.2",
 ]
 
 [[package]]
-name = "regex"
-version = "1.9.5"
+name = "redox_syscall"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47"
+checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd"
+dependencies = [
+ "bitflags 2.6.0",
+]
+
+[[package]]
+name = "regex"
+version = "1.10.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-automata 0.3.8",
- "regex-syntax 0.7.5",
+ "regex-automata 0.4.7",
+ "regex-syntax 0.8.4",
 ]
 
 [[package]]
@@ -1872,13 +2134,13 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.3.8"
+version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795"
+checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-syntax 0.7.5",
+ "regex-syntax 0.8.4",
 ]
 
 [[package]]
@@ -1889,9 +2151,19 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
 
 [[package]]
 name = "regex-syntax"
-version = "0.7.5"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da"
+checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
+
+[[package]]
+name = "resolv-conf"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "52e44394d2086d010551b14b53b1f24e31647570cd1deb0379e2c21b329aba00"
+dependencies = [
+ "hostname",
+ "quick-error",
+]
 
 [[package]]
 name = "ring"
@@ -1902,7 +2174,7 @@ dependencies = [
  "cc",
  "libc",
  "once_cell",
- "spin 0.5.2",
+ "spin",
  "untrusted 0.7.1",
  "web-sys",
  "winapi",
@@ -1910,9 +2182,9 @@ dependencies = [
 
 [[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"
@@ -1925,28 +2197,28 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.38.14"
+version = "0.38.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "747c788e9ce8e92b12cd485c49ddf90723550b654b32508f979b71a7b1ecda4f"
+checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
 dependencies = [
- "bitflags 2.4.0",
+ "bitflags 2.6.0",
  "errno",
  "libc",
  "linux-raw-sys",
- "windows-sys",
+ "windows-sys 0.52.0",
 ]
 
 [[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.15"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741"
+checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
 
 [[package]]
 name = "same-file"
@@ -1964,36 +2236,59 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
 [[package]]
-name = "semver"
-version = "1.0.19"
+name = "security-framework"
+version = "2.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad977052201c6de01a8ef2aa3378c4bd23217a056337d1d6da40468d267a4fb0"
+checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0"
+dependencies = [
+ "bitflags 2.6.0",
+ "core-foundation",
+ "core-foundation-sys",
+ "libc",
+ "security-framework-sys",
+]
+
+[[package]]
+name = "security-framework-sys"
+version = "2.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
+[[package]]
+name = "semver"
+version = "1.0.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
 
 [[package]]
 name = "serde"
-version = "1.0.188"
+version = "1.0.203"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e"
+checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.188"
+version = "1.0.203"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2"
+checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.37",
+ "syn 2.0.68",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.107"
+version = "1.0.120"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65"
+checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5"
 dependencies = [
  "itoa",
  "ryu",
@@ -2002,18 +2297,18 @@ dependencies = [
 
 [[package]]
 name = "sharded-slab"
-version = "0.1.4"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31"
+checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6"
 dependencies = [
  "lazy_static",
 ]
 
 [[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",
 ]
@@ -2035,15 +2330,14 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.1"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "smoltcp"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d2e3a36ac8fea7b94e666dfa3871063d6e0a5c9d5d4fec9a1a6b7b6760f0229"
+version = "0.11.0"
+source = "git+https://github.com/smoltcp-rs/smoltcp?rev=ef67e7b46cabf49783053cbf68d8671ed97ff8d4#ef67e7b46cabf49783053cbf68d8671ed97ff8d4"
 dependencies = [
  "bitflags 1.3.2",
  "byteorder",
@@ -2057,22 +2351,12 @@ dependencies = [
 
 [[package]]
 name = "socket2"
-version = "0.4.9"
+version = "0.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662"
+checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c"
 dependencies = [
  "libc",
- "winapi",
-]
-
-[[package]]
-name = "socket2"
-version = "0.5.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9"
-dependencies = [
- "libc",
- "windows-sys",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -2081,15 +2365,6 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
 
-[[package]]
-name = "spin"
-version = "0.9.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
-dependencies = [
- "lock_api",
-]
-
 [[package]]
 name = "stable_deref_trait"
 version = "1.2.0"
@@ -2098,9 +2373,9 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
 
 [[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"
@@ -2109,15 +2384,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
 dependencies = [
  "proc-macro2",
- "quote",
  "unicode-ident",
 ]
 
 [[package]]
 name = "syn"
-version = "2.0.37"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7303ef2c05cd654186cb250d29049a24840ca25d2747c25c0381c8d9e2f582e8"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2131,10 +2405,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
 
 [[package]]
-name = "tar"
-version = "0.4.40"
+name = "sysinfo"
+version = "0.29.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb"
+checksum = "cd727fc423c2060f6c92d9534cef765c65a6ed3f428a03d7def74a8c4348e666"
+dependencies = [
+ "cfg-if",
+ "core-foundation-sys",
+ "libc",
+ "ntapi",
+ "once_cell",
+ "rayon",
+ "winapi",
+]
+
+[[package]]
+name = "tar"
+version = "0.4.41"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb797dad5fb5b76fcf519e702f4a589483b5ef06567f160c392832c1f5e44909"
 dependencies = [
  "filetime",
  "libc",
@@ -2143,44 +2432,35 @@ dependencies = [
 
 [[package]]
 name = "target-lexicon"
-version = "0.12.11"
+version = "0.12.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a"
-
-[[package]]
-name = "termcolor"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64"
-dependencies = [
- "winapi-util",
-]
+checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f"
 
 [[package]]
 name = "thiserror"
-version = "1.0.48"
+version = "1.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7"
+checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.48"
+version = "1.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35"
+checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.37",
+ "syn 2.0.68",
 ]
 
 [[package]]
 name = "thread_local"
-version = "1.1.7"
+version = "1.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152"
+checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -2188,15 +2468,34 @@ dependencies = [
 
 [[package]]
 name = "tiff"
-version = "0.9.0"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d172b0f4d3fba17ba89811858b9d3d97f928aece846475bbda076ca46736211"
+checksum = "ba1310fcea54c6a9a4fd1aad794ecc02c31682f6bfbecdf460bf19533eed1e3e"
 dependencies = [
  "flate2",
  "jpeg-decoder",
  "weezl",
 ]
 
+[[package]]
+name = "time"
+version = "0.3.36"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
+dependencies = [
+ "deranged",
+ "num-conv",
+ "powerfmt",
+ "serde",
+ "time-core",
+]
+
+[[package]]
+name = "time-core"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
+
 [[package]]
 name = "tinytemplate"
 version = "1.2.1"
@@ -2208,10 +2507,25 @@ dependencies = [
 ]
 
 [[package]]
-name = "tokio"
-version = "1.34.0"
+name = "tinyvec"
+version = "1.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0c014766411e834f7af5b8f4cf46257aab4036ca95e9d2c144a10f59ad6f5b9"
+checksum = "c55115c6fbe2d2bef26eb09ad74bde02d8255476fc0c7b515ef09fbb35742d82"
+dependencies = [
+ "tinyvec_macros",
+]
+
+[[package]]
+name = "tinyvec_macros"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
+
+[[package]]
+name = "tokio"
+version = "1.38.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a"
 dependencies = [
  "backtrace",
  "bytes",
@@ -2220,10 +2534,10 @@ dependencies = [
  "num_cpus",
  "pin-project-lite",
  "signal-hook-registry",
- "socket2 0.5.5",
+ "socket2",
  "tokio-macros",
  "tracing",
- "windows-sys",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -2238,20 +2552,20 @@ 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.37",
+ "syn 2.0.68",
 ]
 
 [[package]]
 name = "tokio-stream"
-version = "0.1.14"
+version = "0.1.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842"
+checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af"
 dependencies = [
  "futures-core",
  "pin-project-lite",
@@ -2260,16 +2574,15 @@ 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]]
@@ -2283,14 +2596,14 @@ dependencies = [
 
 [[package]]
 name = "tonic"
-version = "0.10.2"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d560933a0de61cf715926b9cac824d4c883c2c43142f787595e48280c40a1d0e"
+checksum = "76c4eb7a4e9ef9d4763600161f12f5070b92a578e1b634db88a6887844c91a13"
 dependencies = [
  "async-stream",
  "async-trait",
  "axum",
- "base64 0.21.4",
+ "base64 0.21.7",
  "bytes",
  "h2",
  "http",
@@ -2316,7 +2629,7 @@ checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c"
 dependencies = [
  "futures-core",
  "futures-util",
- "indexmap",
+ "indexmap 1.9.3",
  "pin-project",
  "pin-project-lite",
  "rand",
@@ -2342,11 +2655,10 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
 
 [[package]]
 name = "tracing"
-version = "0.1.37"
+version = "0.1.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8"
+checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
 dependencies = [
- "cfg-if",
  "pin-project-lite",
  "tracing-attributes",
  "tracing-core",
@@ -2354,20 +2666,20 @@ dependencies = [
 
 [[package]]
 name = "tracing-attributes"
-version = "0.1.26"
+version = "0.1.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab"
+checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.37",
+ "syn 2.0.68",
 ]
 
 [[package]]
 name = "tracing-core"
-version = "0.1.31"
+version = "0.1.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a"
+checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
 dependencies = [
  "once_cell",
  "valuable",
@@ -2375,9 +2687,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-subscriber"
-version = "0.3.17"
+version = "0.3.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77"
+checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b"
 dependencies = [
  "matchers",
  "once_cell",
@@ -2390,9 +2702,9 @@ dependencies = [
 
 [[package]]
 name = "try-lock"
-version = "0.2.4"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed"
+checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
 
 [[package]]
 name = "typenum"
@@ -2400,6 +2712,12 @@ version = "1.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
 
+[[package]]
+name = "unicode-bidi"
+version = "0.3.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
+
 [[package]]
 name = "unicode-ident"
 version = "1.0.12"
@@ -2407,10 +2725,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
 
 [[package]]
-name = "unindent"
-version = "0.1.11"
+name = "unicode-normalization"
+version = "0.1.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1766d682d402817b5ac4490b3c3002d91dfa0d22812f341609f97b08757359c"
+checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5"
+dependencies = [
+ "tinyvec",
+]
+
+[[package]]
+name = "unindent"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7de7d73e1754487cb58364ee906a499937a0dfabd86bcb980fa99ec8c8fa2ce"
 
 [[package]]
 name = "universal-hash"
@@ -2434,6 +2761,23 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
 
+[[package]]
+name = "url"
+version = "2.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c"
+dependencies = [
+ "form_urlencoded",
+ "idna 0.5.0",
+ "percent-encoding",
+]
+
+[[package]]
+name = "utf8parse"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
+
 [[package]]
 name = "valuable"
 version = "0.1.0"
@@ -2448,9 +2792,9 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
 
 [[package]]
 name = "walkdir"
-version = "2.4.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee"
+checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
 dependencies = [
  "same-file",
  "winapi-util",
@@ -2473,9 +2817,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.87"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342"
+checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
 dependencies = [
  "cfg-if",
  "wasm-bindgen-macro",
@@ -2483,24 +2827,24 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.87"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd"
+checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
 dependencies = [
  "bumpalo",
  "log",
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.37",
+ "syn 2.0.68",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.87"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d"
+checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -2508,28 +2852,28 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.87"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
+checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.37",
+ "syn 2.0.68",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.87"
+version = "0.2.92"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1"
+checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
 
 [[package]]
 name = "web-sys"
-version = "0.3.64"
+version = "0.3.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b"
+checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -2537,9 +2881,15 @@ dependencies = [
 
 [[package]]
 name = "weezl"
-version = "0.1.7"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb"
+checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082"
+
+[[package]]
+name = "widestring"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7219d36b6eac893fa81e84ebe06485e7dcbb616177469b142df14f1f4deb1311"
 
 [[package]]
 name = "winapi"
@@ -2559,11 +2909,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 
 [[package]]
 name = "winapi-util"
-version = "0.1.6"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596"
+checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b"
 dependencies = [
- "winapi",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -2606,26 +2956,51 @@ dependencies = [
 
 [[package]]
 name = "windows"
-version = "0.52.0"
+version = "0.57.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be"
+checksum = "12342cb4d8e3b046f3d80effd474a7a02447231330ef77d71daa6fbc40681143"
 dependencies = [
  "windows-core",
- "windows-targets 0.52.0",
+ "windows-targets 0.52.5",
 ]
 
 [[package]]
 name = "windows-core"
-version = "0.52.0"
+version = "0.57.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
+checksum = "d2ed2439a290666cd67ecce2b0ffaad89c2a56b976b736e6ece670297897832d"
 dependencies = [
- "windows-targets 0.52.0",
+ "windows-implement",
+ "windows-interface",
+ "windows-result",
+ "windows-targets 0.52.5",
+]
+
+[[package]]
+name = "windows-implement"
+version = "0.57.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.68",
+]
+
+[[package]]
+name = "windows-interface"
+version = "0.57.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.68",
 ]
 
 [[package]]
 name = "windows-redirector"
-version = "0.5.1"
+version = "0.6.2"
 dependencies = [
  "anyhow",
  "env_logger",
@@ -2640,6 +3015,15 @@ dependencies = [
  "winres",
 ]
 
+[[package]]
+name = "windows-result"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8"
+dependencies = [
+ "windows-targets 0.52.5",
+]
+
 [[package]]
 name = "windows-sys"
 version = "0.48.0"
@@ -2649,6 +3033,15 @@ dependencies = [
  "windows-targets 0.48.5",
 ]
 
+[[package]]
+name = "windows-sys"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+dependencies = [
+ "windows-targets 0.52.5",
+]
+
 [[package]]
 name = "windows-targets"
 version = "0.48.5"
@@ -2666,17 +3059,18 @@ dependencies = [
 
 [[package]]
 name = "windows-targets"
-version = "0.52.0"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd"
+checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb"
 dependencies = [
- "windows_aarch64_gnullvm 0.52.0",
- "windows_aarch64_msvc 0.52.0",
- "windows_i686_gnu 0.52.0",
- "windows_i686_msvc 0.52.0",
- "windows_x86_64_gnu 0.52.0",
- "windows_x86_64_gnullvm 0.52.0",
- "windows_x86_64_msvc 0.52.0",
+ "windows_aarch64_gnullvm 0.52.5",
+ "windows_aarch64_msvc 0.52.5",
+ "windows_i686_gnu 0.52.5",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc 0.52.5",
+ "windows_x86_64_gnu 0.52.5",
+ "windows_x86_64_gnullvm 0.52.5",
+ "windows_x86_64_msvc 0.52.5",
 ]
 
 [[package]]
@@ -2687,9 +3081,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
 
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.52.0"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea"
+checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263"
 
 [[package]]
 name = "windows_aarch64_msvc"
@@ -2699,9 +3093,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.52.0"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef"
+checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6"
 
 [[package]]
 name = "windows_i686_gnu"
@@ -2711,9 +3105,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.52.0"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313"
+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"
@@ -2723,9 +3123,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.52.0"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a"
+checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf"
 
 [[package]]
 name = "windows_x86_64_gnu"
@@ -2735,9 +3135,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.52.0"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd"
+checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
@@ -2747,9 +3147,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.52.0"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e"
+checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596"
 
 [[package]]
 name = "windows_x86_64_msvc"
@@ -2759,9 +3159,19 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.52.0"
+version = "0.52.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
+checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"
+
+[[package]]
+name = "winreg"
+version = "0.50.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1"
+dependencies = [
+ "cfg-if",
+ "windows-sys 0.48.0",
+]
 
 [[package]]
 name = "winres"
@@ -2786,18 +3196,20 @@ dependencies = [
 
 [[package]]
 name = "xattr"
-version = "1.0.1"
+version = "1.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4686009f71ff3e5c4dbcf1a282d0a44db3f021ba69350cd42086b3e5f1c6985"
+checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f"
 dependencies = [
  "libc",
+ "linux-raw-sys",
+ "rustix",
 ]
 
 [[package]]
 name = "zeroize"
-version = "1.6.0"
+version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9"
+checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
 dependencies = [
  "zeroize_derive",
 ]
@@ -2810,14 +3222,5 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.37",
-]
-
-[[package]]
-name = "zune-inflate"
-version = "0.2.54"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73ab332fe2f6680068f3582b16a24f90ad7096d5d39b974d1c0aff0125116f02"
-dependencies = [
- "simd-adler32",
+ "syn 2.0.68",
 ]
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mitmproxy-rs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mitmproxy-rs/default.nix
index 79941e67fd..2b6f40abb5 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/mitmproxy-rs/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/mitmproxy-rs/default.nix
@@ -6,22 +6,28 @@
   rustPlatform,
   darwin,
   libiconv,
+  mitmproxy,
   mitmproxy-macos,
 }:
 
 buildPythonPackage rec {
   pname = "mitmproxy-rs";
-  version = "0.5.1";
+  version = "0.6.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mitmproxy";
     repo = "mitmproxy_rs";
     rev = version;
-    hash = "sha256-nrm1T2yaGVmYsubwNJHPnPDC/A/jYiKVzwBKmuc9MD4=";
+    hash = "sha256-zBlt83mtJOsVqskDAkpk50yZHxJO6B8QP7iv8L1YPWA=";
   };
 
-  cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; };
+  cargoDeps = rustPlatform.importCargoLock {
+    outputHashes = {
+      "smoltcp-0.11.0" = "sha256-KC9nTKd2gfZ1ICjrkLK//M2bbqYlfcCK18gBdN0RqWQ=";
+    };
+    lockFile = ./Cargo.lock;
+  };
 
   buildAndTestSubdir = "mitmproxy-rs";
 
@@ -43,6 +49,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/mitmproxy/mitmproxy_rs";
     changelog = "https://github.com/mitmproxy/mitmproxy_rs/blob/${src.rev}/CHANGELOG.md";
     license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    inherit (mitmproxy.meta) maintainers;
   };
 }
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mitmproxy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mitmproxy/default.nix
index e04490dd46..3df81ce29c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/mitmproxy/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/mitmproxy/default.nix
@@ -21,7 +21,7 @@
   mitmproxy-rs,
   msgpack,
   passlib,
-  protobuf,
+  protobuf5,
   publicsuffix2,
   pyopenssl,
   pyparsing,
@@ -30,7 +30,7 @@
   setuptools,
   sortedcontainers,
   tornado,
-  urwid-mitmproxy,
+  urwid,
   wsproto,
   zstandard,
   # Additional check requirements
@@ -45,7 +45,7 @@
 
 buildPythonPackage rec {
   pname = "mitmproxy";
-  version = "10.3.1";
+  version = "10.4.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -54,15 +54,12 @@ buildPythonPackage rec {
     owner = "mitmproxy";
     repo = "mitmproxy";
     rev = "refs/tags/v${version}";
-    hash = "sha256-rIyRY1FolbdoaI4OgFG7D2/mot8NiRHalgittPzledw=";
+    hash = "sha256-W+m7PVphj4sP5+Um7dtPbdnaZ+edZn/fcE4XJGX1E6M=";
   };
 
 
   pythonRelaxDeps = [
-    "aioquic"
-    "cryptography"
-    "pyperclip"
-    "tornado"
+    "urwid"
   ];
 
   propagatedBuildInputs = [
@@ -81,7 +78,7 @@ buildPythonPackage rec {
     mitmproxy-rs
     msgpack
     passlib
-    protobuf
+    protobuf5
     publicsuffix2
     pyopenssl
     pyparsing
@@ -90,7 +87,7 @@ buildPythonPackage rec {
     setuptools
     sortedcontainers
     tornado
-    urwid-mitmproxy
+    urwid
     wsproto
     zstandard
   ] ++ lib.optionals stdenv.isDarwin [ mitmproxy-macos ];
@@ -126,6 +123,23 @@ buildPythonPackage rec {
     # FileNotFoundError: [Errno 2] No such file or directory
     # likely wireguard is also not working in the sandbox
     "test_wireguard"
+    # test require a DNS server
+    # RuntimeError: failed to get dns servers: io error: entity not found
+    "test_errorcheck"
+    "test_errorcheck"
+    "test_dns"
+    "test_order"
+  ];
+
+  disabledTestPaths = [
+    # test require a DNS server
+    # RuntimeError: failed to get dns servers: io error: entity not found
+    "test/mitmproxy/addons/test_dns_resolver.py"
+    "test/mitmproxy/tools/test_dump.py"
+    "test/mitmproxy/tools/test_main.py"
+    "test/mitmproxy/tools/web/test_app.py"
+    "test/mitmproxy/tools/web/test_app.py" # 2 out of 31 tests work
+    "test/mitmproxy/tools/web/test_master.py"
   ];
 
   dontUsePytestXdist = true;
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-exclude/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-exclude/default.nix
index 9958faed05..431eeb44cc 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-exclude/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-exclude/default.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  callPackage,
   buildPythonPackage,
   fetchFromGitHub,
   mkdocs,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-get-deps/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-get-deps/default.nix
index 72d4fce4fa..3b36dfb7fe 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-get-deps/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-git-revision-date-localized-plugin/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-git-revision-date-localized-plugin/default.nix
index 2b75fe35c0..89ea4ba0a5 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-git-revision-date-localized-plugin/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-git-revision-date-localized-plugin/default.nix
@@ -8,7 +8,6 @@
   mkdocs,
   pytz,
   pytestCheckHook,
-  git,
 }:
 
 buildPythonPackage rec {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-macros/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-macros/default.nix
index 1be602360f..bc73fe8848 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-macros/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-macros/default.nix
@@ -4,14 +4,10 @@
   buildPythonPackage,
   fetchPypi,
   mkdocs,
-  mkdocs-macros,
-  mkdocs-material,
   jinja2,
   python-dateutil,
   termcolor,
   pyyaml,
-  runCommand,
-  setuptools,
 }:
 
 buildPythonPackage rec {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-macros/mkdocs-macros-test.nix b/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-macros/mkdocs-macros-test.nix
index 3b8b53693b..75e935d946 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-macros/mkdocs-macros-test.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-macros/mkdocs-macros-test.nix
@@ -1,10 +1,7 @@
 {
   lib,
-  callPackage,
   buildPythonPackage,
   fetchPypi,
-  runCommand,
-  setuptools,
 }:
 
 # Is required for properly testing mkdocs-macros
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-material/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-material/default.nix
index edb8563ed2..b5f17fbe9c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-material/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-mermaid2-plugin/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-mermaid2-plugin/default.nix
index 890bdc7b0a..0056beaa92 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-mermaid2-plugin/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-redirects/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-redirects/default.nix
index 485ab55189..72fced65d1 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-redirects/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-redirects/default.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  callPackage,
   buildPythonPackage,
   fetchFromGitHub,
   mkdocs,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix
index 78a1467554..36863323f9 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/mkdocs-swagger-ui-tag/default.nix
@@ -2,7 +2,6 @@
   lib,
   beautifulsoup4,
   buildPythonPackage,
-  drawio-headless,
   fetchFromGitHub,
   mkdocs,
   pathspec,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mlx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mlx/default.nix
index f922cecadd..2084b8c19f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/mlx/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/mlx/default.nix
@@ -7,7 +7,6 @@
   cmake,
   xcbuild,
   zsh,
-  darwin,
   blas,
   lapack,
 }:
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mmh3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mmh3/default.nix
index 547c7f7b88..9e09b91850 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/mmh3/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/mobi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mobi/default.nix
index 82065268cf..cfa7d4e698 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/mobi/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/mocket/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mocket/default.nix
index a76b460857..323633d3a4 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/mocket/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/mockfs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mockfs/default.nix
index 7f069557ed..5e6da22c91 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/mockfs/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/molbar/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/molbar/default.nix
index f69bfb6f17..be23018274 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/molbar/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/molbar/default.nix
@@ -1,5 +1,4 @@
 { buildPythonPackage
-, python
 , lib
 , gfortran
 , fetchgit
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/monai/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/monai/default.nix
index beefc46c0f..d190facc17 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/monai/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/monai/default.nix
@@ -4,7 +4,6 @@
   fetchFromGitHub,
   fetchpatch,
   pythonOlder,
-  pythonAtLeast,
   ninja,
   ignite,
   numpy,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mopeka-iot-ble/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mopeka-iot-ble/default.nix
index 7ac84ff213..8798668d6c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/mopeka-iot-ble/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/mopeka-iot-ble/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "mopeka-iot-ble";
-  version = "0.7.0";
+  version = "0.8.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "bluetooth-devices";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-wF3ZSR9kjn6qWaB7SRKsQuHfbNMwdKS/5qR9nStsw1c=";
+    hash = "sha256-CKLC0p66JapE9qNePE11ttoGMVd4kA7g28kA+pYLXCE=";
   };
 
   postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/more-itertools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/more-itertools/default.nix
index 0130714fec..ea2b3c4350 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/more-itertools/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/mortgage/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mortgage/default.nix
index 6cc5ccc507..ec5e39c6b8 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/mortgage/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/motmetrics/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/motmetrics/default.nix
index 891497a702..74a0fade7b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/motmetrics/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/moviepy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/moviepy/default.nix
index 23cc5ba5e4..1c9e917b60 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/moviepy/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/mozart-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mozart-api/default.nix
new file mode 100644
index 0000000000..0714dd07bc
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/mpyq/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mpyq/default.nix
index bbd0befe14..cae321df5c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/mpyq/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/mrjob/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mrjob/default.nix
index deb6e0c6ca..669fee8887 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/mrjob/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/mt-940/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mt-940/default.nix
index 3a664b3933..beec1bb17e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/mt-940/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/mujoco/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mujoco/default.nix
index c7d8258e89..569988aabb 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/mujoco/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/multiprocess/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/multiprocess/default.nix
index 57e69de0e7..98a3ad4c56 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/multiprocess/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/mutag/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mutag/default.nix
index d5b6fe944a..6f7bf72c4a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/mutag/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/mutagen/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mutagen/default.nix
index e7219e6075..c66f33c6d9 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/mutagen/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/mwclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mwclient/default.nix
index 72fa00155f..1bdc53e90d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/mwclient/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/mygpoclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mygpoclient/default.nix
index 02f1f07ff6..8205ba66be 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/mygpoclient/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/mypy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mypy/default.nix
index ffdd8bc5ac..0f264d2c86 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/mypy/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/mypy/default.nix
@@ -3,6 +3,7 @@
   stdenv,
   buildPythonPackage,
   fetchFromGitHub,
+  gitUpdater,
   pythonAtLeast,
   pythonOlder,
 
@@ -31,7 +32,7 @@
 
 buildPythonPackage rec {
   pname = "mypy";
-  version = "1.10.0";
+  version = "1.10.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -40,7 +41,10 @@ buildPythonPackage rec {
     owner = "python";
     repo = "mypy";
     rev = "refs/tags/v${version}";
-    hash = "sha256-NCnc4C/YFKHN/kT7RTFCYs/yC00Kt1E7mWCoQuUjxG8=";
+    hash = "sha256-joV+elRaAICNQHkYuYtTDjvOUkHPsRkG1OLRvdxeIHc=";
+  };
+  passthru.updateScript = gitUpdater {
+    rev-prefix = "v";
   };
 
   build-system = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mysql-connector/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mysql-connector/default.nix
index 228b6bd89f..e234bbef0e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/mysql-connector/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/mysql-connector/default.nix
@@ -1,7 +1,6 @@
 {
   lib,
   buildPythonPackage,
-  django,
   dnspython,
   fetchFromGitHub,
   protobuf,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/myst-nb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/myst-nb/default.nix
index 4be14e8510..97628a5e3e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/myst-nb/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/nameparser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nameparser/default.nix
index daafd9190c..dffd114bd0 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/nameparser/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/nanoid/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nanoid/default.nix
index 48d1f3f444..1570c28f9e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/nanoid/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/nanoleaf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nanoleaf/default.nix
index 995c56510d..59f9e82d48 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/nanoleaf/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/napalm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/napalm/default.nix
index bfd35c2fd0..c6eeef191a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/napalm/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/napalm/default.nix
@@ -9,7 +9,6 @@
   cffi,
 
   # dependencies
-  future,
   jinja2,
   junos-eznc,
   lxml,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/napalm/hp-procurve.nix b/third_party/nixpkgs/pkgs/development/python-modules/napalm/hp-procurve.nix
index e7492f0f55..a44fe0becf 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/napalm/hp-procurve.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/napari-console/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/napari-console/default.nix
index a71cad588f..1d7e9c5966 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/napari-console/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/napari-console/default.nix
@@ -2,10 +2,8 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  imageio,
   ipykernel,
   ipython,
-  napari-plugin-engine,
   pythonOlder,
   qtconsole,
   qtpy,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/natsort/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/natsort/default.nix
index d8001e5bd1..4183a65e56 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/natsort/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/nbdev/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nbdev/default.nix
index dc60601b7e..4186fae9f7 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/nbdev/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/nbdev/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "nbdev";
-  version = "2.3.25";
+  version = "2.3.26";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-MntVdZ6LazdFCm+h5FaTxvzEwCtoJjrW/EJPTt2fdnU=";
+    hash = "sha256-PmLY2JQuVOl3NyWxwLewsEr7VKSdcWq7t0nNOHP9/8A=";
   };
 
 
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nbsphinx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nbsphinx/default.nix
index 4a15448d08..aac9c4e6ef 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/nbsphinx/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/nbval/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nbval/default.nix
index 7cc16ab27f..920314b9e4 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/nbval/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/ndg-httpsclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ndg-httpsclient/default.nix
index 7ebffc30c4..6773eed000 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/ndg-httpsclient/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/ndindex/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ndindex/default.nix
index 567476d498..ee44e9b154 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/ndindex/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/neo4j/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/neo4j/default.nix
index d1a6903a66..f99be6637f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/neo4j/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/neoteroi-mkdocs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/neoteroi-mkdocs/default.nix
index 66ae368c2b..88e22c65c7 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/neoteroi-mkdocs/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/neoteroi-mkdocs/default.nix
@@ -10,7 +10,6 @@
   jinja2,
   mkdocs,
   pytestCheckHook,
-  pythonImportsCheckHook,
   rich,
   setuptools,
 }:
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nest-asyncio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nest-asyncio/default.nix
index 45dc089f74..f73c569fdd 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/nest-asyncio/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/netcdf4/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/netcdf4/default.nix
index d6b7613765..911ea8afef 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/netcdf4/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/netifaces/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/netifaces/default.nix
index 381b8818e7..8133131a42 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/netifaces/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/nianet/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nianet/default.nix
index 6a97617838..84b83900d4 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/nianet/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/nianet/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  matplotlib,
   niapy,
   numpy,
   poetry-core,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nibe/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nibe/default.nix
index 79b7833c9e..c08da4abe5 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/nibe/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/nibe/default.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  aiohttp,
   aresponses,
   async-modbus,
   async-timeout,
@@ -20,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "nibe";
-  version = "2.10.1";
+  version = "2.12.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -29,7 +28,7 @@ buildPythonPackage rec {
     owner = "yozik04";
     repo = "nibe";
     rev = "refs/tags/${version}";
-    hash = "sha256-rm0SV48vo68aiiFcvuSSGwCvQEsagIMh2EQXXmUU5dc=";
+    hash = "sha256-Sqwwk++iA/PsAKZRkUPjXuzgSrhnH4N02c072pIVEyw=";
   };
 
   build-system = [ setuptools ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nipype/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nipype/default.nix
index 5ac5192eeb..da8452a437 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/nipype/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/nipype/default.nix
@@ -34,7 +34,6 @@
   which,
   bash,
   glibcLocales,
-  callPackage,
   # causes Python packaging conflict with any package requiring rdflib,
   # so use the unpatched rdflib by default (disables Nipype provenance tracking);
   # see https://github.com/nipy/nipype/issues/2888:
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nix-kernel/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nix-kernel/default.nix
index a0b65797ff..5c4b270d2e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/nix-kernel/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/nltk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nltk/default.nix
index 2c71a15a02..8b4b88fbc1 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/nltk/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/nmapthon2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nmapthon2/default.nix
index 8f2ade7951..0a518c2901 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/nmapthon2/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/nmapthon2/default.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  appdirs,
   buildPythonPackage,
   fetchFromGitHub,
   pytestCheckHook,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/node-semver/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/node-semver/default.nix
index 90815a55ef..72ca86fc28 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/node-semver/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/nodeenv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nodeenv/default.nix
index 6ee3b9033f..45c8ed59fa 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/nodeenv/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/noiseprotocol/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/noiseprotocol/default.nix
index 8192e2dd4f..7e42d2eb25 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/noiseprotocol/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/nose-pattern-exclude/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nose-pattern-exclude/default.nix
deleted file mode 100644
index 62fc26fe7b..0000000000
--- a/third_party/nixpkgs/pkgs/development/python-modules/nose-pattern-exclude/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchPypi,
-  nose,
-}:
-
-buildPythonPackage rec {
-  pname = "nose-pattern-exclude";
-  version = "0.1.3";
-  format = "setuptools";
-
-  propagatedBuildInputs = [ nose ];
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "0apzxx8lavsdlxlpaxqw1snx5p7q8v5dfbip6v32f9pj2vyain1i";
-  };
-
-  # There are no tests
-  doCheck = false;
-
-  meta = with lib; {
-    description = "Exclude specific files and directories from nosetests runs";
-    homepage = "https://github.com/jakubroztocil/nose-pattern-exclude";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ jluttine ];
-  };
-}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nose-timer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nose-timer/default.nix
deleted file mode 100644
index a002e6bfb1..0000000000
--- a/third_party/nixpkgs/pkgs/development/python-modules/nose-timer/default.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchFromGitHub,
-  nose,
-  mock,
-  parameterized,
-  termcolor,
-}:
-
-buildPythonPackage rec {
-  pname = "nose-timer";
-  version = "1.0.1";
-  format = "setuptools";
-
-  src = fetchFromGitHub {
-    owner = "mahmoudimus";
-    repo = pname;
-    rev = "v${version}";
-    sha256 = "0xsai2l5i1av62y9y0q63wy2zk27klmf2jizgghhxg2y8nfa8x3x";
-  };
-
-  propagatedBuildInputs = [ nose ];
-
-  nativeCheckInputs = [
-    mock
-    nose
-    parameterized
-    termcolor
-  ];
-
-  checkPhase = ''
-    runHook preCheck
-    nosetests --verbosity 2 tests
-    runHook postCheck
-  '';
-
-  pythonImportsCheck = [ "nosetimer" ];
-
-  meta = with lib; {
-    description = "Timer plugin for nosetests";
-    homepage = "https://github.com/mahmoudimus/nose-timer";
-    license = licenses.mit;
-    maintainers = with maintainers; [ doronbehar ];
-  };
-}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nose-warnings-filters/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nose-warnings-filters/default.nix
deleted file mode 100644
index 39ad8c46f7..0000000000
--- a/third_party/nixpkgs/pkgs/development/python-modules/nose-warnings-filters/default.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchPypi,
-  isPy3k,
-  nose,
-}:
-
-buildPythonPackage rec {
-  pname = "nose-warnings-filters";
-  version = "0.1.5";
-  format = "setuptools";
-
-  src = fetchPypi {
-    pname = "nose_warnings_filters";
-    inherit version;
-    sha256 = "17dvfqfy2fm7a5cmiffw2dc3064kpx72fn5mlw01skm2rhn5nv25";
-  };
-
-  disabled = !isPy3k;
-
-  propagatedBuildInputs = [ nose ];
-
-  nativeCheckInputs = [ nose ];
-  checkPhase = ''
-    nosetests -v
-  '';
-
-  meta = {
-    description = "Allow injecting warning filters during nosetest";
-    homepage = "https://github.com/Carreau/nose_warnings_filters";
-    license = lib.licenses.mit;
-  };
-}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nose-xunitmp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nose-xunitmp/default.nix
deleted file mode 100644
index 18c235dfaa..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/nose/0001-nose-python-3.12-fixes.patch b/third_party/nixpkgs/pkgs/development/python-modules/nose/0001-nose-python-3.12-fixes.patch
new file mode 100644
index 0000000000..67a671a8ae
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/nose/0001-nose-python-3.12-fixes.patch
@@ -0,0 +1,576 @@
+diff --git a/LICENSE.cpython b/LICENSE.cpython
+new file mode 100644
+index 0000000..14603b9
+--- /dev/null
++++ b/LICENSE.cpython
+@@ -0,0 +1,277 @@
++A. HISTORY OF THE SOFTWARE
++==========================
++
++Python was created in the early 1990s by Guido van Rossum at Stichting
++Mathematisch Centrum (CWI, see https://www.cwi.nl) in the Netherlands
++as a successor of a language called ABC.  Guido remains Python's
++principal author, although it includes many contributions from others.
++
++In 1995, Guido continued his work on Python at the Corporation for
++National Research Initiatives (CNRI, see https://www.cnri.reston.va.us)
++in Reston, Virginia where he released several versions of the
++software.
++
++In May 2000, Guido and the Python core development team moved to
++BeOpen.com to form the BeOpen PythonLabs team.  In October of the same
++year, the PythonLabs team moved to Digital Creations, which became
++Zope Corporation.  In 2001, the Python Software Foundation (PSF, see
++https://www.python.org/psf/) was formed, a non-profit organization
++created specifically to own Python-related Intellectual Property.
++Zope Corporation was a sponsoring member of the PSF.
++
++All Python releases are Open Source (see https://opensource.org for
++the Open Source Definition).  Historically, most, but not all, Python
++releases have also been GPL-compatible; the table below summarizes
++the various releases.
++
++    Release         Derived     Year        Owner       GPL-
++                    from                                compatible? (1)
++
++    0.9.0 thru 1.2              1991-1995   CWI         yes
++    1.3 thru 1.5.2  1.2         1995-1999   CNRI        yes
++    1.6             1.5.2       2000        CNRI        no
++    2.0             1.6         2000        BeOpen.com  no
++    1.6.1           1.6         2001        CNRI        yes (2)
++    2.1             2.0+1.6.1   2001        PSF         no
++    2.0.1           2.0+1.6.1   2001        PSF         yes
++    2.1.1           2.1+2.0.1   2001        PSF         yes
++    2.1.2           2.1.1       2002        PSF         yes
++    2.1.3           2.1.2       2002        PSF         yes
++    2.2 and above   2.1.1       2001-now    PSF         yes
++
++Footnotes:
++
++(1) GPL-compatible doesn't mean that we're distributing Python under
++    the GPL.  All Python licenses, unlike the GPL, let you distribute
++    a modified version without making your changes open source.  The
++    GPL-compatible licenses make it possible to combine Python with
++    other software that is released under the GPL; the others don't.
++
++(2) According to Richard Stallman, 1.6.1 is not GPL-compatible,
++    because its license has a choice of law clause.  According to
++    CNRI, however, Stallman's lawyer has told CNRI's lawyer that 1.6.1
++    is "not incompatible" with the GPL.
++
++Thanks to the many outside volunteers who have worked under Guido's
++direction to make these releases possible.
++
++
++B. TERMS AND CONDITIONS FOR ACCESSING OR OTHERWISE USING PYTHON
++===============================================================
++
++Python software and documentation are licensed under the
++Python Software Foundation License Version 2.
++
++Starting with Python 3.8.6, examples, recipes, and other code in
++the documentation are dual licensed under the PSF License Version 2
++and the Zero-Clause BSD license.
++
++Some software incorporated into Python is under different licenses.
++The licenses are listed with code falling under that license.
++
++
++PYTHON SOFTWARE FOUNDATION LICENSE VERSION 2
++--------------------------------------------
++
++1. This LICENSE AGREEMENT is between the Python Software Foundation
++("PSF"), and the Individual or Organization ("Licensee") accessing and
++otherwise using this software ("Python") in source or binary form and
++its associated documentation.
++
++2. Subject to the terms and conditions of this License Agreement, PSF hereby
++grants Licensee a nonexclusive, royalty-free, world-wide license to reproduce,
++analyze, test, perform and/or display publicly, prepare derivative works,
++distribute, and otherwise use Python alone or in any derivative version,
++provided, however, that PSF's License Agreement and PSF's notice of copyright,
++i.e., "Copyright (c) 2001-2024 Python Software Foundation; All Rights Reserved"
++are retained in Python alone or in any derivative version prepared by Licensee.
++
++3. In the event Licensee prepares a derivative work that is based on
++or incorporates Python or any part thereof, and wants to make
++the derivative work available to others as provided herein, then
++Licensee hereby agrees to include in any such work a brief summary of
++the changes made to Python.
++
++4. PSF is making Python available to Licensee on an "AS IS"
++basis.  PSF MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
++IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, PSF MAKES NO AND
++DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
++FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON WILL NOT
++INFRINGE ANY THIRD PARTY RIGHTS.
++
++5. PSF SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
++FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
++A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON,
++OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
++
++6. This License Agreement will automatically terminate upon a material
++breach of its terms and conditions.
++
++7. Nothing in this License Agreement shall be deemed to create any
++relationship of agency, partnership, or joint venture between PSF and
++Licensee.  This License Agreement does not grant permission to use PSF
++trademarks or trade name in a trademark sense to endorse or promote
++products or services of Licensee, or any third party.
++
++8. By copying, installing or otherwise using Python, Licensee
++agrees to be bound by the terms and conditions of this License
++Agreement.
++
++
++BEOPEN.COM LICENSE AGREEMENT FOR PYTHON 2.0
++-------------------------------------------
++
++BEOPEN PYTHON OPEN SOURCE LICENSE AGREEMENT VERSION 1
++
++1. This LICENSE AGREEMENT is between BeOpen.com ("BeOpen"), having an
++office at 160 Saratoga Avenue, Santa Clara, CA 95051, and the
++Individual or Organization ("Licensee") accessing and otherwise using
++this software in source or binary form and its associated
++documentation ("the Software").
++
++2. Subject to the terms and conditions of this BeOpen Python License
++Agreement, BeOpen hereby grants Licensee a non-exclusive,
++royalty-free, world-wide license to reproduce, analyze, test, perform
++and/or display publicly, prepare derivative works, distribute, and
++otherwise use the Software alone or in any derivative version,
++provided, however, that the BeOpen Python License is retained in the
++Software, alone or in any derivative version prepared by Licensee.
++
++3. BeOpen is making the Software available to Licensee on an "AS IS"
++basis.  BEOPEN MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
++IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, BEOPEN MAKES NO AND
++DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
++FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE WILL NOT
++INFRINGE ANY THIRD PARTY RIGHTS.
++
++4. BEOPEN SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF THE
++SOFTWARE FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS
++AS A RESULT OF USING, MODIFYING OR DISTRIBUTING THE SOFTWARE, OR ANY
++DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
++
++5. This License Agreement will automatically terminate upon a material
++breach of its terms and conditions.
++
++6. This License Agreement shall be governed by and interpreted in all
++respects by the law of the State of California, excluding conflict of
++law provisions.  Nothing in this License Agreement shall be deemed to
++create any relationship of agency, partnership, or joint venture
++between BeOpen and Licensee.  This License Agreement does not grant
++permission to use BeOpen trademarks or trade names in a trademark
++sense to endorse or promote products or services of Licensee, or any
++third party.  As an exception, the "BeOpen Python" logos available at
++http://www.pythonlabs.com/logos.html may be used according to the
++permissions granted on that web page.
++
++7. By copying, installing or otherwise using the software, Licensee
++agrees to be bound by the terms and conditions of this License
++Agreement.
++
++
++CNRI LICENSE AGREEMENT FOR PYTHON 1.6.1
++---------------------------------------
++
++1. This LICENSE AGREEMENT is between the Corporation for National
++Research Initiatives, having an office at 1895 Preston White Drive,
++Reston, VA 20191 ("CNRI"), and the Individual or Organization
++("Licensee") accessing and otherwise using Python 1.6.1 software in
++source or binary form and its associated documentation.
++
++2. Subject to the terms and conditions of this License Agreement, CNRI
++hereby grants Licensee a nonexclusive, royalty-free, world-wide
++license to reproduce, analyze, test, perform and/or display publicly,
++prepare derivative works, distribute, and otherwise use Python 1.6.1
++alone or in any derivative version, provided, however, that CNRI's
++License Agreement and CNRI's notice of copyright, i.e., "Copyright (c)
++1995-2001 Corporation for National Research Initiatives; All Rights
++Reserved" are retained in Python 1.6.1 alone or in any derivative
++version prepared by Licensee.  Alternately, in lieu of CNRI's License
++Agreement, Licensee may substitute the following text (omitting the
++quotes): "Python 1.6.1 is made available subject to the terms and
++conditions in CNRI's License Agreement.  This Agreement together with
++Python 1.6.1 may be located on the internet using the following
++unique, persistent identifier (known as a handle): 1895.22/1013.  This
++Agreement may also be obtained from a proxy server on the internet
++using the following URL: http://hdl.handle.net/1895.22/1013".
++
++3. In the event Licensee prepares a derivative work that is based on
++or incorporates Python 1.6.1 or any part thereof, and wants to make
++the derivative work available to others as provided herein, then
++Licensee hereby agrees to include in any such work a brief summary of
++the changes made to Python 1.6.1.
++
++4. CNRI is making Python 1.6.1 available to Licensee on an "AS IS"
++basis.  CNRI MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
++IMPLIED.  BY WAY OF EXAMPLE, BUT NOT LIMITATION, CNRI MAKES NO AND
++DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
++FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF PYTHON 1.6.1 WILL NOT
++INFRINGE ANY THIRD PARTY RIGHTS.
++
++5. CNRI SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF PYTHON
++1.6.1 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR LOSS AS
++A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING PYTHON 1.6.1,
++OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF THE POSSIBILITY THEREOF.
++
++6. This License Agreement will automatically terminate upon a material
++breach of its terms and conditions.
++
++7. This License Agreement shall be governed by the federal
++intellectual property law of the United States, including without
++limitation the federal copyright law, and, to the extent such
++U.S. federal law does not apply, by the law of the Commonwealth of
++Virginia, excluding Virginia's conflict of law provisions.
++Notwithstanding the foregoing, with regard to derivative works based
++on Python 1.6.1 that incorporate non-separable material that was
++previously distributed under the GNU General Public License (GPL), the
++law of the Commonwealth of Virginia shall govern this License
++Agreement only as to issues arising under or with respect to
++Paragraphs 4, 5, and 7 of this License Agreement.  Nothing in this
++License Agreement shall be deemed to create any relationship of
++agency, partnership, or joint venture between CNRI and Licensee.  This
++License Agreement does not grant permission to use CNRI trademarks or
++trade name in a trademark sense to endorse or promote products or
++services of Licensee, or any third party.
++
++8. By clicking on the "ACCEPT" button where indicated, or by copying,
++installing or otherwise using Python 1.6.1, Licensee agrees to be
++bound by the terms and conditions of this License Agreement.
++
++        ACCEPT
++
++
++CWI LICENSE AGREEMENT FOR PYTHON 0.9.0 THROUGH 1.2
++--------------------------------------------------
++
++Copyright (c) 1991 - 1995, Stichting Mathematisch Centrum Amsterdam,
++The Netherlands.  All rights reserved.
++
++Permission to use, copy, modify, and distribute this software and its
++documentation for any purpose and without fee is hereby granted,
++provided that the above copyright notice appear in all copies and that
++both that copyright notice and this permission notice appear in
++supporting documentation, and that the name of Stichting Mathematisch
++Centrum or CWI not be used in advertising or publicity pertaining to
++distribution of the software without specific, written prior
++permission.
++
++STICHTING MATHEMATISCH CENTRUM DISCLAIMS ALL WARRANTIES WITH REGARD TO
++THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
++FITNESS, IN NO EVENT SHALL STICHTING MATHEMATISCH CENTRUM BE LIABLE
++FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
++WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
++ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
++OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
++
++ZERO-CLAUSE BSD LICENSE FOR CODE IN THE PYTHON DOCUMENTATION
++----------------------------------------------------------------------
++
++Permission to use, copy, modify, and/or distribute this software for any
++purpose with or without fee is hereby granted.
++
++THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
++REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
++AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
++INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
++LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
++OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
++PERFORMANCE OF THIS SOFTWARE.
+diff --git a/nose/importer.py b/nose/importer.py
+index e677658..77099eb 100644
+--- a/nose/importer.py
++++ b/nose/importer.py
+@@ -7,9 +7,10 @@ the builtin importer.
+ import logging
+ import os
+ import sys
++import tokenize
+ from nose.config import Config
+-
+-from imp import find_module, load_module, acquire_lock, release_lock
++from importlib import _imp
++from importlib import machinery
+ 
+ log = logging.getLogger(__name__)
+ 
+@@ -20,6 +21,244 @@ except AttributeError:
+         return (os.path.normcase(os.path.realpath(src)) ==
+                 os.path.normcase(os.path.realpath(dst)))
+ 
++################################################################################
++# BEGIN IMPORTLIB SHIMS
++################################################################################
++
++# Adapted from the CPython 3.11 imp.py code.
++# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021, 2022, 2023 Python Software Foundation; All Rights Reserved
++# Originally licensed under the PSLv2 (see LICENSE.cpython) and incorporated under the LGPL 2.1 (see lgpl.txt).
++
++try:
++    from _imp import create_dynamic
++except ImportError:
++    # Platform doesn't support dynamic loading.
++    create_dynamic = None
++
++from importlib._bootstrap import _ERR_MSG, _exec, _load, _builtin_from_name
++from importlib._bootstrap_external import SourcelessFileLoader
++
++from importlib import machinery
++from importlib import util
++import importlib
++import os
++import sys
++import tokenize
++import types
++
++
++SEARCH_ERROR = 0
++PY_SOURCE = 1
++PY_COMPILED = 2
++C_EXTENSION = 3
++PY_RESOURCE = 4
++PKG_DIRECTORY = 5
++C_BUILTIN = 6
++PY_FROZEN = 7
++PY_CODERESOURCE = 8
++IMP_HOOK = 9
++
++
++def get_suffixes():
++    extensions = [(s, 'rb', C_EXTENSION) for s in machinery.EXTENSION_SUFFIXES]
++    source = [(s, 'r', PY_SOURCE) for s in machinery.SOURCE_SUFFIXES]
++    bytecode = [(s, 'rb', PY_COMPILED) for s in machinery.BYTECODE_SUFFIXES]
++
++    return extensions + source + bytecode
++
++
++class _HackedGetData:
++
++    """Compatibility support for 'file' arguments of various load_*()
++    functions."""
++
++    def __init__(self, fullname, path, file=None):
++        super().__init__(fullname, path)
++        self.file = file
++
++    def get_data(self, path):
++        """Gross hack to contort loader to deal w/ load_*()'s bad API."""
++        if self.file and path == self.path:
++            # The contract of get_data() requires us to return bytes. Reopen the
++            # file in binary mode if needed.
++            if not self.file.closed:
++                file = self.file
++                if 'b' not in file.mode:
++                    file.close()
++            if self.file.closed:
++                self.file = file = open(self.path, 'rb')
++
++            with file:
++                return file.read()
++        else:
++            return super().get_data(path)
++
++
++class _LoadSourceCompatibility(_HackedGetData, machinery.SourceFileLoader):
++
++    """Compatibility support for implementing load_source()."""
++
++
++def load_source(name, pathname, file=None):
++    loader = _LoadSourceCompatibility(name, pathname, file)
++    spec = util.spec_from_file_location(name, pathname, loader=loader)
++    if name in sys.modules:
++        module = _exec(spec, sys.modules[name])
++    else:
++        module = _load(spec)
++    # To allow reloading to potentially work, use a non-hacked loader which
++    # won't rely on a now-closed file object.
++    module.__loader__ = machinery.SourceFileLoader(name, pathname)
++    module.__spec__.loader = module.__loader__
++    return module
++
++
++class _LoadCompiledCompatibility(_HackedGetData, SourcelessFileLoader):
++
++    """Compatibility support for implementing load_compiled()."""
++
++
++def load_compiled(name, pathname, file=None):
++    loader = _LoadCompiledCompatibility(name, pathname, file)
++    spec = util.spec_from_file_location(name, pathname, loader=loader)
++    if name in sys.modules:
++        module = _exec(spec, sys.modules[name])
++    else:
++        module = _load(spec)
++    # To allow reloading to potentially work, use a non-hacked loader which
++    # won't rely on a now-closed file object.
++    module.__loader__ = SourcelessFileLoader(name, pathname)
++    module.__spec__.loader = module.__loader__
++    return module
++
++
++def load_package(name, path):
++    if os.path.isdir(path):
++        extensions = (machinery.SOURCE_SUFFIXES[:] +
++                      machinery.BYTECODE_SUFFIXES[:])
++        for extension in extensions:
++            init_path = os.path.join(path, '__init__' + extension)
++            if os.path.exists(init_path):
++                path = init_path
++                break
++        else:
++            raise ValueError('{!r} is not a package'.format(path))
++    spec = util.spec_from_file_location(name, path,
++                                        submodule_search_locations=[])
++    if name in sys.modules:
++        return _exec(spec, sys.modules[name])
++    else:
++        return _load(spec)
++
++
++def load_module(name, file, filename, details):
++    """
++
++    Load a module, given information returned by find_module().
++
++    The module name must include the full package name, if any.
++
++    """
++    suffix, mode, type_ = details
++    if mode and (not mode.startswith('r') or '+' in mode):
++        raise ValueError('invalid file open mode {!r}'.format(mode))
++    elif file is None and type_ in {PY_SOURCE, PY_COMPILED}:
++        msg = 'file object required for import (type code {})'.format(type_)
++        raise ValueError(msg)
++    elif type_ == PY_SOURCE:
++        return load_source(name, filename, file)
++    elif type_ == PY_COMPILED:
++        return load_compiled(name, filename, file)
++    elif type_ == PKG_DIRECTORY:
++        return load_package(name, filename)
++    elif type_ == C_BUILTIN:
++        return init_builtin(name)
++    elif type_ == PY_FROZEN:
++        return _imp.init_frozen(name)
++    else:
++        msg =  "Don't know how to import {} (type code {})".format(name, type_)
++        raise ImportError(msg, name=name)
++
++
++def find_module(name, path=None):
++    """
++
++    Search for a module.
++
++    If path is omitted or None, search for a built-in, frozen or special
++    module and continue search in sys.path. The module name cannot
++    contain '.'; to search for a submodule of a package, pass the
++    submodule name and the package's __path__.
++
++    """
++    if not isinstance(name, str):
++        raise TypeError("'name' must be a str, not {}".format(type(name)))
++    elif not isinstance(path, (type(None), list)):
++        # Backwards-compatibility
++        raise RuntimeError("'path' must be None or a list, "
++                           "not {}".format(type(path)))
++
++    if path is None:
++        if _imp.is_builtin(name):
++            return None, None, ('', '', C_BUILTIN)
++        elif _imp.is_frozen(name):
++            return None, None, ('', '', PY_FROZEN)
++        else:
++            path = sys.path
++
++    for entry in path:
++        package_directory = os.path.join(entry, name)
++        for suffix in ['.py', machinery.BYTECODE_SUFFIXES[0]]:
++            package_file_name = '__init__' + suffix
++            file_path = os.path.join(package_directory, package_file_name)
++            if os.path.isfile(file_path):
++                return None, package_directory, ('', '', PKG_DIRECTORY)
++        for suffix, mode, type_ in get_suffixes():
++            file_name = name + suffix
++            file_path = os.path.join(entry, file_name)
++            if os.path.isfile(file_path):
++                break
++        else:
++            continue
++        break  # Break out of outer loop when breaking out of inner loop.
++    else:
++        raise ImportError(_ERR_MSG.format(name), name=name)
++
++    encoding = None
++    if 'b' not in mode:
++        with open(file_path, 'rb') as file:
++            encoding = tokenize.detect_encoding(file.readline)[0]
++    file = open(file_path, mode, encoding=encoding)
++    return file, file_path, (suffix, mode, type_)
++
++
++def reload(module):
++    """
++
++    Reload the module and return it.
++
++    The module must have been successfully imported before.
++
++    """
++    return importlib.reload(module)
++
++
++def init_builtin(name):
++    """
++
++    Load and return a built-in module by name, or None is such module doesn't
++    exist
++    """
++    try:
++        return _builtin_from_name(name)
++    except ImportError:
++        return None
++
++
++################################################################################
++# END IMPORTLIB SHIMS
++################################################################################
++
+ 
+ class Importer(object):
+     """An importer class that does only path-specific imports. That
+@@ -73,7 +312,7 @@ class Importer(object):
+             else:
+                 part_fqname = "%s.%s" % (part_fqname, part)
+             try:
+-                acquire_lock()
++                _imp.acquire_lock()
+                 log.debug("find module part %s (%s) in %s",
+                           part, part_fqname, path)
+                 fh, filename, desc = find_module(part, path)
+@@ -95,7 +334,7 @@ class Importer(object):
+             finally:
+                 if fh:
+                     fh.close()
+-                release_lock()
++                _imp.release_lock()
+             if parent:
+                 setattr(parent, part, mod)
+             if hasattr(mod, '__path__'):
+diff --git a/nose/result.py b/nose/result.py
+index f974a14..228a42c 100644
+--- a/nose/result.py
++++ b/nose/result.py
+@@ -13,7 +13,7 @@ try:
+     # 2.7+
+     from unittest.runner import _TextTestResult
+ except ImportError:
+-    from unittest import _TextTestResult
++    from unittest import TextTestResult as _TextTestResult
+ from nose.config import Config
+ from nose.util import isclass, ln as _ln # backwards compat
+ 
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nose/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nose/default.nix
index f864cfb912..308039cc61 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/nose/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/nose/default.nix
@@ -5,24 +5,25 @@
   isPy3k,
   isPyPy,
   python,
-  pythonAtLeast,
+  python312,
   coverage,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   version = "1.3.7";
-  format = "setuptools";
   pname = "nose";
-
-  # unmaintained, relies on the imp module
-  disabled = pythonAtLeast "3.12";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
     sha256 = "f1bffef9cbc82628f6e7d7b40d7e255aefaa1adb6a1b1d26c69a8b79e6208a98";
   };
 
-  # 2to3 was removed in setuptools 58
+  build-system = [ setuptools ];
+
+  patches = lib.optional isPy3k [ ./0001-nose-python-3.12-fixes.patch ];
+
   postPatch = ''
     substituteInPlace setup.py \
       --replace "'use_2to3': True," ""
@@ -31,8 +32,9 @@ buildPythonPackage rec {
       --replace "from setuptools.command.build_py import Mixin2to3" "from distutils.util import Mixin2to3"
   '';
 
-  preBuild = lib.optionalString (isPy3k) ''
-    ${python.pythonOnBuildForHost}/bin/2to3 -wn nose functional_tests unit_tests
+  # 2to3 is removed from Python 3.13, so always use Python 3.12 2to3 for now.
+  preBuild = lib.optionalString isPy3k ''
+    ${python312.pythonOnBuildForHost}/bin/2to3 -wn nose functional_tests unit_tests
   '';
 
   propagatedBuildInputs = [ coverage ];
@@ -56,6 +58,6 @@ buildPythonPackage rec {
     mainProgram = "nosetests";
     homepage = "https://nose.readthedocs.io/";
     license = licenses.lgpl3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nose2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nose2/default.nix
index 95a564c14c..b2a65a5648 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/nose2/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/notebook-shim/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/notebook-shim/default.nix
index 11c17bd751..b61ef87c88 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/notebook-shim/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/notmuch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/notmuch/default.nix
index eb5f017e0e..47f23ed99f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/notmuch/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/nototools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nototools/default.nix
index ea555a5e09..8dc075e2b4 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/nototools/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/ntc-templates/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ntc-templates/default.nix
index 478a401501..722570a258 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/ntc-templates/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/nuclear/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nuclear/default.nix
new file mode 100644
index 0000000000..ac7d354198
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/nuitka/darwin-lto.patch b/third_party/nixpkgs/pkgs/development/python-modules/nuitka/darwin-lto.patch
deleted file mode 100644
index bd3a659054..0000000000
--- a/third_party/nixpkgs/pkgs/development/python-modules/nuitka/darwin-lto.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/nuitka/build/SconsCompilerSettings.py b/nuitka/build/SconsCompilerSettings.py
-index 319b72c4e..89d40f2a2 100644
---- a/nuitka/build/SconsCompilerSettings.py
-+++ b/nuitka/build/SconsCompilerSettings.py
-@@ -173,8 +173,8 @@ def _enableLtoSettings(
-         lto_mode = False
-         reason = "known to be not supported (CondaCC)"
-     elif isMacOS() and env.gcc_mode and env.clang_mode:
--        lto_mode = True
--        reason = "known to be supported (macOS clang)"
-+        lto_mode = False
-+        reason = "known to not be supported (macOS nix clang)"
-     elif env.mingw_mode and env.clang_mode:
-         lto_mode = False
-         reason = "known to not be supported (new MinGW64 Clang)"
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nuitka/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nuitka/default.nix
index fa08422670..cce4467e73 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/nuitka/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/nuitka/default.nix
@@ -23,9 +23,6 @@ buildPythonPackage rec {
     hash = "sha256-nKdCMgA92v9VsSgfktXDbSh3DyKsGlcTjpn0Y7u4rxU=";
   };
 
-  # default lto off for darwin
-  patches = [ ./darwin-lto.patch ];
-
   build-system = [
     setuptools
     wheel
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/num2words/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/num2words/default.nix
index 8e122271c4..cde2beff63 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/num2words/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/numba/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/numba/default.nix
index 4c79076be7..27b34f6a3b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/numba/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/numba/default.nix
@@ -14,7 +14,6 @@
   importlib-metadata,
   substituteAll,
   runCommand,
-  symlinkJoin,
   writers,
   numba,
 
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/numexpr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/numexpr/default.nix
index 0368e32179..f54dcb03b5 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/numexpr/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/numpy-stl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/numpy-stl/default.nix
index 100adcfc42..fd1911a818 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/numpy-stl/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/nvchecker/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nvchecker/default.nix
index d0c88698a6..81be2102da 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/nvchecker/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/nvidia-ml-py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nvidia-ml-py/default.nix
index 52e7c04ca0..b620f20933 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/nvidia-ml-py/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/nvidia-ml-py/default.nix
@@ -3,7 +3,7 @@
   fetchPypi,
   buildPythonPackage,
   substituteAll,
-  addOpenGLRunpath,
+  addDriverRunpath,
 }:
 
 buildPythonPackage rec {
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   patches = [
     (substituteAll {
       src = ./0001-locate-libnvidia-ml.so.1-on-NixOS.patch;
-      inherit (addOpenGLRunpath) driverLink;
+      inherit (addDriverRunpath) driverLink;
     })
   ];
 
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nwdiag/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nwdiag/default.nix
index dc2fd74fbe..6196910595 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/nwdiag/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/nwdiag/default.nix
@@ -3,7 +3,6 @@
   blockdiag,
   fetchFromGitHub,
   buildPythonPackage,
-  nose,
   pytestCheckHook,
   setuptools,
   pythonOlder,
@@ -23,17 +22,13 @@ buildPythonPackage rec {
     hash = "sha256-uKrdkXpL5YBr953sRsHknYg+2/WwrZmyDf8BMA2+0tU=";
   };
 
+  patches = [ ./fix_test_generate.patch ];
+
   build-system = [ setuptools ];
 
   dependencies = [ blockdiag ];
 
-  # tests rely on nose
-  doCheck = pythonOlder "3.12";
-
-  nativeCheckInputs = [
-    nose
-    pytestCheckHook
-  ];
+  nativeCheckInputs = [ pytestCheckHook ];
 
   pytestFlagsArray = [ "src/nwdiag/tests/" ];
 
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nwdiag/fix_test_generate.patch b/third_party/nixpkgs/pkgs/development/python-modules/nwdiag/fix_test_generate.patch
new file mode 100644
index 0000000000..c05b5be45c
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/nwdiag/fix_test_generate.patch
@@ -0,0 +1,22 @@
+diff --git a/src/nwdiag/tests/test_generate_diagram.py b/src/nwdiag/tests/test_generate_diagram.py
+index 2065208..ac9b096 100644
+--- a/src/nwdiag/tests/test_generate_diagram.py
++++ b/src/nwdiag/tests/test_generate_diagram.py
+@@ -16,16 +16,4 @@
+ import os
+ 
+ from blockdiag.tests.test_generate_diagram import (get_diagram_files,
+-                                                   testcase_generator)
+-
+-import nwdiag.command
+-
+-
+-def test_generate():
+-    mainfunc = nwdiag.command.main
+-    basepath = os.path.dirname(__file__)
+-    files = get_diagram_files(basepath)
+-    options = []
+-
+-    for testcase in testcase_generator(basepath, mainfunc, files, options):
+-        yield testcase
++                                                   test_generate_with_separate)
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/oauth2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/oauth2/default.nix
index a45aa21abf..17ea759ce4 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/oauth2/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/oauth2client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/oauth2client/default.nix
index c6fc4b6b29..895c988381 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/oauth2client/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/oauthenticator/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/oauthenticator/default.nix
index 1f4ff0ea62..4b25347fae 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/oauthenticator/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/objexplore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/objexplore/default.nix
index cb92538340..02d4ceeb21 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/objexplore/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/objexplore/default.nix
@@ -10,9 +10,9 @@
   pandas
 }:
 
-buildPythonPackage rec {
+buildPythonPackage {
   pname = "objexplore";
-  version = "1.5.4";
+  version = "1.6.2";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -20,8 +20,10 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "kylepollina";
     repo = "objexplore";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-FFQIiip7pk9fQhjGLxMSMakwoXbzaUjXcbQgDX52dnI=";
+    # tags for >1.5.4 are not availables on github
+    # see: https://github.com/kylepollina/objexplore/issues/25
+    rev = "3c2196d26e5a873eed0a694cddca66352ea7c81e";
+    hash = "sha256-BgeuRRuvbB4p99mwCjNxm3hYEZuGua8x2GdoVssQ7eI=";
   };
 
   pythonRelaxDeps = [ "blessed" "rich" ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ocrmypdf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ocrmypdf/default.nix
index 794b46f57e..7fd248266c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/ocrmypdf/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/ocrmypdf/default.nix
@@ -6,7 +6,6 @@
   ghostscript,
   hypothesis,
   img2pdf,
-  importlib-resources,
   jbig2enc,
   packaging,
   pdfminer-six,
@@ -23,7 +22,6 @@
   setuptools-scm,
   substituteAll,
   tesseract,
-  tqdm,
   unpaper,
   installShellFiles,
 }:
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/od/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/od/default.nix
index f9e9a5bee0..1c3c8bf8ff 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/od/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/oelint-parser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/oelint-parser/default.nix
index 39fb0bf3a4..438078c56e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/oelint-parser/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/oelint-parser/default.nix
@@ -10,13 +10,13 @@
 
 buildPythonPackage rec {
   pname = "oelint-parser";
-  version = "3.5.4";
+  version = "3.5.5";
   format = "setuptools";
 
   src = fetchPypi {
     inherit version;
     pname = "oelint_parser";
-    hash = "sha256-2ZGzGJaVChd7XQM45qQF4vDw70iCEqxrVQP8lhGNfUg=";
+    hash = "sha256-4x7OgC5UKhAII2S1kDu+1RZyusr9F5cZDaRG9HFyhkA=";
   };
 
   buildInputs = [ pip ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ofxhome/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ofxhome/default.nix
index 7f4aa00dd2..0110cfdba1 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/ofxhome/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/ofxhome/default.nix
@@ -1,28 +1,37 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
-  nose,
+  fetchFromGitHub,
+  pytestCheckHook,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   version = "0.3.3";
-  format = "setuptools";
   pname = "ofxhome";
+  pyproject = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "1rpyfqr2q9pnin47rjd4qapl8ngk1m9jx36iqckhdhr8s8gla445";
+  src = fetchFromGitHub {
+    owner = "captin411";
+    repo = "ofxhome";
+    rev = "v${version}";
+    hash = "sha256-i16bE9iuafhAKco2jYfg5T5QCWFHdnYVztf1z2XbO9g=";
   };
 
-  buildInputs = [ nose ];
+  build-system = [ setuptools ];
 
-  # ImportError: No module named tests
-  doCheck = false;
+  nativeCheckInputs = [ pytestCheckHook ];
 
-  meta = with lib; {
+  # These are helper functions that should not be called as tests
+  disabledTests = [
+    "testfile_name"
+    "testfile"
+  ];
+
+  meta = {
     homepage = "https://github.com/captin411/ofxhome";
     description = "ofxhome.com financial institution lookup REST client";
-    license = licenses.mit;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ pyrox0 ];
   };
 }
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/okta/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/okta/default.nix
index b97c858012..6a0331c36a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/okta/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/okta/default.nix
@@ -5,10 +5,12 @@
   buildPythonPackage,
   fetchPypi,
   flatdict,
+  jwcrypto,
   pycryptodome,
   pycryptodomex,
   pydash,
   pyfakefs,
+  pyjwt,
   pytest-asyncio,
   pytest-mock,
   pytest-recording,
@@ -36,9 +38,11 @@ buildPythonPackage rec {
     aenum
     aiohttp
     flatdict
+    jwcrypto
     pycryptodome
     pycryptodomex
     pydash
+    pyjwt
     python-jose
     pyyaml
     xmltodict
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/oletools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/oletools/default.nix
index f253c73d88..0858e4bc7b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/oletools/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/oletools/default.nix
@@ -10,7 +10,6 @@
   pyparsing,
   pytestCheckHook,
   pythonOlder,
-  setuptools,
 }:
 
 buildPythonPackage rec {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ollama/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ollama/default.nix
index 4db5cface1..fae10081d3 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/ollama/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/omemo-dr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/omemo-dr/default.nix
index e6b1317738..83e221c729 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/omemo-dr/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/online-judge-api-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/online-judge-api-client/default.nix
index 964f623230..cc346e1923 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/online-judge-api-client/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/online-judge-api-client/default.nix
@@ -11,7 +11,6 @@
   markdown,
   python,
   requests,
-  substituteAll,
   toml,
 }:
 
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/opcua-widgets/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/opcua-widgets/default.nix
index 371118f677..a36c97dd2c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/opcua-widgets/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/opencensus-context/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/opencensus-context/default.nix
index 1cd1b16a14..1f3d568e27 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/opencensus-context/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/opencensus-context/default.nix
@@ -2,7 +2,6 @@
   buildPythonPackage,
   fetchPypi,
   lib,
-  unittestCheckHook,
 }:
 
 buildPythonPackage rec {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/opencensus/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/opencensus/default.nix
index dc52ff0d91..d7d4ac6ddc 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/opencensus/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/opencensus/default.nix
@@ -2,7 +2,6 @@
   buildPythonPackage,
   fetchPypi,
   lib,
-  unittestCheckHook,
   google-api-core,
   opencensus-context,
 }:
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/opencontainers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/opencontainers/default.nix
index b2677b7044..b5672a5590 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/opencontainers/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/openstacksdk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/openstacksdk/default.nix
index afd98f1f61..5bf0f23acc 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/openstacksdk/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/opentimestamps/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/opentimestamps/default.nix
index c7edcd8437..5a9c412dcd 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/opentimestamps/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/opentimestamps/default.nix
@@ -3,7 +3,6 @@
   bitcoinlib,
   buildPythonPackage,
   fetchFromGitHub,
-  git,
   gitpython,
   pycryptodomex,
   pytestCheckHook,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/opower/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/opower/default.nix
index e6cc3d7c81..062d611cf5 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/opower/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/opower/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "opower";
-  version = "0.5.2";
+  version = "0.6.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "tronikos";
     repo = "opower";
     rev = "refs/tags/v${version}";
-    hash = "sha256-aK/zpeSe9GBONDbFqLF6ZGkBkhp2/GzH5gg3hfJcl/U=";
+    hash = "sha256-juN9o1RPLDALND1po5S4WNMDkOWnr4hl38yxWnsoupg=";
   };
 
   build-system = [ setuptools ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/oracledb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/oracledb/default.nix
index c1989cbe33..cac6da9566 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/oracledb/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/oracledb/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "oracledb";
-  version = "2.2.1";
+  version = "2.3.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-hGTG8ClfMxja9sLHLIPC3Lw34T+P1E4+Of+GZfRC1rY=";
+    hash = "sha256-ubDE7CgLEAY+Z4m+0j3cJDWumFaevmTguaJweAuRA9U=";
   };
 
   build-system = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/orjson/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/orjson/default.nix
index c1d58c0a1c..650d8a634d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/orjson/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/orjson/default.nix
@@ -31,7 +31,7 @@
 
 buildPythonPackage rec {
   pname = "orjson";
-  version = "3.10.5";
+  version = "3.10.6";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -40,13 +40,13 @@ buildPythonPackage rec {
     owner = "ijl";
     repo = "orjson";
     rev = "refs/tags/${version}";
-    hash = "sha256-Q2zi3mNgCFrg7Ucana0+lmR9C9kkuUidEJj8GneR2W4=";
+    hash = "sha256-K3wCzwaGOsaiCm2LW4Oc4XOnp6agrdTxCxqEIMq0fuU=";
   };
 
   cargoDeps = rustPlatform.fetchCargoTarball {
     inherit src;
     name = "${pname}-${version}";
-    hash = "sha256-yhLKw4BhdIHgcu4iVlXQlHk/8J+3NK6LlmSWbm/5y4Q=";
+    hash = "sha256-SNdwqb47dJ084TMNsm2Btks1UCDerjSmSrQQUiGbx50=";
   };
 
   maturinBuildFlags = [ "--interpreter ${python.executable}" ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/orm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/orm/default.nix
index a498127b4f..20825a18b5 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/orm/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/oscrypto/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/oscrypto/default.nix
index 1ddfce166c..fe80b0ac42 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/oscrypto/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/packbits/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/packbits/default.nix
index acca93d0c5..c47983b060 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/packbits/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/packbits/default.nix
@@ -1,11 +1,6 @@
 {
-  stdenv,
   buildPythonPackage,
   fetchPypi,
-  pyparsing,
-  six,
-  pytest,
-  pretend,
   lib,
 }:
 
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/paddlepaddle/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/paddlepaddle/default.nix
index b263cdc8e1..2388807940 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/paddlepaddle/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/paddlepaddle/default.nix
@@ -12,7 +12,7 @@
   setuptools,
   cudaSupport ? config.cudaSupport or false,
   cudaPackages_11 ? { },
-  addOpenGLRunpath,
+  addDriverRunpath,
   # runtime dependencies
   httpx,
   numpy,
@@ -81,13 +81,13 @@ buildPythonPackage {
       p=$(patchelf --print-rpath $1)
       patchelf --set-rpath "$p:$libraryPath" $1
       ${lib.optionalString cudaSupport ''
-        addOpenGLRunpath $1
+        addDriverRunpath $1
       ''}
     }
     fixRunPath $out/${python.sitePackages}/paddle/fluid/libpaddle.so
   '';
 
-  nativeBuildInputs = [ addOpenGLRunpath ];
+  nativeBuildInputs = [ addDriverRunpath ];
 
   propagatedBuildInputs = [
     setuptools
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/palace/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/palace/default.nix
index 43d7e9aa33..8ea9f3b6d9 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/palace/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/palace/default.nix
@@ -7,7 +7,6 @@
   cython_0,
   setuptools,
   alure2,
-  typing-extensions,
 }:
 
 buildPythonPackage rec {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/panel/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/panel/default.nix
index f034d572b3..d37aa9bdc6 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/panel/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/papermill/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/papermill/default.nix
index 280f541b32..2a5352b9d0 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/papermill/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/papis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/papis/default.nix
index 8f9dfbe492..06c4f97cde 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/papis/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/papis/default.nix
@@ -21,7 +21,6 @@
   pytestCheckHook,
   python-doi,
   python-slugify,
-  pythonAtLeast,
   pythonOlder,
   pyyaml,
   requests,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/para/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/para/default.nix
index c5ef2bcdc1..f34260bf15 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/para/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/para/default.nix
@@ -2,31 +2,30 @@
   lib,
   buildPythonPackage,
   fetchPypi,
-  nose,
   pytestCheckHook,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "para";
   version = "0.0.8";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-RsMjKunY6p2IbP0IzdESiSICvthkX0C2JVWXukz+8hc=";
   };
 
-  nativeCheckInputs = [
-    nose
-    pytestCheckHook
-  ];
+  build-system = [ setuptools ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
 
   pythonImportsCheck = [ "para" ];
 
-  meta = with lib; {
+  meta = {
     description = "Set utilities that ake advantage of python's 'multiprocessing' module to distribute CPU-intensive tasks";
     homepage = "https://pypi.org/project/para";
-    license = licenses.mit;
-    maintainers = with maintainers; [ GaetanLepage ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ GaetanLepage ];
   };
 }
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/param/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/param/default.nix
index 7d6baeeee5..8f5975a951 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/param/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/parameterized/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/parameterized/default.nix
index 04bcad91f3..8af2b49170 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/parameterized/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/paramiko/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/paramiko/default.nix
index e5909fca7b..248dc1f513 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/paramiko/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/parfive/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/parfive/default.nix
index e0e55e49f3..4751f65597 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/parfive/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/parsedatetime/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/parsedatetime/default.nix
index f07e2a1e04..b187ba40a2 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/parsedatetime/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/parsimonious/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/parsimonious/default.nix
index 1c25d44e39..c99aafd447 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/parsimonious/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/particle/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/particle/default.nix
index 49771e8728..f6052da1ae 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/particle/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/particle/default.nix
@@ -10,7 +10,6 @@
   pandas,
   pytestCheckHook,
   pythonOlder,
-  setuptools-scm,
   tabulate,
 }:
 
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/parver/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/parver/default.nix
index 546699b2ab..af12a98352 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/parver/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/passlib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/passlib/default.nix
index 786cfc618d..413e6ecb1c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/passlib/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/paste/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/paste/default.nix
index cbe0e02928..b7ac8fefb3 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/paste/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/paste/default.nix
@@ -3,7 +3,6 @@
   buildPythonPackage,
   fetchFromGitHub,
   pytestCheckHook,
-  pythonAtLeast,
   pythonOlder,
   setuptools,
   six,
@@ -46,6 +45,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/third_party/nixpkgs/pkgs/development/python-modules/pastescript/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pastescript/default.nix
index 1fc44b80b6..384ca52949 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pastescript/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pastescript/default.nix
@@ -2,11 +2,10 @@
   lib,
   buildPythonPackage,
   fetchPypi,
-  nose,
-  python,
   pytestCheckHook,
   six,
   paste,
+  setuptools,
   pastedeploy,
   pythonOlder,
 }:
@@ -14,7 +13,7 @@
 buildPythonPackage rec {
   pname = "pastescript";
   version = "3.6.0";
-  format = "setuptools";
+  pyproject = true;
 
   disabled = pythonOlder "3.7";
 
@@ -24,6 +23,8 @@ buildPythonPackage rec {
     hash = "sha256-HCLSt81TUWRr7tKMb3DrSipLklZR2a/Ko1AdBsq7UXE=";
   };
 
+  build-system = [ setuptools ];
+
   propagatedBuildInputs = [
     paste
     pastedeploy
@@ -33,10 +34,7 @@ buildPythonPackage rec {
   # test suite seems to unset PYTHONPATH
   doCheck = false;
 
-  nativeCheckInputs = [
-    nose
-    pytestCheckHook
-  ];
+  nativeCheckInputs = [ pytestCheckHook ];
 
   disabledTestPaths = [ "appsetup/testfiles" ];
 
@@ -51,6 +49,6 @@ buildPythonPackage rec {
     mainProgram = "paster";
     homepage = "https://github.com/cdent/pastescript/";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/path/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/path/default.nix
index 9703edabc1..d7f28f166a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/path/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pathlib-abc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pathlib-abc/default.nix
index 0eb8930822..c1a8c632cb 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pathlib-abc/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pathlib2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pathlib2/default.nix
index 5cbe0f41d3..c439b1b04c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pathlib2/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pathos/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pathos/default.nix
index 75bdc9eaeb..b548dd3c6f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pathos/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pathspec/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pathspec/default.nix
index 4804cfa1c7..c340d74ac5 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pathspec/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pathspec/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchPypi,
-  pythonOlder,
   flit-core,
   unittestCheckHook,
 
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/paypalrestsdk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/paypalrestsdk/default.nix
index e665813250..ed728e0fe1 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/paypalrestsdk/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pbs-installer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pbs-installer/default.nix
index a905568ffc..fb0068dd31 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pbs-installer/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pc-ble-driver-py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pc-ble-driver-py/default.nix
index 8ba9c4b5de..7e56799e9e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pc-ble-driver-py/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pc-ble-driver-py/default.nix
@@ -7,7 +7,6 @@
   fetchFromGitHub,
   git,
   pc-ble-driver,
-  pythonAtLeast,
   pythonOlder,
   scikit-build,
   setuptools,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pcapy-ng/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pcapy-ng/default.nix
index 3e4ac41c16..97313c1570 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pcapy-ng/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pcapy-ng/default.nix
@@ -6,7 +6,6 @@
   libpcap,
   pkgconfig,
   pytestCheckHook,
-  python,
   pythonOlder,
 }:
 
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pdfx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pdfx/default.nix
index 6bdd81de8b..c8759c4601 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pdfx/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pdm-pep517/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pdm-pep517/default.nix
index 0e08e9bd8a..f914b5b86e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pdm-pep517/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pdm-pep517/default.nix
@@ -1,7 +1,6 @@
 {
   lib,
   buildPythonPackage,
-  pythonOlder,
   fetchPypi,
   git,
   pytestCheckHook,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pdoc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pdoc/default.nix
index c1657025e0..a7c2b3feb9 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pdoc/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pdoc/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "pdoc";
-  version = "14.5.1";
+  version = "14.6.0";
   disabled = pythonOlder "3.8";
 
   pyproject = true;
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "mitmproxy";
     repo = "pdoc";
     rev = "v${version}";
-    hash = "sha256-YtoY/Sp9r6yIviXFKPYc+N8PjfKX+cZxtCZmR6fr1Tc=";
+    hash = "sha256-kQBW8bN8WYvWzpqM6JatB3bB/bAQqpHGd98prznyO+g=";
   };
 
   nativeBuildInputs = [ setuptools ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/peewee/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/peewee/default.nix
index 8116af981a..e1c9505b40 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/peewee/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pendulum/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pendulum/default.nix
index fb412e99c0..1a13b5a10f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pendulum/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pep8/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pep8/default.nix
index 01e2928707..7a9c442d42 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pep8/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/perfplot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/perfplot/default.nix
index b8c37ed5d6..78cd6bdaf9 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/perfplot/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/persim/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/persim/default.nix
index 058b613fa2..59892262e6 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/persim/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/persistent/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/persistent/default.nix
index cffa4633a1..644ac8d2e5 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/persistent/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pglast/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pglast/default.nix
index 4fe0061f33..edf70ea2cb 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pglast/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pgsanity/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pgsanity/default.nix
index c0a4919f8a..7f1c482977 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pgsanity/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pgsanity/default.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  python,
   fetchPypi,
   buildPythonPackage,
   postgresql,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pgspecial/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pgspecial/default.nix
index 6ce163dd74..e632972198 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pgspecial/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/phonemizer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/phonemizer/default.nix
index 66edfc945b..114a168886 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/phonemizer/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/photutils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/photutils/default.nix
index 5f76029900..68c5148f7e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/photutils/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/photutils/default.nix
@@ -9,7 +9,6 @@
   gwcs,
   matplotlib,
   numpy,
-  photutils,
   pythonOlder,
   rasterio,
   scikit-image,
@@ -18,9 +17,7 @@
   setuptools-scm,
   setuptools,
   shapely,
-  tomli,
   tqdm,
-  python,
   wheel,
 }:
 
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pika/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pika/default.nix
index f6a71c1a37..d520087a17 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pika/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pillow-heif/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pillow-heif/default.nix
index 4674a8b39c..d512839a79 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pillow-heif/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pillow-heif/default.nix
@@ -3,6 +3,7 @@
   stdenv,
   buildPythonPackage,
   fetchFromGitHub,
+  fetchpatch2,
 
   # build-system
   cmake,
@@ -28,16 +29,24 @@
 
 buildPythonPackage rec {
   pname = "pillow-heif";
-  version = "0.16.0";
+  version = "0.17.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "bigcat88";
     repo = "pillow_heif";
     rev = "refs/tags/v${version}";
-    hash = "sha256-TpK6VK2YoOtc4ueag33m5n1umcUWOUgcda/MZEEOR7g=";
+    hash = "sha256-fKh4UbTVj74YxH2vvL24DNmMxg10GSYAmduwuRneE+0=";
   };
 
+  patches = [
+    (fetchpatch2 {
+      # fix libheif 1.18 support in tests
+      url = "https://github.com/bigcat88/pillow_heif/commit/a59434e9ca1138e47e322ddef2adc79e684384f1.patch";
+      hash = "sha256-yVT/pnO5KWMnsO95EPCZgyhx6FIJOhsna7t0zpTjWpE=";
+    })
+  ];
+
   postPatch = ''
     sed -i '/addopts/d' pyproject.toml
   '';
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pillow-simd/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pillow-simd/default.nix
index f061a17048..e913a10b4f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pillow-simd/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pims/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pims/default.nix
index ca8a72fff5..c016d45ffa 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pims/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pipdate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pipdate/default.nix
index da4cef42ad..87d275cf7c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pipdate/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pipx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pipx/default.nix
index d3f8f3f43b..0fc5fe5648 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pipx/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pipx/default.nix
@@ -41,7 +41,10 @@ buildPythonPackage rec {
     userpath
   ] ++ lib.optionals (pythonOlder "3.11") [ tomli ];
 
-  nativeBuildInputs = [ installShellFiles ];
+  nativeBuildInputs = [
+    installShellFiles
+    argcomplete
+  ];
 
   nativeCheckInputs = [
     pytestCheckHook
@@ -95,9 +98,9 @@ buildPythonPackage rec {
 
   postInstall = ''
     installShellCompletion --cmd pipx \
-      --bash <(${argcomplete}/bin/register-python-argcomplete pipx --shell bash) \
-      --zsh <(${argcomplete}/bin/register-python-argcomplete pipx --shell zsh) \
-      --fish <(${argcomplete}/bin/register-python-argcomplete pipx --shell fish)
+      --bash <(register-python-argcomplete pipx --shell bash) \
+      --zsh <(register-python-argcomplete pipx --shell zsh) \
+      --fish <(register-python-argcomplete pipx --shell fish)
   '';
 
   meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pixelmatch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pixelmatch/default.nix
index bda5d66cf4..23d5f748d3 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pixelmatch/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pkginfo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pkginfo/default.nix
index 589721c410..069ffd31a4 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pkginfo/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/plac/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/plac/default.nix
index 66aaa4e942..d234636bb2 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/plac/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/plaster-pastedeploy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/plaster-pastedeploy/default.nix
index 94ff14306b..0585d596e7 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/plaster-pastedeploy/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/playwrightcapture/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/playwrightcapture/default.nix
index 784ba319a2..4e2c4a884e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/playwrightcapture/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/playwrightcapture/default.nix
@@ -22,7 +22,7 @@
 
 buildPythonPackage rec {
   pname = "playwrightcapture";
-  version = "1.25.8";
+  version = "1.25.9";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -31,7 +31,7 @@ buildPythonPackage rec {
     owner = "Lookyloo";
     repo = "PlaywrightCapture";
     rev = "refs/tags/v${version}";
-    hash = "sha256-KuhcAhnpvM9pEzqr7Ke7aFuQ3WLbaAHEzThr5Idl+zU=";
+    hash = "sha256-p/Zy4roRG0xdk2w5O0CdYIr15D+wumiuGlCNxrHHWdw=";
   };
 
   pythonRelaxDeps = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/plotly/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/plotly/default.nix
index 8c7751b766..6623b8ace1 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/plotly/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pluggy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pluggy/default.nix
index ff03c4a6a5..f2951a245e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pluggy/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pluggy/default.nix
@@ -4,7 +4,6 @@
   fetchFromGitHub,
   setuptools-scm,
   pythonOlder,
-  importlib-metadata,
   callPackage,
 }:
 
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/plugp100/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/plugp100/default.nix
index b01229b261..6a79e5b300 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/plugp100/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/plugp100/default.nix
@@ -1,5 +1,4 @@
 {
-  pkgs,
   lib,
   buildPythonPackage,
   fetchFromGitHub,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/plumbum/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/plumbum/default.nix
index a6a77dd5cb..42a9234a08 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/plumbum/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/plux/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/plux/default.nix
index 5fbc757db8..302b67eea7 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/plux/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pmdsky-debug-py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pmdsky-debug-py/default.nix
index 839ed1f303..81b3796912 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pmdsky-debug-py/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/poetry-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/poetry-core/default.nix
index cf51068bc9..fec055b429 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/poetry-core/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/polarizationsolver/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/polarizationsolver/default.nix
index be7bea5a63..fc0afe375f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/polarizationsolver/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/polarizationsolver/default.nix
@@ -2,7 +2,6 @@
   buildPythonPackage,
   lib,
   fetchFromGitLab,
-  python,
   numpy,
   scipy,
   periodictable,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/polling/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/polling/default.nix
index edca7ccbd3..bbf8583562 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/polling/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/poppler-qt5/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/poppler-qt5/default.nix
index dc3dc7089d..0ac8753d38 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/poppler-qt5/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/portalocker/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/portalocker/default.nix
index 53de4065ff..be7697d0d6 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/portalocker/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/portpicker/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/portpicker/default.nix
index b19dd5b1bf..61fd71319f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/portpicker/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/posix-ipc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/posix-ipc/default.nix
index d081801ce4..6c78fc3483 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/posix-ipc/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/potr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/potr/default.nix
index f6e6f72755..fcf1f4e070 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/potr/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pox/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pox/default.nix
index 2c82fc966e..ffcf9616cb 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pox/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/ppft/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ppft/default.nix
index ec61d57fc4..53eaa5657e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/ppft/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pprintpp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pprintpp/default.nix
index d7da3d5511..904e067b6c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pprintpp/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pprintpp/default.nix
@@ -38,9 +38,6 @@ buildPythonPackage rec {
 
   build-system = [ setuptools ];
 
-  # tests rely on nose
-  doCheck = pythonOlder "3.12";
-
   nativeCheckInputs = [
     nose
     parameterized
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/precis-i18n/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/precis-i18n/default.nix
index 5802f01cc0..7067bd6121 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/precis-i18n/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/preshed/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/preshed/default.nix
index e901288445..1ca058038f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/preshed/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/preshed/default.nix
@@ -3,7 +3,6 @@
   buildPythonPackage,
   cymem,
   cython,
-  python,
   fetchPypi,
   murmurhash,
   pytestCheckHook,
@@ -43,6 +42,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/third_party/nixpkgs/pkgs/development/python-modules/pretend/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pretend/default.nix
index 3e4396a404..f35fcb5e9c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pretend/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/prettytable/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/prettytable/default.nix
index f7fd2f5bfc..53143aa47f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/prettytable/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/prison/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/prison/default.nix
index 32d7a9ead8..5abb41f269 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/prison/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/private-gpt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/private-gpt/default.nix
index 765132c92b..8c4c1545c3 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/private-gpt/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/prometheus-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/prometheus-client/default.nix
index db541075d7..9f0704d7a3 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/prometheus-client/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/prompt-toolkit/1.nix b/third_party/nixpkgs/pkgs/development/python-modules/prompt-toolkit/1.nix
index 1a6dd3223d..b50f5ef7cd 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/prompt-toolkit/1.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/prompt-toolkit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/prompt-toolkit/default.nix
index 0a415b1926..c66dd4499e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/prompt-toolkit/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/protego/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/protego/default.nix
index bfd17d74dc..bf2fb99c36 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/protego/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/protobuf/4.nix b/third_party/nixpkgs/pkgs/development/python-modules/protobuf/4.nix
new file mode 100644
index 0000000000..9d10deca12
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/protobuf/4.nix
@@ -0,0 +1,131 @@
+{
+  buildPackages,
+  buildPythonPackage,
+  fetchpatch,
+  isPyPy,
+  lib,
+  numpy,
+  protobuf,
+  pytestCheckHook,
+  pythonAtLeast,
+  substituteAll,
+  tzdata,
+}:
+
+assert lib.versionOlder protobuf.version "21" -> throw "Protobuf 21 or newer required";
+
+let
+  protobufVersionMajor = lib.versions.major protobuf.version;
+  protobufVersionMinor = lib.versions.minor protobuf.version;
+in
+buildPythonPackage {
+  inherit (protobuf) pname src;
+
+  # protobuf 21 corresponds with its python library 4.21
+  version = "4.${protobufVersionMajor}.${protobufVersionMinor}";
+  format = "setuptools";
+
+  sourceRoot = "${protobuf.src.name}/python";
+
+  patches =
+    lib.optionals (lib.versionAtLeast protobuf.version "22") [
+      # Replace the vendored abseil-cpp with nixpkgs'
+      (substituteAll {
+        src = ./use-nixpkgs-abseil-cpp.patch;
+        abseil_cpp_include_path = "${lib.getDev protobuf.abseil-cpp}/include";
+      })
+    ]
+    ++ lib.optionals (pythonAtLeast "3.11" && lib.versionOlder protobuf.version "22") [
+      (fetchpatch {
+        name = "support-python311.patch";
+        url = "https://github.com/protocolbuffers/protobuf/commit/2206b63c4649cf2e8a06b66c9191c8ef862ca519.diff";
+        stripLen = 1; # because sourceRoot above
+        hash = "sha256-3GaoEyZIhS3QONq8LEvJCH5TdO9PKnOgcQF0GlEiwFo=";
+      })
+    ];
+
+  prePatch = ''
+    if [[ "$(<../version.json)" != *'"python": "'"$version"'"'* ]]; then
+      echo "Python library version mismatch. Derivation version: $version, actual: $(<../version.json)"
+      exit 1
+    fi
+  '';
+
+  # Remove the line in setup.py that forces compiling with C++14. Upstream's
+  # CMake build has been updated to support compiling with other versions of
+  # C++, but the Python build has not. Without this, we observe compile-time
+  # errors using GCC.
+  #
+  # Fedora appears to do the same, per this comment:
+  #
+  #   https://github.com/protocolbuffers/protobuf/issues/12104#issuecomment-1542543967
+  #
+  postPatch = ''
+    sed -i "/extra_compile_args.append('-std=c++14')/d" setup.py
+
+    # The former function has been renamed into the latter in Python 3.12.
+    # Does not apply to all protobuf versions, hence --replace-warn.
+    substituteInPlace google/protobuf/internal/json_format_test.py \
+      --replace-warn assertRaisesRegexp assertRaisesRegex
+  '';
+
+  nativeBuildInputs = lib.optional isPyPy tzdata;
+
+  buildInputs = [ protobuf ];
+
+  propagatedNativeBuildInputs = [
+    # For protoc of the same version.
+    buildPackages."protobuf_${protobufVersionMajor}"
+  ];
+
+  setupPyGlobalFlags = [ "--cpp_implementation" ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ] ++ lib.optionals (lib.versionAtLeast protobuf.version "22") [ numpy ];
+
+  disabledTests = lib.optionals isPyPy [
+    # error message differs
+    "testInvalidTimestamp"
+    # requires tracemalloc which pypy does not implement
+    # https://foss.heptapod.net/pypy/pypy/-/issues/3048
+    "testUnknownFieldsNoMemoryLeak"
+    # assertion is not raised for some reason
+    "testStrictUtf8Check"
+  ];
+
+  disabledTestPaths =
+    lib.optionals (lib.versionAtLeast protobuf.version "23") [
+      # The following commit (I think) added some internal test logic for Google
+      # that broke generator_test.py. There is a new proto file that setup.py is
+      # not generating into a .py file. However, adding this breaks a bunch of
+      # conflict detection in descriptor_test.py that I don't understand. So let's
+      # just disable generator_test.py for now.
+      #
+      #   https://github.com/protocolbuffers/protobuf/commit/5abab0f47e81ac085f0b2d17ec3b3a3b252a11f1
+      #
+      "google/protobuf/internal/generator_test.py"
+    ]
+    ++ lib.optionals (lib.versionAtLeast protobuf.version "25") [
+      "minimal_test.py" # ModuleNotFoundError: No module named 'google3'
+    ];
+
+  pythonImportsCheck = [
+    "google.protobuf"
+    "google.protobuf.internal._api_implementation" # Verify that --cpp_implementation worked
+  ];
+
+  passthru = {
+    inherit protobuf;
+  };
+
+  meta = with lib; {
+    description = "Protocol Buffers are Google's data interchange format";
+    homepage = "https://developers.google.com/protocol-buffers/";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ knedlsepp ];
+    # Tests are currently failing because backend is unavailable and causes tests to fail
+    # Progress tracked in https://github.com/NixOS/nixpkgs/pull/264902
+    broken = lib.versionAtLeast protobuf.version "26";
+  };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/protobuf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/protobuf/default.nix
index 9d10deca12..75dc81ccba 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/protobuf/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/protobuf/default.nix
@@ -1,131 +1,39 @@
 {
-  buildPackages,
   buildPythonPackage,
-  fetchpatch,
-  isPyPy,
+  fetchPypi,
   lib,
-  numpy,
-  protobuf,
-  pytestCheckHook,
-  pythonAtLeast,
-  substituteAll,
-  tzdata,
+  setuptools,
 }:
 
-assert lib.versionOlder protobuf.version "21" -> throw "Protobuf 21 or newer required";
+buildPythonPackage rec {
+  pname = "protobuf";
+  version = "5.27.2";
+  pyproject = true;
 
-let
-  protobufVersionMajor = lib.versions.major protobuf.version;
-  protobufVersionMinor = lib.versions.minor protobuf.version;
-in
-buildPythonPackage {
-  inherit (protobuf) pname src;
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-8+ze8ia5r4VgdfKCJ/8skM46WU0JLDm+5VE1c/JeJxQ=";
+  };
 
-  # protobuf 21 corresponds with its python library 4.21
-  version = "4.${protobufVersionMajor}.${protobufVersionMinor}";
-  format = "setuptools";
+  build-system = [ setuptools ];
 
-  sourceRoot = "${protobuf.src.name}/python";
-
-  patches =
-    lib.optionals (lib.versionAtLeast protobuf.version "22") [
-      # Replace the vendored abseil-cpp with nixpkgs'
-      (substituteAll {
-        src = ./use-nixpkgs-abseil-cpp.patch;
-        abseil_cpp_include_path = "${lib.getDev protobuf.abseil-cpp}/include";
-      })
-    ]
-    ++ lib.optionals (pythonAtLeast "3.11" && lib.versionOlder protobuf.version "22") [
-      (fetchpatch {
-        name = "support-python311.patch";
-        url = "https://github.com/protocolbuffers/protobuf/commit/2206b63c4649cf2e8a06b66c9191c8ef862ca519.diff";
-        stripLen = 1; # because sourceRoot above
-        hash = "sha256-3GaoEyZIhS3QONq8LEvJCH5TdO9PKnOgcQF0GlEiwFo=";
-      })
-    ];
-
-  prePatch = ''
-    if [[ "$(<../version.json)" != *'"python": "'"$version"'"'* ]]; then
-      echo "Python library version mismatch. Derivation version: $version, actual: $(<../version.json)"
-      exit 1
-    fi
-  '';
-
-  # Remove the line in setup.py that forces compiling with C++14. Upstream's
-  # CMake build has been updated to support compiling with other versions of
-  # C++, but the Python build has not. Without this, we observe compile-time
-  # errors using GCC.
-  #
-  # Fedora appears to do the same, per this comment:
-  #
-  #   https://github.com/protocolbuffers/protobuf/issues/12104#issuecomment-1542543967
-  #
-  postPatch = ''
-    sed -i "/extra_compile_args.append('-std=c++14')/d" setup.py
-
-    # The former function has been renamed into the latter in Python 3.12.
-    # Does not apply to all protobuf versions, hence --replace-warn.
-    substituteInPlace google/protobuf/internal/json_format_test.py \
-      --replace-warn assertRaisesRegexp assertRaisesRegex
-  '';
-
-  nativeBuildInputs = lib.optional isPyPy tzdata;
-
-  buildInputs = [ protobuf ];
-
-  propagatedNativeBuildInputs = [
-    # For protoc of the same version.
-    buildPackages."protobuf_${protobufVersionMajor}"
-  ];
-
-  setupPyGlobalFlags = [ "--cpp_implementation" ];
-
-  nativeCheckInputs = [
-    pytestCheckHook
-  ] ++ lib.optionals (lib.versionAtLeast protobuf.version "22") [ numpy ];
-
-  disabledTests = lib.optionals isPyPy [
-    # error message differs
-    "testInvalidTimestamp"
-    # requires tracemalloc which pypy does not implement
-    # https://foss.heptapod.net/pypy/pypy/-/issues/3048
-    "testUnknownFieldsNoMemoryLeak"
-    # assertion is not raised for some reason
-    "testStrictUtf8Check"
-  ];
-
-  disabledTestPaths =
-    lib.optionals (lib.versionAtLeast protobuf.version "23") [
-      # The following commit (I think) added some internal test logic for Google
-      # that broke generator_test.py. There is a new proto file that setup.py is
-      # not generating into a .py file. However, adding this breaks a bunch of
-      # conflict detection in descriptor_test.py that I don't understand. So let's
-      # just disable generator_test.py for now.
-      #
-      #   https://github.com/protocolbuffers/protobuf/commit/5abab0f47e81ac085f0b2d17ec3b3a3b252a11f1
-      #
-      "google/protobuf/internal/generator_test.py"
-    ]
-    ++ lib.optionals (lib.versionAtLeast protobuf.version "25") [
-      "minimal_test.py" # ModuleNotFoundError: No module named 'google3'
-    ];
+  # the pypi source archive does not ship tests
+  doCheck = false;
 
   pythonImportsCheck = [
     "google.protobuf"
-    "google.protobuf.internal._api_implementation" # Verify that --cpp_implementation worked
+    "google.protobuf.compiler"
+    "google.protobuf.internal"
+    "google.protobuf.pyext"
+    "google.protobuf.testdata"
+    "google.protobuf.util"
+    "google._upb._message"
   ];
 
-  passthru = {
-    inherit protobuf;
-  };
-
   meta = with lib; {
     description = "Protocol Buffers are Google's data interchange format";
     homepage = "https://developers.google.com/protocol-buffers/";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ knedlsepp ];
-    # Tests are currently failing because backend is unavailable and causes tests to fail
-    # Progress tracked in https://github.com/NixOS/nixpkgs/pull/264902
-    broken = lib.versionAtLeast protobuf.version "26";
+    maintainers = with maintainers; [ SuperSandro2000 ];
   };
 }
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/protonvpn-nm-lib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/protonvpn-nm-lib/default.nix
index a5067b1525..1f35c5aba5 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/protonvpn-nm-lib/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/protonvpn-nm-lib/default.nix
@@ -17,7 +17,6 @@
   pkgs-systemd,
   python,
   xdg-utils,
-  makeWrapper,
 }:
 
 buildPythonPackage rec {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/prox-tv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/prox-tv/default.nix
index bd82197518..7502d2daf3 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/prox-tv/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/psutil/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/psutil/default.nix
index 0b7a69a434..4c0a93d2fa 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/psutil/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/psycopg2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/psycopg2/default.nix
index 471cff85da..ec958d7525 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/psycopg2/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/psycopg2/default.nix
@@ -72,6 +72,6 @@ buildPythonPackage rec {
       lgpl3Plus
       zpl20
     ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ptable/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ptable/default.nix
index 8847ef8a1b..d88a7433f0 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/ptable/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/publicsuffix/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/publicsuffix/default.nix
index 11f331cd67..c0f0d87477 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/publicsuffix/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/publicsuffix2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/publicsuffix2/default.nix
index 02a686c310..c11880a620 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/publicsuffix2/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pudb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pudb/default.nix
index 44ca0a6950..08abae48d1 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pudb/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pudb/default.nix
@@ -2,7 +2,9 @@
   lib,
   buildPythonPackage,
   fetchPypi,
+  setuptools,
   jedi,
+  packaging,
   pygments,
   urwid,
   urwid-readline,
@@ -13,18 +15,21 @@
 
 buildPythonPackage rec {
   pname = "pudb";
-  version = "2024.1.1";
-  format = "setuptools";
+  version = "2024.1.2";
+  pyproject = true;
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-/19TleNqGaZfIvUi/WAn0no2q3g95FEbQckUhKthSXU=";
+    hash = "sha256-rcmwAEK6g2cRffCmwNxi+pYJq9IcO/jltz1iCQfFtD4=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     jedi
+    packaging
     pygments
     urwid
     urwid-readline
@@ -47,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/third_party/nixpkgs/pkgs/development/python-modules/pulumi-aws/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pulumi-aws/default.nix
index 8d276960ac..c71fac21c5 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pulumi-aws/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pulumi-aws/default.nix
@@ -12,7 +12,7 @@
 buildPythonPackage rec {
   pname = "pulumi-aws";
   # Version is independant of pulumi's.
-  version = "6.41.0";
+  version = "6.46.0";
 
   pyproject = true;
   build-system = [ setuptools ];
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "pulumi";
     repo = "pulumi-aws";
     rev = "refs/tags/v${version}";
-    hash = "sha256-7l+m4ULDGa15QNu6l2kURQznKP2Ut9Y1P9njV7s9nzc=";
+    hash = "sha256-TxtvvkZULEDhxodUyc+T6Xo3i8qwOEE7Mh8Wh0WMJTA=";
   };
 
   sourceRoot = "${src.name}/sdk/python";
@@ -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/third_party/nixpkgs/pkgs/development/python-modules/pure-pcapy3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pure-pcapy3/default.nix
index 5851e3e274..d037fc7af5 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pure-pcapy3/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/purl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/purl/default.nix
index d6e76fcc1b..493ac2fd29 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/purl/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pushover-complete/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pushover-complete/default.nix
index bd53166c58..e0da6ed669 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pushover-complete/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pushover-complete/default.nix
@@ -6,7 +6,6 @@
   requests,
   six,
   pytestCheckHook,
-  pythonOlder,
   requests-toolbelt,
   responses,
 }:
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/py-ccm15/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py-ccm15/default.nix
new file mode 100644
index 0000000000..aa4ccf9928
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/py-cpuinfo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py-cpuinfo/default.nix
index 7c26fe29f2..cf73487294 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/py-cpuinfo/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/py-ecc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py-ecc/default.nix
index 2e2f1dd1bb..6ee5b05346 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/py-ecc/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/py-eth-sig-utils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py-eth-sig-utils/default.nix
index 6c009fd9c5..bf95fb2da7 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/py-eth-sig-utils/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/py-synologydsm-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py-synologydsm-api/default.nix
index e81173c5ca..143a3159b8 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/py-synologydsm-api/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/py-vapid/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py-vapid/default.nix
index 5a546643e1..aed03b8408 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/py-vapid/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/py3status/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py3status/default.nix
index d21e806016..d762008e2f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/py3status/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pyTelegramBotAPI/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyTelegramBotAPI/default.nix
index e86332342b..1cc5d97f9c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyTelegramBotAPI/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyTelegramBotAPI/default.nix
@@ -20,7 +20,7 @@
 
 buildPythonPackage rec {
   pname = "pytelegrambotapi";
-  version = "4.20.0";
+  version = "4.21.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -29,7 +29,7 @@ buildPythonPackage rec {
     owner = "eternnoir";
     repo = "pyTelegramBotAPI";
     rev = "refs/tags/${version}";
-    hash = "sha256-JKT3kllOV9VEwhUwv3geAP5ibJgaAApCahD1N4V5SE8=";
+    hash = "sha256-e0cyxwofixdtv3qNEAnb+dG2ya8wUqKmIx3hRGkFrpE=";
   };
 
   build-system = [ hatchling ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyacoustid/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyacoustid/default.nix
index 24dc34c47f..30211f9b6f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyacoustid/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pyais/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyais/default.nix
index 2cbeb25693..9749114a40 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyais/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pyamg/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyamg/default.nix
index 1fdad3647b..e0a983c6bb 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyamg/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pyaml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyaml/default.nix
index 56096db576..9b5b394893 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyaml/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pyannotate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyannotate/default.nix
index ced51705b9..6c81a3f081 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyannotate/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pyannote-audio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyannote-audio/default.nix
index 9f4510785b..7507b56528 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyannote-audio/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pyannote-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyannote-core/default.nix
index 85c01bcee5..d9ce9b18db 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyannote-core/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pyannote-metrics/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyannote-metrics/default.nix
index 314cc5110c..e8455f4d19 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyannote-metrics/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pyannote-pipeline/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyannote-pipeline/default.nix
index 0b85c50474..a92c56758e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyannote-pipeline/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pyasn1/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyasn1/default.nix
index bbceb87e16..4c9f519fe2 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyasn1/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pyasuswrt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyasuswrt/default.nix
index 85449618a7..33bcc5ef39 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyasuswrt/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pyasyncore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyasyncore/default.nix
index 22f1098ee4..602b90ae41 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyasyncore/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pyathena/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyathena/default.nix
index 71c2d380d4..adc1a20936 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyathena/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pyatmo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyatmo/default.nix
index 77a4b8249d..9d76a23bc7 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyatmo/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pyaxmlparser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyaxmlparser/default.nix
index cb2122eaab..6e4a7e846b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyaxmlparser/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyaxmlparser/default.nix
@@ -37,6 +37,6 @@ buildPythonPackage rec {
       mit
       asl20
     ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pybase64/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pybase64/default.nix
index 50b7bcbd26..6972373eea 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pybase64/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pybids/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pybids/default.nix
index cdb7753119..3d150e82a5 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pybids/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pybind11/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pybind11/default.nix
index b0b7661607..9ca1e37695 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pybind11/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pybind11/default.nix
@@ -4,7 +4,6 @@
   buildPythonPackage,
   pythonOlder,
   fetchFromGitHub,
-  fetchpatch2,
   cmake,
   ninja,
   setuptools,
@@ -51,29 +50,16 @@ let
 in
 buildPythonPackage rec {
   pname = "pybind11";
-  version = "2.12.0";
+  version = "2.13.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pybind";
     repo = "pybind11";
     rev = "v${version}";
-    hash = "sha256-DVkI5NxM5uME9m3PFYVpJOOa2j+yjL6AJn76fCTv2nE=";
+    hash = "sha256-sQUq39CmgsDEMfluKMrrnC5fio//pgExcyqJAE00UjU=";
   };
 
-  patches = [
-    (fetchpatch2 {
-      # https://github.com/pybind/pybind11/pull/5127
-      url = "https://github.com/pybind/pybind11/commit/540bef2d2c9fb54fa7c1474ee1af959ce90f2b32.patch";
-      hash = "sha256-0ZWlH/5kQ3An/tu6ulOXO2k32asATrr1mlI4nGjIqaI=";
-    })
-  ];
-
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace-fail "timeout=300" ""
-  '';
-
   build-system = [
     cmake
     ninja
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pybrowserid/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pybrowserid/default.nix
index e6742c5e36..d5783fa023 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pybrowserid/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pycapnp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pycapnp/default.nix
index 8d34b1f39e..5276e951b3 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pycapnp/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pychm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pychm/default.nix
index 6636f052b0..8b7c443d66 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pychm/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pychm/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchPypi,
-  pythonOlder,
   chmlib,
 }:
 
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pycountry/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pycountry/default.nix
index 5a4fd3fc1b..2f5d52d9da 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pycountry/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pycountry/default.nix
@@ -3,14 +3,13 @@
   buildPythonPackage,
   pythonOlder,
   fetchFromGitHub,
-  fetchpatch2,
   poetry-core,
   pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "pycountry";
-  version = "23.12.11";
+  version = "24.6.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -19,27 +18,15 @@ buildPythonPackage rec {
     owner = "pycountry";
     repo = "pycountry";
     rev = "refs/tags/${version}";
-    hash = "sha256-B6kphZZZgK0YuPSmkiQNbEqEfqOQb+WZGnO2UeEqQN4=";
+    hash = "sha256-4YVPh6OGWguqO9Ortv+vAejxx7WLs4u0SVLv8JlKSWM=";
   };
 
-  patches = [
-    (fetchpatch2 {
-      name = "fix-usage-of-importlib_metadata.patch";
-      url = "https://github.com/pycountry/pycountry/commit/824d2535833d061c04a1f1b6b964f42bb53bced2.patch";
-      excludes = [
-        "HISTORY.txt"
-        "poetry.lock"
-        "pyproject.toml"
-      ];
-      hash = "sha256-U4fbZP++d6YfTJkVG3k2rBC8nOF9NflM6+ONlwBNu+g=";
-    })
-  ];
-
   postPatch = ''
-    sed -i "/addopts/d" pytest.ini
+    sed -i "/addopts/d" pyproject.toml
+    sed -i "/pytest-cov/d" pyproject.toml
   '';
 
-  nativeBuildInputs = [ poetry-core ];
+  build-system = [ poetry-core ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyct/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyct/default.nix
index 4bc528b64f..5509173bd9 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyct/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pycuda/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pycuda/default.nix
index 145bdcaad3..90d71bf7e4 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pycuda/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pycuda/default.nix
@@ -1,6 +1,6 @@
 {
   buildPythonPackage,
-  addOpenGLRunpath,
+  addDriverRunpath,
   fetchPypi,
   fetchFromGitHub,
   mako,
@@ -46,7 +46,7 @@ buildPythonPackage rec {
   postFixup = ''
     find $out/lib -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do
       echo "setting opengl runpath for $lib..."
-      addOpenGLRunpath "$lib"
+      addDriverRunpath "$lib"
     done
   '';
 
@@ -57,7 +57,7 @@ buildPythonPackage rec {
     py.test
   '';
 
-  nativeBuildInputs = [ addOpenGLRunpath ];
+  nativeBuildInputs = [ addDriverRunpath ];
 
   propagatedBuildInputs = [
     numpy
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pycurl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pycurl/default.nix
index 38d46c58e7..689e23e3c1 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pycurl/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pycurl/default.nix
@@ -89,6 +89,6 @@ buildPythonPackage rec {
       lgpl2Only
       mit
     ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pycyphal/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pycyphal/default.nix
index 36d138b188..d1ccc94976 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pycyphal/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pycyphal/default.nix
@@ -11,7 +11,6 @@
   pyserial,
   pytestCheckHook,
   pytest-asyncio,
-  setuptools,
 }:
 
 buildPythonPackage rec {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydantic-extra-types/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydantic-extra-types/default.nix
index 6a9cfaaeb2..39da53345e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pydantic-extra-types/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pydantic-settings/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydantic-settings/default.nix
index 2d15869972..ed94f3da47 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pydantic-settings/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pydantic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydantic/default.nix
index f47c028ac5..4644e79490 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pydantic/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pydantic/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  fetchpatch,
   pythonOlder,
 
   # build-system
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydata-sphinx-theme/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydata-sphinx-theme/default.nix
index 3bfb1d4ae8..1cd06c0d2b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pydata-sphinx-theme/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pydbus/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydbus/default.nix
index aedc5d852f..780f01cec1 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pydbus/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pydigiham/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydigiham/default.nix
index bfa7ba32e0..1bc5fd33e5 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pydigiham/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pydigiham/default.nix
@@ -4,7 +4,6 @@
   fetchFromGitHub,
   python,
   digiham,
-  csdr,
   pycsdr,
   codecserver,
 }:
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydocumentdb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydocumentdb/default.nix
index 6139d6b897..d074f0a5fe 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pydocumentdb/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pydot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydot/default.nix
index 3a5fcb066c..3cad1aafe0 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pydot/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pydot/default.nix
@@ -4,7 +4,6 @@
   fetchPypi,
   substituteAll,
   graphviz,
-  python,
   pytestCheckHook,
   chardet,
   pythonOlder,
@@ -60,6 +59,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/third_party/nixpkgs/pkgs/development/python-modules/pydub/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydub/default.nix
index e9fa5c8f70..2678412b23 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pydub/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pydy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydy/default.nix
index 1c858f5d02..e9b916c888 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pydy/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pydy/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchPypi,
-  pythonOlder,
   numpy,
   scipy,
   sympy,
@@ -29,9 +28,6 @@ buildPythonPackage rec {
     sympy
   ];
 
-  # tests rely on nose
-  doCheck = pythonOlder "3.12";
-
   nativeCheckInputs = [
     nose
     cython
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyevtk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyevtk/default.nix
new file mode 100644
index 0000000000..16081d1cc6
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyevtk/default.nix
@@ -0,0 +1,45 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  numpy,
+  pytestCheckHook,
+  pytest-cov,
+}:
+
+buildPythonPackage rec {
+  pname = "pyevtk";
+  version = "1.2.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "pyscience-projects";
+    repo = "pyevtk";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-HrodoVxjREZiutgRJ3ZUrART29+gAZfpR9f4A4SRh4Q=";
+  };
+
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace-fail 'setup_requires=["pytest-runner"],' 'setup_requires=[],'
+  '';
+
+  build-system = [ setuptools ];
+  dependencies = [ numpy ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    pytest-cov
+  ];
+
+  pythonImportsCheck = [ "pyevtk" ];
+
+  meta = {
+    description = "Exports data to binary VTK files for visualization/analysis";
+    homepage = "https://github.com/pyscience-projects/pyevtk";
+    changelog = "https://github.com/pyscience-projects/pyevtk/blob/${src.rev}/CHANGES.txt";
+    license = lib.licenses.bsd2;
+    maintainers = with lib.maintainers; [ sigmanificient ];
+  };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyexcel-io/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyexcel-io/default.nix
index 93244293ad..0bd4fdc27b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyexcel-io/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pyexcel-ods/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyexcel-ods/default.nix
index 646bd2e8ad..e7683a259f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyexcel-ods/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pyexcel-xls/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyexcel-xls/default.nix
index 5ff87b2390..c372ca08ad 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyexcel-xls/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pyexcel/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyexcel/default.nix
index 4391646985..404f29068a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyexcel/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pyfma/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyfma/default.nix
index b661edcc89..ab6444efeb 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyfma/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pyftpdlib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyftpdlib/default.nix
index 81cc96051c..efe1c17977 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyftpdlib/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pyfxa/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyfxa/default.nix
index 3332c711bf..5f5ba161f5 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyfxa/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pygal/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygal/default.nix
index bed6aabe40..c16eae5e8e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pygal/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pygit2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygit2/default.nix
index c541fe5aac..eeb799f329 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pygit2/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pygnmi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygnmi/default.nix
index caef1f11eb..117d6a7b03 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pygnmi/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pygobject-stubs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygobject-stubs/default.nix
index 38208b28ad..d4a9b4f810 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pygobject-stubs/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pygobject-stubs/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  pygobject3,
   pythonOlder,
   setuptools,
 }:
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygpgme/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygpgme/default.nix
index 76eb40701c..a39bc08458 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pygpgme/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pygtfs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygtfs/default.nix
index c38fed72fd..b4a404dc20 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pygtfs/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pygtfs/default.nix
@@ -3,42 +3,38 @@
   buildPythonPackage,
   docopt,
   fetchPypi,
-  nose,
   pytz,
-  pythonOlder,
+  setuptools,
   setuptools-scm,
   six,
   sqlalchemy,
+  pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "pygtfs";
   version = "0.1.9";
-  format = "setuptools";
-
-  disabled = pythonOlder "3.7";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-J5vu51OOMabWd8h60PpvvBiCnwQlhEnBywNXxy9hOuA=";
   };
 
-  postPatch = ''
-    # https://github.com/jarondl/pygtfs/pull/72
-    substituteInPlace setup.py \
-      --replace "pytz>=2012d" "pytz"
-  '';
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
 
-  nativeBuildInputs = [ setuptools-scm ];
-
-  propagatedBuildInputs = [
+  dependencies = [
     docopt
     pytz
     six
     sqlalchemy
   ];
 
-  nativeCheckInputs = [ nose ];
+  nativeCheckInputs = [ pytestCheckHook ];
+  pytestFlagsArray = [ "pygtfs/test/test.py" ];
 
   pythonImportsCheck = [ "pygtfs" ];
 
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygtkspellcheck/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygtkspellcheck/default.nix
index eb7f549149..f392f53a8c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pygtkspellcheck/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pyheif/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyheif/default.nix
index 2a1cad706b..dc6b6e1ea5 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyheif/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pyinstaller-versionfile/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyinstaller-versionfile/default.nix
index 8a0c51eef3..f941b8dc67 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyinstaller-versionfile/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pykeepass/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pykeepass/default.nix
index 417601c034..5e084b0e33 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pykeepass/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pykka/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pykka/default.nix
index 19cc38aba5..1768d04891 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pykka/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pylacrosse/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pylacrosse/default.nix
index ec7977b5a0..0bd6c7f0b9 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pylacrosse/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pylacrosse/default.nix
@@ -2,8 +2,8 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  fetchpatch2,
   mock,
-  nose,
   pyserial,
   pytestCheckHook,
   pythonOlder,
@@ -23,6 +23,14 @@ buildPythonPackage rec {
     hash = "sha256-jrkehoPLYbutDfxMBO/vlx4nMylTNs/gtvoBTFHFsDw=";
   };
 
+  patches = [
+    # Migrate to pytest, https://github.com/hthiery/python-lacrosse/pull/17
+    (fetchpatch2 {
+      url = "https://github.com/hthiery/python-lacrosse/commit/cc2623c667bc252360a9b5ccb4fc05296cf23d9c.patch?full_index=1";
+      hash = "sha256-LKryLnXMKj1lVClneyHNVOWM5KPPhOGy0/FX/7Qy/jU=";
+    })
+  ];
+
   postPatch = ''
     substituteInPlace setup.py \
       --replace "version = version," "version = '${version}',"
@@ -30,11 +38,8 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ pyserial ];
 
-  doCheck = pythonOlder "3.12";
-
   nativeCheckInputs = [
     mock
-    nose
     pytestCheckHook
   ];
 
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pylibjpeg/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pylibjpeg/default.nix
index 4f5a3cbeb8..155b3f1fe8 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pylibjpeg/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pylibjpeg/default.nix
@@ -5,7 +5,6 @@
   pythonOlder,
   pytestCheckHook,
   flit-core,
-  setuptools,
   numpy,
   pydicom,
   pylibjpeg-data,
@@ -14,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "pylibjpeg";
-  version = "2.0.0";
+  version = "2.0.1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -23,7 +22,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/third_party/nixpkgs/pkgs/development/python-modules/pyliblo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyliblo/default.nix
index 9a6a3680d2..7caead8929 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyliblo/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyliblo/default.nix
@@ -3,7 +3,6 @@
   buildPythonPackage,
   fetchurl,
   isPyPy,
-  pythonAtLeast,
   liblo,
   cython_0,
 }:
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pylibmc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pylibmc/default.nix
index cb3d7d5902..e5730dfeb6 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pylibmc/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pylint/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pylint/default.nix
index 01491a2a61..eb96516e84 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pylint/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pylint/default.nix
@@ -106,7 +106,7 @@ buildPythonPackage rec {
       "test_py3k_jobs_option"
     ];
 
-  meta = with lib; {
+  meta = {
     description = "Bug and style checker for Python";
     homepage = "https://pylint.readthedocs.io/en/stable/";
     changelog = "https://github.com/pylint-dev/pylint/releases/tag/v${version}";
@@ -119,7 +119,8 @@ buildPythonPackage rec {
       - symilar: an independent similarities checker
       - epylint: Emacs and Flymake compatible Pylint
     '';
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ ];
+    license = lib.licenses.gpl2Plus;
+    maintainers = [ ];
+    mainProgram = "pylint";
   };
 }
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pylnk3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pylnk3/default.nix
index 4bcb8547bd..d6617e8179 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pylnk3/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pylnk3/default.nix
@@ -3,7 +3,6 @@
   buildPythonPackage,
   fetchPypi,
   pytest,
-  twine,
   invoke,
   pythonOlder,
 }:
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyls-spyder/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyls-spyder/default.nix
index e86ddcc603..de2cbdae88 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyls-spyder/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pylxd/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pylxd/default.nix
index 048822ad97..78c3cba291 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pylxd/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pylyrics/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pylyrics/default.nix
index 29949d8c08..189b9d184d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pylyrics/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pymatgen/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymatgen/default.nix
index 9dbe207603..005a65b631 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pymatgen/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pymatgen/default.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  stdenv,
   ase,
   buildPythonPackage,
   cython,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymbolic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymbolic/default.nix
index a5d2063c2b..bc5292e6d1 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pymbolic/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pymediainfo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymediainfo/default.nix
index f60c8ed5fc..016b5ee6bf 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pymediainfo/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pymodbus/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymodbus/default.nix
index 0b33812e65..38411beca9 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pymodbus/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pymodbus/default.nix
@@ -46,7 +46,7 @@ buildPythonPackage rec {
       prompt-toolkit
       pygments
       click
-    ] ++ typer.optional-dependencies.all;
+    ];
     serial = [ pyserial ];
   };
 
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymongo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymongo/default.nix
index 0f504b00cd..d7e1b35ed7 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pymongo/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pymoo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymoo/default.nix
index eaaec885e5..b6476c9fe4 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pymoo/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pymoo/default.nix
@@ -15,7 +15,6 @@
   notebook,
   numba,
   numpy,
-  pandas,
   scipy,
 }:
 
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymorphy2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymorphy2/default.nix
index ee9e7daa80..748f7d8d24 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pymorphy2/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pymorphy2/dicts-ru.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymorphy2/dicts-ru.nix
index fd9f2c5e7e..4385990518 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pymorphy2/dicts-ru.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pynacl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pynacl/default.nix
index 765b881542..cc610d62e3 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pynacl/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pynamodb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pynamodb/default.nix
index e7d6803b28..cd55686174 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pynamodb/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pynetdicom/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pynetdicom/default.nix
index 3339b77b98..efcad7461e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pynetdicom/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pynetdicom/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "pynetdicom";
-  version = "2.1.0";
+  version = "2.1.1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "pydicom";
     repo = "pynetdicom";
     rev = "refs/tags/v${version}";
-    hash = "sha256-gAgNSvNn5VsctqhbT/CzFVhwCEpZwGb1pOh0JwkuAW8=";
+    hash = "sha256-cEe0/mzmMnPoLQMx5AsJocGxCUVE512k9KlEmjzjzn4=";
   };
 
   build-system = [ poetry-core ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyngo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyngo/default.nix
index 0f6c85d993..316da55728 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyngo/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyngo/default.nix
@@ -20,7 +20,7 @@
 
 buildPythonPackage rec {
   pname = "pyngo";
-  version = "2.0.1";
+  version = "2.1.0";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -29,7 +29,7 @@ buildPythonPackage rec {
     owner = "yezz123";
     repo = "pyngo";
     rev = "refs/tags/${version}";
-    hash = "sha256-wvy1L21AnQ4JP5seAh6DWksQU2OcbYTXKcixpFryH4w=";
+    hash = "sha256-w5gOwaQeNX9Ca6V2rxi1UGi2aO+/Eaz2uyw4x/JVOxc=";
   };
 
   nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pynvml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pynvml/default.nix
index 762771c66a..936a4f5ce8 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pynvml/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pynvml/default.nix
@@ -5,7 +5,7 @@
   fetchFromGitHub,
   substituteAll,
   pythonOlder,
-  addOpenGLRunpath,
+  addDriverRunpath,
   setuptools,
   pytestCheckHook,
   versioneer,
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   patches = [
     (substituteAll {
       src = ./0001-locate-libnvidia-ml.so.1-on-NixOS.patch;
-      inherit (addOpenGLRunpath) driverLink;
+      inherit (addDriverRunpath) driverLink;
     })
   ];
 
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pynws/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pynws/default.nix
index a9e5e959e5..444b28ddbb 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pynws/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pynws/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "pynws";
-  version = "1.8.2";
+  version = "2.0.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "MatthewFlamm";
     repo = "pynws";
     rev = "refs/tags/v${version}";
-    hash = "sha256-3QKdZ7hg7HfQ56xHbkhXCtlBq4JCwfXdZiTctI3OVl0=";
+    hash = "sha256-eAXIlX/K7Cpq+aiPHiRGqhtSHQDtbHONYP0AjRW8JjY=";
   };
 
   build-system = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyogg/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyogg/default.nix
index ba6d5dbb0c..62e5509d2e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyogg/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyogg/default.nix
@@ -9,7 +9,6 @@
   libopus,
   opusfile,
   substituteAll,
-  python,
 }:
 
 buildPythonPackage rec {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyomo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyomo/default.nix
index f91ae17539..f21872914b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyomo/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pyopenssl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyopenssl/default.nix
index fc7dbfd515..b9691b2a28 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyopenssl/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pyotgw/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyotgw/default.nix
index 0283116b21..03a07846b8 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyotgw/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyotgw/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  pyserial-asyncio,
   pyserial-asyncio-fast,
   pytest-asyncio,
   pytestCheckHook,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyparted/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyparted/default.nix
index 9c02f6eb31..ebdd762b6d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyparted/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyparted/default.nix
@@ -5,7 +5,6 @@
   buildPythonPackage,
   isPyPy,
   pkgs,
-  python,
   six,
   pytestCheckHook,
 }:
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pypemicro/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pypemicro/default.nix
index 7f51691529..42c783a6e4 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pypemicro/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pypemicro/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchPypi,
-  autoPatchelfHook,
 }:
 
 buildPythonPackage rec {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyperf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyperf/default.nix
index 5eab5062ac..5c752a0834 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyperf/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pypresence/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pypresence/default.nix
index cf792a4226..b01f757351 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pypresence/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pyprind/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyprind/default.nix
index ec8367aee0..9506f4c242 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyprind/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pyproject-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyproject-api/default.nix
index 09eb72384c..9133287229 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyproject-api/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyproject-api/default.nix
@@ -10,7 +10,6 @@
 
   # runtime
   packaging,
-  toml,
   tomli,
 
   # docs
@@ -77,6 +76,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/third_party/nixpkgs/pkgs/development/python-modules/pyproject-metadata/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyproject-metadata/default.nix
index 33adc83c67..1a51a0b8f8 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyproject-metadata/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyproject-metadata/default.nix
@@ -6,9 +6,7 @@
   packaging,
   pytestCheckHook,
   pythonOlder,
-  setuptools,
   tomli,
-  wheel,
 }:
 
 buildPythonPackage rec {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyqt/5.x.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyqt/5.x.nix
index ed0264c816..e947ad34b1 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyqt/5.x.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyqt/5.x.nix
@@ -22,13 +22,12 @@
   withSerialPort ? false,
   withTools ? false,
   pkgsBuildTarget,
-  buildPackages,
   dbusSupport ? !stdenv.isDarwin,
 }:
 
 buildPythonPackage rec {
   pname = "pyqt5";
-  version = "5.15.9";
+  version = "5.15.10";
   format = "pyproject";
 
   disabled = isPy27;
@@ -36,7 +35,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "PyQt5";
     inherit version;
-    hash = "sha256-3EHoQBqQ3D4raStBG9VJKrVZrieidCTu1L05FVZOxMA=";
+    hash = "sha256-1Gt4BLGxCk/5F1P4ET5bVYDStEYvMiYoji2ESXM0iYo=";
   };
 
   patches = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyqtwebengine/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyqtwebengine/default.nix
index e8b1da7fdc..263ccf81df 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyqtwebengine/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyqtwebengine/default.nix
@@ -12,7 +12,6 @@
   qtdeclarative,
   wrapQtAppsHook,
   darwin,
-  buildPackages,
 }:
 
 let
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyquaternion/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyquaternion/default.nix
index ac374c9572..fab1e6c4f8 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyquaternion/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyquaternion/default.nix
@@ -1,19 +1,22 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
   numpy,
-  nose,
+  setuptools,
+  pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "pyquaternion";
   version = "0.9.9";
-  format = "setuptools";
+  pyproject = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-sfYa8hnLL+lmtft5oZISTy5jo/end6w8rfKVexqBvqg=";
+  src = fetchFromGitHub {
+    owner = "KieranWynn";
+    repo = "pyquaternion";
+    rev = "v${version}";
+    hash = "sha256-L0wT9DFUDRcmmN7OpmIDNvtQWQrM7iFnZt6R2xrJ+3A=";
   };
 
   # The VERSION.txt file is required for setup.py
@@ -22,9 +25,14 @@ buildPythonPackage rec {
     echo "${version}" > VERSION.txt
   '';
 
-  propagatedBuildInputs = [ numpy ];
+  build-system = [ setuptools ];
+
+  dependencies = [ numpy ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  pytestFlagsArray = [ "pyquaternion/test/" ];
 
-  nativeCheckInputs = [ nose ];
   pythonImportsCheck = [ "pyquaternion" ];
 
   meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyqwikswitch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyqwikswitch/default.nix
index fd6daf7d38..5ccd238330 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyqwikswitch/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyqwikswitch/default.nix
@@ -4,7 +4,6 @@
   fetchPypi,
   attrs,
   requests,
-  python,
 }:
 
 buildPythonPackage rec {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyramid-mako/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyramid-mako/default.nix
index 2b4483d04f..f362fae175 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyramid-mako/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pyramid-multiauth/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyramid-multiauth/default.nix
index 6454fa6c33..2bf668f94e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyramid-multiauth/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pyrfc3339/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyrfc3339/default.nix
index ccfca503e7..bf2abeb811 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyrfc3339/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyrfc3339/default.nix
@@ -2,16 +2,12 @@
   lib,
   buildPythonPackage,
   fetchPypi,
-  pythonOlder,
 
   # build-system
   setuptools,
 
   # dependencies
   pytz,
-
-  # tests
-  nose,
 }:
 
 buildPythonPackage rec {
@@ -29,9 +25,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ pytz ];
 
-  doCheck = pythonOlder "3.12";
-
-  nativeCheckInputs = [ nose ];
+  doCheck = false; # tests are not including in PyPI tarball
 
   meta = with lib; {
     description = "Generate and parse RFC 3339 timestamps";
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyrr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyrr/default.nix
index d939061018..a4f709f2df 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyrr/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyrr/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  setuptools,
   multipledispatch,
   numpy,
 }:
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysaml2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysaml2/default.nix
index 957394ad5f..51ed8f0cc3 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pysaml2/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pysc2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysc2/default.nix
index 3ee18d12e4..667ba03903 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pysc2/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pyscaffoldext-django/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyscaffoldext-django/default.nix
index a724b105ed..c85e01e099 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyscaffoldext-django/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pyscreenshot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyscreenshot/default.nix
index 768cd31704..6112062c91 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyscreenshot/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pyscss/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyscss/default.nix
index 4626161449..af8307218e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyscss/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pysendfile/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysendfile/default.nix
index 236d040cb9..48cc85cf27 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pysendfile/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pyserial-asyncio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyserial-asyncio/default.nix
index 68c318a9d9..bd48ff1b45 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyserial-asyncio/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pyshark/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyshark/default.nix
index 3999af3f3e..ba92fdaebd 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyshark/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pyshp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyshp/default.nix
index 34866cdf85..176e04eed5 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyshp/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pyside2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyside2/default.nix
index c622d13b74..99b0bdad76 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyside2/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyside2/default.nix
@@ -1,7 +1,5 @@
 {
   python,
-  pythonAtLeast,
-  disabledIf,
   fetchurl,
   lib,
   stdenv,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysigma-backend-qradar/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysigma-backend-qradar/default.nix
index d0ec8be3b4..c88fb3e2be 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pysigma-backend-qradar/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pysigma-backend-qradar/default.nix
@@ -7,7 +7,6 @@
   pysigma-pipeline-sysmon,
   pytestCheckHook,
   pythonOlder,
-  requests,
 }:
 
 buildPythonPackage rec {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysim/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysim/default.nix
index ee828c0f71..99563f7260 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pysim/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pysim/default.nix
@@ -4,7 +4,6 @@
   fetchFromGitHub,
   setuptools,
   pytestCheckHook,
-  pytest-asyncio,
   colorlog,
   smpp-pdu,
   pyscard,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysmartdl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysmartdl/default.nix
index d8920c500f..b131b2e3e1 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pysmartdl/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pysnmpcrypto/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysnmpcrypto/default.nix
index 4261815d57..73e3ed2e17 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pysnmpcrypto/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pyspf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyspf/default.nix
index 4a8582409c..8e69a94266 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyspf/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyspf/default.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  python,
   buildPythonPackage,
   fetchFromGitHub,
   pydns,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysqlcipher3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysqlcipher3/default.nix
index a1201c22c2..3b371ba727 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pysqlcipher3/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pysrim/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysrim/default.nix
index 8541a95c8c..f9f4e9c59d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pysrim/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pysrt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysrt/default.nix
index d94e1fec3a..9be5028a87 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pysrt/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pysrt/default.nix
@@ -2,14 +2,16 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  setuptools,
   chardet,
-  nose,
+  pytestCheckHook,
+  fetchpatch2,
 }:
 
 buildPythonPackage rec {
   pname = "pysrt";
   version = "1.1.2";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "byroot";
@@ -18,16 +20,22 @@ buildPythonPackage rec {
     sha256 = "1f5hxyzlh5mdvvi52qapys9qcinffr6ghgivb6k4jxa92cbs3mfg";
   };
 
-  nativeCheckInputs = [ nose ];
-  checkPhase = ''
-    nosetests -v
-  '';
+  patches = [
+    (fetchpatch2 {
+      url = "https://github.com/byroot/pysrt/commit/93f52f6d4f70f4e18dc71deeaae0ec1e9100a50f.patch?full_index=1";
+      hash = "sha256-nikMPwj3OHvl6LunAfRk6ZbFUvVgPwF696Dt8R7BY4U=";
+    })
+  ];
+
+  build-system = [ setuptools ];
 
   propagatedBuildInputs = [ chardet ];
 
+  nativeCheckInputs = [ pytestCheckHook ];
+
   meta = with lib; {
     homepage = "https://github.com/byroot/pysrt";
-    license = licenses.gpl3;
+    license = licenses.gpl3Only;
     description = "Python library used to edit or create SubRip files";
     mainProgram = "srt";
   };
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pystache/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pystache/default.nix
index 9088f2c503..f82f6c8e4a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pystache/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pysubs2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysubs2/default.nix
index c833f155c9..71fbf56b77 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pysubs2/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pysvn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysvn/default.nix
index 53b57ee57d..3df9edb39f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pysvn/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pysvn/default.nix
@@ -2,9 +2,7 @@
   stdenv,
   lib,
   buildPythonPackage,
-  pythonAtLeast,
   fetchurl,
-  isPy3k,
   python,
   apr,
   aprutil,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyswitchbee/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyswitchbee/default.nix
index 715d084ad9..3d81a5b01c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyswitchbee/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyswitchbee/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "pyswitchbee";
-  version = "1.8.0";
+  version = "1.8.3";
   format = "pyproject";
 
   disabled = pythonOlder "3.9";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "jafar-atili";
     repo = "pySwitchbee";
     rev = "refs/tags/${version}";
-    hash = "sha256-bMxWrapFX689yvC6+9NUunEtTe79+QNauFa1ZjG9ON4=";
+    hash = "sha256-at/HCY6htUz1ej09XPrb2QEyoiOWhIEpgSwJange1cU=";
   };
 
   nativeBuildInputs = [ setuptools ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytado/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytado/default.nix
index e82ff9c57e..13e41ed77a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pytado/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pytesseract/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytesseract/default.nix
index ac5a88e436..23a26fd52a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pytesseract/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pytest-annotate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-annotate/default.nix
index 0064ba62fc..31ed87e032 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-annotate/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pytest-ansible/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-ansible/default.nix
index a95648618f..5832ff98e6 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-ansible/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pytest-arraydiff/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-arraydiff/default.nix
index 6de1445b7d..4a1912e958 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-arraydiff/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pytest-astropy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-astropy/default.nix
index b2771d70c4..f620e14a51 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-astropy/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pytest-asyncio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-asyncio/default.nix
index ef428705d7..78baca8da3 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-asyncio/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-asyncio/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "pytest-asyncio";
-  version = "0.23.6"; # N.B.: when updating, tests bleak and aioesphomeapi tests
+  version = "0.23.8"; # N.B.: when updating, tests bleak and aioesphomeapi tests
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "pytest-dev";
     repo = "pytest-asyncio";
     rev = "refs/tags/v${version}";
-    hash = "sha256-+kyKcVzW05kqtLeC81rk3fJpOtyW3xSYshgl5gqIddE=";
+    hash = "sha256-kMv0crYuYHi1LF+VlXizZkG87kSL7xzsKq9tP9LgFVY=";
   };
 
   outputs = [
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     "testout"
   ];
 
-  nativeBuildInputs = [ setuptools-scm ];
+  build-system = [ setuptools-scm ];
 
   buildInputs = [ pytest ];
 
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-black/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-black/default.nix
index 5e07b68d98..f46abe031c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-black/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pytest-click/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-click/default.nix
index 8c12563a5b..2a970b16e7 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-click/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pytest-cov-stub/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-cov-stub/default.nix
new file mode 100644
index 0000000000..025a815686
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-cov-stub/default.nix
@@ -0,0 +1,22 @@
+{
+  lib,
+  buildPythonPackage,
+  python,
+  hatchling,
+}:
+
+buildPythonPackage rec {
+  pname = "pytest-cov-stub";
+  version = (lib.importTOML ./src/pyproject.toml).project.version;
+  pyproject = true;
+
+  src = ./src;
+
+  build-system = [ hatchling ];
+
+  meta = with lib; {
+    description = "Nixpkgs checkPhase stub for pytest-cov";
+    license = licenses.mit;
+    maintainers = [ lib.maintainers.pbsds ];
+  };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-cov-stub/src/pyproject.toml b/third_party/nixpkgs/pkgs/development/python-modules/pytest-cov-stub/src/pyproject.toml
new file mode 100644
index 0000000000..1f356aa7f9
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-cov-stub/src/pyproject.toml
@@ -0,0 +1,13 @@
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
+[project]
+name = "pytest-cov-nixpkgs-stub"
+version = "1.0.0"
+
+[tool.hatch.build.targets.wheel]
+packages = ["pytest_cov"]
+
+[project.entry-points.pytest11]
+pytest_cov = "pytest_cov.plugin"
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-cov-stub/src/pytest_cov/__init__.py b/third_party/nixpkgs/pkgs/development/python-modules/pytest-cov-stub/src/pytest_cov/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-cov-stub/src/pytest_cov/plugin.py b/third_party/nixpkgs/pkgs/development/python-modules/pytest-cov-stub/src/pytest_cov/plugin.py
new file mode 100644
index 0000000000..d03f4d1f7a
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-cov-stub/src/pytest_cov/plugin.py
@@ -0,0 +1,93 @@
+import argparse
+import pytest
+
+class CoverageError(Exception):
+    pass
+
+class PytestCovWarning(pytest.PytestWarning):
+    pass
+
+class CovDisabledWarning(PytestCovWarning):
+    pass
+
+class CovReportWarning(PytestCovWarning):
+    pass
+
+class StoreReport(argparse.Action):
+    def __call__(self, parser, namespace, values, option_string=None):
+        report_type, file = values
+        namespace.cov_report[report_type] = file
+
+def pytest_addoption(parser):
+    group = parser.getgroup('cov', 'coverage reporting')
+    group.addoption(
+        '--cov',
+        action='append',
+        default=[],
+        metavar='SOURCE',
+        nargs='?',
+        const=True,
+        dest='cov_source',
+    )
+    group.addoption(
+        '--cov-reset',
+        action='store_const',
+        const=[],
+        dest='cov_source',
+    )
+    group.addoption(
+        '--cov-report',
+        action=StoreReport,
+        default={},
+        metavar='TYPE',
+        type=lambda x: x.split(":", 1) if ":" in x else (x, None),
+    )
+    group.addoption(
+        '--cov-config',
+        action='store',
+        default='.coveragerc',
+        metavar='PATH',
+    )
+    group.addoption(
+        '--no-cov-on-fail',
+        action='store_true',
+        default=False,
+    )
+    group.addoption(
+        '--no-cov',
+        action='store_true',
+        default=False,
+    )
+    group.addoption(
+        '--cov-fail-under',
+        action='store',
+        metavar='MIN',
+        type=str,
+    )
+    group.addoption(
+        '--cov-append',
+        action='store_true',
+        default=False,
+    )
+    group.addoption(
+        '--cov-branch',
+        action='store_true',
+        default=None,
+    )
+    group.addoption(
+        '--cov-context',
+        action='store',
+        metavar='CONTEXT',
+        type=str,
+    )
+
+def pytest_configure(config):
+    config.addinivalue_line('markers', 'no_cover: disable coverage for this test.')
+
+@pytest.fixture
+def no_cover():
+    pass
+
+@pytest.fixture
+def cov():
+    pass
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-datafiles/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-datafiles/default.nix
index d60948e7d9..2d98d9cfb2 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-datafiles/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pytest-doctestplus/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-doctestplus/default.nix
index 3a57ab7db4..64aae4d60a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-doctestplus/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pytest-filter-subpackage/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-filter-subpackage/default.nix
index 5196a6e8f1..9908c3b2b4 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-filter-subpackage/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pytest-flake8/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-flake8/default.nix
index be1cc3523c..f45abf0941 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-flake8/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pytest-httpbin/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-httpbin/default.nix
index 8d7f98c78f..891b8ed2cb 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-httpbin/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pytest-isort/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-isort/default.nix
index 8462f1565e..e4d5d98c40 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-isort/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pytest-jupyter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-jupyter/default.nix
index c36bcf52e6..36e45343a3 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-jupyter/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pytest-lazy-fixtures/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-lazy-fixtures/default.nix
index 3205d9d0e8..236e6dad3b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-lazy-fixtures/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pytest-pylint/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-pylint/default.nix
index 214863978d..7a9903def5 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-pylint/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pytest-qt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-qt/default.nix
index 6e468060c6..d418cfee9e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-qt/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pytest-regressions/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-regressions/default.nix
index 9c109021be..c9637e9843 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-regressions/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-regressions/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchPypi,
-  pythonAtLeast,
   pythonOlder,
   matplotlib,
   numpy,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-relaxed/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-relaxed/default.nix
index a86aceae8d..6eecdcbc95 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-relaxed/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pytest-remotedata/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-remotedata/default.nix
index 43778bfab6..25cf16b2a6 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-remotedata/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pytest-repeat/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-repeat/default.nix
index 34c4ab2cce..8df24c2be1 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-repeat/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pytest-server-fixtures/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-server-fixtures/default.nix
index 11f67121f4..bc66d607c7 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-server-fixtures/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pytest-services/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-services/default.nix
index d4ae297d0a..969b33dafc 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-services/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-services/default.nix
@@ -9,7 +9,6 @@
   pytestCheckHook,
   pythonOlder,
   requests,
-  setuptools,
   setuptools-scm,
   toml,
   mysqlclient,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-snapshot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-snapshot/default.nix
index aafe4b5b93..8d1f70fc80 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-snapshot/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pytest-socket/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-socket/default.nix
index 7e34ef0a99..c4350d412a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-socket/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-socket/default.nix
@@ -5,7 +5,6 @@
   poetry-core,
   pytest,
   pythonOlder,
-  setuptoolsBuildHook,
 }:
 
 buildPythonPackage rec {
@@ -36,6 +35,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/third_party/nixpkgs/pkgs/development/python-modules/pytest-sugar/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-sugar/default.nix
index b90b2a30e5..ac77a4ac27 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-sugar/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pytest-testmon/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-testmon/default.nix
index 6080586d6e..7fdf801dd1 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-testmon/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-testmon/default.nix
@@ -3,7 +3,6 @@
   buildPythonPackage,
   coverage,
   fetchFromGitHub,
-  poetry-core,
   pytest,
   pythonOlder,
   setuptools,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-tornasync/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-tornasync/default.nix
index b35b412c71..43464e3ce1 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-tornasync/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pytest-xprocess/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-xprocess/default.nix
index efe696a270..a27712212d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-xprocess/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pytest-xvfb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-xvfb/default.nix
index b011f081b9..0923c9b98b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-xvfb/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/python-apt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-apt/default.nix
index 2bf53c80cf..fbb7933595 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/python-apt/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/python-apt/default.nix
@@ -3,7 +3,6 @@
   apt,
   buildPythonPackage,
   fetchFromGitLab,
-  python,
   setuptools,
 }:
 
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-barbicanclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-barbicanclient/default.nix
index cefe9412e8..7188c83816 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/python-barbicanclient/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/python-box/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-box/default.nix
index 7d1e2c47c9..97885c27a9 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/python-box/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/python-box/default.nix
@@ -4,7 +4,6 @@
   cython,
   fetchFromGitHub,
   msgpack,
-  poetry-core,
   pytestCheckHook,
   pythonOlder,
   pyyaml,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-crfsuite/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-crfsuite/default.nix
index 834bfa60a0..5debefcbb3 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/python-crfsuite/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/python-crfsuite/default.nix
@@ -3,7 +3,6 @@
   buildPythonPackage,
   fetchPypi,
   pytestCheckHook,
-  pythonAtLeast,
 }:
 
 buildPythonPackage rec {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-daemon/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-daemon/default.nix
index 63f8575ff2..2adf0060df 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/python-daemon/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/python-daemon/default.nix
@@ -67,6 +67,6 @@ buildPythonPackage rec {
       gpl3Plus
       asl20
     ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-designateclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-designateclient/default.nix
index 20cbf04e6b..fa2a61d85a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/python-designateclient/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/python-djvulibre/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-djvulibre/default.nix
index de74e70eb7..ce454d057a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/python-djvulibre/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/python-djvulibre/default.nix
@@ -7,7 +7,6 @@
   ghostscript_headless,
   packaging,
   pkg-config,
-  requests,
   setuptools,
   unittestCheckHook,
   wheel,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-etcd/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-etcd/default.nix
index b9dcd8aaee..05fe0b8606 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/python-etcd/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/python-fedora/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-fedora/default.nix
index 91f53f56d8..4dda6c0bc8 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/python-fedora/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/python-fontconfig/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-fontconfig/default.nix
index 314f733ca1..a22b41a3d1 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/python-fontconfig/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/python-heatclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-heatclient/default.nix
index d2cefc90b5..b8d4563a4d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/python-heatclient/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/python-ironicclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-ironicclient/default.nix
index 13cd6f4749..2936c3ec2f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/python-ironicclient/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/python-keycloak/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-keycloak/default.nix
index 9150b1a240..e4e964d527 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/python-keycloak/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/python-louvain/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-louvain/default.nix
index 0747ee1dd7..2d908d28c2 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/python-louvain/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/python-lsp-server/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-lsp-server/default.nix
index daa39455f8..927f26b320 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/python-lsp-server/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/python-lsp-server/default.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  stdenv,
   autopep8,
   buildPythonPackage,
   docstring-to-markdown,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-ly/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-ly/default.nix
index f30ac614d8..1d7e39ccf4 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/python-ly/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/python-magic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-magic/default.nix
index 24c828a80e..942f4562d9 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/python-magic/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/python-manilaclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-manilaclient/default.nix
index c3256d0d54..bb444dd15a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/python-manilaclient/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/python-mapnik/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-mapnik/default.nix
index d2d0ae00f0..eed723f10d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/python-mapnik/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/python-mapnik/default.nix
@@ -5,6 +5,7 @@
   substituteAll,
   isPyPy,
   python,
+  setuptools,
   pillow,
   pycairo,
   pkg-config,
@@ -21,7 +22,6 @@
   zlib,
   libxml2,
   sqlite,
-  nose,
   pytestCheckHook,
   darwin,
   sparsehash,
@@ -30,7 +30,7 @@
 buildPythonPackage rec {
   pname = "python-mapnik";
   version = "3.0.16-unstable-2024-02-22";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mapnik";
@@ -55,12 +55,14 @@ buildPythonPackage rec {
 
   stdenv = if python.stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else python.stdenv;
 
+  build-system = [ setuptools ];
+
   nativeBuildInputs = [
     mapnik # for mapnik_config
     pkg-config
   ];
 
-  buildInputs = [
+  dependencies = [
     mapnik
     boost
     cairo
@@ -94,10 +96,7 @@ buildPythonPackage rec {
     export XMLPARSER=libxml2
   '';
 
-  nativeCheckInputs = [
-    nose
-    pytestCheckHook
-  ];
+  nativeCheckInputs = [ pytestCheckHook ];
 
   preCheck =
     ''
@@ -130,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/third_party/nixpkgs/pkgs/development/python-modules/python-mimeparse/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-mimeparse/default.nix
index 4b7ef60329..5291c12e53 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/python-mimeparse/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/python-ndn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-ndn/default.nix
index 69fedb261e..2484537aab 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/python-ndn/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/python-openstackclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-openstackclient/default.nix
index fc48197864..e3dd953e93 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/python-openstackclient/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/python-openzwave/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-openzwave/default.nix
index 179f3fd2b9..6b516823c5 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/python-openzwave/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/python-rtmidi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-rtmidi/default.nix
index 95c047de31..f29a3097c6 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/python-rtmidi/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/python-slugify/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-slugify/default.nix
index 8028d3fe86..c640a72873 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/python-slugify/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/python-snappy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-snappy/default.nix
index 88f4408dd5..806f067173 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/python-snappy/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/python-socks/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-socks/default.nix
index 208df3d95b..0796ea2b3c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/python-socks/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/python-utils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-utils/default.nix
index 8fc1bcc15b..6fabd9a817 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/python-utils/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/python-xapp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-xapp/default.nix
index 07e2092173..9abed70418 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/python-xapp/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/python-xapp/default.nix
@@ -2,7 +2,6 @@
   lib,
   fetchFromGitHub,
   buildPythonPackage,
-  python,
   meson,
   ninja,
   psutil,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-xmp-toolkit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-xmp-toolkit/default.nix
index 612194ae75..edcb3e0047 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/python-xmp-toolkit/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/python-xmp-toolkit/default.nix
@@ -2,7 +2,6 @@
   buildPythonPackage,
   exempi,
   fetchFromGitHub,
-  mock,
   pytz,
   lib,
   stdenv,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytimeparse/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytimeparse/default.nix
index 87a1d9c6f1..f7d3934384 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pytimeparse/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pytimeparse/default.nix
@@ -2,7 +2,7 @@
   lib,
   buildPythonPackage,
   fetchPypi,
-  nose,
+  pytestCheckHook,
   pythonOlder,
   setuptools,
 }:
@@ -21,10 +21,8 @@ buildPythonPackage rec {
 
   build-system = [ setuptools ];
 
-  # tests rely on nose
-  doCheck = pythonOlder "3.12";
-
-  nativeCheckInputs = [ nose ];
+  nativeCheckInputs = [ pytestCheckHook ];
+  pytestFlagsArray = [ "pytimeparse/tests/testtimeparse.py" ];
 
   pythonImportsCheck = [ "pytimeparse" ];
 
@@ -33,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/third_party/nixpkgs/pkgs/development/python-modules/pytlv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytlv/default.nix
index 2960c12e95..05e002a412 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pytlv/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pytlv/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchPypi,
-  poetry-core,
   setuptools,
 }:
 
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyunifiprotect/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyunifiprotect/default.nix
index b33c6695bc..bfbd39ce5c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyunifiprotect/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyunifiprotect/default.nix
@@ -15,7 +15,6 @@
   packaging,
   pillow,
   platformdirs,
-  poetry-core,
   py,
   pydantic,
   pyjwt,
@@ -71,7 +70,7 @@ buildPythonPackage rec {
     pyjwt
     pytz
     typer
-  ] ++ typer.optional-dependencies.all ++ lib.optionals (pythonOlder "3.11") [ async-timeout ];
+  ] ++ lib.optionals (pythonOlder "3.11") [ async-timeout ];
 
   passthru.optional-dependencies = {
     shell = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyutilib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyutilib/default.nix
deleted file mode 100644
index eb2905444f..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pyvmomi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyvmomi/default.nix
index 47002d63d0..16260ed5de 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyvmomi/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pywayland/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pywayland/default.nix
index 2efb46513e..35e3fe6133 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pywayland/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pywayland/default.nix
@@ -11,12 +11,12 @@
 
 buildPythonPackage rec {
   pname = "pywayland";
-  version = "0.4.17";
+  version = "0.4.18";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-9/0ZAmOML3oVrAfzGj72iV08FgyiYBSByoKyxhojxlc=";
+    hash = "sha256-WYreAng6rQWjKPZjtRtpTFq2i9XR4JJsDaPFISxWZTM=";
   };
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pywbem/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pywbem/default.nix
index f61baecd5e..9f5ed908ae 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pywbem/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pyyaml-include/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyyaml-include/default.nix
index 84cec559cc..5e14b6cd84 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyyaml-include/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/pyzmq/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyzmq/default.nix
index f927515894..6c4b807629 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/pyzmq/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/pyzmq/default.nix
@@ -88,6 +88,6 @@ buildPythonPackage rec {
       bsd3 # or
       lgpl3Only
     ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qmk-dotty-dict/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qmk-dotty-dict/default.nix
index 3e19b7bce5..16fe955ef8 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/qmk-dotty-dict/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/qrcode/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qrcode/default.nix
index c0ac1f4bff..2c7df77b33 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/qrcode/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/qtawesome/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qtawesome/default.nix
index 6cf875c9f1..0b7c60d3f4 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/qtawesome/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/quantities/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/quantities/default.nix
index 74f28e526f..17a7b28d05 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/quantities/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/quantulum3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/quantulum3/default.nix
index 889b15a79c..685145d941 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/quantulum3/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/quantulum3/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   pythonOlder,
-  pythonAtLeast,
   fetchFromGitHub,
   # build inputs
   inflect,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/quantum-gateway/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/quantum-gateway/default.nix
index 6b498ae227..e39b66b42a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/quantum-gateway/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/quantum-gateway/default.nix
@@ -7,7 +7,6 @@
   pythonOlder,
   requests,
   requests-mock,
-  setuptools-scm,
   urllib3,
 }:
 
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/querystring-parser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/querystring-parser/default.nix
index 0e104dd1fd..61763323bc 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/querystring-parser/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/querystring-parser/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchPypi,
-  python,
   pythonOlder,
   setuptools,
   six,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/queuelib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/queuelib/default.nix
index eee800736a..53105b8ef7 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/queuelib/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/railroad-diagrams/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/railroad-diagrams/default.nix
index 959c5e1d52..b8970bc1cc 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/railroad-diagrams/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/ramlfications/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ramlfications/default.nix
index 4efb631ad7..22fef92b57 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/ramlfications/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/rapidfuzz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rapidfuzz/default.nix
index 1d406e5d35..4fe45a1dfa 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/rapidfuzz/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/rapidfuzz/default.nix
@@ -59,12 +59,6 @@ buildPythonPackage rec {
       export CMAKE_ARGS="-DCMAKE_CXX_COMPILER_AR=$AR -DCMAKE_CXX_COMPILER_RANLIB=$RANLIB"
     '';
 
-  env.NIX_CFLAGS_COMPILE = toString (
-    lib.optionals (stdenv.cc.isClang && stdenv.isDarwin) [
-      "-fno-lto" # work around https://github.com/NixOS/nixpkgs/issues/19098
-    ]
-  );
-
   passthru.optional-dependencies = {
     full = [ numpy ];
   };
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rarfile/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rarfile/default.nix
index c0c462cb44..ec0ebf0302 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/rarfile/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/rauth/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rauth/default.nix
deleted file mode 100644
index 05580a029e..0000000000
--- a/third_party/nixpkgs/pkgs/development/python-modules/rauth/default.nix
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchFromGitHub,
-  fetchpatch,
-  requests,
-  pytestCheckHook,
-  mock,
-  nose,
-  pycrypto,
-}:
-
-buildPythonPackage rec {
-  pname = "rauth";
-  version = "0.7.2";
-  format = "setuptools";
-
-  src = fetchFromGitHub {
-    owner = "litl";
-    repo = "rauth";
-    rev = version;
-    hash = "sha256-wRKZbxZCEfihOaJM8sk8438LE++KJWxdOGImpL1gHa4=";
-  };
-
-  patches = [
-    (fetchpatch {
-      # https://github.com/litl/rauth/pull/211
-      name = "fix-pycrypdodome-replacement-for-pycrypto.patch";
-      url = "https://github.com/litl/rauth/commit/7fb3b7bf1a1869a52cf59ee3eb607d318e97265c.patch";
-      hash = "sha256-jiAIw+VQ2d/bkm2brqfY1RUrNGf+lsMPnoI91gGUS6o=";
-    })
-  ];
-
-  propagatedBuildInputs = [ requests ];
-
-  pythonImportsCheck = [ "rauth" ];
-
-  nativeCheckInputs = [
-    pytestCheckHook
-    mock
-    nose
-    pycrypto
-  ];
-
-  meta = with lib; {
-    description = "Python library for OAuth 1.0/a, 2.0, and Ofly";
-    homepage = "https://github.com/litl/rauth";
-    changelog = "https://github.com/litl/rauth/blob/${src.rev}/CHANGELOG";
-    license = licenses.mit;
-    maintainers = with maintainers; [ blaggacao ];
-  };
-}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rawkit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rawkit/default.nix
index e4b50337f0..00f469329e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/rawkit/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/ray/binary-hashes.nix b/third_party/nixpkgs/pkgs/development/python-modules/ray/binary-hashes.nix
index 98c442139d..609e6c1228 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/ray/binary-hashes.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/ray/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ray/default.nix
index 69fbb8cae9..9430001fff 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/ray/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/rcssmin/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rcssmin/default.nix
index ce3442245a..7f32b5075d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/rcssmin/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/rdflib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rdflib/default.nix
index 7c131ffe8b..b0f2b4c7cd 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/rdflib/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/readmdict/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/readmdict/default.nix
index 74fec466ad..9089bd1b44 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/readmdict/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/readme-renderer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/readme-renderer/default.nix
index 2e927f5473..2ffce82314 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/readme-renderer/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/readme-renderer/default.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  bleach,
   buildPythonPackage,
   cmarkgfm,
   docutils,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rebulk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rebulk/default.nix
index 2aebf689bb..7bec155f52 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/rebulk/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/recline/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/recline/default.nix
index f80732ad7b..842c57a4ec 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/recline/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/regional/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/regional/default.nix
index e5dea4940b..ea995ee27a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/regional/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/remotezip/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/remotezip/default.nix
index 473ea77623..a362f99324 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/remotezip/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/remotezip/default.nix
@@ -4,7 +4,6 @@
   fetchFromGitHub,
   setuptools,
   requests,
-  tabulate,
   pytestCheckHook,
   requests-mock,
 }:
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rencode/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rencode/default.nix
index f9a0cf8164..388e7ec9cd 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/rencode/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/reportlab/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/reportlab/default.nix
index 61ff8046da..186b02c603 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/reportlab/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/repoze-who/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/repoze-who/default.nix
index abbc62a0aa..6616b1c1e0 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/repoze-who/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/reproject/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/reproject/default.nix
index 7deb0b2061..48fec33e8c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/reproject/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/reproject/default.nix
@@ -20,14 +20,14 @@
 
 buildPythonPackage rec {
   pname = "reproject";
-  version = "0.13.1";
+  version = "0.14.0";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-Y+Ne7ZUgCieWcC4zqfrqPzmr/kGUdFroGfIPKWACaPY=";
+    hash = "sha256-3TxPd2CEmKWDlE1nC2GnXBUASe/DNgZnS1GJoRo5u8A=";
   };
 
   postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/reptor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/reptor/default.nix
index 2bd4a81122..4c50f0faf6 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/reptor/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/reptor/default.nix
@@ -13,11 +13,9 @@
   markdown-it-py,
   mdurl,
   pygments,
-  pytest,
   pytestCheckHook,
   pythonOlder,
   pyyaml,
-  reptor,
   requests,
   rich,
   setuptools,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/requests-aws4auth/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/requests-aws4auth/default.nix
index 670c50c51a..09b8541995 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/requests-aws4auth/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/requests-aws4auth/default.nix
@@ -4,7 +4,6 @@
   fetchFromGitHub,
   httpx,
   pytestCheckHook,
-  python,
   pythonOlder,
   requests,
   six,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/requests-file/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/requests-file/default.nix
index d76cdfbdae..80c72a0b46 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/requests-file/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/requests-hawk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/requests-hawk/default.nix
index 5e96bd5f2d..24370891b5 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/requests-hawk/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/requests-hawk/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchPypi,
-  python,
   mohawk,
   requests,
 }:
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/requirements-parser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/requirements-parser/default.nix
index 50afeafe21..1368b5e0db 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/requirements-parser/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/resampy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/resampy/default.nix
index 9250bf5593..eb93492e75 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/resampy/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/resolvelib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/resolvelib/default.nix
index 15c05ed6da..98e8e8d648 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/resolvelib/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/retrying/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/retrying/default.nix
index 320603a10b..11eab85380 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/retrying/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/rfc3986-validator/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rfc3986-validator/default.nix
index 0f681dba24..bceb67a225 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/rfc3986-validator/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/rfc3986/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rfc3986/default.nix
index 8fbf10e332..863d456205 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/rfc3986/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/rfc6555/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rfc6555/default.nix
index 063f6146a1..596a2ca072 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/rfc6555/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/rich-click/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rich-click/default.nix
index 728be4b0ce..0b6d57325b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/rich-click/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/rich-click/default.nix
@@ -6,7 +6,6 @@
   pythonOlder,
   rich,
   setuptools,
-  typer,
   typing-extensions,
 }:
 
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rio-tiler/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rio-tiler/default.nix
index 757dd7c5e1..008fb69e8a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/rio-tiler/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/rio-tiler/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  fetchpatch,
   pytestCheckHook,
   pythonOlder,
 
@@ -33,6 +34,14 @@ buildPythonPackage rec {
     hash = "sha256-MR6kyoGM3uXt6JiIEfGcsmTmxqlLxUF9Wn+CFuK5LtQ=";
   };
 
+  patches = [
+    # fix xarray tests, remove on next release
+    (fetchpatch {
+      url = "https://github.com/cogeotiff/rio-tiler/commit/7a36ed58b649d2f4d644f280b54851ecb7ffa4e9.patch";
+      hash = "sha256-QlX5ZKpjSpXevi76gx39dXok0aClApkLU0cAVpCuYYs=";
+    })
+  ];
+
   build-system = [ hatchling ];
 
   propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rioxarray/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rioxarray/default.nix
index d270fb5049..3de4fe980b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/rioxarray/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/rioxarray/default.nix
@@ -20,7 +20,7 @@
 
 buildPythonPackage rec {
   pname = "rioxarray";
-  version = "0.15.7";
+  version = "0.17.0";
   pyproject = true;
   disabled = pythonOlder "3.10";
 
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     owner = "corteva";
     repo = "rioxarray";
     rev = "refs/tags/${version}";
-    hash = "sha256-x5+T1ITZ6t+08s+WpSiqbohiKVfigREn63+5pJYHkxc=";
+    hash = "sha256-mOXyfkreQ55vWmPCG2U/ijcKZqzHoQQLfKArSh2fDmA=";
   };
 
   build-system = [ setuptools ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ripser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ripser/default.nix
index 75790f1e3c..318282f763 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/ripser/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/riscof/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/riscof/default.nix
index af2879b0e2..8debd6ea46 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/riscof/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/riscof/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  git,
   jinja2,
   pythonOlder,
   riscv-config,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rjsmin/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rjsmin/default.nix
index cdfeebb491..b3984446c4 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/rjsmin/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/rlp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rlp/default.nix
index f04ecac4c4..3c258f2b8f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/rlp/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/robotframework-requests/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/robotframework-requests/default.nix
index 542aea236d..38080bd666 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/robotframework-requests/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/rollbar/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rollbar/default.nix
index 40e97073c7..cd71a84d64 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/rollbar/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/rouge-score/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rouge-score/default.nix
index a3bd05b8a5..a63d958bda 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/rouge-score/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/rouge-score/default.nix
@@ -2,7 +2,6 @@
   lib,
   fetchPypi,
   fetchFromGitHub,
-  python,
   buildPythonPackage,
   absl-py,
   nltk,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/routes/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/routes/default.nix
index 153aac5754..925653572f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/routes/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/rstcheck/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rstcheck/default.nix
index 91f58f1347..259b460e9e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/rstcheck/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/rstcheck/default.nix
@@ -39,7 +39,7 @@ buildPythonPackage rec {
     types-docutils
     pydantic
     typer
-  ] ++ typer.optional-dependencies.all;
+  ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rtmidi-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rtmidi-python/default.nix
index a700b4c411..6d8bf78b6d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/rtmidi-python/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/ruamel-base/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ruamel-base/default.nix
index 65e96e71fa..2d38ff808d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/ruamel-base/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/ruamel-yaml-clib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ruamel-yaml-clib/default.nix
index 1f898ed670..58a41a1022 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/ruamel-yaml-clib/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/ruamel-yaml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ruamel-yaml/default.nix
index cfd009e7fd..eeb77714fd 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/ruamel-yaml/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/ruff-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ruff-api/default.nix
index 296006018e..76449efee1 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/ruff-api/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/ruff-api/default.nix
@@ -9,8 +9,6 @@
   pythonOlder,
   rustc,
   rustPlatform,
-  ufmt,
-  usort,
 }:
 
 buildPythonPackage rec {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/runs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/runs/default.nix
index d161a33a10..19ea9683b3 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/runs/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/s2clientprotocol/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/s2clientprotocol/default.nix
index a4a729ce42..08ce5f72ea 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/s2clientprotocol/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/sacn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sacn/default.nix
index 4153fe1aa8..d33c4597e8 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/sacn/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/safeio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/safeio/default.nix
index 890e986a81..d1920654d2 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/safeio/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/sarif-om/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sarif-om/default.nix
index 780f856084..98a9503f44 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/sarif-om/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/scancode-toolkit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scancode-toolkit/default.nix
index 10d557f774..62115a6296 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/scancode-toolkit/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/schedule/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/schedule/default.nix
index 102d4d6adc..c0b86fd2dd 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/schedule/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/schema-salad/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/schema-salad/default.nix
index 4df6f0af21..6e3b6e3d5e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/schema-salad/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/schema-salad/default.nix
@@ -4,6 +4,7 @@
   buildPythonPackage,
   cachecontrol,
   fetchFromGitHub,
+  fetchpatch,
   importlib-resources,
   mistune,
   mypy,
@@ -56,6 +57,11 @@ buildPythonPackage rec {
     ++ cachecontrol.optional-dependencies.filecache
     ++ lib.optionals (pythonOlder "3.9") [ importlib-resources ];
 
+  patches = [ (fetchpatch {
+    url = "https://patch-diff.githubusercontent.com/raw/common-workflow-language/schema_salad/pull/840.patch";
+    hash = "sha256-fke75FCCn23LAMJ5bDWJpuBR6E9XIpjmzzXSbjqpxn8=";
+  } ) ];
+
   nativeCheckInputs = [ pytestCheckHook ] ++ passthru.optional-dependencies.pycodegen;
 
   preCheck = ''
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scikit-fmm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scikit-fmm/default.nix
index fb58a91c68..57cc5902ed 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/scikit-fmm/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/scipy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scipy/default.nix
index 43e256b1fb..c6daa99905 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/scipy/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/scipy/default.nix
@@ -92,6 +92,7 @@ buildPythonPackage {
   postPatch = ''
     substituteInPlace pyproject.toml \
       --replace-fail 'numpy>=2.0.0rc1,' 'numpy' \
+      --replace-fail "pybind11>=2.12.0,<2.13.0" "pybind11>=2.12.0" \
   '';
 
   nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scramp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scramp/default.nix
index 53a8faaaa7..63014b75aa 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/scramp/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/scrapy-fake-useragent/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scrapy-fake-useragent/default.nix
index e987c8ab4c..ddb8416598 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/scrapy-fake-useragent/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/scripttest/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scripttest/default.nix
index 9583ae6b28..a480429b6f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/scripttest/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/secp256k1/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/secp256k1/default.nix
index dd311a7642..4d46563e92 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/secp256k1/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/secure/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/secure/default.nix
index 0d2a5cf8bb..f78cda8917 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/secure/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/segments/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/segments/default.nix
index 091bf550bd..322446fd03 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/segments/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/send2trash/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/send2trash/default.nix
index c9e17cb0a2..06beaabdbc 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/send2trash/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/sensor-state-data/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sensor-state-data/default.nix
index ece4555cc3..5f76694f3c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/sensor-state-data/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/sensor-state-data/default.nix
@@ -2,11 +2,9 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  home-assistant-bluetooth,
   poetry-core,
   pytestCheckHook,
   pythonOlder,
-  sensor-state-data,
 }:
 
 buildPythonPackage rec {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sentence-splitter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sentence-splitter/default.nix
index ea6503bd00..1b88987698 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/sentence-splitter/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/sentry-sdk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sentry-sdk/default.nix
index 4bfd35cae5..38200db697 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/sentry-sdk/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/sentry-sdk/default.nix
@@ -63,14 +63,14 @@
 
 buildPythonPackage rec {
   pname = "sentry-sdk";
-  version = "2.10.0";
+  version = "2.11.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "getsentry";
     repo = "sentry-python";
     rev = version;
-    hash = "sha256-sK3jd26zfGp707GXZEU9RwB1aFuqfTGl8rGfGreuj38=";
+    hash = "sha256-ajinOND8MC9Z69WPxF65wjOmJfU5CZUzTRWJwLLh/OQ=";
   };
 
   postPatch = ''
@@ -187,6 +187,8 @@ buildPythonPackage rec {
     # assert count_item_types["sessions"] == 1
     # assert 0 == 1
     "test_auto_session_tracking_with_aggregates"
+    # timing sensitive
+    "test_profile_captured"
   ];
 
   pythonImportsCheck = [ "sentry_sdk" ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/seqdiag/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/seqdiag/default.nix
index 79d575a9fa..754ef870f8 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/seqdiag/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/seqdiag/default.nix
@@ -3,7 +3,6 @@
   blockdiag,
   buildPythonPackage,
   fetchFromGitHub,
-  nose,
   pytestCheckHook,
   pythonOlder,
   setuptools,
@@ -27,14 +26,9 @@ buildPythonPackage rec {
 
   dependencies = [ blockdiag ];
 
-  # tests rely on nose
-  doCheck = pythonOlder "3.12";
-
-  nativeCheckInputs = [
-    nose
-    pytestCheckHook
-  ];
+  patches = [ ./fix_test_generate.patch ];
 
+  nativeCheckInputs = [ pytestCheckHook ];
   pytestFlagsArray = [ "src/seqdiag/tests/" ];
 
   pythonImportsCheck = [ "seqdiag" ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/seqdiag/fix_test_generate.patch b/third_party/nixpkgs/pkgs/development/python-modules/seqdiag/fix_test_generate.patch
new file mode 100644
index 0000000000..d96c1308e6
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/seqdiag/fix_test_generate.patch
@@ -0,0 +1,25 @@
+diff --git a/src/seqdiag/tests/test_generate_diagram.py b/src/seqdiag/tests/test_generate_diagram.py
+index cdd340f..a1dd2d4 100644
+--- a/src/seqdiag/tests/test_generate_diagram.py
++++ b/src/seqdiag/tests/test_generate_diagram.py
+@@ -13,19 +13,5 @@
+ #  See the License for the specific language governing permissions and
+ #  limitations under the License.
+ 
+-import os
+-
+ from blockdiag.tests.test_generate_diagram import (get_diagram_files,
+-                                                   testcase_generator)
+-
+-import seqdiag.command
+-
+-
+-def test_generate():
+-    mainfunc = seqdiag.command.main
+-    basepath = os.path.dirname(__file__)
+-    files = get_diagram_files(basepath)
+-    options = []
+-
+-    for testcase in testcase_generator(basepath, mainfunc, files, options):
+-        yield testcase
++                                                   test_generate_with_separate)
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/seqeval/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/seqeval/default.nix
index aa9cd7c01f..a8a06ed89a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/seqeval/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/serpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/serpy/default.nix
index 324ad056cc..10f0561849 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/serpy/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/setuptools-rust/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/setuptools-rust/default.nix
index 734eef48a0..2e093e7823 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/setuptools-rust/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/sexpdata/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sexpdata/default.nix
index a410c430f6..4eb5d9f813 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/sexpdata/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/shiny/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/shiny/default.nix
new file mode 100644
index 0000000000..d22649c725
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/shiny/default.nix
@@ -0,0 +1,77 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+
+  appdirs,
+  asgiref,
+  click,
+  htmltools,
+  linkify-it-py,
+  markdown-it-py,
+  mdit-py-plugins,
+  python-multipart,
+  questionary,
+  starlette,
+  uvicorn,
+  watchfiles,
+  websockets,
+
+  pytestCheckHook,
+  pytest-asyncio,
+  pytest-playwright,
+  pytest-xdist,
+  pytest-timeout,
+  pytest-rerunfailures,
+  pandas,
+}:
+
+buildPythonPackage rec {
+  pname = "shiny";
+  version = "0.10.2";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "posit-dev";
+    repo = "py-shiny";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-s1j9bMAapO0iRXsuNxiwlNaVv2EoWcl9U7WnHwQe9n8=";
+  };
+
+  build-system = [ setuptools ];
+  dependencies = [
+    appdirs
+    asgiref
+    click
+    htmltools
+    linkify-it-py
+    markdown-it-py
+    mdit-py-plugins
+    python-multipart
+    questionary
+    starlette
+    uvicorn
+    watchfiles
+    websockets
+  ];
+
+  pythonImportsCheck = [ "shiny" ];
+  nativeCheckInputs = [
+    pytestCheckHook
+    pytest-asyncio
+    pytest-playwright
+    pytest-xdist
+    pytest-timeout
+    pytest-rerunfailures
+    pandas
+  ];
+
+  meta = {
+    changelog = "https://github.com/posit-dev/py-shiny/blob/${src.rev}/CHANGELOG.md";
+    description = "Build fast, beautiful web applications in Python";
+    license = lib.licenses.mit;
+    homepage = "https://shiny.posit.co/py";
+    maintainers = with lib.maintainers; [ sigmanificient ];
+  };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/show-in-file-manager/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/show-in-file-manager/default.nix
index 0d52bdb52b..a43b08ee1c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/show-in-file-manager/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/signedjson/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/signedjson/default.nix
index ef386cfd37..a03238cf2e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/signedjson/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/sigstore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sigstore/default.nix
index 56d7ecd6c5..50afaabf6e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/sigstore/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/sigtools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sigtools/default.nix
index d1122d16cf..46c3e3caad 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/sigtools/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/simple-salesforce/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/simple-salesforce/default.nix
index c529e2ab04..b876c0e487 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/simple-salesforce/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/simplemma/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/simplemma/default.nix
index e31fe1873f..3cd1ddface 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/simplemma/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/simplenote/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/simplenote/default.nix
index d717ab1b32..2c32034466 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/simplenote/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/single-source/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/single-source/default.nix
index cc4e4fa3f3..894ad9e1da 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/single-source/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/sip/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sip/default.nix
index 38e604de87..8a398654b0 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/sip/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/sip/default.nix
@@ -5,8 +5,6 @@
   pythonOlder,
   setuptools,
   packaging,
-  ply,
-  toml,
   tomli,
 
   # tests
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sjcl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sjcl/default.nix
index cca5d21cec..ba519e78e9 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/sjcl/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/sjcl/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonOlder,
   pycryptodome,
   unittestCheckHook,
 }:
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/skorch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/skorch/default.nix
index 413e0cfb56..28a8f1771f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/skorch/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/skorch/default.nix
@@ -3,7 +3,6 @@
   stdenv,
   buildPythonPackage,
   fetchPypi,
-  fetchpatch,
   pythonOlder,
   numpy,
   scikit-learn,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/skytemple-icons/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/skytemple-icons/default.nix
index b13416271f..20c6187a2c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/skytemple-icons/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/slack-bolt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/slack-bolt/default.nix
index d4f5eb2af4..7eeb546c5d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/slack-bolt/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/slack-bolt/default.nix
@@ -15,7 +15,6 @@
   flask-sockets,
   gunicorn,
   moto,
-  numpy,
   pyramid,
   pytest-asyncio,
   pytestCheckHook,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/slicerator/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/slicerator/default.nix
index d76fb9fa16..6dc89369d0 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/slicerator/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/slpp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/slpp/default.nix
index c21a183269..10c964c611 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/slpp/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/smpp-pdu/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/smpp-pdu/default.nix
index f42c8dd217..a515b53716 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/smpp-pdu/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/smpp-pdu/default.nix
@@ -2,11 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  poetry-core,
-  pydantic,
-  requests,
   pytestCheckHook,
-  pytest-asyncio,
   setuptools,
 }:
 
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/smpplib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/smpplib/default.nix
index e81479419a..4a1753d7a7 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/smpplib/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/snakebite/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/snakebite/default.nix
index 5570972d24..c07ac11055 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/snakebite/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/snakemake-interface-storage-plugins/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/snakemake-interface-storage-plugins/default.nix
index c16bc8c766..26646c5af2 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/snakemake-interface-storage-plugins/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/snakemake-interface-storage-plugins/default.nix
@@ -7,7 +7,6 @@
   snakemake-interface-common,
   throttler,
   wrapt,
-  snakemake,
 }:
 
 buildPythonPackage rec {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/snapshottest/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/snapshottest/default.nix
index dd2e2f192b..4c697fcdb9 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/snapshottest/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/snowflake-connector-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/snowflake-connector-python/default.nix
index 736612551c..77bc5b2cd1 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/snowflake-connector-python/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/social-auth-app-django/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/social-auth-app-django/default.nix
index 1441caa2cd..a366853ded 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/social-auth-app-django/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/social-auth-app-django/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "social-auth-app-django";
-  version = "5.4.1";
+  version = "5.4.2";
   format = "setuptools";
 
   disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "python-social-auth";
     repo = "social-app-django";
     rev = "refs/tags/${version}";
-    hash = "sha256-BvPQo0pXffGYu0tpy5yHT9lJVwOTewBiX5GLeezBrhE=";
+    hash = "sha256-W9boogixZ7X6qysfh2YEat+TOBy1VNreGr27y8hno+0=";
   };
 
   propagatedBuildInputs = [ social-auth-core ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/socksio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/socksio/default.nix
index 02de4ab9cd..decae7430f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/socksio/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/socksio/default.nix
@@ -3,7 +3,6 @@
   buildPythonPackage,
   fetchpatch,
   fetchPypi,
-  pythonAtLeast,
   flit-core,
   pytestCheckHook,
 }:
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/somajo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/somajo/default.nix
index c8de14dd7f..a10d9b6ff5 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/somajo/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/sortedcontainers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sortedcontainers/default.nix
index a764cf6d5d..967119bbe7 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/sortedcontainers/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/soundcloud-v2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/soundcloud-v2/default.nix
index 1fa7977f4b..fa777afe1f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/soundcloud-v2/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/soupsieve/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/soupsieve/default.nix
index 96dfbe9d84..b5583765da 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/soupsieve/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/soupsieve/default.nix
@@ -3,7 +3,6 @@
   buildPythonPackage,
   fetchPypi,
   hatchling,
-  isPy3k,
 }:
 
 buildPythonPackage rec {
@@ -28,6 +27,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/third_party/nixpkgs/pkgs/development/python-modules/spacy-alignments/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/spacy-alignments/default.nix
index fd548f5eb3..66b1c20655 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/spacy-alignments/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/spacy-loggers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/spacy-loggers/default.nix
index 85201465bb..8ac6396cf0 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/spacy-loggers/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/spacy-loggers/default.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  callPackage,
   fetchPypi,
   buildPythonPackage,
   wandb,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spacy-pkuseg/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/spacy-pkuseg/default.nix
index 04b8ca7e71..f1896a50ad 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/spacy-pkuseg/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/spacy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/spacy/default.nix
index 0f47280570..9842e22c92 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/spacy/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/spacy/default.nix
@@ -20,7 +20,6 @@
   preshed,
   pydantic,
   pytestCheckHook,
-  python,
   pythonOlder,
   requests,
   setuptools,
@@ -135,6 +134,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/third_party/nixpkgs/pkgs/development/python-modules/sparse/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sparse/default.nix
index cfd6569472..6c6e5b76ee 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/sparse/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/speg/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/speg/default.nix
index d47382a5c2..1ec6bc8449 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/speg/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/speg/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchPypi,
-  speg,
 }:
 
 buildPythonPackage rec {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-book-theme/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-book-theme/default.nix
index 5c65ccaeb4..15d4262b69 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-book-theme/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/sphinx-comments/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-comments/default.nix
index 867a457c0c..65dedffdfa 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-comments/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/sphinx-design/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-design/default.nix
index 2b6fbde61a..4e71346021 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-design/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/sphinx-external-toc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-external-toc/default.nix
index fcb02b334a..ab45c1b8bf 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-external-toc/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/sphinx-jinja/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-jinja/default.nix
index f1b4aa3240..7627dddd4b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-jinja/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/sphinx-jupyterbook-latex/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-jupyterbook-latex/default.nix
index cca7c7fa48..0df375058c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-jupyterbook-latex/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/sphinx-multitoc-numbering/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-multitoc-numbering/default.nix
index f24112e237..66ca1490ba 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-multitoc-numbering/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/sphinx-rtd-dark-mode/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-rtd-dark-mode/default.nix
index d3b4bf7f41..863f938488 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-rtd-dark-mode/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-rtd-dark-mode/default.nix
@@ -2,8 +2,7 @@
   buildPythonPackage,
   fetchFromGitHub,
   lib,
-  pythonOlder,
-  nose,
+  pytestCheckHook,
   setuptools,
   sphinx,
   sphinx-rtd-theme,
@@ -25,21 +24,12 @@ buildPythonPackage rec {
 
   dependencies = [ sphinx-rtd-theme ];
 
-  # tests rely on nose
-  doCheck = pythonOlder "3.12";
-
   nativeCheckInputs = [
-    nose
+    pytestCheckHook
     sphinx
   ];
 
-  checkPhase = ''
-    runHook preCheck
-
-    nosetests tests
-
-    runHook postCheck
-  '';
+  pytestFlagsArray = [ "tests/build.py" ];
 
   pythonImportsCheck = [ "sphinx_rtd_dark_mode" ];
 
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-thebe/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-thebe/default.nix
index cc6ac01aad..bae64efe89 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-thebe/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/sphinx-togglebutton/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-togglebutton/default.nix
index f8b2c288ec..4af3ba41ce 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-togglebutton/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-asyncio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-asyncio/default.nix
index 36ee3d3c55..f935b694e6 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-asyncio/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix
index c190e1e625..dbd91f0e5d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-bibtex/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-blockdiag/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-blockdiag/default.nix
index 8fcb0c2c8f..159cc00b32 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-blockdiag/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-ditaa/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-ditaa/default.nix
index db263eab0f..18554a01e1 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-ditaa/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-ditaa/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchPypi,
-  unittestCheckHook,
   setuptools,
   sphinx,
   ditaa,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix
index 0d4735caa6..e21f983ee7 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-plantuml/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-programoutput/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-programoutput/default.nix
index bf41b078d5..6a455531ab 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-programoutput/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-programoutput/default.nix
@@ -3,7 +3,6 @@
   buildPythonPackage,
   fetchPypi,
   sphinx,
-  sphinxcontrib-serializinghtml,
 }:
 
 buildPythonPackage rec {
@@ -29,6 +28,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/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix
index a9125ef5d4..6bff5f2fc6 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-spelling/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix
index f5bab742f9..50c892cd5c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-wavedrom/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-wavedrom/default.nix
index 45cf5dda26..3f56d44878 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-wavedrom/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinxcontrib-wavedrom/default.nix
@@ -1,7 +1,6 @@
 {
   lib,
   buildPythonPackage,
-  pythonOlder,
   fetchPypi,
   setuptools-scm,
   sphinx,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spotipy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/spotipy/default.nix
index e86ea75eb4..00017c3408 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/spotipy/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/spotipy/default.nix
@@ -5,7 +5,6 @@
   pythonOlder,
   redis,
   requests,
-  six,
   urllib3,
 }:
 
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-continuum/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-continuum/default.nix
index 10ea12e7fe..77452fbccd 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-continuum/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-jsonfield/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-jsonfield/default.nix
index edcb8dff3b..e03c86a80a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-jsonfield/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-jsonfield/default.nix
@@ -5,7 +5,6 @@
   sqlalchemy,
   setuptools-scm,
   setuptools,
-  sphinx,
   pytestCheckHook,
   pytest-sugar,
   pymysql,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-mixins/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-mixins/default.nix
index 492b052120..1adb1c21d0 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-mixins/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/sqlalchemy-mixins/default.nix
@@ -2,17 +2,17 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  nose,
-  pytestCheckHook,
+  setuptools,
   pythonOlder,
   six,
   sqlalchemy,
+  pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "sqlalchemy-mixins";
   version = "2.0.5";
-  format = "setuptools";
+  pyproject = true;
 
   disabled = pythonOlder "3.8";
 
@@ -23,15 +23,14 @@ buildPythonPackage rec {
     hash = "sha256-iJrRlV/M0Z1IOdrwWSblefm6wjvdk4/v0am+It8VeWI=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     six
     sqlalchemy
   ];
 
-  nativeCheckInputs = [
-    nose
-    pytestCheckHook
-  ];
+  nativeCheckInputs = [ pytestCheckHook ];
 
   pythonImportsCheck = [ "sqlalchemy_mixins" ];
 
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sqlite-anyio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sqlite-anyio/default.nix
index 5883df4587..811e704879 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/sqlite-anyio/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/sqlobject/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sqlobject/default.nix
index 211bbafd06..75eccd5268 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/sqlobject/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/sqltrie/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sqltrie/default.nix
index c87c744276..685a485582 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/sqltrie/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/sqltrie/default.nix
@@ -6,7 +6,6 @@
   pythonOlder,
   pygtrie,
   orjson,
-  python,
   setuptools-scm,
 }:
 
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/srptools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/srptools/default.nix
index 5e443c6665..9455f16b18 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/srptools/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/srt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/srt/default.nix
index 6a8646be1a..b1badbc6c7 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/srt/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/sshtunnel/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sshtunnel/default.nix
index 37d133ef17..1422b50c32 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/sshtunnel/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/statistics/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/statistics/default.nix
index 4f43cb0120..5664dc2eae 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/statistics/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/statmake/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/statmake/default.nix
index ee3d79302a..2e92efe1e5 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/statmake/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/stdlib-list/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/stdlib-list/default.nix
index 9c739a6ec1..6109e6ce2f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/stdlib-list/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/stm32loader/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/stm32loader/default.nix
index 6578e3c119..0744764df1 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/stm32loader/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/stone/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/stone/default.nix
index 0abcbcf4be..d7698c977d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/stone/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/strct/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/strct/default.nix
index eff84c1f1d..989b4e006d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/strct/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/strct/default.nix
@@ -4,6 +4,7 @@
   buildPythonPackage,
   setuptools,
   pytestCheckHook,
+  pytest-cov-stub,
   sortedcontainers,
 }:
 
@@ -19,13 +20,6 @@ buildPythonPackage rec {
     hash = "sha256-uPM2U+emZUCGqEhIeTBmaOu8eSfK4arqvv9bItBWpUs=";
   };
 
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace-fail  \
-        '"--cov' \
-        '#"--cov'
-  '';
-
   # don't append .dev0 to version
   env.RELEASING_PROCESS = "1";
 
@@ -33,6 +27,7 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     pytestCheckHook
+    pytest-cov-stub
     sortedcontainers
   ];
 
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/streamz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/streamz/default.nix
index 651ebc5597..eea52b8fa8 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/streamz/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/strictyaml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/strictyaml/default.nix
index 793a83c3bc..9e5a4ed1e3 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/strictyaml/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/stripe/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/stripe/default.nix
index d4ab87780f..3c8139edbc 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/stripe/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/stumpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/stumpy/default.nix
index 6587e6193e..f8d9015b28 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/stumpy/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/succulent/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/succulent/default.nix
index f039a30d52..853beb6af1 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/succulent/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/succulent/default.nix
@@ -9,7 +9,6 @@
   poetry-core,
   pytestCheckHook,
   pythonOlder,
-  toml-adapt,
   xmltodict,
 }:
 
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sunpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sunpy/default.nix
index afabfff242..e1bfc94cea 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/sunpy/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/supervise-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/supervise-api/default.nix
index 9ef2083eb0..841663678e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/supervise-api/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/supervise-api/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchPypi,
-  substituteAll,
   supervise,
   setuptools,
   pytestCheckHook,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sure/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sure/default.nix
index a0aff938ab..8a8dd2ed16 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/sure/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/svgutils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/svgutils/default.nix
index 307b6f689a..40e50d9b9a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/svgutils/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/sybil/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sybil/default.nix
index 0d2e4b3d33..57e3c39484 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/sybil/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/syncedlyrics/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/syncedlyrics/default.nix
index 08340ae69b..40a69fc503 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/syncedlyrics/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/syncedlyrics/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "syncedlyrics";
-  version = "1.0.0";
+  version = "1.0.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "rtcq";
     repo = "syncedlyrics";
     rev = "refs/tags/v${version}";
-    hash = "sha256-W3cg/+nU0Zp5pDhkoHqUemYImlDKlZDVbB7jZ3dScnk=";
+    hash = "sha256-rKYze8Z7F6cEkpex6UCFUW9+mf2UWT+T86C5COhYQHY=";
   };
 
   build-system = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/synologydsm-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/synologydsm-api/default.nix
deleted file mode 100644
index 6fc64f5baa..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/syrupy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/syrupy/default.nix
index ac6cdafda0..379091993e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/syrupy/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/tabcmd/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tabcmd/default.nix
index 994449debb..1c29063334 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/tabcmd/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/tableaudocumentapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tableaudocumentapi/default.nix
index 1d9b22ce5b..9f841867cb 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/tableaudocumentapi/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/tableauserverclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tableauserverclient/default.nix
index e37539b18d..032b4e189b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/tableauserverclient/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/tablib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tablib/default.nix
index 38c58f5cb3..443b83ce78 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/tablib/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/tatsu/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tatsu/default.nix
index d1d7697331..5e601845b4 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/tatsu/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/tbm-utils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tbm-utils/default.nix
index f2cec77022..d9a0c20070 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/tbm-utils/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/tdir/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tdir/default.nix
index 4f0fe0ee60..c00e0b3f0b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/tdir/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/tempest/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tempest/default.nix
index 66b7e1aee3..77326c7152 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/tempest/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/tempora/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tempora/default.nix
index 6c2a136d83..23c8e031c4 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/tempora/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
index 77d8d06907..0ae113a73f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
+++ b/third_party/nixpkgs/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.1200";
   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-iZEAhj29MZ1CXZa0RvvwUVT61su+jd5PhjcYwsuBygI=";
   };
 
   build-system = [ setuptools ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tensorflow-estimator/bin.nix b/third_party/nixpkgs/pkgs/development/python-modules/tensorflow-estimator/bin.nix
index 7146208c4d..1acfcec9a8 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/tensorflow-estimator/bin.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/tensorflow-estimator/bin.nix
@@ -9,13 +9,13 @@
 
 buildPythonPackage rec {
   pname = "tensorflow-estimator";
-  version = "2.11.0";
+  version = "2.15.0";
   format = "wheel";
 
   src = fetchPypi {
     pname = "tensorflow_estimator";
     inherit version format;
-    hash = "sha256-6jtkrP/z2aJE8GF4yb3ty90/Eltn0IiNuoIpSY0GRos=";
+    hash = "sha256-rt8h7sf7LckRUPyRoc4SvETbtyJ4oItY55/4fJ4o8VM=";
   };
 
   propagatedBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/bin.nix b/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/bin.nix
index 11eba98cf4..bb476a7240 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/bin.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/bin.nix
@@ -4,7 +4,6 @@
   fetchurl,
   buildPythonPackage,
   isPy3k,
-  pythonOlder,
   pythonAtLeast,
   astor,
   gast,
@@ -31,7 +30,7 @@
   python,
   keras-applications,
   keras-preprocessing,
-  addOpenGLRunpath,
+  addDriverRunpath,
   astunparse,
   flatbuffers,
   h5py,
@@ -91,7 +90,7 @@ buildPythonPackage {
     h5py
   ] ++ lib.optional (!isPy3k) mock;
 
-  build-system = [ wheel ] ++ lib.optionals cudaSupport [ addOpenGLRunpath ];
+  build-system = [ wheel ] ++ lib.optionals cudaSupport [ addDriverRunpath ];
 
   preConfigure = ''
     unset SOURCE_DATE_EPOCH
@@ -189,7 +188,7 @@ buildPythonPackage {
         chmod a+rx "$lib"
         patchelf --set-rpath "$rrPath" "$lib"
         ${lib.optionalString cudaSupport ''
-          addOpenGLRunpath "$lib"
+          addDriverRunpath "$lib"
         ''}
       done
     '';
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/default.nix
index 5f41420dff..b1a2dd0f90 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/tensorflow/default.nix
@@ -5,7 +5,7 @@
   lib,
   fetchFromGitHub,
   symlinkJoin,
-  addOpenGLRunpath,
+  addDriverRunpath,
   fetchpatch,
   fetchzip,
   linkFarm,
@@ -308,7 +308,7 @@ let
       perl
       protobuf-core
       protobuf-extra
-    ] ++ lib.optional cudaSupport addOpenGLRunpath;
+    ] ++ lib.optional cudaSupport addDriverRunpath;
 
     buildInputs =
       [
@@ -581,7 +581,7 @@ let
 
       postFixup = lib.optionalString cudaSupport ''
         find $out -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do
-          addOpenGLRunpath "$lib"
+          addDriverRunpath "$lib"
         done
       '';
 
@@ -664,11 +664,11 @@ buildPythonPackage {
     wrapt
   ] ++ lib.optionals withTensorboard [ tensorboard ];
 
-  nativeBuildInputs = lib.optionals cudaSupport [ addOpenGLRunpath ];
+  nativeBuildInputs = lib.optionals cudaSupport [ addDriverRunpath ];
 
   postFixup = lib.optionalString cudaSupport ''
     find $out -type f \( -name '*.so' -or -name '*.so.*' \) | while read lib; do
-      addOpenGLRunpath "$lib"
+      addDriverRunpath "$lib"
 
       patchelf --set-rpath "${cudatoolkit}/lib:${cudatoolkit.lib}/lib:${cudnnMerged}/lib:${lib.getLib nccl}/lib:$(patchelf --print-rpath "$lib")" "$lib"
     done
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/terminado/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/terminado/default.nix
index fdf4b5dab4..7773844c2f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/terminado/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/tesla-fleet-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tesla-fleet-api/default.nix
index adeb9d6119..a06f880b8c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/tesla-fleet-api/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/tesla-fleet-api/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "tesla-fleet-api";
-  version = "0.7.2";
+  version = "0.7.3";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "Teslemetry";
     repo = "python-tesla-fleet-api";
     rev = "refs/tags/v${version}";
-    hash = "sha256-BvKFRJS/0xvk++HP5Ovpzb1+phGAyTHgByqwTNwS3nQ=";
+    hash = "sha256-P5cU5TZ2zWVIkFp4USjofA6mOshG9IdjhYLXnY2z9fY=";
   };
 
   build-system = [ setuptools ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tesla-wall-connector/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tesla-wall-connector/default.nix
index e3da4c482f..cc5907be5b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/tesla-wall-connector/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/tesla-wall-connector/default.nix
@@ -1,7 +1,6 @@
 {
   lib,
   aiohttp,
-  aioresponses,
   aresponses,
   backoff,
   buildPythonPackage,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/testrail-api/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/testrail-api/default.nix
index 7f8ad55c60..d4292ef2c3 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/testrail-api/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/testrail-api/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "testrail-api";
-  version = "1.13.1";
+  version = "1.13.2";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "tolstislon";
     repo = "testrail-api";
     rev = "refs/tags/${version}";
-    hash = "sha256-VH63shGCBOkbHcUFL4M/QvuVrS+y2JiM1YYBJgZ6r/w=";
+    hash = "sha256-GR1yhky33XZZFcPEO2WRvVUkmekG9HoM00doVgTCD+0=";
   };
 
   build-system = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/texsoup/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/texsoup/default.nix
index 697d160adc..86519f929c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/texsoup/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/textdistance/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/textdistance/default.nix
index 1a370d4595..b331d1fdd2 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/textdistance/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/textfsm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/textfsm/default.nix
index 38d07c9f10..89ba02bf4f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/textfsm/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/texttable/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/texttable/default.nix
index 10d123e08d..82ebb624d7 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/texttable/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/threadloop/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/threadloop/default.nix
index 9b548f1a91..bdc80d921c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/threadloop/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/three-merge/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/three-merge/default.nix
index c30c0a018d..e20e1aea09 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/three-merge/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/time-machine/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/time-machine/default.nix
index 8d2490f428..17d3827f48 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/time-machine/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/time-machine/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "time-machine";
-  version = "2.13.0";
+  version = "2.14.2";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -21,12 +21,12 @@ buildPythonPackage rec {
     owner = "adamchainz";
     repo = pname;
     rev = version;
-    hash = "sha256-SjenPLLr4JoWK5HAokwgW+bw3mfAZiuDb1N7Za5wtrw=";
+    hash = "sha256-u5RxNv+hsL+0yxtiWeYHtmMQY7bvb8WY7ipouj+IZJ8=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     python-dateutil
   ] ++ lib.optionals (pythonOlder "3.9") [ backports-zoneinfo ];
 
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/timing-asgi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/timing-asgi/default.nix
index 30798baa5b..c67885f692 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/timing-asgi/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/timing-asgi/default.nix
@@ -3,7 +3,6 @@
   buildPythonPackage,
   fetchFromGitHub,
   poetry-core,
-  asynctest,
   pytestCheckHook,
 }:
 
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/timm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/timm/default.nix
index a02c901524..af86c57bae 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/timm/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/tinycss/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tinycss/default.nix
index 8d9d2bf492..f525e40d16 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/tinycss/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/tissue/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tissue/default.nix
deleted file mode 100644
index f716c1b715..0000000000
--- a/third_party/nixpkgs/pkgs/development/python-modules/tissue/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchPypi,
-  nose,
-  pep8,
-}:
-
-buildPythonPackage rec {
-  pname = "tissue";
-  version = "0.9.2";
-  format = "setuptools";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "7e34726c3ec8fae358a7faf62de172db15716f5582e5192a109e33348bd76c2e";
-  };
-
-  buildInputs = [ nose ];
-  propagatedBuildInputs = [ pep8 ];
-
-  meta = with lib; {
-    homepage = "https://github.com/WoLpH/tissue";
-    description = "Tissue - automated pep8 checker for nose";
-    license = licenses.lgpl2;
-    maintainers = with maintainers; [ domenkozar ];
-  };
-}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/titlecase/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/titlecase/default.nix
index 813fe48eb0..b6bd8b1071 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/titlecase/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/todoist/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/todoist/default.nix
index e276725a53..9a7eec1354 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/todoist/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/tokenizers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tokenizers/default.nix
index cda6f1b7a5..aca17db0e7 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/tokenizers/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/tomli-w/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tomli-w/default.nix
index c864dfe142..3741f4e288 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/tomli-w/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/tomli-w/default.nix
@@ -1,7 +1,6 @@
 {
   lib,
   buildPythonPackage,
-  callPackage,
   fetchFromGitHub,
   flit-core,
 }:
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tomli/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tomli/default.nix
index 74a9f78b2e..20ae66d60f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/tomli/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/tomli/default.nix
@@ -1,7 +1,6 @@
 {
   lib,
   buildPythonPackage,
-  callPackage,
   fetchFromGitHub,
   flit-core,
   unittestCheckHook,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/toposort/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/toposort/default.nix
index f7d1a06943..12644de66f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/toposort/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/torch/bin.nix b/third_party/nixpkgs/pkgs/development/python-modules/torch/bin.nix
index 8cb60722d0..a10be3732e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/torch/bin.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/torch/bin.nix
@@ -7,7 +7,7 @@
   python,
   pythonAtLeast,
   pythonOlder,
-  addOpenGLRunpath,
+  addDriverRunpath,
   callPackage,
   cudaPackages,
   future,
@@ -16,7 +16,6 @@
   pyyaml,
   requests,
   setuptools,
-  torch-bin,
   typing-extensions,
   sympy,
   jinja2,
@@ -44,7 +43,7 @@ buildPythonPackage {
   src = fetchurl srcs."${stdenv.system}-${pyVerNoDot}" or unsupported;
 
   nativeBuildInputs = lib.optionals stdenv.isLinux [
-    addOpenGLRunpath
+    addDriverRunpath
     autoPatchelfHook
     autoAddDriverRunpath
   ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/torch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/torch/default.nix
index ee7015abd8..088f5f1d27 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/torch/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/torch/default.nix
@@ -26,7 +26,6 @@
 
   # tests.cudaAvailable:
   callPackage,
-  torchWithCuda,
 
   # Native build inputs
   cmake,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/torchaudio/bin.nix b/third_party/nixpkgs/pkgs/development/python-modules/torchaudio/bin.nix
index be9710041f..44205578a3 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/torchaudio/bin.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/torchaudio/bin.nix
@@ -1,13 +1,11 @@
 {
   lib,
   stdenv,
-  addOpenGLRunpath,
+  addDriverRunpath,
   autoPatchelfHook,
   buildPythonPackage,
   cudaPackages,
   fetchurl,
-  ffmpeg_4,
-  ffmpeg_5,
   ffmpeg_6,
   sox,
   pythonAtLeast,
@@ -33,9 +31,7 @@ buildPythonPackage rec {
 
   buildInputs =
     [
-      # We need to patch the lib/_torchaudio_ffmpeg[4-6]
-      ffmpeg_4.dev
-      ffmpeg_5.dev
+      # We need to patch lib/torio/_torio_ffmpeg6
       ffmpeg_6.dev
       sox
     ]
@@ -54,7 +50,7 @@ buildPythonPackage rec {
 
   nativeBuildInputs = lib.optionals stdenv.isLinux [
     autoPatchelfHook
-    addOpenGLRunpath
+    addDriverRunpath
   ];
 
   dependencies = [ torch-bin ];
@@ -63,6 +59,12 @@ buildPythonPackage rec {
     addAutoPatchelfSearchPath "${torch-bin}/${python.sitePackages}/torch"
   '';
 
+  preFixup = ''
+    # TorchAudio loads the newest FFmpeg that works, so get rid of the
+    # old ones.
+    rm $out/${python.sitePackages}/torio/lib/{lib,_}torio_ffmpeg{4,5}.*
+  '';
+
   # The wheel-binary is not stripped to avoid the error of `ImportError: libtorch_cuda_cpp.so: ELF load command address/offset not properly aligned.`.
   dontStrip = true;
 
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/torchio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/torchio/default.nix
index 79d245c926..c0aae74f17 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/torchio/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/torchio/default.nix
@@ -42,7 +42,7 @@ buildPythonPackage rec {
     torch
     tqdm
     typer
-  ] ++ typer.passthru.optional-dependencies.all;
+  ];
 
   nativeCheckInputs = [
     pytestCheckHook
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/torchvision/bin.nix b/third_party/nixpkgs/pkgs/development/python-modules/torchvision/bin.nix
index fc731fae2e..d796159cbb 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/torchvision/bin.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/torchvision/bin.nix
@@ -1,7 +1,7 @@
 {
   lib,
   stdenv,
-  addOpenGLRunpath,
+  addDriverRunpath,
   autoPatchelfHook,
   buildPythonPackage,
   cudaPackages,
@@ -41,7 +41,7 @@ buildPythonPackage {
 
   nativeBuildInputs = lib.optionals stdenv.isLinux [
     autoPatchelfHook
-    addOpenGLRunpath
+    addDriverRunpath
   ];
 
   dependencies = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tornado/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tornado/default.nix
index 38afe65df6..2a5c06f5ab 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/tornado/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/torrent-parser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/torrent-parser/default.nix
index baa2fbe76b..ae1c3a6016 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/torrent-parser/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/towncrier/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/towncrier/default.nix
index 6bd00159fd..8f89edf7c4 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/towncrier/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/tox/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tox/default.nix
index b143ab8d85..4c358cce90 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/tox/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/tox/default.nix
@@ -8,7 +8,6 @@
   py,
   six,
   virtualenv,
-  setuptools-scm,
   toml,
   tomli,
   filelock,
@@ -72,6 +71,6 @@ buildPythonPackage rec {
     mainProgram = "tox";
     homepage = "https://github.com/tox-dev/tox";
     license = licenses.mit;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tpm2-pytss/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tpm2-pytss/default.nix
index 02494a535b..44e1b68a25 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/tpm2-pytss/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/tpm2-pytss/default.nix
@@ -1,7 +1,6 @@
 {
   lib,
   stdenv,
-  fetchurl,
   substituteAll,
   buildPythonPackage,
   fetchPypi,
@@ -11,9 +10,7 @@
   cryptography,
   pkgconfig, # see nativeBuildInputs
   pkg-config, # see nativeBuildInputs
-  pycparser,
   pytestCheckHook,
-  python,
   pyyaml,
   setuptools-scm,
   tpm2-tss,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tracerite/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tracerite/default.nix
index 024859c6be..dd51ff779e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/tracerite/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/trackpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/trackpy/default.nix
index 7ab56f6936..a12ffea156 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/trackpy/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/traits/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/traits/default.nix
index e104f762de..f222f9dba2 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/traits/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/traittypes/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/traittypes/default.nix
index dfc793888b..e00ebe4ce1 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/traittypes/default.nix
+++ b/third_party/nixpkgs/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"
+  '';
 
-  propagatedBuildInputs = [ traitlets ];
+  build-system = [ setuptools ];
+
+  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/third_party/nixpkgs/pkgs/development/python-modules/transaction/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/transaction/default.nix
index fa4cef5acb..2b3e051589 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/transaction/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/transitions/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/transitions/default.nix
index 0f7310ca5c..6e18160f1a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/transitions/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/transitions/default.nix
@@ -9,7 +9,6 @@
   pycodestyle,
   pygraphviz,
   pytestCheckHook,
-  pythonAtLeast,
   setuptools,
   six,
 }:
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/treq/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/treq/default.nix
index 9c09079012..1d2a9b1537 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/treq/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/trio-websocket/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/trio-websocket/default.nix
index 87bc67368d..39a9ee4baa 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/trio-websocket/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/triton/bin.nix b/third_party/nixpkgs/pkgs/development/python-modules/triton/bin.nix
index cbec8d0cea..0189278bc0 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/triton/bin.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/triton/bin.nix
@@ -1,7 +1,7 @@
 {
   lib,
   stdenv,
-  addOpenGLRunpath,
+  addDriverRunpath,
   cudaPackages,
   buildPythonPackage,
   fetchurl,
@@ -64,7 +64,7 @@ buildPythonPackage rec {
         old = [ "-lcuda" ];
         new = [
           "-lcuda"
-          "-L${addOpenGLRunpath.driverLink}"
+          "-L${addDriverRunpath.driverLink}"
           "-L${cudaPackages.cuda_cudart}/lib/stubs/"
         ];
 
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/trove-classifiers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/trove-classifiers/default.nix
index ec13fb857c..a62a953eda 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/trove-classifiers/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/trove-classifiers/default.nix
@@ -11,7 +11,7 @@
 let
   self = buildPythonPackage rec {
     pname = "trove-classifiers";
-    version = "2024.5.22";
+    version = "2024.7.2";
     pyproject = true;
 
     disabled = pythonOlder "3.7";
@@ -19,7 +19,7 @@ let
     src = fetchPypi {
       pname = "trove_classifiers";
       inherit version;
-      hash = "sha256-imJCu7XJrojTTPZl6Bayh9IhKXPId336717BjXKsHQM=";
+      hash = "sha256-gyjyrCzj/Xc8uzfHZaDteoP4ncVkx9RS8Dm2kknQrDU=";
     };
 
     postPatch = ''
@@ -27,7 +27,7 @@ let
         --replace '"calver"' ""
     '';
 
-    nativeBuildInputs = [
+    build-system = [
       calver
       setuptools
     ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ttp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ttp/default.nix
index dc6cc76abb..700f97a68b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/ttp/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/tubeup/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tubeup/default.nix
index 1d58d87eeb..3d5384614c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/tubeup/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/twisted/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/twisted/default.nix
index 8449cc2a6f..b17693c2e0 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/twisted/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/twitch-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/twitch-python/default.nix
index ea16e8927f..9cf268fc0b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/twitch-python/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/txaio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/txaio/default.nix
index 60c7f0f444..6522246a71 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/txaio/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/txgithub/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/txgithub/default.nix
index 98530fb9f4..aa30df3c3c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/txgithub/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/txrequests/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/txrequests/default.nix
index aeabc80a94..62b4b5c4ef 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/txrequests/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/txtorcon/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/txtorcon/default.nix
index 1c4352caa4..7bdb9a9158 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/txtorcon/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/txtorcon/default.nix
@@ -6,15 +6,11 @@
   cryptography,
   fetchPypi,
   geoip,
-  idna,
   incremental,
   lsof,
   mock,
-  pyopenssl,
   pytestCheckHook,
-  python,
   pythonOlder,
-  service-identity,
   twisted,
   zope-interface,
 }:
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/typecode/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/typecode/default.nix
index ed9bc62959..2baa87f666 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/typecode/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/typed-ast/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/typed-ast/default.nix
index 68f1a23810..9cf7744433 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/typed-ast/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/typed-settings/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/typed-settings/default.nix
index 66f59fb6f0..f093f43f1b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/typed-settings/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/typeguard/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/typeguard/default.nix
index 41e7c35791..472b5b882f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/typeguard/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/typer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/typer/default.nix
index 298db51c8f..2ef63fd1f9 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/typer/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/typer/default.nix
@@ -33,11 +33,12 @@ buildPythonPackage rec {
   propagatedBuildInputs = [
     click
     typing-extensions
-  ];
+  # Build includes the standard optional by default
+  # https://github.com/tiangolo/typer/blob/0.12.3/pyproject.toml#L71-L72
+  ] ++ optional-dependencies.standard;
 
-  passthru.optional-dependencies = {
-    all = [
-      colorama
+  optional-dependencies = {
+    standard = [
       shellingham
       rich
     ];
@@ -48,7 +49,7 @@ buildPythonPackage rec {
     pytest-sugar
     pytest-xdist
     pytestCheckHook
-  ] ++ passthru.optional-dependencies.all;
+  ];
 
   preCheck = ''
     export HOME=$(mktemp -d);
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-appdirs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-appdirs/default.nix
index 7185845566..78c3cbee88 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/types-appdirs/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/types-mock/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-mock/default.nix
index dfad6b26d0..37b313bc59 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/types-mock/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/types-psycopg2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-psycopg2/default.nix
index 8a3f08f8e7..2ba7ec577d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/types-psycopg2/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/typeshed-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/typeshed-client/default.nix
index d43ea8e83a..3ed7693ce8 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/typeshed-client/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/typesystem/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/typesystem/default.nix
index 9d0b250f35..41a4b5147f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/typesystem/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/tzdata/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tzdata/default.nix
index 26e01f033f..198df9570b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/tzdata/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/ufo2ft/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ufo2ft/default.nix
index 62741a5a06..0f317a90c3 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/ufo2ft/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/ufolib2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ufolib2/default.nix
index 2cc899002a..6eaac11f17 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/ufolib2/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/uharfbuzz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/uharfbuzz/default.nix
index 3e2cb60517..0dc8fea9bc 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/uharfbuzz/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/ujson/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ujson/default.nix
index b94550bdce..129f731b3c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/ujson/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/umap-learn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/umap-learn/default.nix
index 238cc2547a..8a6f51bded 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/umap-learn/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/umap-learn/default.nix
@@ -17,7 +17,6 @@
   scikit-learn,
   scipy,
   seaborn,
-  tbb,
   tensorflow,
   tensorflow-probability,
   tqdm,
@@ -93,6 +92,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/third_party/nixpkgs/pkgs/development/python-modules/umodbus/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/umodbus/default.nix
index 0ccefecf0d..d45aebe8d0 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/umodbus/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/umodbus/default.nix
@@ -5,7 +5,6 @@
   pyserial,
   pytestCheckHook,
   pythonOlder,
-  setuptools,
 }:
 
 buildPythonPackage rec {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/undefined/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/undefined/default.nix
index ccd803bc08..59cf5c2a84 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/undefined/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/unittest-data-provider/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/unittest-data-provider/default.nix
index 690db790d7..a9deef7e2e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/unittest-data-provider/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/univers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/univers/default.nix
index 081641c6cb..7caf423379 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/univers/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/univers/default.nix
@@ -5,33 +5,35 @@
   commoncode,
   fetchPypi,
   packaging,
-  pyparsing,
   pytestCheckHook,
   pythonOlder,
   saneyaml,
   semantic-version,
   semver,
+  setuptools,
   setuptools-scm,
 }:
 
 buildPythonPackage rec {
   pname = "univers";
-  version = "30.11.0";
-  format = "setuptools";
+  version = "30.12.0";
+  pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-xyrg8B+C5xUN8zHLrMbAe/MWjZb8fCL0MIAz2w4B7/U=";
+    hash = "sha256-NbsoYfTk5SWyUQZnOdm+ZCXK7wD+DV/updRHqHoU49c=";
   };
 
-  nativeBuildInputs = [ setuptools-scm ];
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     attrs
     packaging
-    pyparsing
     semantic-version
     semver
   ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/upass/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/upass/default.nix
index 79d2e4389a..7e82256d39 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/upass/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/uri-template/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/uri-template/default.nix
index e37fd44391..27f91bad92 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/uri-template/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/urwid-mitmproxy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/urwid-mitmproxy/default.nix
deleted file mode 100644
index 09e28d2839..0000000000
--- a/third_party/nixpkgs/pkgs/development/python-modules/urwid-mitmproxy/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchFromGitHub,
-  pythonOlder,
-}:
-
-buildPythonPackage rec {
-  pname = "urwid-mitmproxy";
-  version = "2.1.2.1";
-  format = "setuptools";
-
-  disabled = pythonOlder "3.7";
-
-  src = fetchFromGitHub {
-    owner = "mitmproxy";
-    repo = "urwid-mitmproxy";
-    rev = "refs/tags/${version}";
-    hash = "sha256-93AauYWbrG/2smAhbNKGE0twGJZ2u9gBetlXGCpciH8=";
-  };
-
-  pythonImportsCheck = [ "urwid" ];
-
-  # Tests which assert on strings don't decode results correctly, see urwid
-  doCheck = false;
-
-  meta = with lib; {
-    description = "Urwid fork used by mitmproxy";
-    homepage = "https://github.com/mitmproxy/urwid-mitmproxy";
-    license = licenses.lgpl21Plus;
-    maintainers = with maintainers; [ fab ];
-  };
-}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/urwid/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/urwid/default.nix
index af4c3579e1..7c2024af44 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/urwid/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/urwidtrees/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/urwidtrees/default.nix
index 0f03b4fdbc..c50502c3df 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/urwidtrees/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/us/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/us/default.nix
index 1aa4d2bc8d..b42c5c8f6a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/us/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/ush/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ush/default.nix
index eba36519ac..3b4cd7a0bd 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/ush/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/uvloop/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/uvloop/default.nix
index 4f2ff7d11c..905a923dc7 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/uvloop/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/uxsim/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/uxsim/default.nix
index f75a620ec5..17906660c0 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/uxsim/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/uxsim/default.nix
@@ -17,14 +17,14 @@
 }:
 buildPythonPackage rec {
   pname = "uxsim";
-  version = "1.3.1";
+  version = "1.4.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "toruseo";
     repo = "UXsim";
     rev = "refs/tags/v${version}";
-    hash = "sha256-74iNsRtEmpE+i4FeKCXrqczdMP9u4mVt6eyF/4RXZfU=";
+    hash = "sha256-cWtBmBmrQTruRZ8n8O6i9LGlHMR5UvRhcOICvwP383M=";
   };
 
   patches = [ ./add-qt-plugin-path-to-env.patch ];
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/validator-collection/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/validator-collection/default.nix
index 60cc3c9c6f..fbec2841fc 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/validator-collection/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/validator-collection/default.nix
@@ -3,7 +3,6 @@
   buildPythonPackage,
   fetchFromGitHub,
   setuptools,
-  wheel,
   alabaster,
   attrs,
   babel,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/vcrpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/vcrpy/default.nix
index 920a439d33..20d4e7b463 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/vcrpy/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/verspec/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/verspec/default.nix
index fe30ab8beb..2da64ec5f6 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/verspec/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/verspec/default.nix
@@ -39,6 +39,6 @@ buildPythonPackage rec {
       bsd2 # and
       asl20
     ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/vg/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/vg/default.nix
index a1695da99a..69c55a4203 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/vg/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/vg/default.nix
@@ -6,7 +6,6 @@
   poetry-core,
   pythonOlder,
   pytestCheckHook,
-  setuptools,
 }:
 
 buildPythonPackage rec {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/virtualenv-clone/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/virtualenv-clone/default.nix
index 2e1e864cb8..056e38a329 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/virtualenv-clone/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/virtualenv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/virtualenv/default.nix
index 331164405b..6e7904dbe3 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/virtualenv/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/virtualenv/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   pythonOlder,
-  isPy27,
   isPyPy,
   cython,
   distlib,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/visitor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/visitor/default.nix
index 87c286c8e3..8bab0d88fe 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/visitor/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/vobject/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/vobject/default.nix
index 81f6553a96..db8692e77b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/vobject/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/volvooncall/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/volvooncall/default.nix
index c3189b8662..23677ab4ec 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/volvooncall/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/volvooncall/default.nix
@@ -12,8 +12,6 @@
   pytest-asyncio,
   pytestCheckHook,
   pythonOlder,
-  setuptools,
-  websockets,
 }:
 
 buildPythonPackage rec {
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/vsts-cd-manager/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/vsts-cd-manager/default.nix
index 8730f6e0ef..94ebbbe5e4 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/vsts-cd-manager/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/vsts/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/vsts/default.nix
index c3a3d38b98..6c339204f3 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/vsts/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/vtjp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/vtjp/default.nix
index cfc0aaf1b9..76661675f6 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/vtjp/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/w1thermsensor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/w1thermsensor/default.nix
index e02dbdcdef..eca3bdd930 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/w1thermsensor/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/w1thermsensor/default.nix
@@ -2,13 +2,10 @@
   lib,
   buildPythonPackage,
   fetchPypi,
-  pkgs,
   setuptools,
   aiofiles,
   click,
-  coverage,
   tomli,
-  pytest,
   pytest-mock,
   pytest-asyncio,
   pytestCheckHook,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/w3lib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/w3lib/default.nix
index 2fa0ee8117..620f30f250 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/w3lib/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/wagtail-modeladmin/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wagtail-modeladmin/default.nix
index 4d6f693823..6b46643985 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/wagtail-modeladmin/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/wagtail-modeladmin/default.nix
@@ -2,16 +2,10 @@
   lib,
   buildPythonPackage,
   dj-database-url,
-  django,
-  django-rq,
   fetchFromGitHub,
   flit-core,
-  freezegun,
-  google-cloud-translate,
-  polib,
   python,
   pythonOlder,
-  typing-extensions,
   wagtail,
 }:
 
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/warlock/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/warlock/default.nix
index cfe32849b5..5445631c4d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/warlock/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/warlock/default.nix
@@ -6,7 +6,6 @@
   poetry-core,
   jsonpatch,
   jsonschema,
-  six,
   pytestCheckHook,
 }:
 
@@ -48,6 +47,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/third_party/nixpkgs/pkgs/development/python-modules/wasabi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wasabi/default.nix
index 5081be3853..290e4faec0 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/wasabi/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/wat/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wat/default.nix
new file mode 100644
index 0000000000..7ea8166164
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/wcag-contrast-ratio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wcag-contrast-ratio/default.nix
index 34383f549f..fb7328d5c3 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/wcag-contrast-ratio/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/wcmatch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wcmatch/default.nix
index 90c83d3596..ad6225e4cb 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/wcmatch/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/wcwidth/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wcwidth/default.nix
index 27a3bac5d7..c79af7be6b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/wcwidth/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/weasyprint/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/weasyprint/default.nix
index 321ee830e5..2652a52467 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/weasyprint/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/weasyprint/default.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   buildPythonPackage,
-  cairosvg,
   cffi,
   cssselect2,
   fetchPypi,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/webauthn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/webauthn/default.nix
index af0621ad54..f747271881 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/webauthn/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/webcolors/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/webcolors/default.nix
index 2cd7fed141..93f2030755 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/webcolors/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/webhelpers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/webhelpers/default.nix
deleted file mode 100644
index 4b7c9c3674..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/webob/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/webob/default.nix
index 921b75ef07..e574d78da1 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/webob/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/webob/default.nix
@@ -2,14 +2,17 @@
   lib,
   buildPythonPackage,
   fetchPypi,
+  setuptools,
+  legacy-cgi,
   pytestCheckHook,
+  pythonAtLeast,
   pythonOlder,
 }:
 
 buildPythonPackage rec {
   pname = "webob";
   version = "1.8.7";
-  format = "setuptools";
+  pyproject = true;
 
   disabled = pythonOlder "3.7";
 
@@ -19,6 +22,11 @@ buildPythonPackage rec {
     hash = "sha256-tk71FBvlWc+t5EjwRPpFwiYDUe3Lao72t+AMfc7wwyM=";
   };
 
+  build-system = [ setuptools ];
+
+  # https://github.com/Pylons/webob/issues/437
+  dependencies = lib.optionals (pythonAtLeast "3.13") [ legacy-cgi ];
+
   nativeCheckInputs = [ pytestCheckHook ];
 
   pythonImportsCheck = [ "webob" ];
@@ -33,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/third_party/nixpkgs/pkgs/development/python-modules/weboob/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/weboob/default.nix
deleted file mode 100644
index 53b632abea..0000000000
--- a/third_party/nixpkgs/pkgs/development/python-modules/weboob/default.nix
+++ /dev/null
@@ -1,91 +0,0 @@
-{
-  lib,
-  babel,
-  buildPythonPackage,
-  cssselect,
-  feedparser,
-  fetchPypi,
-  gdata,
-  gnupg,
-  google-api-python-client,
-  html2text,
-  libyaml,
-  lxml,
-  mechanize,
-  nose,
-  pdfminer-six,
-  pillow,
-  prettytable,
-  pyqt5,
-  python-dateutil,
-  pythonOlder,
-  pyyaml,
-  requests,
-  simplejson,
-  termcolor,
-  unidecode,
-}:
-
-buildPythonPackage rec {
-  pname = "weboob";
-  version = "2.0";
-  format = "setuptools";
-
-  disabled = pythonOlder "3.7";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "1c69vzf8sg8471lcaafpz9iw2q3rfj5hmcpqrs2k59fkgbvy32zw";
-  };
-
-  nativeBuildInputs = [ pyqt5 ];
-
-  propagatedBuildInputs = [
-    babel
-    cssselect
-    python-dateutil
-    feedparser
-    gdata
-    gnupg
-    google-api-python-client
-    html2text
-    libyaml
-    lxml
-    mechanize
-    pdfminer-six
-    pillow
-    prettytable
-    pyqt5
-    pyyaml
-    requests
-    simplejson
-    termcolor
-    unidecode
-  ];
-
-  postPatch = ''
-    substituteInPlace setup.cfg \
-      --replace "with-doctest = 1" "" \
-      --replace "with-coverage = 1" "" \
-      --replace "weboob.browser.filters.standard," "" \
-      --replace "weboob.browser.tests.filters," "" \
-      --replace "weboob.tools.application.formatters.json," "" \
-      --replace "weboob.tools.application.formatters.table," "" \
-      --replace "weboob.tools.capabilities.bank.transactions," ""
-  '';
-
-  nativeCheckInputs = [ nose ];
-
-  checkPhase = ''
-    nosetests
-  '';
-
-  pythonImportsCheck = [ "weboob" ];
-
-  meta = with lib; {
-    description = "Collection of applications and APIs to interact with websites";
-    homepage = "http://weboob.org";
-    license = licenses.agpl3Plus;
-    maintainers = with maintainers; [ ];
-  };
-}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/websockify/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/websockify/default.nix
index fc1b3c7115..2dee5231dc 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/websockify/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/wheezy-template/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wheezy-template/default.nix
index fd88225ee6..fcdaf64d80 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/wheezy-template/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/whitenoise/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/whitenoise/default.nix
index a47c58b1ad..cc595dbc78 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/whitenoise/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/whool/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/whool/default.nix
new file mode 100644
index 0000000000..3d440d73ee
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/whool/default.nix
@@ -0,0 +1,49 @@
+{
+  buildPythonPackage,
+  fetchFromGitHub,
+  git,
+  hatch-vcs,
+  lib,
+  manifestoo-core,
+  pytestCheckHook,
+  pythonOlder,
+  tomli,
+  wheel,
+}:
+
+buildPythonPackage rec {
+  pname = "whool";
+  version = "1.2";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "sbidoul";
+    repo = "whool";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-uIHtygDeFbtIZLn0YwGzAHD7B+EZQ3JAovuNMZ5YMxc=";
+  };
+
+  build-system = [ hatch-vcs ];
+
+  dependencies = [
+    manifestoo-core
+    wheel
+  ] ++ lib.optionals (pythonOlder "3.11") [ tomli ];
+
+  pythonImportsCheck = [ "whool" ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    git
+  ];
+
+  setupHook = ./setup-hook.sh;
+
+  meta = {
+    description = "Standards-compliant Python build backend to package Odoo addons";
+    homepage = "https://github.com/sbidoul/whool";
+    changelog = "https://github.com/sbidoul/whool/blob/${version}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.yajo ];
+  };
+}
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/whool/setup-hook.sh b/third_party/nixpkgs/pkgs/development/python-modules/whool/setup-hook.sh
new file mode 100644
index 0000000000..1c8ecdf2c6
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/python-modules/whool/setup-hook.sh
@@ -0,0 +1,16 @@
+# Avoid using git to auto-bump the addon version
+# DOCS https://github.com/sbidoul/whool/?tab=readme-ov-file#configuration
+whool-post-version-strategy-hook() {
+    # DOCS https://stackoverflow.com/a/13864829/1468388
+    if [ -z ${WHOOL_POST_VERSION_STRATEGY_OVERRIDE+x} ]; then
+        echo Setting WHOOL_POST_VERSION_STRATEGY_OVERRIDE to none
+        export WHOOL_POST_VERSION_STRATEGY_OVERRIDE=none
+    fi
+
+    # Make sure you can import the built addon
+    for manifest in $(find -L . -name __manifest__.py); do
+        export pythonImportsCheck="$pythonImportsCheck odoo.addons.$(basename $(dirname $(realpath $manifest)))"
+    done
+}
+
+preBuildHooks+=(whool-post-version-strategy-hook)
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/whoosh/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/whoosh/default.nix
index fbe8528c0c..b56a590a3f 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/whoosh/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/wifi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wifi/default.nix
index 76d4e7f819..b99d4782f4 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/wifi/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/wifi/default.nix
@@ -5,7 +5,6 @@
   pbkdf2,
   pytestCheckHook,
   pythonOlder,
-  substituteAll,
   wirelesstools,
 }:
 
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wrapt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wrapt/default.nix
index caaa6d1c99..b4c636923b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/wrapt/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/ws4py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ws4py/default.nix
index fb53253c8c..4cb6bacc3c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/ws4py/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/wsproto/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wsproto/default.nix
index 92d7f79082..880e10b59d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/wsproto/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/wurlitzer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wurlitzer/default.nix
index d71ba1adca..ea46539a5d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/wurlitzer/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/xapian/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xapian/default.nix
index 58981027b3..743e7b068b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/xapian/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/xarray-einstats/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xarray-einstats/default.nix
index 5d5486dbff..b82a8a8cd7 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/xarray-einstats/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/xarray-einstats/default.nix
@@ -6,7 +6,6 @@
   flit-core,
   numba,
   numpy,
-  pandas,
   pytestCheckHook,
   pythonOlder,
   scipy,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xattr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xattr/default.nix
index e700a0a80d..84a9d63536 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/xattr/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/xdg/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xdg/default.nix
index 87eeec7902..4a2efae3a8 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/xdg/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/xhtml2pdf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xhtml2pdf/default.nix
index 1ab72c73a8..eeb1b6ce33 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/xhtml2pdf/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/xlib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xlib/default.nix
index 97672413a4..a24b9fe21a 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/xlib/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/xlib/default.nix
@@ -7,7 +7,6 @@
   setuptools,
   setuptools-scm,
   xorg,
-  python,
   mock,
   pytestCheckHook,
   util-linux,
@@ -53,6 +52,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/third_party/nixpkgs/pkgs/development/python-modules/xlsx2csv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xlsx2csv/default.nix
index 272fe74098..5748b788e1 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/xlsx2csv/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/xlsx2csv/default.nix
@@ -9,12 +9,12 @@
 
 buildPythonPackage rec {
   pname = "xlsx2csv";
-  version = "0.8.2";
+  version = "0.8.3";
   format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-zdJyyC+LMvHO52rq74ey7jVJZh/d+Q9+zyMQlnoW/IQ=";
+    hash = "sha256-bGXVmJ6NPxTdcpbUJdaTpn9RiZ0Mjh7XvL+cyxgiNzQ=";
   };
 
   nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xmlschema/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xmlschema/default.nix
index 13829b6be8..927296f072 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/xmlschema/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/xmlschema/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "xmlschema";
-  version = "3.3.1";
+  version = "3.3.2";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "sissaschool";
     repo = "xmlschema";
     rev = "refs/tags/v${version}";
-    hash = "sha256-Sy70OQvKx0H8vxRFTEkg+QV9eVij5C9dlAwJ2HTFOi8=";
+    hash = "sha256-cZVNgY0Y9tE+ud8596Ujidc7aq+Gon9x6q/XDCuJ9oI=";
   };
 
   build-system = [ setuptools ];
@@ -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/third_party/nixpkgs/pkgs/development/python-modules/xmltodict/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xmltodict/default.nix
index 9a61425016..0000eea5f4 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/xmltodict/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/xmod/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xmod/default.nix
index e16652e971..34b197579c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/xmod/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/xsdata/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xsdata/default.nix
index 568ef51a9e..0e16d17bd3 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/xsdata/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/xsdata/default.nix
@@ -19,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "xsdata";
-  version = "24.6.1";
+  version = "24.7";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     owner = "tefra";
     repo = "xsdata";
     rev = "refs/tags/v${version}";
-    hash = "sha256-ijXV7ZKIKg44OhySBwfQ8s5IFaLZKM3oBgXeLAr9wiM=";
+    hash = "sha256-7rROd0iKs/SuIZGUwVDbusKgp7APIlvFto43Q3QCfZk=";
   };
 
   patches = [
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yamlfix/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yamlfix/default.nix
index f2f2e7379b..b8747bc3f0 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/yamlfix/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/yamlfix/default.nix
@@ -7,7 +7,6 @@
   pdm-backend,
   pytest-freezegun,
   pytest-xdist,
-  pytest,
   pytestCheckHook,
   pythonOlder,
   ruyaml,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yamlordereddictloader/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yamlordereddictloader/default.nix
index 33a4732fde..b1f4a0caa6 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/yamlordereddictloader/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/yangson/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yangson/default.nix
index c623097a6d..3883e3fa54 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/yangson/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/yangson/default.nix
@@ -45,6 +45,6 @@ buildPythonPackage rec {
       gpl3Plus
       lgpl3Plus
     ];
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yark/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yark/default.nix
index 30143e8a90..c1a0a6cc90 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/yark/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/yattag/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yattag/default.nix
index f5a87425a0..bbf2a0605c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/yattag/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/youtube-search-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/youtube-search-python/default.nix
index b9eeabea51..344427e53e 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/youtube-search-python/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/yowsup/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yowsup/default.nix
index dfe6cbf51f..b95a996f76 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/yowsup/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/ytmusicapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ytmusicapi/default.nix
index cf4f33fdac..4d99219d05 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/ytmusicapi/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/zamg/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zamg/default.nix
index 82e6d5bb0e..e057433c17 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/zamg/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/zamg/default.nix
@@ -1,7 +1,6 @@
 {
   lib,
   aiohttp,
-  aresponses,
   buildPythonPackage,
   fetchFromGitHub,
   poetry-core,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zarr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zarr/default.nix
index 9022a3aaeb..131aef003b 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/zarr/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/zha/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zha/default.nix
index 358a475f6f..01101670ef 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/zha/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/zigpy-cc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zigpy-cc/default.nix
index 7cd3ea9248..048fc2b17d 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/zigpy-cc/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/zigpy-cc/default.nix
@@ -3,7 +3,6 @@
   asynctest,
   buildPythonPackage,
   fetchFromGitHub,
-  pyserial,
   pyserial-asyncio,
   pytest-asyncio,
   pytestCheckHook,
diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zigpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zigpy/default.nix
index b39bba71dd..db54562417 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/zigpy/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/zipp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zipp/default.nix
index f9ecaecd95..07185aa568 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/zipp/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/zodbpickle/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zodbpickle/default.nix
index 55dcfb7800..e9d90b93e4 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/zodbpickle/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python-modules/zulip/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zulip/default.nix
index 9f623b01c8..d5bec61a0c 100644
--- a/third_party/nixpkgs/pkgs/development/python-modules/zulip/default.nix
+++ b/third_party/nixpkgs/pkgs/development/python-modules/zulip/default.nix
@@ -5,7 +5,6 @@
   fetchFromGitHub,
   setuptools,
   requests,
-  matrix-client,
   distro,
   click,
   typing-extensions,
diff --git a/third_party/nixpkgs/pkgs/development/python2-modules/attrs/default.nix b/third_party/nixpkgs/pkgs/development/python2-modules/attrs/default.nix
index f4b4b50572..e894ee27d3 100644
--- a/third_party/nixpkgs/pkgs/development/python2-modules/attrs/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python2-modules/futures/default.nix b/third_party/nixpkgs/pkgs/development/python2-modules/futures/default.nix
index bc19a31927..d1cdb679d0 100644
--- a/third_party/nixpkgs/pkgs/development/python2-modules/futures/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python2-modules/pluggy/default.nix b/third_party/nixpkgs/pkgs/development/python2-modules/pluggy/default.nix
index 30fa2e1945..ea362bdb58 100644
--- a/third_party/nixpkgs/pkgs/development/python2-modules/pluggy/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python2-modules/pygobject/default.nix b/third_party/nixpkgs/pkgs/development/python2-modules/pygobject/default.nix
index 2a09002976..00c98fba39 100644
--- a/third_party/nixpkgs/pkgs/development/python2-modules/pygobject/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/python2-modules/setuptools-scm/default.nix b/third_party/nixpkgs/pkgs/development/python2-modules/setuptools-scm/default.nix
index 6b5aafcd3c..48b6d3b813 100644
--- a/third_party/nixpkgs/pkgs/development/python2-modules/setuptools-scm/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/r-modules/default.nix b/third_party/nixpkgs/pkgs/development/r-modules/default.nix
index acd9e6b2d1..678604f04a 100644
--- a/third_party/nixpkgs/pkgs/development/r-modules/default.nix
+++ b/third_party/nixpkgs/pkgs/development/r-modules/default.nix
@@ -1256,7 +1256,7 @@ let
     pbdZMQ = old.pbdZMQ.overrideAttrs (attrs: {
       postPatch = lib.optionalString stdenv.isDarwin ''
         for file in R/*.{r,r.in}; do
-            sed -i 's#system("which \(\w\+\)"[^)]*)#"${pkgs.darwin.cctools}/bin/\1"#g' $file
+            sed -i 's#system("which \(\w\+\)"[^)]*)#"${pkgs.cctools}/bin/\1"#g' $file
         done
       '';
     });
diff --git a/third_party/nixpkgs/pkgs/development/rocm-modules/5/default.nix b/third_party/nixpkgs/pkgs/development/rocm-modules/5/default.nix
index 7f48c4d034..c1ffd01c80 100644
--- a/third_party/nixpkgs/pkgs/development/rocm-modules/5/default.nix
+++ b/third_party/nixpkgs/pkgs/development/rocm-modules/5/default.nix
@@ -10,7 +10,6 @@
 , opencv
 , ffmpeg_4
 , libjpeg_turbo
-, rapidjson-unstable
 }:
 
 let
@@ -304,7 +303,6 @@ in rec {
     inherit (llvm) clang openmp;
     opencv = opencv.override { enablePython = true; };
     ffmpeg = ffmpeg_4;
-    rapidjson = rapidjson-unstable;
     stdenv = llvm.rocmClangStdenv;
 
     # Unfortunately, rocAL needs a custom libjpeg-turbo until further notice
diff --git a/third_party/nixpkgs/pkgs/development/rocm-modules/6/default.nix b/third_party/nixpkgs/pkgs/development/rocm-modules/6/default.nix
index ad7ff7d1d1..6825a8bf86 100644
--- a/third_party/nixpkgs/pkgs/development/rocm-modules/6/default.nix
+++ b/third_party/nixpkgs/pkgs/development/rocm-modules/6/default.nix
@@ -10,7 +10,6 @@
 , opencv
 , ffmpeg_4
 , libjpeg_turbo
-, rapidjson-unstable
 }:
 
 let
@@ -303,7 +302,6 @@ in rec {
     inherit (llvm) clang openmp;
     opencv = opencv.override { enablePython = true; };
     ffmpeg = ffmpeg_4;
-    rapidjson = rapidjson-unstable;
     stdenv = llvm.rocmClangStdenv;
 
     # Unfortunately, rocAL needs a custom libjpeg-turbo until further notice
diff --git a/third_party/nixpkgs/pkgs/development/ruby-modules/bundled-common/default.nix b/third_party/nixpkgs/pkgs/development/ruby-modules/bundled-common/default.nix
index 3bb9552113..1cb6574839 100644
--- a/third_party/nixpkgs/pkgs/development/ruby-modules/bundled-common/default.nix
+++ b/third_party/nixpkgs/pkgs/development/ruby-modules/bundled-common/default.nix
@@ -1,4 +1,8 @@
-{ stdenv, runCommand, ruby, lib, rsync
+{ stdenv
+, lib
+, buildPackages
+, runCommand
+, ruby
 , defaultGemConfig, buildRubyGem, buildEnv
 , makeBinaryWrapper
 , bundler
@@ -191,7 +195,7 @@ let
       runCommand name' basicEnvArgs ''
         mkdir -p $out
         for i in $paths; do
-          ${rsync}/bin/rsync -a $i/lib $out/
+          ${buildPackages.rsync}/bin/rsync -a $i/lib $out/
         done
         eval "$postBuild"
       ''
diff --git a/third_party/nixpkgs/pkgs/development/ruby-modules/bundled-common/functions.nix b/third_party/nixpkgs/pkgs/development/ruby-modules/bundled-common/functions.nix
index 57a10dadc4..3f9e49fc53 100644
--- a/third_party/nixpkgs/pkgs/development/ruby-modules/bundled-common/functions.nix
+++ b/third_party/nixpkgs/pkgs/development/ruby-modules/bundled-common/functions.nix
@@ -59,8 +59,21 @@ in rec {
     then attrs // gemConfig.${attrs.gemName} attrs
     else attrs);
 
-  genStubsScript = { lib, ruby, confFiles, bundler, groups, binPaths, ... }: ''
-      ${ruby}/bin/ruby ${./gen-bin-stubs.rb} \
+  genStubsScript = { lib, runCommand, ruby, confFiles, bundler, groups, binPaths, ... }:
+    let
+      genStubsScript = runCommand "gen-bin-stubs"
+        {
+          strictDeps = true;
+          nativeBuildInputs = [ ruby ];
+        }
+        ''
+          cp ${./gen-bin-stubs.rb} $out
+          chmod +x $out
+          patchShebangs --build $out
+        '';
+    in
+    ''
+      ${genStubsScript} \
         "${ruby}/bin/ruby" \
         "${confFiles}/Gemfile" \
         "$out/${ruby.gemPath}" \
diff --git a/third_party/nixpkgs/pkgs/development/ruby-modules/bundled-common/gen-bin-stubs.rb b/third_party/nixpkgs/pkgs/development/ruby-modules/bundled-common/gen-bin-stubs.rb
index 822996b7cb..d1d4ad9544 100644
--- a/third_party/nixpkgs/pkgs/development/ruby-modules/bundled-common/gen-bin-stubs.rb
+++ b/third_party/nixpkgs/pkgs/development/ruby-modules/bundled-common/gen-bin-stubs.rb
@@ -1,3 +1,4 @@
+#!/usr/bin/env ruby
 require 'rbconfig'
 require 'rubygems'
 require 'rubygems/specification'
diff --git a/third_party/nixpkgs/pkgs/development/ruby-modules/bundler-env/default.nix b/third_party/nixpkgs/pkgs/development/ruby-modules/bundler-env/default.nix
index faef3be4d9..35fecb70c0 100644
--- a/third_party/nixpkgs/pkgs/development/ruby-modules/bundler-env/default.nix
+++ b/third_party/nixpkgs/pkgs/development/ruby-modules/bundler-env/default.nix
@@ -1,5 +1,6 @@
 { ruby, lib, callPackage, defaultGemConfig, buildEnv, runCommand
-, bundler, rsync
+, buildPackages
+, bundler
 }@defs:
 
 { name ? null
@@ -21,7 +22,7 @@
 }@args:
 
 let
-  inherit (import ../bundled-common/functions.nix {inherit lib ruby gemConfig groups; }) genStubsScript;
+  inherit (import ../bundled-common/functions.nix { inherit lib ruby gemConfig groups; }) genStubsScript;
 
   basicEnv = (callPackage ../bundled-common { inherit bundler; }) (args // { inherit pname name; mainGemName = pname; });
 
@@ -51,7 +52,7 @@ in
         pathsToLink = [ "/lib" ];
 
         postBuild = genStubsScript {
-          inherit lib ruby bundler groups;
+          inherit lib runCommand ruby bundler groups;
           confFiles = basicEnv.confFiles;
           binPaths = [ basicEnv.gems.${pname} ];
         } + lib.optionalString (postBuild != null) postBuild;
@@ -67,7 +68,7 @@ in
         runCommand basicEnv.name bundlerEnvArgs ''
           mkdir -p $out
           for i in $paths; do
-            ${rsync}/bin/rsync -a $i/lib $out/
+            ${buildPackages.rsync}/bin/rsync -a $i/lib $out/
           done
           eval "$postBuild"
         ''
diff --git a/third_party/nixpkgs/pkgs/development/ruby-modules/bundler/default.nix b/third_party/nixpkgs/pkgs/development/ruby-modules/bundler/default.nix
index 581c2544a2..c144149da2 100644
--- a/third_party/nixpkgs/pkgs/development/ruby-modules/bundler/default.nix
+++ b/third_party/nixpkgs/pkgs/development/ruby-modules/bundler/default.nix
@@ -4,8 +4,8 @@ buildRubyGem rec {
   inherit ruby;
   name = "${gemName}-${version}";
   gemName = "bundler";
-  version = "2.5.11";
-  source.sha256 = "sha256-3XhL/lODSzmlbmQtvG4eyhmi5kVOTVOZTLcpgAWsTC4=";
+  version = "2.5.16";
+  source.sha256 = "sha256-h7oDOPQNWSinmxqwZ4Z6Ns3lgTXQi2MmfvY5eVuVmDo=";
   dontPatchShebangs = true;
 
   postFixup = ''
diff --git a/third_party/nixpkgs/pkgs/development/ruby-modules/gem-config/default.nix b/third_party/nixpkgs/pkgs/development/ruby-modules/gem-config/default.nix
index 2e59b8a99c..a541a8ee34 100644
--- a/third_party/nixpkgs/pkgs/development/ruby-modules/gem-config/default.nix
+++ b/third_party/nixpkgs/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"
     ];
   };
 
@@ -783,10 +804,7 @@ in
       substituteInPlace lib/sassc/native.rb \
         --replace 'gem_root = spec.gem_dir' 'gem_root = File.join(__dir__, "../../")'
     '';
-  } // (lib.optionalAttrs stdenv.isDarwin {
-    # https://github.com/NixOS/nixpkgs/issues/19098
-    buildFlags = [ "--disable-lto" ];
-  });
+  };
 
   sass-embedded = attrs: {
     # Patch the Rakefile to use our dart-sass and not try to fetch anything.
diff --git a/third_party/nixpkgs/pkgs/development/ruby-modules/gem-config/hpricot-fix-incompatible-function-pointer-conversion.patch b/third_party/nixpkgs/pkgs/development/ruby-modules/gem-config/hpricot-fix-incompatible-function-pointer-conversion.patch
new file mode 100644
index 0000000000..1a4a0b55c2
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/ruby-modules/gem/default.nix b/third_party/nixpkgs/pkgs/development/ruby-modules/gem/default.nix
index 6f3245849f..b2bb437366 100644
--- a/third_party/nixpkgs/pkgs/development/ruby-modules/gem/default.nix
+++ b/third_party/nixpkgs/pkgs/development/ruby-modules/gem/default.nix
@@ -251,6 +251,14 @@ stdenv.mkDerivation ((builtins.removeAttrs attrs ["source"]) // {
     done
     ''}
 
+    # For Ruby-generated binstubs, shebang paths are already in Nix store but for
+    # ruby used to build the package. Update them to match the host system. Note
+    # that patchShebangsAuto ignores scripts where shebang line is already in Nix
+    # store.
+    if [[ -d $GEM_HOME/bin ]]; then
+      patchShebangs --update --host -- "$GEM_HOME"/bin
+    fi
+
     runHook postInstall
   '';
 
diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/binlore/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/binlore/default.nix
index f8a88b4ce6..53a0247665 100644
--- a/third_party/nixpkgs/pkgs/development/tools/analysis/binlore/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/analysis/binlore/default.nix
@@ -56,58 +56,169 @@ let
     #   in here, but I'm erring on the side of flexibility
     #   since this form will make it easier to pilot other
     #   uses of binlore.
-    callback = lore: drv: overrides: ''
+    callback = lore: drv: ''
       if [[ -d "${drv}/bin" ]] || [[ -d "${drv}/lib" ]] || [[ -d "${drv}/libexec" ]]; then
         echo generating binlore for $drv by running:
         echo "${yara}/bin/yara --scan-list --recursive ${lore.rules} <(printf '%s\n' ${drv}/{bin,lib,libexec}) | ${yallback}/bin/yallback ${lore.yallback}"
       else
         echo "failed to generate binlore for $drv (none of ${drv}/{bin,lib,libexec} exist)"
       fi
-    '' +
-    /*
-    Override lore for some packages. Unsure, but for now:
-    1. start with the ~name (pname-version)
-    2. remove characters from the end until we find a match
-       in overrides/
-    3. execute the override script with the list of expected
-       lore types
-    */
-    ''
-      i=''${#identifier}
-      filter=
-      while [[ $i > 0 ]] && [[ -z "$filter" ]]; do
-        if [[ -f "${overrides}/''${identifier:0:$i}" ]]; then
-          filter="${overrides}/''${identifier:0:$i}"
-          echo using "${overrides}/''${identifier:0:$i}" to generate overriden binlore for $drv
-          break
-        fi
-        ((i--)) || true # don't break build
-      done # || true # don't break build
+
       if [[ -d "${drv}/bin" ]] || [[ -d "${drv}/lib" ]] || [[ -d "${drv}/libexec" ]]; then
-        ${yara}/bin/yara --scan-list --recursive ${lore.rules} <(printf '%s\n' ${drv}/{bin,lib,libexec}) | ${yallback}/bin/yallback ${lore.yallback} "$filter"
+        ${yara}/bin/yara --scan-list --recursive ${lore.rules} <(printf '%s\n' ${drv}/{bin,lib,libexec}) | ${yallback}/bin/yallback ${lore.yallback}
       fi
     '';
   };
-  overrides = (src + "/overrides");
 
 in rec {
+  /*
+    Output a directory containing lore for multiple drvs.
+
+    This will `make` lore for drv in drvs and then combine lore
+    of the same type across all packages into a single file.
+
+    When drvs are also specified in the strip argument, corresponding
+    lore is made relative by stripping the path of each drv from
+    matching entries. (This is mainly useful in a build process that
+    uses a chain of two or more derivations where the output of one
+    is the source for the next. See resholve for an example.)
+  */
   collect = { lore ? loreDef, drvs, strip ? [ ] }: (runCommand "more-binlore" { } ''
     mkdir $out
     for lorefile in ${toString lore.types}; do
       cat ${lib.concatMapStrings (x: x + "/$lorefile ") (map (make lore) (map lib.getBin (builtins.filter lib.isDerivation drvs)))} > $out/$lorefile
-      substituteInPlace $out/$lorefile ${lib.concatMapStrings (x: "--replace '${x}/' '' ") strip}
+      substituteInPlace $out/$lorefile ${lib.concatMapStrings (x: "--replace-quiet '${x}/' '' ") strip}
     done
   '');
-  # TODO: echo for debug, can be removed at some point
+
+  /*
+    Output a directory containing lore for a single drv.
+
+    This produces lore for the derivation (via lore.callback) and
+    appends any lore that the derivation itself wrote to nix-support
+    or which was overridden in drv.binlore.<outputName> (passthru).
+
+    > *Note*: Since the passthru is attached to all outputs, binlore
+    > is an attrset namespaced by outputName to support packages with
+    > executables in more than one output.
+
+    Since the last entry wins, the effective priority is:
+    drv.binlore.<outputName> > $drv/nix-support > lore generated here by callback
+  */
   make = lore: drv: runCommand "${drv.name}-binlore" {
-      identifier = drv.name;
       drv = drv;
     } (''
     mkdir $out
     touch $out/{${builtins.concatStringsSep "," lore.types}}
 
-    ${lore.callback lore drv overrides}
+    ${lore.callback lore drv}
+    '' +
+    # append lore from package's $out and drv.binlore.${drv.outputName} (last entry wins)
+    ''
+    for lore_type in ${builtins.toString lore.types}; do
+      if [[ -f "${drv}/nix-support/$lore_type" ]]; then
+        cat "${drv}/nix-support/$lore_type" >> "$out/$lore_type"
+      fi
+      '' + lib.optionalString (builtins.hasAttr "binlore" drv && builtins.hasAttr drv.outputName drv.binlore) ''
+      if [[ -f "${drv.binlore."${drv.outputName}"}/$lore_type" ]]; then
+        cat "${drv.binlore."${drv.outputName}"}/$lore_type" >> "$out/$lore_type"
+      fi
+      '' + ''
+    done
 
     echo binlore for $drv written to $out
   '');
+
+  /*
+    Utility function for creating override lore for drv.
+
+    We normally attach this lore to `drv.passthru.binlore.<outputName>`.
+
+    > *Notes*:
+    > - Since the passthru is attached to all outputs, binlore is an
+    >   attrset namespaced by outputName to support packages with
+    >   executables in more than one output. You'll generally just use
+    >   `out` or `bin`.
+    > - We can reconsider the passthru attr name if someone adds
+    >   a new lore provider. We settled on `.binlore` for now to make it
+    >   easier for people to figure out what this is for.
+
+    The lore argument should be a Shell script (string) that generates
+    the necessary lore. You can use arbitrary Shell, but this function
+    includes a shell DSL you can use to declare/generate lore in most
+    cases. It has the following functions:
+
+    - `execer <verdict> [<path>...]`
+    - `wrapper <wrapper_path> <original_path>`
+
+    Writing every override explicitly in a Nix list would be tedious
+    for large packages, but this small shell DSL enables us to express
+    many overrides efficiently via pathname expansion/globbing.
+
+    Here's a very general example of both functions:
+
+    passthru.binlore.out = binlore.synthesize finalAttrs.finalPackage ''
+      execer can bin/hello bin/{a,b,c}
+      wrapper bin/hello bin/.hello-wrapped
+    '';
+
+    And here's a specific example of how pathname expansion enables us
+    to express lore for the single-binary variant of coreutils while
+    being both explicit and (somewhat) efficient:
+
+    passthru = {} // optionalAttrs (singleBinary != false) {
+      binlore.out = binlore.synthesize coreutils ''
+        execer can bin/{chroot,env,install,nice,nohup,runcon,sort,split,stdbuf,timeout}
+        execer cannot bin/{[,b2sum,base32,base64,basename,basenc,cat,chcon,chgrp,chmod,chown,cksum,comm,cp,csplit,cut,date,dd,df,dir,dircolors,dirname,du,echo,expand,expr,factor,false,fmt,fold,groups,head,hostid,id,join,kill,link,ln,logname,ls,md5sum,mkdir,mkfifo,mknod,mktemp,mv,nl,nproc,numfmt,od,paste,pathchk,pinky,pr,printenv,printf,ptx,pwd,readlink,realpath,rm,rmdir,seq,sha1sum,sha224sum,sha256sum,sha384sum,sha512sum,shred,shuf,sleep,stat,stty,sum,sync,tac,tail,tee,test,touch,tr,true,truncate,tsort,tty,uname,unexpand,uniq,unlink,uptime,users,vdir,wc,who,whoami,yes}
+      '';
+    };
+
+    Caution: Be thoughtful about using a bare wildcard (*) glob here.
+    We should generally override lore only when a human understands if
+    the executable will exec arbitrary user-passed executables. A bare
+    glob can match new executables added in future package versions
+    before anyone can audit them.
+  */
+  synthesize = drv: loreSynthesizingScript: runCommand "${drv.name}-lore-override" {
+    drv = drv;
+  } (''
+    execer(){
+      local verdict="$1"
+
+      shift
+
+      for path in "$@"; do
+        if [[ -f "$PWD/$path" ]]; then
+          echo "$verdict:$PWD/$path"
+        else
+          echo "error: Tried to synthesize execer lore for missing file: $PWD/$path" >&2
+          exit 2
+        fi
+      done
+    } >> $out/execers
+
+    wrapper(){
+      local wrapper="$1"
+      local original="$2"
+
+      if [[ ! -f "$wrapper" ]]; then
+        echo "error: Tried to synthesize wrapper lore for missing wrapper: $PWD/$wrapper" >&2
+        exit 2
+      fi
+
+      if [[ ! -f "$original" ]]; then
+        echo "error: Tried to synthesize wrapper lore for missing original: $PWD/$original" >&2
+        exit 2
+      fi
+
+      echo "$PWD/$wrapper:$PWD/$original"
+
+    } >> $out/wrappers
+
+    mkdir $out
+
+    # lore override commands are relative to the drv root
+    cd $drv
+
+  '' + loreSynthesizingScript);
 }
diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/checkov/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/checkov/default.nix
index 099e4f7c60..68671a7338 100644
--- a/third_party/nixpkgs/pkgs/development/tools/analysis/checkov/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/analysis/checkov/default.nix
@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "checkov";
-  version = "3.2.208";
+  version = "3.2.213";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "bridgecrewio";
     repo = "checkov";
     rev = "refs/tags/${version}";
-    hash = "sha256-bCaqwgFG/bHy9nWYKqiGMoeXvE9bTc5QZmtp3rDOkUk=";
+    hash = "sha256-Wc0vfyQhftgp+rGTgpU4KkUIARaaP2/FOZXEYGkSG50=";
   };
 
   patches = [ ./flake8-compat-5.x.patch ];
@@ -123,6 +123,8 @@ python3.pkgs.buildPythonApplication rec {
     "test_get_cyclonedx_report"
     # Test fails on Hydra
     "test_sast_js_filtered_files_by_ts"
+    # Timing sensitive
+    "test_non_multiline_pair_time_limit_creating_report"
   ];
 
   disabledTestPaths = [
diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix
index 8143a6bfd5..27c11ffb2e 100644
--- a/third_party/nixpkgs/pkgs/development/tools/analysis/codeql/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/analysis/dotenv-linter/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/dotenv-linter/default.nix
index 75745be014..603cc1d1cc 100644
--- a/third_party/nixpkgs/pkgs/development/tools/analysis/dotenv-linter/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/analysis/dotenv-linter/default.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-HCP1OUWm/17e73TbinmDxYUi18/KXxppstyUSixjlSo=";
   };
 
-  cargoSha256 = "sha256-4r4NTq2rLnpmm/nwxJ9RoN2+JrUI6XKGfYFI78NY710=";
+  cargoHash = "sha256-4r4NTq2rLnpmm/nwxJ9RoN2+JrUI6XKGfYFI78NY710=";
 
   buildInputs = lib.optional stdenv.isDarwin Security;
 
diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/panopticon/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/panopticon/default.nix
index 02bfaf8bd3..01ba9da439 100644
--- a/third_party/nixpkgs/pkgs/development/tools/analysis/panopticon/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/analysis/panopticon/default.nix
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec {
 
   dontWrapQtApps = true;
 
-  cargoSha256 = "0vhcb3kw1zgchx3nrk8lyrz8p5071y99vsysxvi71klv7dcvn0am";
+  cargoHash = "sha256-VQG7WTubznDi7trrnZIPB5SLfvYUzWxHh+z9wOdYDG4=";
   doCheck = false;
 
   postInstall = ''
diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/smatch/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/smatch/default.nix
index 93a74f2b4a..b55e8c5bcf 100644
--- a/third_party/nixpkgs/pkgs/development/tools/analysis/smatch/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/analysis/snowman/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/snowman/default.nix
index 4e2af64c60..706d3f6b8e 100644
--- a/third_party/nixpkgs/pkgs/development/tools/analysis/snowman/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/analysis/snyk/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/snyk/default.nix
index 41f1af5642..cb10603e9b 100644
--- a/third_party/nixpkgs/pkgs/development/tools/analysis/snyk/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/analysis/stylelint/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/stylelint/default.nix
index ab2b971683..8de60ad396 100644
--- a/third_party/nixpkgs/pkgs/development/tools/analysis/stylelint/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/async/default.nix b/third_party/nixpkgs/pkgs/development/tools/async/default.nix
index ae5a1d8256..dd2ea52053 100644
--- a/third_party/nixpkgs/pkgs/development/tools/async/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/async/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "19ypflbayi5l0mb8yw7w0a4bq9a3w8nl9jsxapp9m3xggzmsvrxx";
   };
 
-  cargoSha256 = "0y2q46i838gha58p95vcv5r5i14il1kv86k35s30ncfibijgp0lc";
+  cargoHash = "sha256-jIL7ZFzRMQuGLmMatGegkYRYctlsl3RRUfChgaIhWHg=";
 
   meta = with lib; {
     description = "Tool to parallelize shell commands";
diff --git a/third_party/nixpkgs/pkgs/development/tools/avro-tools/default.nix b/third_party/nixpkgs/pkgs/development/tools/avro-tools/default.nix
index 7ee16a2972..9615d4574c 100644
--- a/third_party/nixpkgs/pkgs/development/tools/avro-tools/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/bloaty/default.nix b/third_party/nixpkgs/pkgs/development/tools/bloaty/default.nix
index 7f2fb6daea..1393a7ca54 100644
--- a/third_party/nixpkgs/pkgs/development/tools/bloaty/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/bloom/default.nix b/third_party/nixpkgs/pkgs/development/tools/bloom/default.nix
index 1b977e3302..e870371c0e 100644
--- a/third_party/nixpkgs/pkgs/development/tools/bloom/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/boomerang/default.nix b/third_party/nixpkgs/pkgs/development/tools/boomerang/default.nix
index d173403e3d..99421a2bd6 100644
--- a/third_party/nixpkgs/pkgs/development/tools/boomerang/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_7/cpp-test.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_7/cpp-test.nix
index 8f5592b5e8..5722d26ea1 100644
--- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_7/cpp-test.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_7/cpp-test.nix
@@ -3,6 +3,7 @@
 , bazel-examples
 , bazelTest
 , callPackage
+, cctools
 , darwin
 , distDir
 , extraBazelArgs ? ""
@@ -37,8 +38,8 @@ let
     #! ${runtimeShell}
 
     export CXX='${stdenv.cc}/bin/clang++'
-    export LD='${darwin.cctools}/bin/ld'
-    export LIBTOOL='${darwin.cctools}/bin/libtool'
+    export LD='${cctools}/bin/ld'
+    export LIBTOOL='${cctools}/bin/libtool'
     export CC='${stdenv.cc}/bin/clang'
 
     # XXX: hack for macosX, this flags disable bazel usage of xcode
diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_7/java-test.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_7/java-test.nix
index 2b231dc52a..51fea3e32d 100644
--- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_7/java-test.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_7/java-test.nix
@@ -4,7 +4,7 @@
 , stdenv
 , symlinkJoin
 , callPackage
-, darwin
+, cctools
 , extraBazelArgs ? ""
 , lib
 , openjdk8
@@ -38,8 +38,8 @@ let
     #! ${runtimeShell}
 
     export CXX='${stdenv.cc}/bin/clang++'
-    export LD='${darwin.cctools}/bin/ld'
-    export LIBTOOL='${darwin.cctools}/bin/libtool'
+    export LD='${cctools}/bin/ld'
+    export LIBTOOL='${cctools}/bin/libtool'
     export CC='${stdenv.cc}/bin/clang'
 
     # XXX: hack for macosX, this flags disable bazel usage of xcode
diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_7/protobuf-test.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_7/protobuf-test.nix
index 4d188ed414..ebe4f13346 100644
--- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_7/protobuf-test.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/bazel_7/protobuf-test.nix
@@ -2,6 +2,7 @@
 , Foundation
 , bazelTest
 , callPackage
+, cctools
 , darwin
 , distDir
 , extraBazelArgs ? ""
@@ -97,8 +98,8 @@ let
     #! ${runtimeShell}
 
     export CXX='${stdenv.cc}/bin/clang++'
-    export LD='${darwin.cctools}/bin/ld'
-    export LIBTOOL='${darwin.cctools}/bin/libtool'
+    export LD='${cctools}/bin/ld'
+    export LIBTOOL='${cctools}/bin/libtool'
     export CC='${stdenv.cc}/bin/clang'
 
     # XXX: hack for macosX, this flags disable bazel usage of xcode
diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/cpp-test.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/cpp-test.nix
index 7b0e2a5d01..6759bf14de 100644
--- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/cpp-test.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/cpp-test.nix
@@ -3,6 +3,7 @@
 , bazelTest
 , bazel-examples
 , stdenv
+, cctools
 , darwin
 , extraBazelArgs ? ""
 , lib
@@ -20,8 +21,8 @@ let
     #! ${runtimeShell}
 
     export CXX='${stdenv.cc}/bin/clang++'
-    export LD='${darwin.cctools}/bin/ld'
-    export LIBTOOL='${darwin.cctools}/bin/libtool'
+    export LD='${cctools}/bin/ld'
+    export LIBTOOL='${cctools}/bin/libtool'
     export CC='${stdenv.cc}/bin/clang'
 
     # XXX: hack for macosX, this flags disable bazel usage of xcode
diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/java-test.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/java-test.nix
index ed4711f402..3890d45d2b 100644
--- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/java-test.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/java-test.nix
@@ -2,7 +2,7 @@
 , bazelTest
 , bazel-examples
 , stdenv
-, darwin
+, cctools
 , extraBazelArgs ? ""
 , lib
 , openjdk8
@@ -20,8 +20,8 @@ let
     #! ${runtimeShell}
 
     export CXX='${stdenv.cc}/bin/clang++'
-    export LD='${darwin.cctools}/bin/ld'
-    export LIBTOOL='${darwin.cctools}/bin/libtool'
+    export LD='${cctools}/bin/ld'
+    export LIBTOOL='${cctools}/bin/libtool'
     export CC='${stdenv.cc}/bin/clang'
 
     # XXX: hack for macosX, this flags disable bazel usage of xcode
diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/protobuf-test.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/protobuf-test.nix
index 963bad679c..0466404ced 100644
--- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/protobuf-test.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/protobuf-test.nix
@@ -4,7 +4,7 @@
 , fetchFromGitHub
 , fetchurl
 , stdenv
-, darwin
+, cctools
 , lib
 , openjdk8
 , jdk11_headless
@@ -134,8 +134,8 @@ let
     #! ${runtimeShell}
 
     export CXX='${stdenv.cc}/bin/clang++'
-    export LD='${darwin.cctools}/bin/ld'
-    export LIBTOOL='${darwin.cctools}/bin/libtool'
+    export LD='${cctools}/bin/ld'
+    export LIBTOOL='${cctools}/bin/libtool'
     export CC='${stdenv.cc}/bin/clang'
 
     # XXX: hack for macosX, this flags disable bazel usage of xcode
diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/python-bin-path-test.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/python-bin-path-test.nix
index 2538a2ae07..e0e59fb889 100644
--- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/python-bin-path-test.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/python-bin-path-test.nix
@@ -2,7 +2,7 @@
   bazel
 , bazelTest
 , stdenv
-, darwin
+, cctools
 , extraBazelArgs ? ""
 , lib
 , runLocal
@@ -17,8 +17,8 @@ let
     #! ${runtimeShell}
 
     export CXX='${stdenv.cc}/bin/clang++'
-    export LD='${darwin.cctools}/bin/ld'
-    export LIBTOOL='${darwin.cctools}/bin/libtool'
+    export LD='${cctools}/bin/ld'
+    export LIBTOOL='${cctools}/bin/libtool'
     export CC='${stdenv.cc}/bin/clang'
 
     # XXX: hack for macosX, this flags disable bazel usage of xcode
diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/fac/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/fac/default.nix
index 06095fb032..d4748ecf98 100644
--- a/third_party/nixpkgs/pkgs/development/tools/build-managers/fac/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/fac/default.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
 
 
   buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ];
-  cargoSha256 = "sha256-XT4FQVE+buORuZAFZK5Qnf/Fl3QSvw4SHUuCzWhxUdk=";
+  cargoHash = "sha256-XT4FQVE+buORuZAFZK5Qnf/Fl3QSvw4SHUuCzWhxUdk=";
 
   # fac includes a unit test called ls_files_works which assumes it's
   # running in a git repo. Nix's sandbox runs cargo build outside git,
diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/gn/generic.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/gn/generic.nix
index c890caa5da..fe74486ccf 100644
--- a/third_party/nixpkgs/pkgs/development/tools/build-managers/gn/generic.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/gn/generic.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchgit, darwin, writeText
+{ stdenv, lib, fetchgit, cctools, darwin, writeText
 , ninja, python3
 , ...
 }:
diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix
index 7567b3e3db..1522411656 100644
--- a/third_party/nixpkgs/pkgs/development/tools/build-managers/gradle/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/build-managers/leiningen/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/leiningen/default.nix
index 4c10652d67..efbce0bcd3 100644
--- a/third_party/nixpkgs/pkgs/development/tools/build-managers/leiningen/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/build-managers/scala-cli/sources.json b/third_party/nixpkgs/pkgs/development/tools/build-managers/scala-cli/sources.json
index 676c8eebb0..743aa87325 100644
--- a/third_party/nixpkgs/pkgs/development/tools/build-managers/scala-cli/sources.json
+++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/scala-cli/sources.json
@@ -1,21 +1,21 @@
 {
-  "version": "1.4.0",
+  "version": "1.4.1",
   "assets": {
     "aarch64-darwin": {
       "asset": "scala-cli-aarch64-apple-darwin.gz",
-      "sha256": "1k9yc868lh7yjvxf81pg9n1sdyb2c566i6qwrf7kxczn0s9sa12h"
+      "sha256": "08w3xvh62faiaw5ma5nwayf5j0382llmaq9kn9xvxc9csnpwmn6m"
     },
     "aarch64-linux": {
       "asset": "scala-cli-aarch64-pc-linux.gz",
-      "sha256": "08chhm364m5lbl1wr5xiww3mmm8d31hfw07s4jdsrmpjvxx0yrhg"
+      "sha256": "000k2nxh9qa20l5xblrawqmy6qf5i0ad59g2l4iblplflzw6lv8h"
     },
     "x86_64-darwin": {
       "asset": "scala-cli-x86_64-apple-darwin.gz",
-      "sha256": "1a1ng800aaydvp83wrvxdxw3x6zcdgl2g7fa3zz5h2ba208xjv62"
+      "sha256": "1p7krdi3p0n82f27ap7scy7ka42xbvzqb3kk88lghdkcrlwvwdyp"
     },
     "x86_64-linux": {
       "asset": "scala-cli-x86_64-pc-linux.gz",
-      "sha256": "1cav0c0bhag64mic1c37l9zb21zyasshcyl3r12y939fmc9icnww"
+      "sha256": "02zxn516v507r9hyglb6cmd3l9lmgy7pqrwgxqgmckibnghgxbqz"
     }
   }
 }
diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/scons/4.1.0.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/scons/4.1.0.nix
deleted file mode 100644
index 13357dfb99..0000000000
--- a/third_party/nixpkgs/pkgs/development/tools/build-managers/scons/4.1.0.nix
+++ /dev/null
@@ -1,57 +0,0 @@
-{ lib, fetchFromGitHub, python3 }:
-
-let
-  pname = "scons";
-  version = "4.1.0";
-  src = fetchFromGitHub {
-    owner = "Scons";
-    repo = "scons";
-    rev = version;
-    hash = "sha256-ldus/9ghqAMB7A+NrHiCQm7saCdIpqzufGCLxWRhYKU=";
-  };
-in
-python3.pkgs.buildPythonApplication {
-  inherit pname version src;
-
-  outputs = [ "out" "man" ];
-
-  postPatch = ''
-    substituteInPlace setup.cfg \
-      --replace "build/dist" "dist"
-  '';
-
-  preConfigure = ''
-    python scripts/scons.py
-  '';
-
-  postInstall = ''
-    mkdir -pv "$man/share/man/man1"
-    mv -v "$out/"*.1 "$man/share/man/man1/"
-  '';
-
-  setupHook = ./setup-hook.sh;
-
-  # The release tarballs don't contain any tests (runtest.py and test/*):
-  doCheck = false;
-
-  passthru = {
-    # expose the used python version so tools using this (and extensing scos
-    # with other python modules) can use the exact same python version.
-    inherit python3;
-    python = python3;
-  };
-
-  meta = {
-    description = "Improved, cross-platform substitute for Make";
-    longDescription = ''
-      SCons is an Open Source software construction tool. Think of SCons as an
-      improved, cross-platform substitute for the classic Make utility with
-      integrated functionality similar to autoconf/automake and compiler caches
-      such as ccache. In short, SCons is an easier, more reliable and faster way
-      to build software.
-    '';
-    homepage = "https://scons.org/";
-    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ AndersonTorres ];
-  };
-}
diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/scons/4.5.2.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/scons/4.5.2.nix
deleted file mode 100644
index 6b5720c86e..0000000000
--- a/third_party/nixpkgs/pkgs/development/tools/build-managers/scons/4.5.2.nix
+++ /dev/null
@@ -1,62 +0,0 @@
-{ lib, fetchFromGitHub, python3 }:
-
-let
-  pname = "scons";
-  version = "4.5.2";
-  src = fetchFromGitHub {
-    owner = "Scons";
-    repo = "scons";
-    rev = version;
-    hash = "sha256-vxJsz24jDsPcttwPXq9+ztc/N7W4Gkydgykk/FLgZLo=";
-  };
-in
-python3.pkgs.buildPythonApplication {
-  inherit pname version src;
-
-  outputs = [ "out" "man" ];
-
-  patches = [
-    ./env.patch
-  ];
-
-  postPatch = ''
-    substituteInPlace setup.cfg \
-      --replace "build/dist" "dist" \
-      --replace "build/doc/man/" ""
-  '';
-
-  preConfigure = ''
-    python scripts/scons.py
-  '';
-
-  postInstall = ''
-    mkdir -p "$man/share/man/man1"
-    mv "$out/"*.1 "$man/share/man/man1/"
-  '';
-
-  setupHook = ./setup-hook.sh;
-
-  # The release tarballs don't contain any tests (runtest.py and test/*):
-  doCheck = false;
-
-  passthru = {
-    # expose the used python version so tools using this (and extensing scos
-    # with other python modules) can use the exact same python version.
-    inherit python3;
-    python = python3;
-  };
-
-  meta = {
-    description = "Improved, cross-platform substitute for Make";
-    longDescription = ''
-      SCons is an Open Source software construction tool. Think of SCons as an
-      improved, cross-platform substitute for the classic Make utility with
-      integrated functionality similar to autoconf/automake and compiler caches
-      such as ccache. In short, SCons is an easier, more reliable and faster way
-      to build software.
-    '';
-    homepage = "https://scons.org/";
-    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ AndersonTorres ];
-  };
-}
diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/xmake/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/xmake/default.nix
index 9b745264eb..184c038bea 100644
--- a/third_party/nixpkgs/pkgs/development/tools/build-managers/xmake/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/buildah/wrapper.nix b/third_party/nixpkgs/pkgs/development/tools/buildah/wrapper.nix
index b5042ae1b8..6067079182 100644
--- a/third_party/nixpkgs/pkgs/development/tools/buildah/wrapper.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/buildah/wrapper.nix
@@ -32,7 +32,7 @@ let
   helpersBin = symlinkJoin {
     name = "${buildah-unwrapped.pname}-helper-binary-wrapper-${buildah-unwrapped.version}";
 
-    # this only works for some binaries, others may need to be be added to `binPath` or in the modules
+    # this only works for some binaries, others may need to be added to `binPath` or in the modules
     paths = [
     ] ++ lib.optionals stdenv.isLinux [
       aardvark-dns
diff --git a/third_party/nixpkgs/pkgs/development/tools/bundletool/default.nix b/third_party/nixpkgs/pkgs/development/tools/bundletool/default.nix
index d524da13cf..43279049ea 100644
--- a/third_party/nixpkgs/pkgs/development/tools/bundletool/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/bunyan-rs/default.nix b/third_party/nixpkgs/pkgs/development/tools/bunyan-rs/default.nix
index 314af560ca..35fc322b05 100644
--- a/third_party/nixpkgs/pkgs/development/tools/bunyan-rs/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/bunyan-rs/default.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-dqhZIwxWBMXS2RgE8YynYrESVyAOIJ9ujAKcp2tDhvA=";
   };
 
-  cargoSha256 = "sha256-sQ6f8BHGsPFPchFDjNlZimnu9i99SGYf5bYfM1/2Gac=";
+  cargoHash = "sha256-sQ6f8BHGsPFPchFDjNlZimnu9i99SGYf5bYfM1/2Gac=";
 
   meta = with lib; {
     description = "CLI to pretty print logs in bunyan format (Rust port of the original JavaScript bunyan CLI)";
diff --git a/third_party/nixpkgs/pkgs/development/tools/cbfmt/default.nix b/third_party/nixpkgs/pkgs/development/tools/cbfmt/default.nix
index 6fc8526cab..099a2a7f9f 100644
--- a/third_party/nixpkgs/pkgs/development/tools/cbfmt/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/cbfmt/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-/ZvL1ZHXcmE1n+hHvJeSqmnI9nSHJ+zM9lLNx0VQfIE=";
   };
 
-  cargoSha256 = "sha256-6oZCpjQ8t/QLFhEtF7td8KGI/kFE04pg7OELutsrJKo=";
+  cargoHash = "sha256-6oZCpjQ8t/QLFhEtF7td8KGI/kFE04pg7OELutsrJKo=";
 
   passthru.tests.version = testers.testVersion {
     package = cbfmt;
diff --git a/third_party/nixpkgs/pkgs/development/tools/clean-css-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/clean-css-cli/default.nix
index 2f0cd241ec..62782c311d 100644
--- a/third_party/nixpkgs/pkgs/development/tools/clean-css-cli/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/clog-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/clog-cli/default.nix
index f1d67bddc6..6f4fa62cb5 100644
--- a/third_party/nixpkgs/pkgs/development/tools/clog-cli/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/clog-cli/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1wxglc4n1dar5qphhj5pab7ps34cjr7jy611fwn72lz0f6c7jp3z";
   };
 
-  cargoSha256 = "0xcgzlcmlk5ycw4kklprm8lzs72j2zp8xm3dcpy606z4r9qn0c6a";
+  cargoHash = "sha256-yjBgccrkG2D8ZW3Uju4XUhz9Kar50jkJZ75MWhn9j3U=";
 
   meta = {
     description = "Generate changelogs from local git metadata";
diff --git a/third_party/nixpkgs/pkgs/development/tools/cloud-nuke/default.nix b/third_party/nixpkgs/pkgs/development/tools/cloud-nuke/default.nix
index 8bd22b5371..9d516ebe4e 100644
--- a/third_party/nixpkgs/pkgs/development/tools/cloud-nuke/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/cloudsmith-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/cloudsmith-cli/default.nix
index 0131a50290..ed4cde502a 100644
--- a/third_party/nixpkgs/pkgs/development/tools/cloudsmith-cli/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/cocogitto/default.nix b/third_party/nixpkgs/pkgs/development/tools/cocogitto/default.nix
index aae8fb3972..7c604e7112 100644
--- a/third_party/nixpkgs/pkgs/development/tools/cocogitto/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/compile-daemon/default.nix b/third_party/nixpkgs/pkgs/development/tools/compile-daemon/default.nix
index f18865a7ce..65ae92d904 100644
--- a/third_party/nixpkgs/pkgs/development/tools/compile-daemon/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/conftest/default.nix b/third_party/nixpkgs/pkgs/development/tools/conftest/default.nix
index 5e6b582865..98051df100 100644
--- a/third_party/nixpkgs/pkgs/development/tools/conftest/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/conftest/default.nix
@@ -6,15 +6,15 @@
 
 buildGoModule rec {
   pname = "conftest";
-  version = "0.54.0";
+  version = "0.55.0";
 
   src = fetchFromGitHub {
     owner = "open-policy-agent";
     repo = "conftest";
     rev = "refs/tags/v${version}";
-    hash = "sha256-YZ5IAQAzfynXYAZadUp18+hfwCVxRDkT5OOMHQm2h3A=";
+    hash = "sha256-cJY3NmZa+IBmadTAusvzHKXeGsnsKpRqvJwYPVnU68A=";
   };
-  vendorHash = "sha256-9vP+PgXWySjKCFbshaV27fG+UDYWSVP48HDvpKzp82Q=";
+  vendorHash = "sha256-iPTyDqaodTFhnGRLEbEFpQjfz9r4DsFdue7fQNwq/pU=";
 
   ldflags = [
     "-s"
diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-test-collector-rust/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-test-collector-rust/default.nix
index 709cd3e87f..28630e43b7 100644
--- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-test-collector-rust/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-test-collector-rust/default.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
     Security
   ];
 
-  cargoSha256 = "sha256-4eaU6dOb97/vV3NSCCpdzK2oQUIHl4kdAtgWbGsY5LU=";
+  cargoHash = "sha256-4eaU6dOb97/vV3NSCCpdzK2oQUIHl4kdAtgWbGsY5LU=";
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/drone-runner-docker/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/drone-runner-docker/default.nix
index e77aecde51..05347f153c 100644
--- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/drone-runner-docker/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/cpm-cmake/default.nix b/third_party/nixpkgs/pkgs/development/tools/cpm-cmake/default.nix
index f0b45f8a50..628a9cefb0 100644
--- a/third_party/nixpkgs/pkgs/development/tools/cpm-cmake/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/database/indradb/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/indradb/default.nix
index d003754bc4..29f665d1e1 100644
--- a/third_party/nixpkgs/pkgs/development/tools/database/indradb/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/database/indradb/default.nix
@@ -27,7 +27,7 @@ in
     version = "unstable-2021-01-05";
     inherit src meta;
 
-    cargoSha256 = "sha256-3WtiW31AkyNX7HiT/zqfNo2VSKR7Q57/wCigST066Js=";
+    cargoHash = "sha256-3WtiW31AkyNX7HiT/zqfNo2VSKR7Q57/wCigST066Js=";
 
     buildAndTestSubdir = "server";
 
@@ -45,7 +45,7 @@ in
     version = "unstable-2021-01-05";
     inherit src meta;
 
-    cargoSha256 = "sha256-pxan6W/CEsOxv8DbbytEBuIqxWn/C4qT4ze/RnvESOM=";
+    cargoHash = "sha256-pxan6W/CEsOxv8DbbytEBuIqxWn/C4qT4ze/RnvESOM=";
 
     PROTOC = "${protobuf}/bin/protoc";
 
diff --git a/third_party/nixpkgs/pkgs/development/tools/database/prisma-engines/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/prisma-engines/default.nix
index 24d3fa7417..1471771f65 100644
--- a/third_party/nixpkgs/pkgs/development/tools/database/prisma-engines/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/database/prisma-engines/default.nix
@@ -74,7 +74,8 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://www.prisma.io/";
     license = licenses.asl20;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ pimeys tomhoule ivan aqrln ];
+    mainProgram = "prisma";
+    maintainers = with maintainers; [ pimeys tomhoule aqrln ];
   };
 }
 
diff --git a/third_party/nixpkgs/pkgs/development/tools/database/shmig/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/shmig/default.nix
index 3e7e640c88..797ee27eee 100644
--- a/third_party/nixpkgs/pkgs/development/tools/database/shmig/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/database/sqlitebrowser/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/sqlitebrowser/default.nix
index b13255f57a..96d9c035be 100644
--- a/third_party/nixpkgs/pkgs/development/tools/database/sqlitebrowser/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/database/sqlitebrowser/default.nix
@@ -4,13 +4,13 @@
 
 mkDerivation rec {
   pname = "sqlitebrowser";
-  version = "3.12.2";
+  version = "3.13.0";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-33iVic0kxemWld+SiHOWGlKFSi5fpk1RtLUiNDr7WNI=";
+    sha256 = "sha256-2U0jnL2hmrxynMxEiObl10bKFAFlCrY2hulZ/Ggqimw=";
   };
 
   # We should be using qscintilla from nixpkgs instead of the vendored version,
diff --git a/third_party/nixpkgs/pkgs/development/tools/database/timescaledb-tune/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/timescaledb-tune/default.nix
index 121ccee544..32458926bd 100644
--- a/third_party/nixpkgs/pkgs/development/tools/database/timescaledb-tune/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/djhtml/default.nix b/third_party/nixpkgs/pkgs/development/tools/djhtml/default.nix
index 5d654b58a1..0d30fc4f38 100644
--- a/third_party/nixpkgs/pkgs/development/tools/djhtml/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/drm_info/default.nix b/third_party/nixpkgs/pkgs/development/tools/drm_info/default.nix
index d2b69af76e..e14437b08b 100644
--- a/third_party/nixpkgs/pkgs/development/tools/drm_info/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/dum/default.nix b/third_party/nixpkgs/pkgs/development/tools/dum/default.nix
index 6a68c502d9..201c81f3fd 100644
--- a/third_party/nixpkgs/pkgs/development/tools/dum/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/dum/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0rnm59zhpaa8nbbh6rh53svnlb484q1k6s4wc4w9516b18xhmkca";
   };
 
-  cargoSha256 = "sha256-aMx4xfWYiiz5TY/CVCogZ3WNR6md77jb8RKhhVwqeto=";
+  cargoHash = "sha256-aMx4xfWYiiz5TY/CVCogZ3WNR6md77jb8RKhhVwqeto=";
 
   meta = with lib; {
     description = "Npm scripts runner written in Rust";
diff --git a/third_party/nixpkgs/pkgs/development/tools/dump_syms/default.nix b/third_party/nixpkgs/pkgs/development/tools/dump_syms/default.nix
index f29473ef85..631051ee3a 100644
--- a/third_party/nixpkgs/pkgs/development/tools/dump_syms/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/dump_syms/default.nix
@@ -29,7 +29,7 @@ rustPlatform.buildRustPackage {
     hash = "sha256-pZlWA7LZeMb+ZhnfQh9MzvDDlre1kkPc6aSVNZcVi/w=";
   };
 
-  cargoSha256 = "sha256-srphb7jFSJB08hSShk3f5QYPoYu8UwbUzkzn0zpMqyg=";
+  cargoHash = "sha256-srphb7jFSJB08hSShk3f5QYPoYu8UwbUzkzn0zpMqyg=";
 
   nativeBuildInputs = [
     pkg-config
diff --git a/third_party/nixpkgs/pkgs/development/tools/dyff/default.nix b/third_party/nixpkgs/pkgs/development/tools/dyff/default.nix
index a4d29757ae..02c5d2bfcc 100644
--- a/third_party/nixpkgs/pkgs/development/tools/dyff/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/dyff/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "dyff";
-  version = "1.8.0";
+  version = "1.8.1";
 
   src = fetchFromGitHub {
     owner = "homeport";
     repo = "dyff";
     rev = "v${version}";
-    sha256 = "sha256-RRLIogNOvbXylmdR59anMVSYCILdVr0Xeot21HqXlXU=";
+    sha256 = "sha256-EidlGr8gWeq2CvO2HJApGigD8eC1xWLE1heA7rC4ZT4=";
   };
 
-  vendorHash = "sha256-BLwdNBthYTMSNDcT5Cf8IcAr4uUmpewLdZRgIvq5htE=";
+  vendorHash = "sha256-sWOlqgrvWFa6GIhUgBEMPJw7iqfu0ltFGXYSqvLxioM=";
 
   subPackages = [
     "cmd/dyff"
diff --git a/third_party/nixpkgs/pkgs/development/tools/electron/chromedriver/info.json b/third_party/nixpkgs/pkgs/development/tools/electron/chromedriver/info.json
index 01b29e15ed..2a5d1f400c 100644
--- a/third_party/nixpkgs/pkgs/development/tools/electron/chromedriver/info.json
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/electron/common.nix b/third_party/nixpkgs/pkgs/development/tools/electron/common.nix
index 36cecd7ce6..dbd97b8982 100644
--- a/third_party/nixpkgs/pkgs/development/tools/electron/common.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/electron/common.nix
@@ -16,7 +16,7 @@
 , pipewire
 , libsecret
 , libpulseaudio
-, speechd
+, speechd-minimal
 , info
 }:
 
@@ -199,7 +199,7 @@ in (chromium.override { upstream-info = info.chromium; }).mkDerivation (base: {
         stdenv.cc.cc.lib
         libsecret
         libpulseaudio
-        speechd
+        speechd-minimal
       ];
     in
   base.postFixup + ''
diff --git a/third_party/nixpkgs/pkgs/development/tools/firebase-tools/default.nix b/third_party/nixpkgs/pkgs/development/tools/firebase-tools/default.nix
index ff2af4cc5a..b056718f63 100644
--- a/third_party/nixpkgs/pkgs/development/tools/firebase-tools/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/frece/default.nix b/third_party/nixpkgs/pkgs/development/tools/frece/default.nix
index c8b6a3a85f..c8bc63e3dc 100644
--- a/third_party/nixpkgs/pkgs/development/tools/frece/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/frece/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-CAiIqT5KuzrqbV9FVK3nZUe8MDs2KDdsKplJMI7rN9w=";
   };
 
-  cargoSha256 = "sha256-eLN917L6l0vUWlAn3ROKrRdtyqaaMKjBQD2tEGWECUU=";
+  cargoHash = "sha256-eLN917L6l0vUWlAn3ROKrRdtyqaaMKjBQD2tEGWECUU=";
 
   meta = with lib; {
     description = "Maintain a database sorted by frecency (frequency + recency)";
@@ -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/third_party/nixpkgs/pkgs/development/tools/gllvm/default.nix b/third_party/nixpkgs/pkgs/development/tools/gllvm/default.nix
index 457895c061..3b754db80f 100644
--- a/third_party/nixpkgs/pkgs/development/tools/gllvm/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/gnulib/default.nix b/third_party/nixpkgs/pkgs/development/tools/gnulib/default.nix
index be6719c351..1a5f173317 100644
--- a/third_party/nixpkgs/pkgs/development/tools/gnulib/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/gnulib/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromSavannah, python3 }:
+{ lib, stdenv, fetchFromSavannah, python3, perl }:
 
 stdenv.mkDerivation rec {
   pname = "gnulib";
@@ -12,6 +12,8 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     patchShebangs gnulib-tool.py
+    substituteInPlace build-aux/{prefix-gnulib-mk,useless-if-before-free,update-copyright,gitlog-to-changelog,announce-gen} \
+    --replace-fail 'exec perl' 'exec ${lib.getExe perl}'
   '';
 
   buildInputs = [ python3 ];
diff --git a/third_party/nixpkgs/pkgs/development/tools/go-bindata/default.nix b/third_party/nixpkgs/pkgs/development/tools/go-bindata/default.nix
index 3b0bd53e48..7877313b9d 100644
--- a/third_party/nixpkgs/pkgs/development/tools/go-bindata/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/goa/default.nix b/third_party/nixpkgs/pkgs/development/tools/goa/default.nix
index 626276a40c..79ec969e88 100644
--- a/third_party/nixpkgs/pkgs/development/tools/goa/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/godot/3/mono/default.nix b/third_party/nixpkgs/pkgs/development/tools/godot/3/mono/default.nix
index 96130cb92a..9c6da83d43 100644
--- a/third_party/nixpkgs/pkgs/development/tools/godot/3/mono/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/godot/3/mono/default.nix
@@ -6,12 +6,12 @@
 , dotnet-sdk
 , writeText
 , scons
-, python311
+, python311Packages
 }:
 
 (godot3.override {
   scons = scons.override {
-    python3 = python311;
+    python3Packages = python311Packages;
   };
 }).overrideAttrs (self: base: {
   pname = "godot3-mono";
diff --git a/third_party/nixpkgs/pkgs/development/tools/godot/3/mono/glue.nix b/third_party/nixpkgs/pkgs/development/tools/godot/3/mono/glue.nix
index e914bd04e5..09659d0ab4 100644
--- a/third_party/nixpkgs/pkgs/development/tools/godot/3/mono/glue.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/godot/3/mono/glue.nix
@@ -1,8 +1,8 @@
-{ godot3, mono, scons, python311 }:
+{ godot3, mono, scons, python311Packages }:
 
 (godot3.override {
   scons = scons.override {
-    python3 = python311;
+    python3Packages = python311Packages;
   };
 }).overrideAttrs (self: base: {
   pname = "godot3-mono-glue";
diff --git a/third_party/nixpkgs/pkgs/development/tools/godot/4/default.nix b/third_party/nixpkgs/pkgs/development/tools/godot/4/default.nix
index 111cf9e0a1..9c183ec79f 100644
--- a/third_party/nixpkgs/pkgs/development/tools/godot/4/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/godot/4/default.nix
@@ -19,7 +19,7 @@
 , alsa-lib
 , libpulseaudio
 , dbus
-, speechd
+, speechd-minimal
 , fontconfig
 , udev
 , withDebug ? false
@@ -81,7 +81,7 @@ stdenv.mkDerivation rec {
   ++ lib.optional withPulseaudio libpulseaudio
   ++ lib.optional withDbus dbus
   ++ lib.optional withDbus dbus.lib
-  ++ lib.optional withSpeechd speechd
+  ++ lib.optional withSpeechd speechd-minimal
   ++ lib.optional withFontconfig fontconfig
   ++ lib.optional withFontconfig fontconfig.lib
   ++ lib.optional withUdev udev;
diff --git a/third_party/nixpkgs/pkgs/development/tools/google-java-format/default.nix b/third_party/nixpkgs/pkgs/development/tools/google-java-format/default.nix
index b5196f01e5..cbecd3d598 100644
--- a/third_party/nixpkgs/pkgs/development/tools/google-java-format/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/google-java-format/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "google-java-format";
-  version = "1.22.0";
+  version = "1.23.0";
 
   src = fetchurl {
     url = "https://github.com/google/google-java-format/releases/download/v${version}/google-java-format-${version}-all-deps.jar";
-    sha256 = "sha256-FrKh7pOGhsix2Iq/GeuD39DWI87p3m/G0JmAIU+BbT8=";
+    sha256 = "sha256-fGN1rCS0glvmu+YZAOi1ixo+iUShNnqDYyEPntLQhXA=";
   };
 
   dontUnpack = true;
diff --git a/third_party/nixpkgs/pkgs/development/tools/gotest/default.nix b/third_party/nixpkgs/pkgs/development/tools/gotest/default.nix
index 172d2eb12e..2f54241d65 100644
--- a/third_party/nixpkgs/pkgs/development/tools/gotest/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/graphql-client/default.nix b/third_party/nixpkgs/pkgs/development/tools/graphql-client/default.nix
index eb365325a3..241e1ef95f 100644
--- a/third_party/nixpkgs/pkgs/development/tools/graphql-client/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/graphql-client/default.nix
@@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-eQ+7Ru3au/rDQZtwFDXYyybqC5uFtNBs6cEzX2QSFI4=";
   };
 
-  cargoSha256 = "sha256-fEjt7ax818hlIq2+UrIG6EismQUGdaq7/C3xN+Nrw2s=";
+  cargoHash = "sha256-fEjt7ax818hlIq2+UrIG6EismQUGdaq7/C3xN+Nrw2s=";
 
   nativeBuildInputs = [
     pkg-config
diff --git a/third_party/nixpkgs/pkgs/development/tools/grpc-gateway/default.nix b/third_party/nixpkgs/pkgs/development/tools/grpc-gateway/default.nix
index 39621abf85..040bad3269 100644
--- a/third_party/nixpkgs/pkgs/development/tools/grpc-gateway/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/grpc-gateway/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "grpc-gateway";
-  version = "2.20.0";
+  version = "2.21.0";
 
   src = fetchFromGitHub {
     owner = "grpc-ecosystem";
     repo = "grpc-gateway";
     rev = "v${version}";
-    sha256 = "sha256-CnnJRgEGarwIaE2LkphN3gogzIhwQ5hAaUZFpLR/HxU=";
+    sha256 = "sha256-vdKGHcJazT6aVPMdUpvaheGPb50DNhj+DyzXhaJE63I=";
   };
 
-  vendorHash = "sha256-aNOWu+TXbXn3jZ29BwU+x+vWMtL76NZoPElFuUwcHiI=";
+  vendorHash = "sha256-3x85PA6QAChHkjAohHWjFwrDGjacKRFzg/cJfoDqP3A=";
 
   ldflags = [
     "-X=main.version=${version}"
diff --git a/third_party/nixpkgs/pkgs/development/tools/hors/default.nix b/third_party/nixpkgs/pkgs/development/tools/hors/default.nix
index 39710ad74a..4ecea68c18 100644
--- a/third_party/nixpkgs/pkgs/development/tools/hors/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/hors/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1q17i8zg7dwd8al42wfnkn891dy5hdhw4325plnihkarr50avbr0";
   };
 
-  cargoSha256 = "sha256-1PB/JvgfC6qABI+cIePqtsSlZXPqMGQIay9SCXJkV9o=";
+  cargoHash = "sha256-1PB/JvgfC6qABI+cIePqtsSlZXPqMGQIay9SCXJkV9o=";
 
   buildInputs = lib.optional stdenv.isDarwin Security;
 
diff --git a/third_party/nixpkgs/pkgs/development/tools/hotdoc/default.nix b/third_party/nixpkgs/pkgs/development/tools/hotdoc/default.nix
index 342cc4009e..11d9cf11b1 100644
--- a/third_party/nixpkgs/pkgs/development/tools/hotdoc/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/hover/default.nix b/third_party/nixpkgs/pkgs/development/tools/hover/default.nix
index 86630d33ce..5a2ea9772b 100644
--- a/third_party/nixpkgs/pkgs/development/tools/hover/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/hover/default.nix
@@ -9,7 +9,7 @@
 , writeScript
 , xorg
 , libglvnd
-, addOpenGLRunpath
+, addDriverRunpath
 , makeWrapper
 , gcc
 , go
@@ -55,7 +55,7 @@ let
       sha256 = "sha256-ch59Wx4g72u7x99807ppURI4I+5aJ/W8Zr35q8X68v4=";
     };
 
-    nativeBuildInputs = [ addOpenGLRunpath makeWrapper ];
+    nativeBuildInputs = [ addDriverRunpath makeWrapper ];
 
     buildInputs = libs;
 
@@ -79,7 +79,7 @@ let
     '';
 
     postFixup = ''
-      addOpenGLRunpath $out/bin/hover
+      addDriverRunpath $out/bin/hover
     '';
   };
 
diff --git a/third_party/nixpkgs/pkgs/development/tools/htmlhint/default.nix b/third_party/nixpkgs/pkgs/development/tools/htmlhint/default.nix
index 162bb82b28..6d70819515 100644
--- a/third_party/nixpkgs/pkgs/development/tools/htmlhint/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/htmlq/default.nix b/third_party/nixpkgs/pkgs/development/tools/htmlq/default.nix
index 6a5015c600..7e55740d03 100644
--- a/third_party/nixpkgs/pkgs/development/tools/htmlq/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/htmlq/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-kZtK2QuefzfxxuE1NjXphR7otr+RYfMif/RSpR6TxY0=";
   };
 
-  cargoSha256 = "sha256-r9EnQQPGpPIcNYb1eqGrMnRdh0snIa5iVsTYTI+YErY=";
+  cargoHash = "sha256-r9EnQQPGpPIcNYb1eqGrMnRdh0snIa5iVsTYTI+YErY=";
 
   buildInputs = lib.optionals stdenv.isDarwin [ Security ];
 
diff --git a/third_party/nixpkgs/pkgs/development/tools/kafka-delta-ingest/default.nix b/third_party/nixpkgs/pkgs/development/tools/kafka-delta-ingest/default.nix
index cffc417d7c..8dd3cf1299 100644
--- a/third_party/nixpkgs/pkgs/development/tools/kafka-delta-ingest/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/karma-runner/default.nix b/third_party/nixpkgs/pkgs/development/tools/karma-runner/default.nix
index d05d0e7e39..514d789ac6 100644
--- a/third_party/nixpkgs/pkgs/development/tools/karma-runner/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/knightos/regenkfs/default.nix b/third_party/nixpkgs/pkgs/development/tools/knightos/regenkfs/default.nix
index c50b10527f..b8d4ed3b15 100644
--- a/third_party/nixpkgs/pkgs/development/tools/knightos/regenkfs/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/knightos/regenkfs/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage {
     sha256 = "sha256-zkwOpMNPGstn/y1l1s8blUKpBebY4Ta9hiPYxVLvG6Y=";
   };
 
-  cargoSha256 = "sha256-05VmQdop4vdzw2XEvVdp9+RNmyZvay1Q7gKN2n8rDEQ=";
+  cargoHash = "sha256-05VmQdop4vdzw2XEvVdp9+RNmyZvay1Q7gKN2n8rDEQ=";
 
   buildFeatures = [ "c-undef" ];
 
diff --git a/third_party/nixpkgs/pkgs/development/tools/knightos/remkrom/default.nix b/third_party/nixpkgs/pkgs/development/tools/knightos/remkrom/default.nix
index 4e40364e6d..c7a8fb2124 100644
--- a/third_party/nixpkgs/pkgs/development/tools/knightos/remkrom/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/knightos/remkrom/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage {
     sha256 = "sha256-DhfNfV9bd0p5dLXKgrVLyugQHK+RHsepeg0tGq5J6cI=";
   };
 
-  cargoSha256 = "sha256-JUyIbg1SxQ7pdqypGv7Kz2MM0ZwL3M9YJekO9oSftLM=";
+  cargoHash = "sha256-JUyIbg1SxQ7pdqypGv7Kz2MM0ZwL3M9YJekO9oSftLM=";
 
   meta = with lib; {
     description = "Reimplementation of mkrom in Rust";
diff --git a/third_party/nixpkgs/pkgs/development/tools/krankerl/default.nix b/third_party/nixpkgs/pkgs/development/tools/krankerl/default.nix
index bad8a84717..51d0e5e634 100644
--- a/third_party/nixpkgs/pkgs/development/tools/krankerl/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/krankerl/default.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-fFtjQFkNB5vn9nlFJI6nRdqxB9PmOGl3ySZ5LG2tgPg=";
   };
 
-  cargoSha256 = "sha256-0V2ftZmuKXRhOFWCroYOxQqW3NFh9Uuwcg0CM1sFlcQ=";
+  cargoHash = "sha256-0V2ftZmuKXRhOFWCroYOxQqW3NFh9Uuwcg0CM1sFlcQ=";
 
   nativeBuildInputs = [
     pkg-config
diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/kotlin-language-server/default.nix b/third_party/nixpkgs/pkgs/development/tools/language-servers/kotlin-language-server/default.nix
index af7775f572..19ff79c332 100644
--- a/third_party/nixpkgs/pkgs/development/tools/language-servers/kotlin-language-server/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/language-servers/millet/default.nix b/third_party/nixpkgs/pkgs/development/tools/language-servers/millet/default.nix
index 6ff7bb4c11..36e78863de 100644
--- a/third_party/nixpkgs/pkgs/development/tools/language-servers/millet/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/language-servers/nixd/default.nix b/third_party/nixpkgs/pkgs/development/tools/language-servers/nixd/default.nix
index 13a3a63fe3..71e9133fce 100644
--- a/third_party/nixpkgs/pkgs/development/tools/language-servers/nixd/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/language-servers/nixd/default.nix
@@ -16,22 +16,24 @@
   nlohmann_json,
   pkg-config,
   testers,
+  python3,
 }:
 
 let
   common = rec {
-    version = "2.2.3";
+    version = "2.3.0";
 
     src = fetchFromGitHub {
       owner = "nix-community";
       repo = "nixd";
       rev = version;
-      hash = "sha256-1i4U012vqw84NuD5cjgfVX/he4vW9MyEeIetJ55g280=";
+      hash = "sha256-iB6Hc3kgtsZ360JlAhPqCRWFTf3tawHEKYAeYt7DM4E=";
     };
 
     nativeBuildInputs = [
       meson
       ninja
+      python3
       pkg-config
     ];
 
@@ -49,6 +51,7 @@ let
         inclyc
         Ruixi-rebirth
         aleksana
+        redyf
       ];
       platforms = lib.platforms.unix;
     };
diff --git a/third_party/nixpkgs/pkgs/development/tools/language-servers/zls/default.nix b/third_party/nixpkgs/pkgs/development/tools/language-servers/zls/default.nix
index 1642d495b1..408bb69f64 100644
--- a/third_party/nixpkgs/pkgs/development/tools/language-servers/zls/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/language-servers/zls/deps.nix b/third_party/nixpkgs/pkgs/development/tools/language-servers/zls/deps.nix
index 4de50620ef..1c6b2cd25f 100644
--- a/third_party/nixpkgs/pkgs/development/tools/language-servers/zls/deps.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/legitify/default.nix b/third_party/nixpkgs/pkgs/development/tools/legitify/default.nix
index 24ef9d6a6d..4759f9f199 100644
--- a/third_party/nixpkgs/pkgs/development/tools/legitify/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/legitify/default.nix
@@ -5,29 +5,33 @@
 
 buildGoModule rec {
   pname = "legitify";
-  version = "0.1.5";
+  version = "1.0.11";
 
   src = fetchFromGitHub {
     owner = "Legit-Labs";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-Sr6P5S5+DqbP0ihCj97l84739/NRAlYJLnXp4B5gHNE=";
+    repo = "legitify";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-ijW0vvamuqcN6coV5pAtmjAUjzNXxiqr2S9EwrNlrJc=";
   };
 
-  vendorHash = "sha256-EJMXzWrOXFl7JFYBp/XAcHLcNyWCKbOBAyo/Yf2mh5s=";
+  vendorHash = "sha256-QwSh7+LuwdbBtrIGk3ZK6cMW9h7wzNArPT/lVZgUGBU=";
 
   ldflags = [
     "-w"
     "-s"
-    "-X github.com/Legit-Labs/legitify/internal/version.Version=${version}"
+    "-X=github.com/Legit-Labs/legitify/internal/version.Version=${version}"
   ];
 
+  preCheck = ''
+    rm e2e/e2e_test.go # tests requires network
+  '';
+
   meta = with lib; {
     description = "Tool to detect and remediate misconfigurations and security risks of GitHub assets";
-    mainProgram = "legitify";
     homepage = "https://github.com/Legit-Labs/legitify";
     changelog = "https://github.com/Legit-Labs/legitify/releases/tag/v${version}";
     license = licenses.asl20;
     maintainers = with maintainers; [ fab ];
+    mainProgram = "legitify";
   };
 }
diff --git a/third_party/nixpkgs/pkgs/development/tools/mbed-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/mbed-cli/default.nix
index 393f2512e8..3434e4771b 100644
--- a/third_party/nixpkgs/pkgs/development/tools/mbed-cli/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/misc/binutils/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/binutils/default.nix
index 308ac9d591..610f04fd35 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/binutils/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/misc/binutils/default.nix
@@ -58,10 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
   pname = targetPrefix + "binutils";
   inherit version;
 
-  # HACK: Ensure that we preserve source from bootstrap binutils to not rebuild LLVM
-  src = stdenv.__bootPackages.binutils-unwrapped.src
-    or srcs.${targetPlatform.system}
-    or srcs.normal;
+  src = srcs.${targetPlatform.system} or srcs.normal;
 
   # WARN: this package is used for bootstrapping fetchurl, and thus cannot use
   # fetchpatch! All mutable patches (generated by GitHub or cgit) that are
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/c2ffi/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/c2ffi/default.nix
index 56dbcb06a1..d83381080a 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/c2ffi/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/misc/cbrowser/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/cbrowser/default.nix
index 3bd4d3fc72..72a177a17f 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/cbrowser/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/misc/cbrowser/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
 
     homepage = "https://sourceforge.net/projects/cbrowser/";
 
-    maintainers = with lib.maintainers; [viric];
+    maintainers = [ ];
 
     platforms = with lib.platforms; linux;
   };
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/cgdb/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/cgdb/default.nix
index 1c3c1ba622..bb5a792fa4 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/cgdb/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/misc/chruby/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/chruby/default.nix
index 31e7134e7e..10d6d2e7d0 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/chruby/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/misc/cscope/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/cscope/default.nix
index 05e61e1afb..f306478948 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/cscope/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/misc/cscope/default.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
 
     homepage = "https://cscope.sourceforge.net/";
 
-    maintainers = with lib.maintainers; [viric];
+    maintainers = [ ];
 
     platforms = lib.platforms.unix;
   };
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/cwebbin/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/cwebbin/default.nix
index d491b7199d..fc07a523ff 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/cwebbin/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/misc/dejagnu/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/dejagnu/default.nix
index 57f8b2d84a..015e7ff991 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/dejagnu/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/misc/dura/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/dura/default.nix
index c2b4b4206d..34b5127e11 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/dura/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/misc/dura/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-xAcFk7z26l4BYYBEw+MvbG6g33MpPUvnpGvgmcqhpGM=";
   };
 
-  cargoSha256 = "sha256-XOtPtOEKZMJzNeBZBT3Mc/KOjMOcz71byIv/ftcRP48=";
+  cargoHash = "sha256-XOtPtOEKZMJzNeBZBT3Mc/KOjMOcz71byIv/ftcRP48=";
 
   cargoPatches = [
     ./Cargo.lock.patch
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/elfinfo/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/elfinfo/default.nix
index 2af3f4cd39..93636e1675 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/elfinfo/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/misc/elfutils/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/elfutils/default.nix
index a5a812aa03..9f5a4bfa3a 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/elfutils/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/misc/elfutils/default.nix
@@ -73,7 +73,11 @@ stdenv.mkDerivation rec {
     "--enable-deterministic-archives"
     (lib.enableFeature enableDebuginfod "libdebuginfod")
     (lib.enableFeature enableDebuginfod "debuginfod")
-  ];
+  ] ++ lib.optional (stdenv.targetPlatform.useLLVM or false) "--disable-demangler"
+    ++ lib.optionals stdenv.cc.isClang [
+      "CFLAGS=-Wno-unused-private-field"
+      "CXXFLAGS=-Wno-unused-private-field"
+    ];
 
   enableParallelBuilding = true;
 
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/gdb/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/gdb/default.nix
index 263196dab5..21dafb9bbc 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/gdb/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/misc/gdb/default.nix
@@ -30,11 +30,11 @@ assert pythonSupport -> python3 != null;
 
 stdenv.mkDerivation rec {
   pname = targetPrefix + basename + lib.optionalString hostCpuOnly "-host-cpu-only";
-  version = "14.2";
+  version = "15.1";
 
   src = fetchurl {
     url = "mirror://gnu/gdb/${basename}-${version}.tar.xz";
-    hash = "sha256-LU3YBh2N7RK2xj9V5FNEiB6CJhBfTSqbI0BA76XOd3I=";
+    hash = "sha256-OCVOrNRXITS8qcWlqk1MpWTLvTDDadiB9zP7a5AzVPI=";
   };
 
   postPatch = lib.optionalString stdenv.isDarwin ''
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/go-license-detector/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/go-license-detector/default.nix
index 81f35d7ec4..a59b55be97 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/go-license-detector/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/misc/gtkperf/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/gtkperf/default.nix
index bee2b85c78..0d3da39084 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/gtkperf/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/misc/highlight-assertions/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/highlight-assertions/default.nix
index 5dd965d6c0..b2f595cb01 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/highlight-assertions/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/misc/highlight-assertions/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-7r8tBJ6JFGUGUsTivzlO23hHiXISajjn2WF12mmbmMg=";
   };
 
-  cargoSha256 = "sha256-E2TNwCry7JOWy50+iLM9d+Tx4lIO6hkBtaHVLV8bDuo=";
+  cargoHash = "sha256-E2TNwCry7JOWy50+iLM9d+Tx4lIO6hkBtaHVLV8bDuo=";
 
   # requires nightly features
   RUSTC_BOOTSTRAP = 1;
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/jiq/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/jiq/default.nix
index 34177e142d..ed07a8d3c3 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/jiq/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/misc/libwhich/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/libwhich/default.nix
index c6d89a4c6b..e8d919cfab 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/libwhich/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/misc/ltrace/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/ltrace/default.nix
index 189f389587..594828e259 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/ltrace/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/misc/mdctags/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/mdctags/default.nix
index acd6d39e97..2307cc54fa 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/mdctags/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/misc/mdctags/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage {
     sha256 = "14gryhgh9czlkfk75ml0620c6v8r74i6h3ykkkmc7gx2z8h1jxrb";
   };
 
-  cargoSha256 = "1kdbrcpvxiq91m5vq33vzjhsp4j3flzrpbj5hmxf0k3al1a7qk1g";
+  cargoHash = "sha256-L0x8VKBqTOB6hUWumz91Q5Krofx7DLxLDQnHvi/Lq80=";
 
   meta = {
     description = "tags for markdown file";
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/opengrok/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/opengrok/default.nix
index dec8b3fa8c..8bde12db62 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/opengrok/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/misc/opengrok/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   pname = "opengrok";
-  version = "1.13.7";
+  version = "1.13.9";
 
   # binary distribution
   src = fetchurl {
     url = "https://github.com/oracle/opengrok/releases/download/${version}/${pname}-${version}.tar.gz";
-    hash = "sha256-vGzwXs4i9NiIz5M4JfoweJdpP5vbPKCdeUlE5xueYc4=";
+    hash = "sha256-EG0C1ebVlh01DLBnEFZxOzxTiCSByBy2OW9IP8wSlbE=";
   };
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/pest-ide-tools/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/pest-ide-tools/default.nix
index d3a31c8118..a962444a6f 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/pest-ide-tools/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/misc/pest-ide-tools/default.nix
@@ -11,7 +11,7 @@
 rustPlatform.buildRustPackage rec {
   pname = "pest-ide-tools";
   version = "0.3.11";
-  cargoSha256 = "sha256-ZD8UQbkk5JhkanBkzo+c86DZE4aD44ma5cN97aKx97U=";
+  cargoHash = "sha256-ZD8UQbkk5JhkanBkzo+c86DZE4aD44ma5cN97aKx97U=";
 
   src = fetchFromGitHub {
     owner = "pest-parser";
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/rtss/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/rtss/default.nix
index 4172919d42..5545d90281 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/rtss/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/misc/rtss/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-WeeZsB42/4SlIaWwKvOqWiPNV5p0QOToynI8ozVVxJM=";
   };
 
-  cargoSha256 = "sha256-aHK9KBzRbU2IYr7vOdlz0Aw4iYGjD6VedbWPE/V7AVc=";
+  cargoHash = "sha256-aHK9KBzRbU2IYr7vOdlz0Aw4iYGjD6VedbWPE/V7AVc=";
 
   meta = with lib; {
     description = "Annotate output with relative durations between lines";
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/strace/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/strace/default.nix
index 71fc6dd496..0fd75a8de8 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/strace/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/misc/strace/default.nix
@@ -19,7 +19,8 @@ stdenv.mkDerivation rec {
     # -kk
     ++ lib.optional (lib.meta.availableOn stdenv.hostPlatform elfutils) elfutils;
 
-  configureFlags = [ "--enable-mpers=check" ];
+  configureFlags = [ "--enable-mpers=check" ]
+    ++ lib.optional stdenv.cc.isClang "CFLAGS=-Wno-unused-function";
 
   passthru.updateScript = gitUpdater {
     # No nicer place to find latest release.
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/swig/4.nix b/third_party/nixpkgs/pkgs/development/tools/misc/swig/4.nix
index 6b6d1bc02d..bae53ad42f 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/swig/4.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/misc/swig/4.nix
@@ -1,19 +1,19 @@
-{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, pcre }:
+{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, bison, pcre2 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "swig";
-  version = "4.0.2";
+  version = "4.2.1";
 
   src = fetchFromGitHub {
     owner = "swig";
     repo = "swig";
-    rev = "rel-${version}";
-    sha256 = "12vlps766xvwck8q0i280s8yx21qm2dxl34710ybpmz3c1cfdjsc";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-VlUsiRZLScmbC7hZDzKqUr9481YXVwo0eXT/jy6Fda8=";
   };
 
-  PCRE_CONFIG = "${pcre.dev}/bin/pcre-config";
+  PCRE_CONFIG = "${pcre2.dev}/bin/pcre-config";
   nativeBuildInputs = [ autoconf automake libtool bison ];
-  buildInputs = [ pcre ];
+  buildInputs = [ pcre2 ];
 
   configureFlags = [ "--without-tcl" ];
 
@@ -26,12 +26,14 @@ stdenv.mkDerivation rec {
     ./autogen.sh
   '';
 
-  meta = with lib; {
-    description = "SWIG, an interface compiler that connects C/C++ code to higher-level languages";
+  meta = {
+    changelog = "https://github.com/swig/swig/blob/${finalAttrs.src.rev}/CHANGES.current";
+    description = "Interface compiler that connects C/C++ code to higher-level languages";
     homepage = "https://swig.org/";
-    # Different types of licenses available: http://www.swig.org/Release/LICENSE .
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ orivej ];
-    platforms = with platforms; linux ++ darwin;
+    # Different types of licenses available: https://www.swig.org/Release/LICENSE .
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ orivej ];
+    mainProgram = "swig";
+    platforms = with lib.platforms; linux ++ darwin;
   };
-}
+})
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/terraform-lsp/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/terraform-lsp/default.nix
index f336162828..35a503d8b0 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/terraform-lsp/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/misc/terser/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/terser/default.nix
index efb4a364a6..a0f6527d05 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/terser/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/misc/terser/default.nix
@@ -2,16 +2,16 @@
 
 buildNpmPackage rec {
   pname = "terser";
-  version = "5.31.1";
+  version = "5.31.3";
 
   src = fetchFromGitHub {
     owner = "terser";
     repo = "terser";
     rev = "v${version}";
-    hash = "sha256-yKJPV6JGZTNCMjHh8v+MgnhaMuGF5cVHGEIJei896Hg=";
+    hash = "sha256-7B6dRulnSPD5s2w4nTXBPxJUCRvKD9++/Y1BMNm2ZwM=";
   };
 
-  npmDepsHash = "sha256-E50RrEllhmluWe726KRmD2pcXbD2bSkWz8x6FeF+kOU=";
+  npmDepsHash = "sha256-FMd2bbMHzo38/zJuOlpzGtRPwuoxmZJF/XF2KgTP2ak=";
 
   meta = with lib; {
     description = "JavaScript parser, mangler and compressor toolkit for ES6+";
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/texinfo/4.13a.nix b/third_party/nixpkgs/pkgs/development/tools/misc/texinfo/4.13a.nix
deleted file mode 100644
index c6036c069d..0000000000
--- a/third_party/nixpkgs/pkgs/development/tools/misc/texinfo/4.13a.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ stdenv, fetchurl, texinfo, ncurses, xz, lib }:
-
-stdenv.mkDerivation rec {
-  pname = "texinfo";
-  version = "4.13a";
-
-  src = fetchurl {
-    url = "mirror://gnu/texinfo/${pname}-${version}.tar.lzma";
-    sha256 = "1rf9ckpqwixj65bw469i634897xwlgkm5i9g2hv3avl6mv7b0a3d";
-  };
-
-  buildInputs = [ ncurses ];
-  nativeBuildInputs = [ xz ];
-
-  env.NIX_CFLAGS_COMPILE = toString (lib.optionals stdenv.cc.isClang [
-    "-Wno-error=implicit-function-declaration"
-  ]);
-
-  # Disabled because we don't have zdiff in the stdenv bootstrap.
-  #doCheck = true;
-
-  meta = texinfo.meta // { branch = version; };
-}
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/texinfo/5.2.nix b/third_party/nixpkgs/pkgs/development/tools/misc/texinfo/5.2.nix
deleted file mode 100644
index d395494984..0000000000
--- a/third_party/nixpkgs/pkgs/development/tools/misc/texinfo/5.2.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-import ./common.nix {
-  version = "5.2";
-  sha256 = "1njfwh2z34r2c4r0iqa7v24wmjzvsfyz4vplzry8ln3479lfywal";
-}
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/texinfo/6.5.nix b/third_party/nixpkgs/pkgs/development/tools/misc/texinfo/6.5.nix
deleted file mode 100644
index 34596f3065..0000000000
--- a/third_party/nixpkgs/pkgs/development/tools/misc/texinfo/6.5.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-import ./common.nix {
-  version = "6.5";
-  sha256 = "0qjzvbvnv9003xdrcpi3jp7y68j4hq2ciw9frh2hghh698zlnxvp";
-}
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/texinfo/6.7.nix b/third_party/nixpkgs/pkgs/development/tools/misc/texinfo/6.7.nix
deleted file mode 100644
index 7915d6e3c6..0000000000
--- a/third_party/nixpkgs/pkgs/development/tools/misc/texinfo/6.7.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-import ./common.nix {
-  version = "6.7";
-  sha256 = "1aicn1v3czqii08wc91jw089n1x3gfchkf808q2as59dak0h714q";
-}
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/texinfo/6.8.nix b/third_party/nixpkgs/pkgs/development/tools/misc/texinfo/6.8.nix
deleted file mode 100644
index 992f695bc9..0000000000
--- a/third_party/nixpkgs/pkgs/development/tools/misc/texinfo/6.8.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-import ./common.nix {
-  version = "6.8";
-  sha256 = "1i7yb7mrp3inz25zbzv2pllr4y7d58v818f1as7iz8mw53nm7dwf";
-  patches = [
-    # glibc 2.34 compat
-    ./fix-glibc-2.34.patch
-  ];
-}
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/texinfo/7.0.nix b/third_party/nixpkgs/pkgs/development/tools/misc/texinfo/7.0.nix
deleted file mode 100644
index 01788f40d7..0000000000
--- a/third_party/nixpkgs/pkgs/development/tools/misc/texinfo/7.0.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-import ./common.nix {
-  version = "7.0.3";
-  sha256 = "sha256-dLQg0J1/Uo6E+XqjMPDdaamKYFPnpOAXZ+7RFQOIB78=";
-}
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/texinfo/common.nix b/third_party/nixpkgs/pkgs/development/tools/misc/texinfo/common.nix
index ab9da3ccea..9b5959d40e 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/texinfo/common.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/misc/texinfo/common.nix
@@ -1,10 +1,29 @@
-{ version, sha256, patches ? [] }:
+{
+  lib,
+  stdenv,
+  buildPackages,
+  fetchurl,
+  perl,
+  libintl,
+  bash,
+  updateAutotoolsGnuConfigScriptsHook,
+  gnulib,
+  gawk,
+  freebsd,
+  libiconv,
+  xz,
 
-{ lib, stdenv, buildPackages, fetchurl, perl, libintl, bash
-, updateAutotoolsGnuConfigScriptsHook, gnulib, gawk, freebsd, libiconv
+  # we are a dependency of gcc, this simplifies bootstraping
+  interactive ? false,
+  ncurses,
+  procps,
+  meta,
+}:
 
-# we are a dependency of gcc, this simplifies bootstraping
-, interactive ? false, ncurses, procps
+{
+  version,
+  hash,
+  patches ? [ ],
 }:
 
 # Note: this package is used for bootstrapping fetchurl, and thus
@@ -13,7 +32,15 @@
 # files.
 
 let
-  inherit (lib) getDev getLib optional optionals optionalString;
+  inherit (lib)
+    getBin
+    getDev
+    getLib
+    optional
+    optionals
+    optionalString
+    versionOlder
+    ;
   crossBuildTools = stdenv.hostPlatform != stdenv.buildPlatform;
 in
 
@@ -23,20 +50,21 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "mirror://gnu/texinfo/texinfo-${version}.tar.xz";
-    inherit sha256;
+    inherit hash;
   };
 
   patches = patches ++ optional crossBuildTools ./cross-tools-flags.patch;
 
-  postPatch = ''
-    patchShebangs tp/maintain
-  ''
-  # This patch is needed for IEEE-standard long doubles on
-  # powerpc64; it does not apply cleanly to texinfo 5.x or
-  # earlier.  It is merged upstream in texinfo 6.8.
-  + lib.optionalString (version == "6.7") ''
-    patch -p1 -d gnulib < ${gnulib.passthru.longdouble-redirect-patch}
-  '';
+  postPatch =
+    ''
+      patchShebangs tp/maintain
+    ''
+    # This patch is needed for IEEE-standard long doubles on
+    # powerpc64; it does not apply cleanly to texinfo 5.x or
+    # earlier.  It is merged upstream in texinfo 6.8.
+    + optionalString (version == "6.7") ''
+      patch -p1 -d gnulib < ${gnulib.passthru.longdouble-redirect-patch}
+    '';
 
   # ncurses is required to build `makedoc'
   # this feature is introduced by the ./cross-tools-flags.patch
@@ -47,31 +75,45 @@ stdenv.mkDerivation {
   enableParallelBuilding = true;
 
   # A native compiler is needed to build tools needed at build time
-  depsBuildBuild = [ buildPackages.stdenv.cc perl ];
+  depsBuildBuild = [
+    buildPackages.stdenv.cc
+    perl
+  ];
 
   nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ];
-  buildInputs = [ bash libintl ]
-    ++ optionals stdenv.isSunOS [ libiconv gawk ]
+  buildInputs =
+    [
+      bash
+      libintl
+    ]
+    ++ optionals stdenv.isSunOS [
+      libiconv
+      gawk
+    ]
     ++ optional interactive ncurses;
 
-  configureFlags = [ "PERL=${buildPackages.perl}/bin/perl" ]
+  configureFlags =
+    [ "PERL=${buildPackages.perl}/bin/perl" ]
     # Perl XS modules are difficult to cross-compile and texinfo has pure Perl
     # fallbacks.
     # Also prevent the buildPlatform's awk being used in the texindex script
-    ++ optionals crossBuildTools [ "--enable-perl-xs=no" "TI_AWK=${gawk}/bin/awk" ]
-    ++ lib.optional stdenv.isSunOS "AWK=${gawk}/bin/awk";
+    ++ optionals crossBuildTools [
+      "--enable-perl-xs=no"
+      "TI_AWK=${getBin gawk}/bin/awk"
+    ]
+    ++ optional stdenv.isSunOS "AWK=${gawk}/bin/awk";
 
   installFlags = [ "TEXMF=$(out)/texmf-dist" ];
-  installTargets = [ "install" "install-tex" ];
+  installTargets = [
+    "install"
+    "install-tex"
+  ];
 
-  nativeCheckInputs = [ procps ]
-    ++ optionals stdenv.buildPlatform.isFreeBSD [ freebsd.locale ];
+  nativeCheckInputs = [ procps ] ++ optionals stdenv.buildPlatform.isFreeBSD [ freebsd.locale ];
 
-  doCheck = interactive
-    && !stdenv.isDarwin
-    && !stdenv.isSunOS; # flaky
+  doCheck = interactive && !stdenv.isDarwin && !stdenv.isSunOS; # flaky
 
-  checkFlags = lib.optionals (!stdenv.hostPlatform.isMusl && lib.versionOlder version "7") [
+  checkFlags = optionals (!stdenv.hostPlatform.isMusl && versionOlder version "7") [
     # Test is known to fail on various locales on texinfo-6.8:
     #   https://lists.gnu.org/r/bug-texinfo/2021-07/msg00012.html
     "XFAIL_TESTS=test_scripts/layout_formatting_fr_icons.sh"
@@ -84,31 +126,9 @@ stdenv.mkDerivation {
     done
   '';
 
-  meta = with lib; {
-    description = "GNU documentation system";
-    homepage = "https://www.gnu.org/software/texinfo/";
-    changelog = "https://git.savannah.gnu.org/cgit/texinfo.git/plain/NEWS";
-    license = licenses.gpl3Plus;
-    platforms = platforms.all;
-    maintainers = with maintainers; [ oxij ];
-    # see comment above in patches section
-    broken = stdenv.hostPlatform.isPower64 && lib.strings.versionOlder version "6.0";
-
-    longDescription = ''
-      Texinfo is the official documentation format of the GNU project.
-      It was invented by Richard Stallman and Bob Chassell many years
-      ago, loosely based on Brian Reid's Scribe and other formatting
-      languages of the time.  It is used by many non-GNU projects as
-      well.
-
-      Texinfo uses a single source file to produce output in a number
-      of formats, both online and printed (dvi, html, info, pdf, xml,
-      etc.).  This means that instead of writing different documents
-      for online information and another for a printed manual, you
-      need write only one document.  And when the work is revised, you
-      need revise only that one document.  The Texinfo system is
-      well-integrated with GNU Emacs.
-    '';
+  meta = meta // {
     branch = version;
+    # see comment above in patches section
+    broken = stdenv.hostPlatform.isPower64 && versionOlder version "6.0";
   };
 }
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/texinfo/packages.nix b/third_party/nixpkgs/pkgs/development/tools/misc/texinfo/packages.nix
new file mode 100644
index 0000000000..4131b6a539
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/tools/misc/texinfo/packages.nix
@@ -0,0 +1,112 @@
+{
+  lib,
+  stdenv,
+  buildPackages,
+  callPackage,
+  fetchurl,
+  perl,
+  libintl,
+  bash,
+  updateAutotoolsGnuConfigScriptsHook,
+  gnulib,
+  gawk,
+  freebsd,
+  libiconv,
+  xz,
+
+  # we are a dependency of gcc, this simplifies bootstraping
+  interactive ? false,
+  ncurses,
+  procps,
+}:
+
+let
+  meta = {
+    description = "GNU documentation system";
+    homepage = "https://www.gnu.org/software/texinfo/";
+    changelog = "https://git.savannah.gnu.org/cgit/texinfo.git/plain/NEWS";
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [ oxij ];
+
+    longDescription = ''
+      Texinfo is the official documentation format of the GNU project.
+      It was invented by Richard Stallman and Bob Chassell many years
+      ago, loosely based on Brian Reid's Scribe and other formatting
+      languages of the time.  It is used by many non-GNU projects as
+      well.
+
+      Texinfo uses a single source file to produce output in a number
+      of formats, both online and printed (dvi, html, info, pdf, xml,
+      etc.).  This means that instead of writing different documents
+      for online information and another for a printed manual, you
+      need write only one document.  And when the work is revised, you
+      need revise only that one document.  The Texinfo system is
+      well-integrated with GNU Emacs.
+    '';
+    mainProgram = "texi2any";
+  };
+  buildTexinfo = callPackage ./common.nix {
+    inherit
+      lib
+      stdenv
+      buildPackages
+      updateAutotoolsGnuConfigScriptsHook
+      fetchurl
+      perl
+      xz
+      libintl
+      libiconv
+      bash
+      gnulib
+      gawk
+      freebsd
+      ncurses
+      procps
+      meta
+      interactive
+      ;
+  };
+in
+{
+  texinfo413 = stdenv.mkDerivation (finalAttrs: {
+    pname = "texinfo";
+    version = "4.13a";
+
+    src = fetchurl {
+      url = "mirror://gnu/texinfo/texinfo-${finalAttrs.version}.tar.lzma";
+      hash = "sha256-bSiwzq6GbjU2FC/FUuejvJ+EyDAxGcJXMbJHju9kyeU=";
+    };
+
+    buildInputs = [ ncurses ];
+    nativeBuildInputs = [ xz ];
+
+    # Disabled because we don't have zdiff in the stdenv bootstrap.
+    #doCheck = true;
+
+    meta = meta // {
+      branch = finalAttrs.version;
+    };
+  });
+  texinfo5 = buildTexinfo {
+    version = "5.2";
+    hash = "sha256-VHHvaDpkWIp8/vRu8r3T+8vKidhH4QgyYSKT8QXkTto=";
+  };
+  texinfo6_5 = buildTexinfo {
+    version = "6.5";
+    hash = "sha256-d3dLP0oGwgcFzC7xyASGRCLjz5UjXpZbHwCkbffaX2I=";
+  };
+  texinfo6_7 = buildTexinfo {
+    version = "6.7";
+    hash = "sha256-mIQDwVQtFa0ERgC5CZl7owebEOAyJMYRiBF/NnawLKo=";
+  };
+  texinfo6 = buildTexinfo {
+    version = "6.8";
+    hash = "sha256-jrdT7Si8oh+PVsGhgDYq7XiSKb1i//WL+DaOm+tZ/sQ=";
+    patches = [ ./fix-glibc-2.34.patch ];
+  };
+  texinfo7 = buildTexinfo {
+    version = "7.1";
+    hash = "sha256-3u7J8Z8VngRv34rSIjGYGAbawzLMNy8cdjUErYKzCVM=";
+  };
+}
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/tie/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/tie/default.nix
index eeaeca1f9c..5a50600d47 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/tie/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/misc/tockloader/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/tockloader/default.nix
index d81760daa5..90cf25e547 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/tockloader/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/misc/tokei/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/tokei/default.nix
index 2008d134b5..ff3ceafc7f 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/tokei/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/misc/tokei/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-jqDsxUAMD/MCCI0hamkGuCYa8rEXNZIR8S+84S8FbgI=";
   };
 
-  cargoSha256 = "sha256-U7Bode8qwDsNf4FVppfEHA9uiOFz74CtKgXG6xyYlT8=";
+  cargoHash = "sha256-U7Bode8qwDsNf4FVppfEHA9uiOFz74CtKgXG6xyYlT8=";
 
   buildInputs = lib.optionals stdenv.isDarwin [
     libiconv Security
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/travis/shell.nix b/third_party/nixpkgs/pkgs/development/tools/misc/travis/shell.nix
index ddcf493bb4..0820e89b4b 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/travis/shell.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/misc/unused/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/unused/default.nix
index 56166b0c85..9c78751466 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/unused/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/misc/unused/default.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
 
   nativeBuildInputs = [ cmake ];
 
-  cargoSha256 = "sha256-hCtkR20+xs1UHZP7oJVpJACVGcMQLQmSS1QE2tmIVhs=";
+  cargoHash = "sha256-hCtkR20+xs1UHZP7oJVpJACVGcMQLQmSS1QE2tmIVhs=";
 
   meta = with lib; {
     description = "Tool to identify potentially unused code";
diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/whatstyle/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/whatstyle/default.nix
index acfaa78736..030dcf400f 100644
--- a/third_party/nixpkgs/pkgs/development/tools/misc/whatstyle/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/nailgun/default.nix b/third_party/nixpkgs/pkgs/development/tools/nailgun/default.nix
index 6c71e374ff..6f4e550529 100644
--- a/third_party/nixpkgs/pkgs/development/tools/nailgun/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/nasmfmt/default.nix b/third_party/nixpkgs/pkgs/development/tools/nasmfmt/default.nix
index e57dcffac2..0b6aaea05f 100644
--- a/third_party/nixpkgs/pkgs/development/tools/nasmfmt/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/nodehun/default.nix b/third_party/nixpkgs/pkgs/development/tools/nodehun/default.nix
index 5a49c90ad2..ec5587273d 100644
--- a/third_party/nixpkgs/pkgs/development/tools/nodehun/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/nodehun/default.nix
@@ -1,4 +1,5 @@
 { buildNpmPackage
+, cctools
 , darwin
 , fetchFromGitHub
 , lib
@@ -31,7 +32,7 @@ buildNpmPackage {
 
   buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ];
   nativeBuildInputs = [ nodePackages.node-gyp python3 ]
-    ++ lib.optionals stdenv.isDarwin [ darwin.cctools ];
+    ++ lib.optionals stdenv.isDarwin [ cctools ];
 
   postInstall = ''
     # Only keep the necessary parts of build/Release to reduce closure size
diff --git a/third_party/nixpkgs/pkgs/development/tools/nufmt/default.nix b/third_party/nixpkgs/pkgs/development/tools/nufmt/default.nix
index d9f2732aed..4c9e6ff4af 100644
--- a/third_party/nixpkgs/pkgs/development/tools/nufmt/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/nufmt/default.nix
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
     IOKit
   ]);
 
-  cargoSha256 = "sha256-16Z20opeZpoa7h258um+grL3ktPmY4P0M/tqMTr5hYc=";
+  cargoHash = "sha256-16Z20opeZpoa7h258um+grL3ktPmY4P0M/tqMTr5hYc=";
 
   meta = with lib; {
     description = "Nushell formatter";
diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/camlp5/default.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/camlp5/default.nix
index d0308f31f7..9f6055677e 100644
--- a/third_party/nixpkgs/pkgs/development/tools/ocaml/camlp5/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/ocaml/obuild/default.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/obuild/default.nix
index 94848a7936..4575226afd 100644
--- a/third_party/nixpkgs/pkgs/development/tools/ocaml/obuild/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/ocaml/opam-publish/default.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/opam-publish/default.nix
index ce0a807cc5..9204ecdd12 100644
--- a/third_party/nixpkgs/pkgs/development/tools/ocaml/opam-publish/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/ofono-phonesim/default.nix b/third_party/nixpkgs/pkgs/development/tools/ofono-phonesim/default.nix
index 81a513edd6..b37043ca41 100644
--- a/third_party/nixpkgs/pkgs/development/tools/ofono-phonesim/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/okteto/default.nix b/third_party/nixpkgs/pkgs/development/tools/okteto/default.nix
index e8aca09b18..4c224be33d 100644
--- a/third_party/nixpkgs/pkgs/development/tools/okteto/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/okteto/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "okteto";
-  version = "2.27.4";
+  version = "2.29.3";
 
   src = fetchFromGitHub {
     owner = "okteto";
     repo = "okteto";
     rev = version;
-    hash = "sha256-FctWmYGOdmGqjHGlsi3k+RUmU35ufzpMh7Eh88GZiUc=";
+    hash = "sha256-aU2yH33HVg9CHA5+NOWZUmhRC7W6yMjKIwyDM8E4e2g=";
   };
 
-  vendorHash = "sha256-RpkKWz/cJ1StbpVydqpSfA6uwIYgKa1YOCJVXZRer6k=";
+  vendorHash = "sha256-7XZImCS9hv8ILYfGcoY3tMk0grswWbfpQrBKhghTfsY=";
 
   postPatch = ''
     # Disable some tests that need file system & network access.
@@ -35,9 +35,21 @@ buildGoModule rec {
     export HOME="$(mktemp -d)"
   '';
 
-  checkFlags = [
-    "-skip=TestCreateDockerfile" # Skip flaky test
-  ];
+  checkFlags =
+    let
+      skippedTests = [
+        # require network access
+        "TestCreateDockerfile"
+
+        # access file system
+        "Test_translateDeployment"
+        "Test_translateStatefulSet"
+        "Test_translateJobWithoutVolumes"
+        "Test_translateJobWithVolumes"
+        "Test_translateService"
+      ];
+    in
+    [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];
 
   postInstall = ''
     installShellCompletion --cmd okteto \
diff --git a/third_party/nixpkgs/pkgs/development/tools/omnisharp-roslyn/default.nix b/third_party/nixpkgs/pkgs/development/tools/omnisharp-roslyn/default.nix
index 2441df861d..bd5102e038 100644
--- a/third_party/nixpkgs/pkgs/development/tools/omnisharp-roslyn/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/omnisharp-roslyn/deps.nix b/third_party/nixpkgs/pkgs/development/tools/omnisharp-roslyn/deps.nix
index 6379a4a293..65912a5059 100644
--- a/third_party/nixpkgs/pkgs/development/tools/omnisharp-roslyn/deps.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/operator-sdk/default.nix b/third_party/nixpkgs/pkgs/development/tools/operator-sdk/default.nix
index b334654dd9..15a8fa1e80 100644
--- a/third_party/nixpkgs/pkgs/development/tools/operator-sdk/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/operator-sdk/default.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "operator-sdk";
-  version = "1.35.0";
+  version = "1.36.0";
 
   src = fetchFromGitHub {
     owner = "operator-framework";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-KalG1DLhvXEjNAOeP79BMYvI74j6nKnDkOYubIJ0Shs=";
+    hash = "sha256-TdA0kqRDg0nSHbcqlZSzVyFL0hIwuv9rL98hftaWHe0=";
   };
 
-  vendorHash = "sha256-TuDbQoC9at3yQikGTfsAKJ5kc/naqLqfHEwXLOv+12A=";
+  vendorHash = "sha256-+VA9xq1ilZ/NOrnEOIvw5YWcmAsqZKfQMGz9vPVNmzU=";
 
   nativeBuildInputs = [
     makeWrapper
diff --git a/third_party/nixpkgs/pkgs/development/tools/package-project-cmake/default.nix b/third_party/nixpkgs/pkgs/development/tools/package-project-cmake/default.nix
index 48ddac5088..41cbef2a72 100644
--- a/third_party/nixpkgs/pkgs/development/tools/package-project-cmake/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/pactorio/default.nix b/third_party/nixpkgs/pkgs/development/tools/pactorio/default.nix
index 851c2c8954..e6254bdbbb 100644
--- a/third_party/nixpkgs/pkgs/development/tools/pactorio/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/pactorio/default.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-3+irejeDltf7x+gyJxWBgvPgpQx5uU3DewU23Z4Nr/A=";
   };
 
-  cargoSha256 = "sha256-sAFsG+EPSmvPDFR9R0fZ5f+y/PXVpTJlMzL61vwf4SY=";
+  cargoHash = "sha256-sAFsG+EPSmvPDFR9R0fZ5f+y/PXVpTJlMzL61vwf4SY=";
 
   nativeBuildInputs = [ installShellFiles pkg-config ];
 
diff --git a/third_party/nixpkgs/pkgs/development/tools/parinfer-rust/default.nix b/third_party/nixpkgs/pkgs/development/tools/parinfer-rust/default.nix
index 7d7ea67417..cc434f14dd 100644
--- a/third_party/nixpkgs/pkgs/development/tools/parinfer-rust/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/parinfer-rust/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0hj5in5h7pj72m4ag80ing513fh65q8xlsf341qzm3vmxm3y3jgd";
   };
 
-  cargoSha256 = "1lam4gwzcj6w0pyxf61l2cpbvvf5gmj2gwi8dangnhd60qhlnvrx";
+  cargoHash = "sha256-PW9LIQamQfusaijyJ2R9xe29LhM0GNf9BdxI9vkjVdE=";
 
   nativeBuildInputs = [ llvmPackages.clang rustPlatform.bindgenHook ];
 
diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/spicy/default.nix b/third_party/nixpkgs/pkgs/development/tools/parsing/spicy/default.nix
index 9738ffb41b..f9ef5f37df 100644
--- a/third_party/nixpkgs/pkgs/development/tools/parsing/spicy/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/parsing/spicy/default.nix
@@ -24,13 +24,14 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
+    bison
     cmake
+    flex
     makeWrapper
     python3
   ];
 
   buildInputs = [
-    bison
     flex
     zlib
   ];
diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/default.nix b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/default.nix
index 6e3390103b..fbf5852ee4 100644
--- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/default.nix
@@ -27,8 +27,8 @@ let
   # 2) nix-build -A tree-sitter.updater.update-all-grammars
   # 3) Set GITHUB_TOKEN env variable to avoid api rate limit (Use a Personal Access Token from https://github.com/settings/tokens It does not need any permissions)
   # 4) run the ./result script that is output by that (it updates ./grammars)
-  version = "0.22.5";
-  hash = "sha256-f8bdpiPNo5M8aefTmrQ2MQVg7lS0Yq7j312K1slortA=";
+  version = "0.22.6";
+  hash = "sha256-jBCKgDlvXwA7Z4GDBJ+aZc52zC+om30DtsZJuHado1s=";
 
   src = fetchFromGitHub {
     owner = "tree-sitter";
@@ -112,7 +112,7 @@ rustPlatform.buildRustPackage {
   pname = "tree-sitter";
   inherit src version;
 
-  cargoHash = "sha256-Fk6V/kPKc/GL/q6QsaCUrq+ZG0R+N5FLOpIm77Y+n2A=";
+  cargoHash = "sha256-44FIO0kPso6NxjLwmggsheILba3r9GEhDld2ddt601g=";
 
   buildInputs =
     lib.optionals stdenv.isDarwin [ Security CoreServices ];
diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix
index 97e825bfe3..c9faf8a788 100644
--- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-bqn.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-bqn.json
new file mode 100644
index 0000000000..c909530a21
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-clojure.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-clojure.json
index 66ef359104..e79396e609 100644
--- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-clojure.json
+++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-clojure.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/sogaiu/tree-sitter-clojure",
-  "rev": "6e41628e9d18b19caea1cb1d72aae4ccff5bdfe9",
-  "date": "2023-05-05T15:36:48+09:00",
-  "path": "/nix/store/fx50ap0gdspwcpgf0zni4j1pzz29abk5-tree-sitter-clojure",
-  "sha256": "0hcl4svn0q4979mx0nn3hhi27xfxj1lz7g1926lcjx6sv1z4ihmj",
-  "hash": "sha256-ssJIftjadMmoESm882mQ3fUjIoTDWtBrOolgYLcmlEE=",
+  "rev": "3a1ace906c151dd631cf6f149b5083f2b60e6a9e",
+  "date": "2024-05-15T19:51:17+09:00",
+  "path": "/nix/store/naaja1ijjxpsln6fr62sd4m3sgygb309-tree-sitter-clojure",
+  "sha256": "1j41ba48sid6blnfzn6s9vsl829qxd86lr6yyrnl95m42x8q5cx4",
+  "hash": "sha256-pLOCUReklkRt9t5kalDrOAlE9U7a2O8sXaZFjYhagcg=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json
index 53a829c4a9..c5a2a628c4 100644
--- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json
+++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-cpp",
-  "rev": "72fd00128f1c38319670cbf4bcedbba0dc849d96",
-  "date": "2024-04-14T21:38:58-04:00",
-  "path": "/nix/store/sy0ln7q947bv9k313q4z6kkibl2zgdi1-tree-sitter-cpp",
-  "sha256": "0qaa48gq4n3300apwx1mdcwqnfg59q8bdj88c3ssd45pr1n47s88",
-  "hash": "sha256-COlDbMi3kKb1YAjJthBO5TmLOWs1dH4VAGNYgh8iSmE=",
+  "rev": "2369fa991eba294e9238e28280ffcd58132f94bc",
+  "date": "2024-04-30T23:37:25-04:00",
+  "path": "/nix/store/6zvwyr1034vawcvw8yra4rcjb6m7shlj-tree-sitter-cpp",
+  "sha256": "1dbb8w4dyzgp7czqnrdfyjbm6zyyxbxqmfzmrj6kd37vcxldxq5d",
+  "hash": "sha256-reDeaGf7jDaNzPW7ivvq3n9Tl/SuZYs/O/d93whHa7U=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-css.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-css.json
index 224b48ea52..47cf0bc2a3 100644
--- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-css.json
+++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-css.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-css",
-  "rev": "02b4ee757654b7d54fe35352fd8e53a8a4385d42",
-  "date": "2024-02-14T18:09:29-05:00",
-  "path": "/nix/store/l2vr6xj78qrqjlpj6lzc0bi8dirqvfkx-tree-sitter-css",
-  "sha256": "0j1kg16sly7xsvvc3kxyy5zaznlbz7x2j2bwwv1r1nki2249ly12",
-  "hash": "sha256-IniaiBBx2pDD5nwJKfr5i9qvfvG+z8H21v14qk14M0g=",
+  "rev": "f6be52c3d1cdb1c5e4dd7d8bce0a57497f55d6af",
+  "date": "2024-05-05T18:14:34-04:00",
+  "path": "/nix/store/iw66hs4n4wmf9mjaj4zb78diwfkb8y4d-tree-sitter-css",
+  "sha256": "1mq5yzcj16bv9jphgj0v16fsa9bzf7y204c78mf79ls2rqsanljp",
+  "hash": "sha256-V1KrNM5C03RcRYcRIPxxfyWlnQkbyAevTHuZINn3Bdc=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dart.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dart.json
index f492de75ad..40f4c4bab4 100644
--- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dart.json
+++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dart.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/usernobody14/tree-sitter-dart",
-  "rev": "6da46473ab8accb13da48113f4634e729a71d335",
-  "date": "2024-04-07T18:27:24-06:00",
-  "path": "/nix/store/v04h2p45ngm7llrckpkkbnvj9m5763vm-tree-sitter-dart",
-  "sha256": "1jxz4s0j8pmjxl7cz7s9blzqhr1w5jannxihidqrd6dqxawc6gh1",
-  "hash": "sha256-AT7DuOq4mZZxizB2a5UsPGSIP11Jn88O7bJeJIEmv8s=",
+  "rev": "ac0bb849ccd1a923963af47573b5e396736ff582",
+  "date": "2024-04-28T11:52:00-06:00",
+  "path": "/nix/store/7sfa8zsg3p14rm0dbgv030s86lk8fv3w-tree-sitter-dart",
+  "sha256": "0vm0yd2km73cyl2dph5qwb1fbgjjambn9mi4k7jxh495wrmk8hn8",
+  "hash": "sha256-yEI0a+YlEdjlmSTWZFdVUr7lwuK4wNsE9WycOkXzoG4=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dockerfile.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dockerfile.json
index f089eea145..951deac2d0 100644
--- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dockerfile.json
+++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dockerfile.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/camdencheek/tree-sitter-dockerfile",
-  "rev": "d34a0cebd094e830bdd2106a28cb2f1fb22401d8",
-  "date": "2022-01-27T11:20:14-07:00",
-  "path": "/nix/store/3whf6fv79zqk5w0d6jbzfgs5jzm4cll4-tree-sitter-dockerfile",
-  "sha256": "0kf4c4xs5naj8lpcmr3pbdvwj526wl9p6zphxxpimbll7qv6qfnd",
-  "hash": "sha256-zTpsNj6Urhpv7/B+cxPlRhTJd1t35MouRVLZojthxE0=",
+  "rev": "868e44ce378deb68aac902a9db68ff82d2299dd0",
+  "date": "2024-05-09T10:18:45-04:00",
+  "path": "/nix/store/mcyxjcriszp3av7pjxfqn9igpcxrd0jg-tree-sitter-dockerfile",
+  "sha256": "09iw9mqlpgsi6ak4mxrv16anvmbyap6vf61r2pi2lqdp9h1mp7g0",
+  "hash": "sha256-4J1bA0y3YSriFTkYt81VftVtlQk790qmMlG/S3FNPCY=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-earthfile.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-earthfile.json
index 10a75441a4..0241aff6a8 100644
--- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-earthfile.json
+++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-earthfile.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/glehmann/tree-sitter-earthfile",
-  "rev": "9badbe4b107647672f627e7d6bddc8a0b61d1f50",
-  "date": "2024-04-17T16:28:53+02:00",
-  "path": "/nix/store/n7jprqmy1r5xgr0bl5d7rsz4xi10m9rf-tree-sitter-earthfile",
-  "sha256": "0yslldcxpmi2hdgja1ygz3grsaj2jj52xm1dqdwlv296ahx5wqkh",
-  "hash": "sha256-cGJeOlQmiU15wy3ULoqUQiqd3/jPByVfgyLW21mjVHs=",
+  "rev": "450546b6db9a37a178fd87aeda93a287301e9570",
+  "date": "2024-05-16T21:54:01+02:00",
+  "path": "/nix/store/9fsxiz65a2n0kyy7a10q9lqzhhdz1p6x-tree-sitter-earthfile",
+  "sha256": "0vhj9x7zr102f363l9kpgb58py3n4c3q3fl1c3b2dh5dadks0r6h",
+  "hash": "sha256-0GSgZ1OtwCbWYIG6gQcjdviLynp3JjrMcAKE/E9PEm4=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json
index 2d29f1f401..e8722c8981 100644
--- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json
+++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-embedded-template",
-  "rev": "6d791b897ecda59baa0689a85a9906348a2a6414",
-  "date": "2024-02-14T20:15:12-05:00",
-  "path": "/nix/store/fj8gk7h81lgj15x79cbrkfvdw2hmbmyb-tree-sitter-embedded-template",
-  "sha256": "0d4kc2bpbx1bvd0xv37wd87hbi775hq4938qz2n657h036dzg0i3",
-  "hash": "sha256-I4L3mxkAnmKs+BiNRDAs58QFD2r8jN1B2yv0dZdgkzQ=",
+  "rev": "38d5004a797298dc42c85e7706c5ceac46a3f29f",
+  "date": "2024-05-05T21:28:26-04:00",
+  "path": "/nix/store/i2kni0fn6yqgags7l329bbg3n45dc9ww-tree-sitter-embedded-template",
+  "sha256": "178cvdmlvzq2c29n0x8aganqbx3vz6w9m90gwhk63qxa2rxw5wr0",
+  "hash": "sha256-IPPCexaq42Em5A+kmrj5e/SFrXoKdWCTYAL/TWvbDJ0=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glsl.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glsl.json
index eb12bf0a26..7faba26b25 100644
--- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glsl.json
+++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glsl.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/thehamsta/tree-sitter-glsl",
-  "rev": "e7817c982e0e921c5ee89a1e0283121bb5cc5e01",
-  "date": "2024-04-14T19:48:45+02:00",
-  "path": "/nix/store/fs5zdqn1lilbd6f0g6kgjjl35dli61fv-tree-sitter-glsl",
-  "sha256": "1gxg9d3i7iyzxv0sijllbl57dl7ai7z48f1639xd8ljhwl7yyim6",
-  "hash": "sha256-pkbvD+VQUtR6GiY4RP6J6tB2Cl2UyqjB7t/HE0dLr78=",
+  "rev": "8c9fb41836dc202bbbcf0e2369f256055786dedb",
+  "date": "2024-05-11T23:58:08+02:00",
+  "path": "/nix/store/knbraa6ipp3gm9b2ja01zlk1i27pswp0-tree-sitter-glsl",
+  "sha256": "1vpdfpznkh7p47wqya3bqqih2wn1nmyqx4jmyv05v88x5f138hv9",
+  "hash": "sha256-aUM0gisdoV3A9lWSjn21wXIBI8ZrKI/5IffAaf917e4=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json
index f0bb177216..ed82da289c 100644
--- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json
+++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-haskell",
-  "rev": "95a4f0023741b3bee0cc500f3dab9c5bab2dc2be",
-  "date": "2024-03-24T15:47:21+01:00",
-  "path": "/nix/store/ay1m5h51pp7p84hh5mlmxir8fsr68bs5-tree-sitter-haskell",
-  "sha256": "0kwbknxk8f6824bijqqkmlfg04074v31ava8qsf97bqsgs6039vf",
-  "hash": "sha256-bqcBjH4ar5OcxkhtFcYmBxDwHK0TYxkXEcg4NLudi08=",
+  "rev": "a50070d5bb5bd5c1281740a6102ecf1f4b0c4f19",
+  "date": "2024-05-05T18:23:47+02:00",
+  "path": "/nix/store/knnf5zfxjwnml5cdbp3x6kjkw7q4nhsd-tree-sitter-haskell",
+  "sha256": "0hi72f7d4y89i6zkzg9r2j16ykxcb4vh4gwaxg9hcqa95wpv9qw6",
+  "hash": "sha256-huO0Ly9JYQbT64o/AjdZrE9vghQ5vT+/iQl50o4TJ0I=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-janet-simple.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-janet-simple.json
index 547cf21ab0..a68ad7d89d 100644
--- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-janet-simple.json
+++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-janet-simple.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/sogaiu/tree-sitter-janet-simple",
-  "rev": "51271e260346878e1a1aa6c506ce6a797b7c25e2",
-  "date": "2023-11-11T12:18:30+09:00",
-  "path": "/nix/store/whms9s60xj63bl0b7m2gqkd7900h5qwy-tree-sitter-janet-simple",
-  "sha256": "018vwy6y1kr1bh5wp399vspc1y4wpvvgh0c6p7541xl196rzywa1",
-  "hash": "sha256-QXH/s0mB9kDKuYYB+Pa+nPjArt4pjcsLXCHP4I3nGwU=",
+  "rev": "25d0687433ed0ed8e320861c2c625711ce1716f9",
+  "date": "2024-05-17T12:45:28+09:00",
+  "path": "/nix/store/ffqfh3ggcszd5lnx4gx5d2wpilsv6qz5-tree-sitter-janet-simple",
+  "sha256": "0xzqllz8gi2lb44y4hiqxk25p96yl7ysy8r6k1c11sv9gjf65ja4",
+  "hash": "sha256-RMlinHxp6xBYmCYjr/2h3qRbxOw4QuIJWVTEhz6l+Hc=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json
index 67e30dd121..4e5bb91173 100644
--- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json
+++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-javascript",
-  "rev": "ac10a11e0c8db512f70e6b798260d2516d22454c",
-  "date": "2024-04-07T02:36:56-04:00",
-  "path": "/nix/store/b5fahwmcx0riy3bfaarlggncfgfkhx38-tree-sitter-javascript",
-  "sha256": "1f0k7mk785ijppw1swcrilr5bl2nddi7hifml431y4lsqm7y6kmg",
-  "hash": "sha256-r07jT8WaEh8GodVFeGJrVtBVMo2ZcR34vTIWdGY9E7g=",
+  "rev": "e88537c2703546f3f0887dd3f16898e1749cdba5",
+  "date": "2024-05-10T14:09:58-04:00",
+  "path": "/nix/store/s29hw61sfkgxs4pixpnsjbfqi1w73f06-tree-sitter-javascript",
+  "sha256": "0ly10ib6f7lj6l4za7pz8xz7pn4cjp7d5c56bf4n538zlgv136py",
+  "hash": "sha256-/poR9qMfjWKJW6aw0s6VjNh7fkf/HvUJNZIeZ1YEwVM=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsdoc.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsdoc.json
index fbc2c37c8a..d2dce87abb 100644
--- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsdoc.json
+++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsdoc.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-jsdoc",
-  "rev": "6a6cf9e7341af32d8e2b2e24a37fbfebefc3dc55",
-  "date": "2024-02-14T18:13:00-05:00",
-  "path": "/nix/store/9i7fgay23cjnvjapg95bj07jbliv8bmk-tree-sitter-jsdoc",
-  "sha256": "1xmkkqyb9mc18jh6dlffzw9j560mmc5i6fbic8ki9z0r30b1ravw",
-  "hash": "sha256-fKscFhgZ/BQnYnE5EwurFZgiE//O0WagRIHVtDyes/Y=",
+  "rev": "49fde205b59a1d9792efc21ee0b6d50bbd35ff14",
+  "date": "2024-05-05T20:47:41-04:00",
+  "path": "/nix/store/7i5mj175rsgz6gsxji0hbchxw6mvvsjp-tree-sitter-jsdoc",
+  "sha256": "030r6ksv6v0wnlb8yi22n0blls21cipzvgi4flnjllpm9vrsxxii",
+  "hash": "sha256-Mfau8071UiotdSS+/W9kQWhKF7BCRI8WtRxss/U0GQw=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json.json
index 3a43b67184..785c855a23 100644
--- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json.json
+++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-json",
-  "rev": "80e623c2165887f9829357acfa9c0a0bab34a3cd",
-  "date": "2024-04-07T15:21:58-04:00",
-  "path": "/nix/store/9cixfhx0x72pvn0ak349cbbzvhzlvhll-tree-sitter-json",
-  "sha256": "0mjphf34k5d0h28wwafwljk486h5mzx30dqdxz23lcmvnh0s79y1",
-  "hash": "sha256-waejAbS7MjrE7w03MPqvBRpEpqTcKc6RgKCVSYaDV1Y=",
+  "rev": "94f5c527b2965465956c2000ed6134dd24daf2a7",
+  "date": "2024-05-06T15:10:02-04:00",
+  "path": "/nix/store/nl87jvkhqfwshind35dvh204bmjkdv1h-tree-sitter-json",
+  "sha256": "14za39wy4cw0r6r2m5a1i1za9m2wcyrlmh6yi2zl15b86i3dkbyp",
+  "hash": "sha256-16/ZRjRolUC/iN7ASrNnXNSkfohBlSqyyYAz4nka6pM=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json5.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json5.json
index 505875342f..5565bdfabf 100644
--- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json5.json
+++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json5.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/joakker/tree-sitter-json5",
-  "rev": "c23f7a9b1ee7d45f516496b1e0e4be067264fa0d",
-  "date": "2023-10-05T17:25:17-03:00",
-  "path": "/nix/store/k0jyqq66qp3nq8nmzr1dhm3pk2vxhg1r-tree-sitter-json5",
-  "sha256": "11j8sjq2b0ibiygmcnxzl5vxa0p9ygngfhzjvjl19jnlnf0h7a6p",
-  "hash": "sha256-16gDgbPUyhSo3PJD9+zz6QLVd6G/W1afjyuCJbDUSIY=",
+  "rev": "ab0ba8229d639ec4f3fa5f674c9133477f4b77bd",
+  "date": "2024-04-30T19:40:01-04:00",
+  "path": "/nix/store/3ag1lv1h8wg3cvbjbigyqmvqr0jy1i48-tree-sitter-json5",
+  "sha256": "0n33v04d5q79j1qp1l26ygfqywl7vxfam38dap78g6i7ys78581d",
+  "hash": "sha256-LaCCjvYnmofOVQ2Nqlzfh3KP3fNG0HBxkOng0gjYY1g=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-julia.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-julia.json
index d55e2ca470..aa993c30c3 100644
--- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-julia.json
+++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-julia.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-julia",
-  "rev": "0a80d33aca49dd257625ab25ef3a506e2b99a554",
-  "date": "2024-04-14T10:47:45-07:00",
-  "path": "/nix/store/zi4q89960k33nkic7wm19fiq05bhx2bq-tree-sitter-julia",
-  "sha256": "057hg3v4rzzq19swb2mv2zlxp8zd746zxklxc0vw1i1fkr2x34yi",
-  "hash": "sha256-0ZPRRZ4uxMA3YJ3O/g057aPb6Re7isV1Cvj/TPZ48BQ=",
+  "rev": "acd5ca12cc278df7960629c2429a096c7ac4bbea",
+  "date": "2024-04-17T13:39:34-05:00",
+  "path": "/nix/store/3cjbxyngm4mbki1mydjv5q34w16kfhgp-tree-sitter-julia",
+  "sha256": "12dwy7ljhddg804jwkkzh6mn0mbjazihhsbcwn3gd5175qqr9lym",
+  "hash": "sha256-1dOUMS4nlPaG5WxpCONXclVgq4F/Ti4JQK81KOnxvIk=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-just.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-just.json
index 8e480f72a4..2d3d164256 100644
--- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-just.json
+++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-just.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/IndianBoy42/tree-sitter-just",
-  "rev": "6c2f018ab1d90946c0ce029bb2f7d57f56895dff",
-  "date": "2024-03-22T16:21:21-05:00",
-  "path": "/nix/store/8p22m5p2clrcc563v2z6pmhnhh03yyvg-tree-sitter-just",
-  "sha256": "0752hfkkqk92g0s68b01wf5d5q2y7aw87wsj8kz2vxkbj0i38x8j",
-  "hash": "sha256-EnU0IpBr9i3+RFLzg7g6XuDSiuMBLGQ0eCJNPKeDohw=",
+  "rev": "fd814fc6c579f68c2a642f5e0268cf69daae92d7",
+  "date": "2024-05-02T02:56:00-04:00",
+  "path": "/nix/store/4q0rpglj1sa6lay5i1fdnws2pyl8hh71-tree-sitter-just",
+  "sha256": "09faimq5mhldc91r89707fsmdfjqg6dicc2ccr6q9qn5sy0drr6a",
+  "hash": "sha256-yuTcgNfF4oRNZkwwFpt5WLpWtTvgJJRDYo3CWnCNyiU=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-kotlin.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-kotlin.json
index ecd5333bc0..7cf5bab4e7 100644
--- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-kotlin.json
+++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-kotlin.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/fwcd/tree-sitter-kotlin",
-  "rev": "51e451be6c18e2cc123249f49edf8e26fc50311c",
-  "date": "2024-03-14T00:25:12+01:00",
-  "path": "/nix/store/ab6r0biy5244mbw88zxbskfxi0xs4r6s-tree-sitter-kotlin",
-  "sha256": "0s41qgir95lcc68y2xvy7zzai7mm58mlx6w7xkndpc5jvgkc3akx",
-  "hash": "sha256-farB5tuysNvs7IebTisqtZ6o/j9+d+GRYYyWlOPDgWg=",
+  "rev": "d5dc99a9bdc3fe895e6bcd39caddcfa4820f4c03",
+  "date": "2024-05-08T00:38:43+02:00",
+  "path": "/nix/store/gj5w748yk7iyx9s7bzyqj6m9i9sx6rrv-tree-sitter-kotlin",
+  "sha256": "0lqwjg778xy561hhf90c9m8zdjmv58z5kxgy0cjgys4xqsfbfri6",
+  "hash": "sha256-Jma3nMadaP8kA/71WT4qu8r2UU0MJAdhMMV3dM6THFM=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg.json
index f9be1d8935..5253f32efc 100644
--- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg.json
+++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/nvim-neorg/tree-sitter-norg",
-  "rev": "ceb44e4cdb58fbeea52301835bdd461817ddb57e",
-  "date": "2024-04-14T13:26:39+02:00",
-  "path": "/nix/store/gmzacfd1sbdbgvc26bnv3cpyl5l3csq9-tree-sitter-norg",
-  "sha256": "1jzk1wxqah5ajgpxmmbhrjk43hhk9vpg1f7v9wnj1xgp7zv4w6mv",
-  "hash": "sha256-uxpO9j/39SAtT/u48O5OE8JBpsxw1drvk6pAhTsP88s=",
+  "rev": "aa1a1a7ded81a094cc3d5cb14bea6f34b86d8688",
+  "date": "2024-04-19T19:37:12+02:00",
+  "path": "/nix/store/pas31z7l3x16113qa7k7ywb6hbarnwvs-tree-sitter-norg",
+  "sha256": "08bsk3v61r0xhracanjv25jccqv80ahipx0mv5a1slzhcyymv8kd",
+  "hash": "sha256-baJdvWfwUx1U2RX0G6ECaGPGZBFbWsVUhh3kYPaYeiE=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nu.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nu.json
index 8a5f286af0..5f43ea1f7a 100644
--- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nu.json
+++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nu.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/nushell/tree-sitter-nu",
-  "rev": "b090676f0205f52debb93745b9ad788385583276",
-  "date": "2024-04-14T14:09:50-05:00",
-  "path": "/nix/store/f8pjwwdy175mayqncxicn47lj7gw4vks-tree-sitter-nu",
-  "sha256": "10rmw80xzhpqhjhysfx13pkqzfm4a31wvvmq57wvrcrrrlqb982k",
-  "hash": "sha256-U6C0MM05s7z5KbjuzcNQpLqP5x2hO+2hhPjC3wHiNYM=",
+  "rev": "a58513279e98dc3ff9ed149e3b4310cbb7e11068",
+  "date": "2024-04-20T10:10:30-04:00",
+  "path": "/nix/store/h4jw0skhik308krrqi7rmhw7ls4vp1rs-tree-sitter-nu",
+  "sha256": "00vpw8aai4k7bw57pyjwn6b09lb9rr1n88qc4r4nma86rl63y9ic",
+  "hash": "sha256-LCY/DM0GqWpJJgwjZEPOadEElrFc+nsKX2eSqBTidwM=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pgn.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pgn.json
index ee5733041b..433932e936 100644
--- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pgn.json
+++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pgn.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/rolandwalker/tree-sitter-pgn",
-  "rev": "e26ee30850f0cb81541480cf1e2c70385bdb013a",
-  "date": "2021-08-25T17:57:38-04:00",
-  "path": "/nix/store/fj882ab2hl3qrz45zvq366na6d2gqv8v-tree-sitter-pgn",
-  "sha256": "1c4602jmq3p7p7splzip76863l1z3rgbjlbksqv0diqjxp7c42gq",
-  "hash": "sha256-+AnCzu0SxwY21nNRuV4eP9BhkDk3fnr1uecOXKUAhrA=",
+  "rev": "c5b2f2346e4148702b1343ec9bcc42b4a9aa88dc",
+  "date": "2024-04-27T16:35:50-04:00",
+  "path": "/nix/store/klrbfqwbmrwpgrghr2jijy0yy4yra3c3-tree-sitter-pgn",
+  "sha256": "1p6vn84f06c38kanv6j7w5pdwxny0gc7vk357s8ykiz0wv6r8ay9",
+  "hash": "sha256-ySuUzebgx+mRPmXMfdgD3nbebuFHmm3VRIMZ4Aiy29w=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json
index 059ce3aed9..688de10aa4 100644
--- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json
+++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-python",
-  "rev": "a22761025cdac6c314b7e3aa48fb44fa9e594d6a",
-  "date": "2024-04-05T08:52:41-04:00",
-  "path": "/nix/store/4zxxl74gpdm4y3dcaxxy831c5zay31bw-tree-sitter-python",
-  "sha256": "1kr3rj4wszpb1bz7xjn8v5cmkp6817d1iyficpdafglv7rx89a1g",
-  "hash": "sha256-L6iEej6bPqfaZdH5GNoJyNxZWdnIyn7+Cut+zYnMI88=",
+  "rev": "71778c2a472ed00a64abf4219544edbf8e4b86d7",
+  "date": "2024-04-30T21:50:21-04:00",
+  "path": "/nix/store/xqc20db4g26sqsj0jflj4z2jm8hfmd97-tree-sitter-python",
+  "sha256": "1dmg11dbrddf55xhly813cb6ykxmyam2kjs7lyfi8k8xms03jx44",
+  "hash": "sha256-hHQ5gK4dTRSdp0fLKarytU9vFhsBeQp7Ka61vFoIr7Y=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql-dbscheme.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql-dbscheme.json
index 86a69e6f67..c213aaa449 100644
--- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql-dbscheme.json
+++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql-dbscheme.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-ql-dbscheme",
-  "rev": "6b66b9e6e3d36a49ce4def7abee2a286ac9ca289",
-  "date": "2022-08-29T08:49:16+02:00",
-  "path": "/nix/store/k58fls33kiwgbf8vn4488x5l79c9a18x-tree-sitter-ql-dbscheme",
-  "sha256": "1kpkjg97s5j1dx79r3fk0i2bxhpm9sdawgb1drqnjgz4qsshp7f2",
-  "hash": "sha256-wp0LtcbkP2lxbmE9rppO9cK+RATTjZxOb0EWfdKT884=",
+  "rev": "afd8764736bb7ae52b6628618e8b3e7e28224ab7",
+  "date": "2024-05-07T13:58:04+02:00",
+  "path": "/nix/store/696rbv0z6i563jjqbwgdavy6kvpkja94-tree-sitter-ql-dbscheme",
+  "sha256": "1mb87h2gzv3cwswklnnk2s8xmj060j4aj3ccgic7va23n1mm6rbs",
+  "hash": "sha256-emVTa7BDqH1YfIwNqYgEBsjakRbTWjq55mzs/wQ8aNU=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql.json
index eb790ecf9c..6cf9f8045e 100644
--- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql.json
+++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-ql",
-  "rev": "ff04ba61857ba05b80221e71b423b2728dbebe1e",
-  "date": "2024-02-14T19:32:53-05:00",
-  "path": "/nix/store/9s2i55p2nm5lz9lkxs2kkmhiy3zlgx8l-tree-sitter-ql",
-  "sha256": "1wdjy8287823rgl1vibljgf129ll9srxn9n6m1piaj3z46lv5b7x",
-  "hash": "sha256-/ayyqSF/SBVvqMYm27NOlCYR3JN0xR3oy0OggwTysvE=",
+  "rev": "42becd6f8f7bae82c818fa3abb1b6ff34b552310",
+  "date": "2024-05-07T14:00:59+02:00",
+  "path": "/nix/store/dknbdl1hrgp0kicx2wx1wjnhb7bay643-tree-sitter-ql",
+  "sha256": "1gcgs87cas4qd5ppvzjfgzj2ayjnjfxbyg3gl204w8mrvciq2niq",
+  "hash": "sha256-OFqBI9u5Ik6AoG88v7qTVnol5H9O/n1vaZhoxQ7Sj70=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-query.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-query.json
index b5ce91ba4c..09390cce1e 100644
--- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-query.json
+++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-query.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/nvim-treesitter/tree-sitter-query",
-  "rev": "2e31ca2771f6042b0e4e0c41a6290014a9e1face",
-  "date": "2024-03-26T11:42:51+02:00",
-  "path": "/nix/store/d80f3x65zd87i9zpi7z2rh28a5f03n1k-tree-sitter-query",
-  "sha256": "0g8234yicidpjqc1rc7dvpx5ja49g938w451796nnn02chxa204i",
-  "hash": "sha256-kQChOmQCWGtNOqEQjkZ6iShZ+t3tsBwYlrdFFj0ZAj0=",
+  "rev": "d25e8d183f319497b8b22a2a1585975b020da722",
+  "date": "2024-05-06T23:21:15+02:00",
+  "path": "/nix/store/bj3dsdmf608vwagc1nwwhs5z90p6swzc-tree-sitter-query",
+  "sha256": "191h311g14aah7wpibpyhpz925506c3l6qyrfra1kd8pjn1nv2vk",
+  "hash": "sha256-c4ttg5UXtRlUdtljQwczoBSR/oX+rnj5gUqR8EIYMKQ=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-r.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-r.json
index 7ec43650bb..c74499796f 100644
--- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-r.json
+++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-r.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/r-lib/tree-sitter-r",
-  "rev": "c55f8b4dfaa32c80ddef6c0ac0e79b05cb0cbf57",
-  "date": "2023-07-26T18:01:44-07:00",
-  "path": "/nix/store/ydqli8jal8g3nbr78nl8rimb0m5r7b50-tree-sitter-r",
-  "sha256": "0si338c05z3bapxkb7zwk30rza5w0saw0jyk0pljxi32869w8s9m",
-  "hash": "sha256-NWnEk0FixC7pBdNLwJUGvKifwZj8nzX7VWv8AhgaI2o=",
+  "rev": "391400572538ff9854341a175ed8ab4b1e45f44b",
+  "date": "2024-05-03T14:16:03-04:00",
+  "path": "/nix/store/dkmd92q56snynssaridhzkd7rv8zckq7-tree-sitter-r",
+  "sha256": "05s0n6qvb3jsx7sv4vzsc794vdxinxf7f8d2sbf9qz3vwwm39kr8",
+  "hash": "sha256-KM80Kud7fJzc0qIhd1y3sbdN0mH6b7L16VqOtbGxQBc=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-regex.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-regex.json
index 24fa8e0c9c..fee52809be 100644
--- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-regex.json
+++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-regex.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-regex",
-  "rev": "ba22e4e0cb42b2ef066948d0ea030ac509cef733",
-  "date": "2024-02-14T19:05:11-05:00",
-  "path": "/nix/store/9fwryyszxm2fj1pm0l5p641yqiyggcvp-tree-sitter-regex",
-  "sha256": "02nxl4s5vx8nsmhg7cjaf45nl92x8q60b7jhlp29qdqvbgg35gwr",
-  "hash": "sha256-mb8y3lsbN5zEpVCeBQxGXSRqC3FKsvNg1Rb1XTSh3Qo=",
+  "rev": "47007f195752d8e57bda80b0b6cdb2d173a9f7d7",
+  "date": "2024-05-05T20:53:57-04:00",
+  "path": "/nix/store/4vlp0kgq09yp9bnjkrsc82mh0c0mb4qa-tree-sitter-regex",
+  "sha256": "0j9shwv7j8jnkms1f8h9ddg80cj85vp1pivkdcspdifbi69q8l2z",
+  "hash": "sha256-X1CEk4nLxXY1a3PHG+4uSDKAXmsJIhd0nVYieTaHOkk=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json
index 3861a460d1..12519a98bf 100644
--- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json
+++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-rust",
-  "rev": "b77c0d8ac28a7c143224e6ed9b4f9e4bd044ff5b",
-  "date": "2024-04-08T18:09:37-04:00",
-  "path": "/nix/store/mzkmi2d933cn0imzhvfvm43rwzgv624n-tree-sitter-rust",
-  "sha256": "1i1and7lkrcpxkkm3y8p8v1d6wpb6z3b3vrxk9dlw84mwa03y97d",
-  "hash": "sha256-7SQ/gOKVIE5bmj3vscY363LTwkYX+VHn7JflSU+zKsQ=",
+  "rev": "9c84af007b0f144954adb26b3f336495cbb320a7",
+  "date": "2024-05-05T19:28:38-04:00",
+  "path": "/nix/store/5mmx41c8spdf25jci02lw3vmq117dksv-tree-sitter-rust",
+  "sha256": "0wjw8wz34c3h624xi0n133pv4ld1gmx4zn60xfkqgv7cmn9f42cv",
+  "hash": "sha256-mwnikq3s7Ien68DYT3p9oVGy7xjBgtiJMHAwMj5HXHI=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sql.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sql.json
index b18c4d8c71..210646ac4c 100644
--- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sql.json
+++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sql.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/derekstride/tree-sitter-sql",
-  "rev": "c85ffb5228dd643d447ad8ebc75884f6c4fc6158",
-  "date": "2023-12-15T15:40:26-05:00",
-  "path": "/nix/store/mj8yhb4hs86y2yqyz4znpdp9x9bbd8bl-tree-sitter-sql",
-  "sha256": "0p6ay475y30wq949hrffl31lj46axkqi8abf71ak54dibx0892l3",
-  "hash": "sha256-g4qEQF+xkTJVOG4pFPHsyhBJw6DOZZhIwhwMXw7xylw=",
+  "rev": "7d591a1a14ce4d5caf81ae64284c2dc185544cb2",
+  "date": "2024-04-20T18:48:13+02:00",
+  "path": "/nix/store/r6sz2sa4az2p2idl3vjv90nr4zghxmxr-tree-sitter-sql",
+  "sha256": "1x4kw4fflizwb472n8sfpigqyc8y57m28mawsf999011flzg2dmp",
+  "hash": "sha256-tzbxPnUhgJSS01xVJOopHjGPX7xOIysOWfxH6hzhk/Q=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-supercollider.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-supercollider.json
index ec2da6b0fd..a83d9b23b0 100644
--- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-supercollider.json
+++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-supercollider.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/madskjeldgaard/tree-sitter-supercollider",
-  "rev": "3b35bd0fded4423c8fb30e9585c7bacbcd0e8095",
-  "date": "2023-05-30T21:04:53+02:00",
-  "path": "/nix/store/fzb78sqxbxcyldz5m7yx6zirxsvxn5cc-tree-sitter-supercollider",
-  "sha256": "0ib8mja321zwbw59i45xa66p39gikn8n1pihhv26hm5xgdkwwr4r",
-  "hash": "sha256-mWTOZ3u9VGjEhjDeYJGd8aVxjVG9kJgKX/wHMZSsaEU=",
+  "rev": "affa4389186b6939d89673e1e9d2b28364f5ca6f",
+  "date": "2024-04-30T09:37:18+02:00",
+  "path": "/nix/store/jhngv28bin50xqq7b898mq55s8mzmvr9-tree-sitter-supercollider",
+  "sha256": "02jbkx3679b5z78fdn62yr1ax7lr4mlcrdq0fs378alx8hm9704g",
+  "hash": "sha256-j4CTKkSdKnSGdgC3zGglmZ6uQvbC2ObQ+WWlY0afSwo=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-templ.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-templ.json
index 9173e9300f..6dbe640896 100644
--- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-templ.json
+++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-templ.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/vrischmann/tree-sitter-templ",
-  "rev": "1f9dae9c273136551684cb41461d00e565150e23",
-  "date": "2024-04-14T01:39:30+02:00",
-  "path": "/nix/store/swrbx6wrw3k022j2g7vq625zvjbmaxnr-tree-sitter-templ",
-  "sha256": "0w9kr1awc9f30mvidz4aysqs5wk3v93yam6ybb2d2jmmnv9kx5zj",
-  "hash": "sha256-8pc+07a1StHEWt5U5UfaY/KisfaK/BZ3BcMlxlXIM3E=",
+  "rev": "d631f60287c0904770bc41aa865e249594b52422",
+  "date": "2024-05-09T13:42:17+02:00",
+  "path": "/nix/store/5h839wwxwjmg799bp79kkcav2ld8k0jy-tree-sitter-templ",
+  "sha256": "16di98f9xnqdpzb69p8hrgisfhsz0r9p4pv342z0cvkjv5n4s0xc",
+  "hash": "sha256-rANNbNlybga+IGNfclMGX0On48sQ3WTWvw3bnhxKsZk=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tlaplus.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tlaplus.json
index eda4e2a966..f50a35e3f2 100644
--- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tlaplus.json
+++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tlaplus.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/tlaplus-community/tree-sitter-tlaplus",
-  "rev": "3c8ce503563ea04ba1cc07c468ed064b1974c3ba",
-  "date": "2024-04-12T21:02:56-04:00",
-  "path": "/nix/store/p9q0v9h09nf49ji1fnl3s87xsda7skmj-tree-sitter-tlaplus",
-  "sha256": "0vh0kdab362n1cm1nl1klqixshdzjnx5cxynadrmz021x2dx3xl7",
-  "hash": "sha256-h/bRm+hBgF9zU9Z3VrqVv0HdI6YzUBsqC1aYsVSbAG4=",
+  "rev": "ef18145e7f985f592ad41b04004b24a590f58b71",
+  "date": "2024-05-15T18:54:24-04:00",
+  "path": "/nix/store/saczmakjnrwrvn0dad37bfva1m3mvzc5-tree-sitter-tlaplus",
+  "sha256": "0hnylz5mxsvk1q8bbv7ak4r49l2knx75ln58i4isqs7qr0a2vw6b",
+  "hash": "sha256-y/AtFMj4aKwjiahYWk63U9BEMpnq7LUQDnPrXsun3kI=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-verilog.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-verilog.json
index daa765d0c9..e0c25f2310 100644
--- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-verilog.json
+++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-verilog.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-verilog",
-  "rev": "2dfddfcb891f74a1cdb9d8ce480a997d11846e17",
-  "date": "2024-02-14T20:12:08-05:00",
-  "path": "/nix/store/6jdd5vk6m85h4mir572admz08pcp7yqx-tree-sitter-verilog",
-  "sha256": "0qqk9066wlwjrmac43i1irjfnimbkdxwvx4srnnkjv466sn7si3s",
-  "hash": "sha256-ekR9rDaGbDmtzZr0zXubq0brZI4hDsJUzZJTbgxIE2M=",
+  "rev": "075ebfc84543675f12e79a955f79d717772dcef3",
+  "date": "2024-04-27T13:13:12-04:00",
+  "path": "/nix/store/6wsakwazlb9y44n2pmr6xfx0dn6hr99x-tree-sitter-verilog",
+  "sha256": "0j5iycqm5dmvzy7dssm8km1djhr7hnfgk26zyzcxanhrwwq3wi4k",
+  "hash": "sha256-k0Q+MOcZWtXZ99+I+ZyFJ0PZQp2oat2O/7u2UjHzsUg=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-wing.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-wing.json
index bb79674690..0492557e1b 100644
--- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-wing.json
+++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-wing.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/winglang/wing",
-  "rev": "f0b6b11709eb2ed56e5ef76a9b6fcc98615683b8",
-  "date": "2024-04-15T06:16:09+00:00",
-  "path": "/nix/store/iz1a2mwxdx9zqgdds0rfy8apq9l36xpb-wing",
-  "sha256": "105q2w5a3mx8pd0k0jhr6p3fprd85jr7fz3ndkj48yb2m8x2r1is",
-  "hash": "sha256-OoYsOqpieUTkbHZ8d7IsqOXrxjUZSjBBu6jXoQoXuIA=",
+  "rev": "d65e4c03e1b992adc76df2c2485562c8f2204462",
+  "date": "2024-05-17T04:19:16+00:00",
+  "path": "/nix/store/3pdf6cy205v9s4bf2y8r45qpvf3j1zq1-wing",
+  "sha256": "0y0w3559980ryhnnbjkxxlr6w11110fxvvqsk2wr0sijy53j07w5",
+  "hash": "sha256-hR8gR/EyapC5mBrv3R0IIQRuMu19ymUt9BmglEoZHHg=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/update.nix b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/update.nix
index 9b7558b53c..4c2f2c10ae 100644
--- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/update.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/pax-rs/default.nix b/third_party/nixpkgs/pkgs/development/tools/pax-rs/default.nix
index 7b0e2c7a78..6152e0c8dc 100644
--- a/third_party/nixpkgs/pkgs/development/tools/pax-rs/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/pax-rs/default.nix
@@ -36,5 +36,5 @@ rustPlatform.buildRustPackage rec {
       cp ${cargo-lock} $out/Cargo.lock
     '';
 
-  cargoSha256 = "0d6g52hjflnw2zvlx10pz78527vh7mw5n43yi8q6dwr3pkbds1fs";
+  cargoHash = "sha256-2gXd1rwj82Ywin4QW3g9cB9R0PkXhE73F9xSJ6EozzQ=";
 }
diff --git a/third_party/nixpkgs/pkgs/development/tools/perseus-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/perseus-cli/default.nix
index b6fdd048f3..cffa0299be 100644
--- a/third_party/nixpkgs/pkgs/development/tools/perseus-cli/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/perseus-cli/default.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-IYjLx9/4oWSXa4jhOtGw1GOHmrR7LQ6bWyN5zbOuEFs=";
   };
 
-  cargoSha256 = "sha256-i7MPmO9MoANZLzmR5gsD+v0gyDtFbzhsmE9xOsb88L0=";
+  cargoHash = "sha256-i7MPmO9MoANZLzmR5gsD+v0gyDtFbzhsmE9xOsb88L0=";
 
   nativeBuildInputs = [ makeWrapper ];
   buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ];
diff --git a/third_party/nixpkgs/pkgs/development/tools/pifpaf/default.nix b/third_party/nixpkgs/pkgs/development/tools/pifpaf/default.nix
index 6ae32206c6..bc4d0c9ca6 100644
--- a/third_party/nixpkgs/pkgs/development/tools/pifpaf/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/poac/default.nix b/third_party/nixpkgs/pkgs/development/tools/poac/default.nix
index 13562e2672..95a028c6f8 100644
--- a/third_party/nixpkgs/pkgs/development/tools/poac/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/profiling/EZTrace/default.nix b/third_party/nixpkgs/pkgs/development/tools/profiling/EZTrace/default.nix
index e4dbbd76e7..2e2cecf774 100644
--- a/third_party/nixpkgs/pkgs/development/tools/profiling/EZTrace/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/profiling/malt/default.nix b/third_party/nixpkgs/pkgs/development/tools/profiling/malt/default.nix
index e13f488bdf..82b041cc86 100644
--- a/third_party/nixpkgs/pkgs/development/tools/profiling/malt/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/profiling/malt/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     description = "Memory tool to find where you allocate your memory";
     homepage = "https://github.com/memtt/malt";
     license = licenses.cecill-c;
-    maintainers = with maintainers; [ viric ];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/third_party/nixpkgs/pkgs/development/tools/protoc-gen-entgrpc/default.nix b/third_party/nixpkgs/pkgs/development/tools/protoc-gen-entgrpc/default.nix
index 3fbd496792..b4751caa88 100644
--- a/third_party/nixpkgs/pkgs/development/tools/protoc-gen-entgrpc/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/protoc-gen-entgrpc/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "protoc-gen-entgrpc";
-  version = "0.5.0";
+  version = "0.6.0";
 
   src = fetchFromGitHub {
     owner = "ent";
     repo = "contrib";
     rev = "v${version}";
-    sha256 = "sha256-fXvpPH4b1JG++z0KEm9BNu5pGkneefNVvi9R5R3FqB4=";
+    sha256 = "sha256-8BQXjoVTasCReAc3XWBgeoYmL9zLj+uvf9TRKBYaAr4=";
   };
 
-  vendorHash = "sha256-SdUs2alcc4rA6CGIrnaLO7KCseP4a0v6WE58JcRGr0k=";
+  vendorHash = "sha256-jdjcnDfEAP33oQSn5nqgFqE+uwKBXp3gJWTNiiH/6iw=";
 
   subPackages = [ "entproto/cmd/protoc-gen-entgrpc" ];
 
@@ -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/third_party/nixpkgs/pkgs/development/tools/pup/default.nix b/third_party/nixpkgs/pkgs/development/tools/pup/default.nix
index 1d47e79e8a..3df3ef3bc4 100644
--- a/third_party/nixpkgs/pkgs/development/tools/pup/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/pyenv/default.nix b/third_party/nixpkgs/pkgs/development/tools/pyenv/default.nix
index edbf8a5dfd..c7658d2fe7 100644
--- a/third_party/nixpkgs/pkgs/development/tools/pyenv/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/pyenv/default.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   pname = "pyenv";
-  version = "2.4.7";
+  version = "2.4.8";
 
   src = fetchFromGitHub {
     owner = "pyenv";
     repo = "pyenv";
     rev = "refs/tags/v${version}";
-    hash = "sha256-DrLma9gR9wy0IULtCoD/gTHMFPVyxijGACqcoQnYUHY=";
+    hash = "sha256-JXNEAgppFbeNKxjvrI/jUyHmN6pSWUFGSrxeVZi5pHw=";
   };
 
   nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/development/tools/react-native-debugger/default.nix b/third_party/nixpkgs/pkgs/development/tools/react-native-debugger/default.nix
index f0383d5c9a..9479a949ff 100644
--- a/third_party/nixpkgs/pkgs/development/tools/react-native-debugger/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/react-static/default.nix b/third_party/nixpkgs/pkgs/development/tools/react-static/default.nix
index ea21f3ca3e..5307f93a4b 100644
--- a/third_party/nixpkgs/pkgs/development/tools/react-static/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/rebazel/default.nix b/third_party/nixpkgs/pkgs/development/tools/rebazel/default.nix
index 6cc64e1169..d5979ac53d 100644
--- a/third_party/nixpkgs/pkgs/development/tools/rebazel/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/rebazel/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-v84ZXhtJpejQmP61NmP06+qrtMu/0yb7UyD7U12xlME=";
   };
 
-  cargoSha256 = "sha256-cBAm8LyNKEVJkhZJ+QZU5XtQutb1oNvad8xH70Bi2LM=";
+  cargoHash = "sha256-cBAm8LyNKEVJkhZJ+QZU5XtQutb1oNvad8xH70Bi2LM=";
 
   buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ];
 
diff --git a/third_party/nixpkgs/pkgs/development/tools/reindeer/default.nix b/third_party/nixpkgs/pkgs/development/tools/reindeer/default.nix
index 00e9ffb97f..b68fd3ddba 100644
--- a/third_party/nixpkgs/pkgs/development/tools/reindeer/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/reindeer/default.nix
@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "reindeer";
-  version = "2024.07.15.00";
+  version = "2024.07.22.00";
 
   src = fetchFromGitHub {
     owner = "facebookincubator";
     repo = "reindeer";
     rev = "refs/tags/v${version}";
-    hash = "sha256-/pz+kFTT89AGQzvgaYsbiCFO1TouqyETsvahcgEe6qE=";
+    hash = "sha256-T6qUXkzYlkaHlGahf4tnZLD9MogSQueFIBeZDJCiB/w=";
   };
 
-  cargoHash = "sha256-Tg0NhBZLbj9uaPS6FUcPyLSOxFAN9uPSzCwEE/63Ve0=";
+  cargoHash = "sha256-DUcyMohQbkc/93iqFWQGMwvOhdlzhoQTdXH64FFbmY0=";
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs =
diff --git a/third_party/nixpkgs/pkgs/development/tools/remodel/default.nix b/third_party/nixpkgs/pkgs/development/tools/remodel/default.nix
index c9374d3a8d..2788f4fb11 100644
--- a/third_party/nixpkgs/pkgs/development/tools/remodel/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/remodel/default.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-tZ6ptGeNBULJaoFomMFN294wY8YUu1SrJh4UfOL/MnI=";
   };
 
-  cargoSha256 = "sha256-YCYs+MMTxnJEKhzjddBp7lnSYPrpf3G+ktr1ez/ZKkg=";
+  cargoHash = "sha256-YCYs+MMTxnJEKhzjddBp7lnSYPrpf3G+ktr1ez/ZKkg=";
 
   nativeBuildInputs = [
     pkg-config
diff --git a/third_party/nixpkgs/pkgs/development/tools/renderdoc/default.nix b/third_party/nixpkgs/pkgs/development/tools/renderdoc/default.nix
index 843e4fe2c6..751eb51853 100644
--- a/third_party/nixpkgs/pkgs/development/tools/renderdoc/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/renderdoc/default.nix
@@ -17,7 +17,7 @@
 , pcre
 , automake
 , autoconf
-, addOpenGLRunpath
+, addDriverRunpath
 , waylandSupport ? false
 , wayland
 }:
@@ -48,7 +48,7 @@ mkDerivation rec {
   ])
   ++ lib.optional waylandSupport wayland;
 
-  nativeBuildInputs = [ cmake makeWrapper pkg-config bison pcre automake autoconf addOpenGLRunpath ];
+  nativeBuildInputs = [ cmake makeWrapper pkg-config bison pcre automake autoconf addDriverRunpath ];
 
   postUnpack = ''
     cp -r ${custom_swig} swig
@@ -79,7 +79,7 @@ mkDerivation rec {
 
   # The only documentation for this so far is in pkgs/build-support/add-opengl-runpath/setup-hook.sh
   postFixup = ''
-    addOpenGLRunpath $out/lib/librenderdoc.so
+    addDriverRunpath $out/lib/librenderdoc.so
   '';
 
   passthru.updateScript = nix-update-script { };
diff --git a/third_party/nixpkgs/pkgs/development/tools/renderizer/default.nix b/third_party/nixpkgs/pkgs/development/tools/renderizer/default.nix
index 61f06a3bf4..18aea30413 100644
--- a/third_party/nixpkgs/pkgs/development/tools/renderizer/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/renderizer/default.nix
@@ -22,6 +22,6 @@ buildGoModule rec {
     mainProgram = "renderizer";
     inherit (src.meta) homepage;
     license = licenses.gpl3;
-    maintainers = [];
+    maintainers = [ ];
   };
 }
diff --git a/third_party/nixpkgs/pkgs/development/tools/revive/default.nix b/third_party/nixpkgs/pkgs/development/tools/revive/default.nix
index 8acdef07d2..e08e2876c8 100644
--- a/third_party/nixpkgs/pkgs/development/tools/revive/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/revive/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "revive";
-  version = "1.3.7";
+  version = "1.3.9";
 
   src = fetchFromGitHub {
     owner = "mgechev";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-Z5areIRlCyjUbusAdfL49mm5+J0UryWrS5/9Ttw16Po=";
+    hash = "sha256-ZfZNqr7zeMrLjSS1h3ZbjiXNjX1UiqldtrEFth2Z4f0=";
     # populate values that require us to use git. By doing this in postFetch we
     # can delete .git afterwards and maintain better reproducibility of the src.
     leaveDotGit = true;
@@ -18,7 +18,7 @@ buildGoModule rec {
       rm -rf $out/.git
     '';
   };
-  vendorHash = "sha256-JYZdV6CefCB7/WzeZqUhIsK3PKo9KJG15dinN3S+1xw=";
+  vendorHash = "sha256-iIAKPCE06lhAf/4f4TRVO51RdlvuXNA7yMlGVPGrIeo=";
 
   ldflags = [
     "-s"
@@ -35,7 +35,7 @@ buildGoModule rec {
 
   # The following tests fail when built by nix:
   #
-  # $ nix log /nix/store/build-revive.1.3.7.drv | grep FAIL
+  # $ nix log /nix/store/build-revive.1.3.9.drv | grep FAIL
   #
   # --- FAIL: TestAll (0.01s)
   # --- FAIL: TestTimeEqual (0.00s)
diff --git a/third_party/nixpkgs/pkgs/development/tools/rojo/default.nix b/third_party/nixpkgs/pkgs/development/tools/rojo/default.nix
index 746d269f76..3ba5c839c5 100644
--- a/third_party/nixpkgs/pkgs/development/tools/rojo/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/rojo/default.nix
@@ -12,17 +12,17 @@ let
 in
 rustPlatform.buildRustPackage rec {
   pname = "rojo";
-  version = "7.4.1";
+  version = "7.4.2";
 
   src = fetchFromGitHub {
     owner = "rojo-rbx";
     repo = "rojo";
     rev = "v${version}";
-    hash = "sha256-7fnzNYAbsZW/48C4dwpMXXQy2ZgxbYFSs85wNKGcu/4=";
+    hash = "sha256-T4a54JiCGKfXvt80rCRZbS/zqV3gomzG0IwAQRxcQo8=";
     fetchSubmodules = true;
   };
 
-  cargoHash = "sha256-9kmSNWsZY0OcqaYOCblMwkXTdGXhj7f/2pUDx/L/o2o=";
+  cargoHash = "sha256-hXEz7u6dT2LRcQDYNjK4yxSHA1lxXZwNP98r0NT6mgA=";
 
   nativeBuildInputs = [
     pkg-config
diff --git a/third_party/nixpkgs/pkgs/development/tools/rover/default.nix b/third_party/nixpkgs/pkgs/development/tools/rover/default.nix
index ab146df71a..c70869299c 100644
--- a/third_party/nixpkgs/pkgs/development/tools/rover/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/rover/default.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-uyeePAHBDCzXzwIWrKcc9LHClwSI7DMBYod/o4LfK+Y=";
   };
 
-  cargoSha256 = "sha256-Rf4kRXYW+WAF1rM7o8PmXBLgp/YyA8y/TqbZL22VOqI=";
+  cargoHash = "sha256-Rf4kRXYW+WAF1rM7o8PmXBLgp/YyA8y/TqbZL22VOqI=";
 
   buildInputs = lib.optionals stdenv.isDarwin [
     darwin.apple_sdk.frameworks.Security
diff --git a/third_party/nixpkgs/pkgs/development/tools/rover/update.sh b/third_party/nixpkgs/pkgs/development/tools/rover/update.sh
index 3914c9acb5..a9a5bdb6ad 100755
--- a/third_party/nixpkgs/pkgs/development/tools/rover/update.sh
+++ b/third_party/nixpkgs/pkgs/development/tools/rover/update.sh
@@ -36,16 +36,16 @@ sed --in-place \
     "s|sha256 = \"[a-zA-Z0-9\/+-=]*\"|sha256 = \"$rover_sri_hash\"|" \
     "$dirname/default.nix"
 
-# Clear cargoSha256.
+# Clear cargoHash.
 sed --in-place \
-    "s|cargoSha256 = \".*\"|cargoSha256 = \"sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\"|" \
+    "s|cargoHash = \".*\"|cargoHash = \"sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=\"|" \
     "$dirname/default.nix"
 
-# Update cargoSha256
-echo "Computing cargoSha256"
-cargoSha256=$(
-    nix-prefetch "{ sha256 }: (import $nixpkgs {}).rover.cargoDeps.overrideAttrs (_: { outputHash = sha256; })"
+# Update cargoHash
+echo "Computing cargoHash"
+cargoHash=$(
+    nix-prefetch "{ hash }: (import $nixpkgs {}).rover.cargoDeps.overrideAttrs (_: { outputHash = hash; })"
 )
 sed --in-place \
-    "s|cargoSha256 = \".*\"|cargoSha256 = \"$cargoSha256\"|" \
+    "s|cargoHash = \".*\"|cargoHash = \"$cargoHash\"|" \
     "$dirname/default.nix"
diff --git a/third_party/nixpkgs/pkgs/development/tools/rq/default.nix b/third_party/nixpkgs/pkgs/development/tools/rq/default.nix
index f8ed521ad2..b5624092c8 100644
--- a/third_party/nixpkgs/pkgs/development/tools/rq/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/rq/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-QyYTbMXikLSe3eYJRUALQJxUJjA6VlvaLMwGrxIKfZI=";
   };
 
-  cargoSha256 = "sha256-WAgWc9rAQBjrsaHP6s3Djpg3iYmfRVC9J9yq0T/zMqA=";
+  cargoHash = "sha256-WAgWc9rAQBjrsaHP6s3Djpg3iYmfRVC9J9yq0T/zMqA=";
 
   postPatch = ''
     # Remove #[deny(warnings)] which is equivalent to -Werror in C.
diff --git a/third_party/nixpkgs/pkgs/development/tools/rslint/default.nix b/third_party/nixpkgs/pkgs/development/tools/rslint/default.nix
index cac55f4bb3..28dfadd4cd 100644
--- a/third_party/nixpkgs/pkgs/development/tools/rslint/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/rslint/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-3DEwi+bhqwP8aMpZYl07GZbe7IecraB3m54lZ5LViVc=";
   };
 
-  cargoSha256 = "sha256-bqF5v52uxbvmVmphXAmcWlCI6nbQzZemCxlTcqhRDTY=";
+  cargoHash = "sha256-bqF5v52uxbvmVmphXAmcWlCI6nbQzZemCxlTcqhRDTY=";
 
   cargoBuildFlags = [
     "-p" "rslint_cli"
diff --git a/third_party/nixpkgs/pkgs/development/tools/ruff/Cargo.lock b/third_party/nixpkgs/pkgs/development/tools/ruff/Cargo.lock
index 17b61df9f3..c072bcac55 100644
--- a/third_party/nixpkgs/pkgs/development/tools/ruff/Cargo.lock
+++ b/third_party/nixpkgs/pkgs/development/tools/ruff/Cargo.lock
@@ -1866,6 +1866,7 @@ dependencies = [
  "ruff_python_ast",
  "rustc-hash 2.0.0",
  "salsa",
+ "tempfile",
  "tracing",
  "tracing-subscriber",
  "tracing-tree",
@@ -1897,6 +1898,7 @@ version = "0.0.0"
 dependencies = [
  "anyhow",
  "bitflags 2.6.0",
+ "countme",
  "hashbrown",
  "ordermap",
  "red_knot_module_resolver",
@@ -1904,7 +1906,6 @@ dependencies = [
  "ruff_index",
  "ruff_python_ast",
  "ruff_python_parser",
- "ruff_python_trivia",
  "ruff_text_size",
  "rustc-hash 2.0.0",
  "salsa",
@@ -1992,7 +1993,7 @@ dependencies = [
 
 [[package]]
 name = "ruff"
-version = "0.5.4"
+version = "0.5.5"
 dependencies = [
  "anyhow",
  "argfile",
@@ -2091,6 +2092,7 @@ dependencies = [
  "ruff_notebook",
  "ruff_python_ast",
  "ruff_python_parser",
+ "ruff_python_trivia",
  "ruff_source_file",
  "ruff_text_size",
  "rustc-hash 2.0.0",
@@ -2176,7 +2178,7 @@ dependencies = [
 
 [[package]]
 name = "ruff_linter"
-version = "0.5.4"
+version = "0.5.5"
 dependencies = [
  "aho-corasick",
  "annotate-snippets 0.9.2",
@@ -2491,7 +2493,7 @@ dependencies = [
 
 [[package]]
 name = "ruff_wasm"
-version = "0.5.4"
+version = "0.5.5"
 dependencies = [
  "console_error_panic_hook",
  "console_log",
@@ -2910,9 +2912,9 @@ checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc"
 
 [[package]]
 name = "syn"
-version = "2.0.71"
+version = "2.0.72"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b146dcf730474b4bcd16c311627b31ede9ab149045db4d6088b3becaea046462"
+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3000,18 +3002,18 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.62"
+version = "1.0.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2675633b1499176c2dff06b0856a27976a8f9d436737b4cf4f312d4d91d8bbb"
+checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.62"
+version = "1.0.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d20468752b09f49e909e55a5d338caa8bedf615594e9d80bc4c565d30faf798c"
+checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3075,9 +3077,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[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",
@@ -3096,9 +3098,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",
  "serde",
@@ -3183,9 +3185,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-tree"
-version = "0.3.1"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b56c62d2c80033cb36fae448730a2f2ef99410fe3ecbffc916681a32f6807dbe"
+checksum = "f459ca79f1b0d5f71c54ddfde6debfc59c8b6eeb46808ae492077f739dc7b49c"
 dependencies = [
  "nu-ansi-term 0.50.0",
  "tracing-core",
@@ -3338,9 +3340,9 @@ checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
 
 [[package]]
 name = "uuid"
-version = "1.9.1"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5de17fd2f7da591098415cff336e12965a28061ddace43b59cb3c430179c9439"
+checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314"
 dependencies = [
  "getrandom",
  "rand",
@@ -3350,9 +3352,9 @@ dependencies = [
 
 [[package]]
 name = "uuid-macro-internal"
-version = "1.9.1"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3ff64d5cde1e2cb5268bdb497235b6bd255ba8244f910dbc3574e59593de68c"
+checksum = "ee1cd046f83ea2c4e920d6ee9f7c3537ef928d75dce5d84a87c2c5d6b3999a3a"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/third_party/nixpkgs/pkgs/development/tools/ruff/default.nix b/third_party/nixpkgs/pkgs/development/tools/ruff/default.nix
index f887789246..499c3c8819 100644
--- a/third_party/nixpkgs/pkgs/development/tools/ruff/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/ruff/default.nix
@@ -13,13 +13,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "ruff";
-  version = "0.5.4";
+  version = "0.5.5";
 
   src = fetchFromGitHub {
     owner = "astral-sh";
     repo = "ruff";
     rev = "refs/tags/${version}";
-    hash = "sha256-dvvhd84T2YaNR5yu1uYcqwHjVzcWXvlXthyMBf8qZzE=";
+    hash = "sha256-dqfK6YdAV4cdUYB8bPE9I5FduBJ90RxUA7TMvcVq6Zw=";
   };
 
   cargoLock = {
@@ -53,6 +53,25 @@ rustPlatform.buildRustPackage rec {
     version = testers.testVersion { package = ruff; };
   };
 
+  # Failing on darwin for an unclear reason.
+  # According to the maintainers, those tests are from an experimental crate that isn't actually
+  # used by ruff currently and can thus be safely skipped.
+  checkFlags = lib.optionals stdenv.isDarwin [
+    "--skip=changed_file"
+    "--skip=changed_metadata"
+    "--skip=deleted_file"
+    "--skip=directory_deleted"
+    "--skip=directory_moved_to_trash"
+    "--skip=directory_moved_to_workspace"
+    "--skip=directory_renamed"
+    "--skip=move_file_to_trash"
+    "--skip=move_file_to_workspace"
+    "--skip=new_file"
+    "--skip=new_ignored_file"
+    "--skip=rename_file"
+    "--skip=search_path"
+  ];
+
   meta = {
     description = "Extremely fast Python linter";
     homepage = "https://github.com/astral-sh/ruff";
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/bootimage/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/bootimage/default.nix
index 9f1f513439..16dc55b64f 100644
--- a/third_party/nixpkgs/pkgs/development/tools/rust/bootimage/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/rust/bootimage/default.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "12p18mk3l473is3ydv3zmn6s7ck8wgjwavllimcpja3yjilxm3zg";
   };
 
-  cargoSha256 = "03jximwqgjq7359c5mxbyfja2d04y57h34f87aby8jy0lz99jy2x";
+  cargoHash = "sha256-XXiZ0qfAS+SXOsiRAU/xBDShpPOr18JSGQfLh3mNXQ4=";
 
   meta = with lib; {
     description = "Creates a bootable disk image from a Rust OS kernel";
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-apk/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-apk/default.nix
index a468e03e85..c889f643b5 100644
--- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-apk/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-apk/default.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-1vCrM+0SNefd7FrRXnSjLhM3/MSVJfcL4k1qAstX+/A=";
   };
 
-  cargoSha256 = "sha256-rGn3MKbqIRWayarsgedIOhuTTl8lyRsRxn7BN5Id97w=";
+  cargoHash = "sha256-rGn3MKbqIRWayarsgedIOhuTTl8lyRsRxn7BN5Id97w=";
 
   meta = with lib; {
     description = "Tool for creating Android packages";
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-asm/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-asm/default.nix
index 68d5a256bb..9c66f2cd97 100644
--- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-asm/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-asm/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1f6kzsmxgdms9lq5z9ynnmxymk9k2lzlp3caa52wqjvdw1grw0rb";
   };
 
-  cargoSha256 = "1c22aal3i7zbyxr2c41fimfx13fwp9anmhh641951yd7cqb8xij2";
+  cargoHash = "sha256-QsaOFman+VBSIAbCalW63I3QXY0uECZy9+ufOKhSQrA=";
 
   buildInputs = lib.optional stdenv.isDarwin Security;
 
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-bazel/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-bazel/default.nix
index fb97482c50..22567ad2d1 100644
--- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-bazel/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-bazel/default.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-FS1WFlK0YNq1QCi3S3f5tMN+Bdcfx2dxhDKRLXLcios=";
   };
 
-  cargoSha256 = "+PVNB/apG5AR236Ikqt+JTz20zxc0HUi7z6BU6xq/Fw=";
+  cargoHash = "sha256-+PVNB/apG5AR236Ikqt+JTz20zxc0HUi7z6BU6xq/Fw=";
 
   buildInputs = lib.optional stdenv.isDarwin Security;
 
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-binutils/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-binutils/default.nix
index 126b149a31..0f7e53474f 100644
--- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-binutils/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-binutils/default.nix
@@ -9,7 +9,7 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-tRh3+X6QCdkkJE1O60ZRkDBRbznGZ1aB1AOmcz0EINI=";
   };
 
-  cargoSha256 = "sha256-lZJcsCg7e5ZmClnzKFjm/roXBIyhkPTzS7R6BTmcNIk=";
+  cargoHash = "sha256-lZJcsCg7e5ZmClnzKFjm/roXBIyhkPTzS7R6BTmcNIk=";
 
   meta = with lib; {
     description = "Cargo subcommands to invoke the LLVM tools shipped with the Rust toolchain";
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-bitbake/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-bitbake/default.nix
index ed3f5a243c..91b4912022 100644
--- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-bitbake/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-bitbake/default.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ openssl ];
 
-  cargoSha256 = "sha256-LYdQ0FLfCopY8kPTCmiW0Qyx6sHA4nlb+hK9hXezGLg=";
+  cargoHash = "sha256-LYdQ0FLfCopY8kPTCmiW0Qyx6sHA4nlb+hK9hXezGLg=";
 
   meta = with lib; {
     description = "Cargo extension that can generate BitBake recipes utilizing the classes from meta-rust";
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-bolero/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-bolero/default.nix
index 7d3985dcb1..cd082dca6c 100644
--- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-bolero/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-bolero/default.nix
@@ -9,7 +9,7 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-Xcu91CbIDBLSojWQJjvdFWJiqjMteAxF105lemCAipk=";
   };
 
-  cargoSha256 = "sha256-QLtf42Il+XHWeaUdh8jNNWU1sXaVe82sYOKiHLoXw2M=";
+  cargoHash = "sha256-QLtf42Il+XHWeaUdh8jNNWU1sXaVe82sYOKiHLoXw2M=";
 
   buildInputs = [ libbfd libopcodes libunwind ];
 
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-cache/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-cache/default.nix
index a1151c161f..8c8a4ea29a 100644
--- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-cache/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-cache/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-q9tYKXK8RqiqbDZ/lTxUI1Dm/h28/yZR8rTQuq+roZs=";
   };
 
-  cargoSha256 = "sha256-275QREIcncgBk4ah/CivSz5N2m6s/XPCfp6JGChpr38=";
+  cargoHash = "sha256-275QREIcncgBk4ah/CivSz5N2m6s/XPCfp6JGChpr38=";
 
   buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ];
 
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-criterion/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-criterion/default.nix
index 986892a68b..b139a4ce3a 100644
--- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-criterion/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-criterion/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-RPix9DM6E32PhObvV3xPGrnXrrVHn3auxLUhysP8GM0=";
   };
 
-  cargoSha256 = "sha256-L/ILHKWlcYTkbEi2qDu7tf/3NHfTl6GhW0s+fUlsW08=";
+  cargoHash = "sha256-L/ILHKWlcYTkbEi2qDu7tf/3NHfTl6GhW0s+fUlsW08=";
 
   meta = with lib; {
     description = "Cargo extension for running Criterion.rs benchmarks";
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-cross/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-cross/default.nix
index d94c15890b..772461683b 100644
--- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-cross/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-cross/default.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-TFPIQno30Vm5m2nZ2b3d0WPu/98UqANLhw3IZiE5a38=";
   };
 
-  cargoSha256 = "sha256-x+DrKo79R8TAeLVuvIIguQs3gdAHiAQ9dUU2/eZRZ0c=";
+  cargoHash = "sha256-x+DrKo79R8TAeLVuvIIguQs3gdAHiAQ9dUU2/eZRZ0c=";
 
   checkFlags = [
     "--skip=docker::shared::tests::directories::test_host"
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-deadlinks/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-deadlinks/default.nix
index ead5705c59..d206e739bb 100644
--- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-deadlinks/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-deadlinks/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0s5q9aghncsk9834azn5cgnn5ms3zzyjan2rq06kaqcgzhld4cjh";
   };
 
-  cargoSha256 = "00g06zf0m1wry0mhf098pw99kbb99d8a17985pb90yf1w74rdkh6";
+  cargoHash = "sha256-Bs6WyeHBeZDWLSidoFBLaa2ZEr8oAQcr8JmHCtw34AE=";
 
   checkFlags = [
     # uses internet
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-espmonitor/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-espmonitor/default.nix
index 55f4df99c6..9c4874a975 100644
--- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-espmonitor/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-espmonitor/default.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "hWFdim84L2FfG6p9sEf+G5Uq4yhp5kv1ZMdk4sMHa+4=";
   };
 
-  cargoSha256 = "d0tN6NZiAd+RkRy941fIaVEw/moz6tkpL0rN8TZew3g=";
+  cargoHash = "sha256-d0tN6NZiAd+RkRy941fIaVEw/moz6tkpL0rN8TZew3g=";
 
   meta = with lib; {
     description = "Cargo tool for monitoring ESP32/ESP8266 execution";
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-feature/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-feature/default.nix
index c09447ebbc..1e713076e1 100644
--- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-feature/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-feature/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-UPpqkz/PwoMaJan9itfldjyTmZmiMb6PzCyu9Vtjj1s=";
   };
 
-  cargoSha256 = "sha256-8qrpW/gU7BvxN3nSbFWhbgu5bwsdzYZTS3w3kcwsGbU=";
+  cargoHash = "sha256-8qrpW/gU7BvxN3nSbFWhbgu5bwsdzYZTS3w3kcwsGbU=";
 
   buildInputs = lib.optional stdenv.isDarwin libiconv;
 
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-flamegraph/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-flamegraph/default.nix
index 1e90dedccc..4a6d9c3ff3 100644
--- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-flamegraph/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-flamegraph/default.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-VrC3c3a1G8mn9U6txeynsaWOL4HQQk2IOiQqS52iPGo=";
   };
 
-  cargoSha256 = "sha256-KwpveTiViY+C4A+fE5yeGuT9PXbDyi+YsOc75mX2KdU=";
+  cargoHash = "sha256-KwpveTiViY+C4A+fE5yeGuT9PXbDyi+YsOc75mX2KdU=";
 
   nativeBuildInputs = lib.optionals stdenv.isLinux [ makeWrapper ];
   buildInputs = lib.optionals stdenv.isDarwin [
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-guppy/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-guppy/default.nix
index b373b584d9..13bb3eaff1 100644
--- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-guppy/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-guppy/default.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-LWU1yAD/f9w5m522vcKP9D2JusGkwzvfGSGstvFGUpk=";
   };
 
-  cargoSha256 = "sha256-IyU5fJSFzef8P5v8ILufGcTP3+5Gm0PH4Cox2G5saHw=";
+  cargoHash = "sha256-IyU5fJSFzef8P5v8ILufGcTP3+5Gm0PH4Cox2G5saHw=";
 
   nativeBuildInputs = [ pkg-config ];
 
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-hf2/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-hf2/default.nix
index 41dd6ae904..ec689cb515 100644
--- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-hf2/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-hf2/default.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-0o3j7YfgNNnfbrv9Gppo24DqYlDCxhtsJHIhAV214DU=";
   };
 
-  cargoSha256 = "sha256-zBxvpQfB9xw8+Rc1H1EaK/gQZtQ+uSs4YJwhm2o0vhI=";
+  cargoHash = "sha256-zBxvpQfB9xw8+Rc1H1EaK/gQZtQ+uSs4YJwhm2o0vhI=";
 
   nativeBuildInputs = [ pkg-config ];
 
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-inspect/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-inspect/default.nix
index db646ec07c..e8b1443dd0 100644
--- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-inspect/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-inspect/default.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
 
   buildInputs = lib.optionals stdenv.isDarwin [ Security ];
 
-  cargoSha256 = "069i8ydrp1pssnjq7d6mydwr7xh2cmcpzpf8bzd6nfjr6xx1pipr";
+  cargoHash = "sha256-+cYbejdZOmvaX8jdf1llAvaTefPVtIOl1fqGm5tHMRk=";
 
   meta = with lib; {
     description = "See what Rust is doing behind the curtains";
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-kcov/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-kcov/default.nix
index 68ed13d1ad..2517ac37c7 100644
--- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-kcov/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-kcov/default.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0hqplgj3i8js42v2kj44khk543a93sk3n6wlfpv3c84pdqlm29br";
   };
 
-  cargoSha256 = "0m5gfyjzzwd8wkbb388vmd785dy334x0migq3ssi7dlah9zx62bj";
+  cargoHash = "sha256-cgnTf4KKthO1HvjFCjoZw7eCTqsbobHW5Kjx/6V3r1Q=";
   doCheck = false;
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-limit/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-limit/default.nix
index f52f76a3de..958bfeb447 100644
--- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-limit/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-limit/default.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-joWDB9fhCsYVZFZdr+Gfm4JaRlm5kj+CHp34Sx5iQYk=";
   };
 
-  cargoSha256 = "sha256-dwqbG0UFeUQHa0K98ebHfjbcQuQOhK2s6ZxAT6r0cik=";
+  cargoHash = "sha256-dwqbG0UFeUQHa0K98ebHfjbcQuQOhK2s6ZxAT6r0cik=";
 
   buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
 
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-llvm-cov/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-llvm-cov/default.nix
index 5c9ac80d56..93994a7bc7 100644
--- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-llvm-cov/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-llvm-cov/default.nix
@@ -63,7 +63,7 @@ rustPlatform.buildRustPackage {
     cp ${cargoLock} source/Cargo.lock
   '';
 
-  cargoSha256 = "sha256-sN3vNZgi45pcDXI8kQ0L/r6HCDGs8l2VMwI+LHjwZ6Q=";
+  cargoHash = "sha256-sN3vNZgi45pcDXI8kQ0L/r6HCDGs8l2VMwI+LHjwZ6Q=";
 
   # `cargo-llvm-cov` reads these environment variables to find these binaries,
   # which are needed to run the tests
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-msrv/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-msrv/default.nix
index 1492de85da..e8b23c70bd 100644
--- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-msrv/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-msrv/default.nix
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-rmWPkxxrpVamYHII0xkZq62ubL3/jrcqXUvFH9VuNtg=";
   };
 
-  cargoSha256 = "sha256-/Bspy94uIP/e4uJY8qo+UPK1tnPjglxiMWeYWx2qoHk=";
+  cargoHash = "sha256-/Bspy94uIP/e4uJY8qo+UPK1tnPjglxiMWeYWx2qoHk=";
 
   passthru = {
     updateScript = gitUpdater {
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-play/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-play/default.nix
index 94520d0d56..a95f2c10c3 100644
--- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-play/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-play/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-Z5zcLQYfQeGybsnt2U+4Z+peRHxNPbDriPMKWhJ+PeA=";
   };
 
-  cargoSha256 = "sha256-I+keVi0fxUVttMHOGJQWVfIpHEQu/9aTbERa3qiHmnQ=";
+  cargoHash = "sha256-I+keVi0fxUVttMHOGJQWVfIpHEQu/9aTbERa3qiHmnQ=";
 
   # these tests require internet access
   checkFlags = [
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-public-api/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-public-api/default.nix
index 6509fa381c..aa55cac49d 100644
--- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-public-api/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-public-api/default.nix
@@ -10,14 +10,14 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-public-api";
-  version = "0.36.0";
+  version = "0.37.0";
 
   src = fetchCrate {
     inherit pname version;
-    hash = "sha256-Umxkm+GCXsb60l9Gq417cynoy7D30Hlh6r04HoWGVPA=";
+    hash = "sha256-BwCqGQJpFjrZtQpjZ7FIIUfIaIXBTJWDzjZoktSa2Zg=";
   };
 
-  cargoHash = "sha256-Aj9SykzdAZJSw8wQ5QHLhtWaxo2tnjjdJZnPIp3fsVw=";
+  cargoHash = "sha256-McqRVfTX8z3NkkIvp3jqJlhtOhOGdcahTghDCMY2E6c=";
 
   nativeBuildInputs = [ pkg-config ];
 
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-readme/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-readme/default.nix
index aa4a6cf5ea..8924195b4e 100644
--- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-readme/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-readme/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-FFWHADATEfvZvxGwdkj+eTVoq7pnPuoUAhMGTokUkMs=";
   };
 
-  cargoSha256 = "sha256-OEArMqOiT+PZ+zMRt9h0EzeP7ikFuOYR8mFGtm+xCkQ=";
+  cargoHash = "sha256-OEArMqOiT+PZ+zMRt9h0EzeP7ikFuOYR8mFGtm+xCkQ=";
 
   # disable doc tests
   cargoTestFlags = [
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-rr/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-rr/default.nix
index 6c3780719f..cccd1368a8 100644
--- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-rr/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-rr/default.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-t8pRqeOdaRVG0titQhxezT2aDjljSs//MnRTTsJ73Yo=";
   };
 
-  cargoSha256 = "sha256-P4r4XRolORdSGAsNg5RutZ2VVRR8rAfiBZNm+vIH3aM=";
+  cargoHash = "sha256-P4r4XRolORdSGAsNg5RutZ2VVRR8rAfiBZNm+vIH3aM=";
 
   passthru = {
     updateScript = nix-update-script { };
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-sort/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-sort/default.nix
index cb8efeef12..53f941e788 100644
--- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-sort/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-sort/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-fqmyL4ZSz+nKfUIrcrfLRT9paEas5d00Y/kvEqyz2vw=";
   };
 
-  cargoSha256 = "sha256-JON6cE1ZHeI+0vU9AJp0e1TIbiH3AWjHyn0jd9PNqQU=";
+  cargoHash = "sha256-JON6cE1ZHeI+0vU9AJp0e1TIbiH3AWjHyn0jd9PNqQU=";
 
   meta = with lib; {
     description = "Tool to check that your Cargo.toml dependencies are sorted alphabetically";
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-sweep/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-sweep/default.nix
index 08e0416a9a..8e04ed2bc9 100644
--- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-sweep/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-sweep/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-L9tWTgW8PIjxeby+wa71NPp3kWMYH5D7PNtpk8Bmeyc=";
   };
 
-  cargoSha256 = "sha256-aalB7gHLc3YIgSOg68wc2fyzXFGfHO5x5YdzhuRmyro=";
+  cargoHash = "sha256-aalB7gHLc3YIgSOg68wc2fyzXFGfHO5x5YdzhuRmyro=";
 
   checkFlags = [
     # Requires a rustup toolchain to be installed.
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-sync-readme/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-sync-readme/default.nix
index c790f097a2..953553cb94 100644
--- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-sync-readme/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-sync-readme/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-n9oIWblTTuXFFQFN6mpQiCH5N7yg5fAp8v9vpB5/DAo=";
   };
 
-  cargoSha256 = "sha256-DsB2C2ELuvuVSvxG/xztmnY2qfX8+Y7udbXlpRQoL/c=";
+  cargoHash = "sha256-DsB2C2ELuvuVSvxG/xztmnY2qfX8+Y7udbXlpRQoL/c=";
 
   meta = with lib; {
     description = "Cargo plugin that generates a Markdown section in your README based on your Rust documentation";
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-valgrind/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-valgrind/default.nix
index e084c528c9..1020caad55 100644
--- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-valgrind/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-valgrind/default.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-l/1paghG/ARD0JfzNh0xj2UD5kW6FddM8Xrd/FCygYc=";
   };
 
-  cargoSha256 = "sha256-9/kIIZDIsOhUvRT3TyXN5PGFUB+a8m2yXmzBbsPUK28=";
+  cargoHash = "sha256-9/kIIZDIsOhUvRT3TyXN5PGFUB+a8m2yXmzBbsPUK28=";
 
   passthru = {
     updateScript = nix-update-script { };
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-vet/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-vet/default.nix
index 0d71a77baa..96822b3078 100644
--- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-vet/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-vet/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-VnOqQ1dKgNZSHTzJrD7stoCzNGrSkYxcLDJAsrJUsEQ=";
   };
 
-  cargoSha256 = "sha256-M8sZzgSEMIB6pPVaE+tC18MCbwYaYpHOnhrEvm9JTso=";
+  cargoHash = "sha256-M8sZzgSEMIB6pPVaE+tC18MCbwYaYpHOnhrEvm9JTso=";
 
   buildInputs = lib.optional stdenv.isDarwin Security;
 
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-web/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-web/default.nix
index d1dd2cc527..11f1fc6aac 100644
--- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-web/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-web/default.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1dl5brj5fnmxmwl130v36lvy4j64igdpdvjwmxw3jgg2c6r6b7cd";
   };
 
-  cargoSha256 = "0q7yxvvngfvn4s889qzp1qnsw2c6qy2ryv9vz9cxhmqidx4dg4va";
+  cargoHash = "sha256-apPXSG8RV9hZ+jttn4XHhgmuLQ7344SQJna7Z/fu/mA=";
 
   nativeBuildInputs = [ openssl perl pkg-config ];
   buildInputs = lib.optionals stdenv.isDarwin [ CoreServices Security ];
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-wipe/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-wipe/default.nix
index 86a2dc5805..af9ae57c7c 100644
--- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-wipe/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-wipe/default.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-xMYpZ6a8HdULblkfEqnqLjX8OVFJWx8MHDGNhuFzdTc=";
   };
 
-  cargoSha256 = "sha256-/cne7uTGyxgTRONWMEE5dPbPDnCxf+ZnYzYXRAeHJyQ=";
+  cargoHash = "sha256-/cne7uTGyxgTRONWMEE5dPbPDnCxf+ZnYzYXRAeHJyQ=";
 
   passthru = {
     updateScript = nix-update-script { };
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cauwugo/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cauwugo/default.nix
index d5a3dad06f..10a3432d4d 100644
--- a/third_party/nixpkgs/pkgs/development/tools/rust/cauwugo/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/rust/cauwugo/default.nix
@@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-9gWUu2qbscKlbWZlRbOn+rrmizegkHxPnwnAmpaV1Ww=";
   };
 
-  cargoSha256 = "sha256-dXlSBb3ey3dAiifrQ9Bbhscnm1QmcChiQbX1ic069V4=";
+  cargoHash = "sha256-dXlSBb3ey3dAiifrQ9Bbhscnm1QmcChiQbX1ic069V4=";
 
   nativeBuildInputs = [ installShellFiles ];
 
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cbindgen/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cbindgen/default.nix
index da73d1ca6e..1e4d755fde 100644
--- a/third_party/nixpkgs/pkgs/development/tools/rust/cbindgen/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/rust/cbindgen/default.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-gyNZAuxpeOjuC+Rh9jAyHSBQRRYUlYoIrBKuCFg3Hao=";
   };
 
-  cargoSha256 = "sha256-pdTxhECAZzBx5C01Yx7y/OGwhhAdlEDpqLBdvQcb8bc=";
+  cargoHash = "sha256-pdTxhECAZzBx5C01Yx7y/OGwhhAdlEDpqLBdvQcb8bc=";
 
   buildInputs = lib.optional stdenv.isDarwin Security;
 
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/gitlab-clippy/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/gitlab-clippy/default.nix
index 2efb232f38..8bdd529bb4 100644
--- a/third_party/nixpkgs/pkgs/development/tools/rust/gitlab-clippy/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/rust/gitlab-clippy/default.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
     rev = version;
     hash = "sha256-d7SmlAWIV4SngJhIvlud90ZUSF55FWIrzFpkfSXIy2Y=";
   };
-  cargoSha256 = "sha256-ztPbI+ncMNMKnIxUksxgz8GHQpLZ7SVWdC4QJWh18Wk=";
+  cargoHash = "sha256-ztPbI+ncMNMKnIxUksxgz8GHQpLZ7SVWdC4QJWh18Wk=";
 
   # TODO re-add theses tests once they get fixed in upstream
   checkFlags = [
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/ograc/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/ograc/default.nix
index 6b1e1f45d2..538a22ab68 100644
--- a/third_party/nixpkgs/pkgs/development/tools/rust/ograc/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/rust/ograc/default.nix
@@ -9,7 +9,7 @@ rustPlatform.buildRustPackage {
     rev = "d09b3102ff7a364bf2593589327a16a473bd4f25";
     hash = "sha256-vdHPFY6zZ/OBNlJO3N/6YXcvlddw2wYHgFWI0yfSgVo=";
   };
-  cargoSha256 = "sha256-HAeEd7HY+hbTUOkIt6aTfvPYLRPtdAcUGvkuBUMjohA=";
+  cargoHash = "sha256-HAeEd7HY+hbTUOkIt6aTfvPYLRPtdAcUGvkuBUMjohA=";
 
   meta = with lib; {
     description = "like cargo, but backwards";
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/rhack/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/rhack/default.nix
index 967a8a9216..5be698ca6e 100644
--- a/third_party/nixpkgs/pkgs/development/tools/rust/rhack/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/rust/rhack/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "088ynf65szaa86pxwwasn3wwi00z5pn7i8w9gh5dyn983z4d8237";
   };
 
-  cargoSha256 = "sha256-HmBh2qbO/HuNPfHKifq41IB5ResnGka2iaAsnwppm9s=";
+  cargoHash = "sha256-HmBh2qbO/HuNPfHKifq41IB5ResnGka2iaAsnwppm9s=";
 
   meta = with lib; {
     description = "Temporary edit external crates that your project depends on";
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/roogle/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/roogle/default.nix
index 2dbca708ad..2964f07f06 100644
--- a/third_party/nixpkgs/pkgs/development/tools/rust/roogle/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/rust/roogle/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1h0agialbvhhiijkdnr47y7babq432limdl6ag2rmjfs7yishn4r";
   };
 
-  cargoSha256 = "sha256-CzFfFKTmBUAafk8PkkWmUkRIyO+yEhmCfN1zsLRq4Iw=";
+  cargoHash = "sha256-CzFfFKTmBUAafk8PkkWmUkRIyO+yEhmCfN1zsLRq4Iw=";
 
   postInstall = ''
     mkdir -p $out/share/roogle
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix
index 29df32b705..5787b3dd1c 100644
--- a/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix
@@ -13,14 +13,14 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "rust-analyzer-unwrapped";
-  version = "2024-07-15";
-  cargoSha256 = "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/third_party/nixpkgs/pkgs/development/tools/rust/rust-audit-info/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/rust-audit-info/default.nix
index 19bfd811e9..381e6d5bc7 100644
--- a/third_party/nixpkgs/pkgs/development/tools/rust/rust-audit-info/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/rust/rust-audit-info/default.nix
@@ -9,7 +9,7 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-g7ElNehBAVSRRlqsxkNm20C0KOMkf310bXNs3EN+/NQ=";
   };
 
-  cargoSha256 = "sha256-bKrdgz6dyv/PF5JXMq7uvsh7SsK/qEd2W7tm6+YYlxg=";
+  cargoHash = "sha256-bKrdgz6dyv/PF5JXMq7uvsh7SsK/qEd2W7tm6+YYlxg=";
 
   meta = with lib; {
     description = "Command-line tool to extract the dependency trees embedded in binaries by cargo-auditable";
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/rustfilt/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/rustfilt/default.nix
index 353cdcdbfd..45312ccd7e 100644
--- a/third_party/nixpkgs/pkgs/development/tools/rust/rustfilt/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/rust/rustfilt/default.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-zb1tkeWmeMq7aM8hWssS/UpvGzGbfsaVYCOKBnAKwiQ=";
   };
 
-  cargoSha256 = "sha256-rs2EWcvTxLVeJ0t+jLM75s+K72t+hqKzwy3oAdCZ8BE=";
+  cargoHash = "sha256-rs2EWcvTxLVeJ0t+jLM75s+K72t+hqKzwy3oAdCZ8BE=";
 
   meta = with lib; {
     description = "Demangle Rust symbol names using rustc-demangle";
diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/rusty-man/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/rusty-man/default.nix
index 05b9f85af4..164977facb 100644
--- a/third_party/nixpkgs/pkgs/development/tools/rust/rusty-man/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/rust/rusty-man/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-djprzmogT1OEf0/+twdxzx30YaMNzFjXkZd4IDsH8oo=";
   };
 
-  cargoSha256 = "sha256-Wf8D6y3LRYJpQjFFt0w5X+BOllbR3mc4Gzcr1ad3zD0=";
+  cargoHash = "sha256-Wf8D6y3LRYJpQjFFt0w5X+BOllbR3mc4Gzcr1ad3zD0=";
 
   meta = with lib; {
     description = "Command-line viewer for documentation generated by rustdoc";
diff --git a/third_party/nixpkgs/pkgs/development/tools/selenium/chromedriver/binary.nix b/third_party/nixpkgs/pkgs/development/tools/selenium/chromedriver/binary.nix
index 230bc558f0..ace1f1e8f2 100644
--- a/third_party/nixpkgs/pkgs/development/tools/selenium/chromedriver/binary.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/skaffold/default.nix b/third_party/nixpkgs/pkgs/development/tools/skaffold/default.nix
index da1a2db8c8..4bf5f21ce1 100644
--- a/third_party/nixpkgs/pkgs/development/tools/skaffold/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/skopeo/default.nix b/third_party/nixpkgs/pkgs/development/tools/skopeo/default.nix
index fa9dbcb766..6e78caf84f 100644
--- a/third_party/nixpkgs/pkgs/development/tools/skopeo/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/so/default.nix b/third_party/nixpkgs/pkgs/development/tools/so/default.nix
index 6b0c37ec3f..30563875a2 100644
--- a/third_party/nixpkgs/pkgs/development/tools/so/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/so/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-4IZNOclQj3ZLE6WRddn99CrV8OoyfkRBXnA4oEyMxv8=";
   };
 
-  cargoSha256 = "sha256-hHXA/n/HQeBaD4QZ2b6Okw66poBRwNTpQWF0qBhLp/o=";
+  cargoHash = "sha256-hHXA/n/HQeBaD4QZ2b6Okw66poBRwNTpQWF0qBhLp/o=";
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [
diff --git a/third_party/nixpkgs/pkgs/development/tools/spr/default.nix b/third_party/nixpkgs/pkgs/development/tools/spr/default.nix
index aa2ceb6982..7ecd5dcfb2 100644
--- a/third_party/nixpkgs/pkgs/development/tools/spr/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/spr/default.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-lsdWInJWcofwU3P4vAWcLQeZuV3Xn1z30B7mhODJ4Vc=";
   };
 
-  cargoSha256 = "sha256-VQg3HDNw+L1FsFtHXnIw6dMVUxV63ZWHCxiknzsqXW8=";
+  cargoHash = "sha256-VQg3HDNw+L1FsFtHXnIw6dMVUxV63ZWHCxiknzsqXW8=";
 
   buildInputs = lib.optional stdenv.isDarwin Security;
 
diff --git a/third_party/nixpkgs/pkgs/development/tools/swc/default.nix b/third_party/nixpkgs/pkgs/development/tools/swc/default.nix
index ff3287c894..d93b4c4ec8 100644
--- a/third_party/nixpkgs/pkgs/development/tools/swc/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/swc/default.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-8zbxE1qkEWeSYt2L5PElZeJPRuK4Yiooy8xDmCD/PYw=";
   };
 
-  cargoSha256 = "sha256-kRsRUOvDMRci3bN5NfhiLCWojNkSuLz3K4BfKfGYc7g=";
+  cargoHash = "sha256-kRsRUOvDMRci3bN5NfhiLCWojNkSuLz3K4BfKfGYc7g=";
 
   buildFeatures = [ "swc_core/plugin_transform_host_native" ];
 
diff --git a/third_party/nixpkgs/pkgs/development/tools/textql/default.nix b/third_party/nixpkgs/pkgs/development/tools/textql/default.nix
index 8202065031..182427c4b3 100644
--- a/third_party/nixpkgs/pkgs/development/tools/textql/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/toluapp/default.nix b/third_party/nixpkgs/pkgs/development/tools/toluapp/default.nix
index ded720948f..5d3d9a5385 100644
--- a/third_party/nixpkgs/pkgs/development/tools/toluapp/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/turso-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/turso-cli/default.nix
index 8ef4c2d8fe..db6b0d0e20 100644
--- a/third_party/nixpkgs/pkgs/development/tools/turso-cli/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/turso-cli/default.nix
@@ -8,16 +8,16 @@
 }:
 buildGoModule rec {
   pname = "turso-cli";
-  version = "0.96.2";
+  version = "0.96.3";
 
   src = fetchFromGitHub {
     owner = "tursodatabase";
     repo = "turso-cli";
     rev = "v${version}";
-    hash = "sha256-G8rYCjGkk0/bVnp0A74HIduYuC5lLvlzAoaOLaQfhG4=";
+    hash = "sha256-3noPhWS5Sh6KZs4u310HbNybL58yIcdM7jD0R+UvZ0s=";
   };
 
-  vendorHash = "sha256-nMhXjCRBv4q6c3VcQ+6JTijEH1EVctfb+i1sCYoD62E=";
+  vendorHash = "sha256-c8dX60GPZSNMoCaF51jLWJK+aNDmw6TdzlBYS+vSuEY=";
 
   nativeBuildInputs = [ installShellFiles ];
 
diff --git a/third_party/nixpkgs/pkgs/development/tools/twilio-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/twilio-cli/default.nix
index a37c79b34f..5b386b9822 100644
--- a/third_party/nixpkgs/pkgs/development/tools/twilio-cli/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/typos/default.nix b/third_party/nixpkgs/pkgs/development/tools/typos/default.nix
index d14dd18819..2953efa267 100644
--- a/third_party/nixpkgs/pkgs/development/tools/typos/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/typos/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "typos";
-  version = "1.23.2";
+  version = "1.23.5";
 
   src = fetchFromGitHub {
     owner = "crate-ci";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-DheAS9HHzhmg6J6qBF81uaTmlGNS2igcxuc3ic3nFr0=";
+    hash = "sha256-rSMMzDf0GVUoyoYt++a2khjC4lcR3jvoLJRq8tk+UAE=";
   };
 
-  cargoHash = "sha256-VEBwVs1UJFRsoyHHcKQaUpKna5XvAG7vzoWaS7c8ycU=";
+  cargoHash = "sha256-faQfKbBKr8WRCXZpGy+uCbKdMp4FDFwYcsryNls+IRw=";
 
   meta = with lib; {
     description = "Source code spell checker";
diff --git a/third_party/nixpkgs/pkgs/development/tools/vim-vint/default.nix b/third_party/nixpkgs/pkgs/development/tools/vim-vint/default.nix
index 6d377b00db..9ff37be205 100644
--- a/third_party/nixpkgs/pkgs/development/tools/vim-vint/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/vsce/default.nix b/third_party/nixpkgs/pkgs/development/tools/vsce/default.nix
index a5002fdabc..3ad734efdc 100644
--- a/third_party/nixpkgs/pkgs/development/tools/vsce/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/vultr-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/vultr-cli/default.nix
index 1a1cd76c5a..3861ad43e7 100644
--- a/third_party/nixpkgs/pkgs/development/tools/vultr-cli/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/vultr-cli/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "vultr-cli";
-  version = "3.3.0";
+  version = "3.3.1";
 
   src = fetchFromGitHub {
     owner = "vultr";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-Gn2N/v3qFqxI2ZU94GNuzpHoXgPeJaAO+ODjb5ff1aI=";
+    hash = "sha256-pJrujiZfIuqRFwIHReWT7xPi94Zh3owcZFz23jtpsQg=";
   };
 
-  vendorHash = "sha256-kglG6Mhe1XUqblt+0ZR8FPPTrBKjxb1xG8bPXQrrzxE=";
+  vendorHash = "sha256-4HRzd5p5u8h07/escAoatF97RZ/hejYqW61Dlkp27Gk=";
 
   nativeBuildInputs = [ installShellFiles ];
 
diff --git a/third_party/nixpkgs/pkgs/development/tools/watchman/default.nix b/third_party/nixpkgs/pkgs/development/tools/watchman/default.nix
index 213aa3f879..b60872dce6 100644
--- a/third_party/nixpkgs/pkgs/development/tools/watchman/default.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/watchman/default.nix
@@ -9,6 +9,7 @@
 , fb303
 , fbthrift
 , fetchFromGitHub
+, fetchpatch
 , fizz
 , fmt_8
 , folly
@@ -91,6 +92,14 @@ stdenv.mkDerivation rec {
     lockFile = ./Cargo.lock;
   };
 
+  patches = [
+    # fix build with rustc >=1.79
+    (fetchpatch {
+      url = "https://github.com/facebook/watchman/commit/c3536143cab534cdd9696eb3e2d03c4ac1e2f883.patch";
+      hash = "sha256-lpGr5H28gfVXkWNdfDo4SCbF/p5jB4SNlHj6km/rfw4=";
+    })
+  ];
+
   postPatch = ''
     patchShebangs .
     cp ${./Cargo.lock} ${cargoRoot}/Cargo.lock
diff --git a/third_party/nixpkgs/pkgs/development/tools/web-ext/default.nix b/third_party/nixpkgs/pkgs/development/tools/web-ext/default.nix
index bfbfbdf5c1..89e3f2257f 100644
--- a/third_party/nixpkgs/pkgs/development/tools/web-ext/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/wgo/default.nix b/third_party/nixpkgs/pkgs/development/tools/wgo/default.nix
index 863d53bb09..e895ffa43d 100644
--- a/third_party/nixpkgs/pkgs/development/tools/wgo/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/xcbuild/toolchains.nix b/third_party/nixpkgs/pkgs/development/tools/xcbuild/toolchains.nix
index e0abf90847..a5e8ed28ce 100644
--- a/third_party/nixpkgs/pkgs/development/tools/xcbuild/toolchains.nix
+++ b/third_party/nixpkgs/pkgs/development/tools/xcbuild/toolchains.nix
@@ -60,7 +60,7 @@ runCommand "Toolchains" {} (''
   ln -s ${buildPackages.indent}/bin/indent $toolchain/bin/indent
   ln -s ${buildPackages.ctags}/bin/ctags $toolchain/bin/ctags
 '' + optionalString stdenv.isDarwin ''
-  for bin in ${getBin buildPackages.darwin.cctools}/bin/*; do
+  for bin in ${getBin buildPackages.cctools}/bin/*; do
     if ! [ -e "$toolchain/bin/$(basename $bin)" ]; then
       ln -s $bin $toolchain/bin
     fi
diff --git a/third_party/nixpkgs/pkgs/development/tools/yo/default.nix b/third_party/nixpkgs/pkgs/development/tools/yo/default.nix
index 325939a760..ded4b5d020 100644
--- a/third_party/nixpkgs/pkgs/development/tools/yo/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/tools/zsv/default.nix b/third_party/nixpkgs/pkgs/development/tools/zsv/default.nix
index 3d917e4348..ee24281798 100644
--- a/third_party/nixpkgs/pkgs/development/tools/zsv/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/development/web/flyctl/default.nix b/third_party/nixpkgs/pkgs/development/web/flyctl/default.nix
index bc1ca74842..aeb4ee7100 100644
--- a/third_party/nixpkgs/pkgs/development/web/flyctl/default.nix
+++ b/third_party/nixpkgs/pkgs/development/web/flyctl/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "flyctl";
-  version = "0.2.94";
+  version = "0.2.101";
 
   src = fetchFromGitHub {
     owner = "superfly";
     repo = "flyctl";
     rev = "v${version}";
-    hash = "sha256-yw8c3afGmriEoewSA8gIcuVDfRUwXqG46fi36GCGQBM=";
+    hash = "sha256-Ceep71qyQXX+UQzI7VP64WRk5wMF7QADxs3on75cBic=";
   };
 
-  vendorHash = "sha256-L5tQ45Dujnef31Fs05mK5u+6zaGyJi1HkipOvkmra/0=";
+  vendorHash = "sha256-l1Pt1eMgj/ZlOhV/yOVnJek9qm86n3iTKIQi3B3Kweo=";
 
   subPackages = [ "." ];
 
diff --git a/third_party/nixpkgs/pkgs/development/web/flyctl/disable-auto-update.patch b/third_party/nixpkgs/pkgs/development/web/flyctl/disable-auto-update.patch
index d6c59755f8..3fe6048871 100644
--- a/third_party/nixpkgs/pkgs/development/web/flyctl/disable-auto-update.patch
+++ b/third_party/nixpkgs/pkgs/development/web/flyctl/disable-auto-update.patch
@@ -1,4 +1,4 @@
-From 9c76dbff982b0fd8beaffae42a6e98bc1e67f089 Mon Sep 17 00:00:00 2001
+From a46bc88829282032ab1d68ef6d67d25421ab8d32 Mon Sep 17 00:00:00 2001
 From: Gabriel Simmer <g@gmem.ca>
 Date: Fri, 21 Jul 2023 08:16:52 +0100
 Subject: [PATCH] Disable auto update
@@ -8,18 +8,18 @@ Subject: [PATCH] Disable auto update
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/internal/config/config.go b/internal/config/config.go
-index 1914f8e0..958baf27 100644
+index 04583ca5..1b085b55 100644
 --- a/internal/config/config.go
 +++ b/internal/config/config.go
-@@ -141,7 +141,7 @@ func (cfg *Config) ApplyFile(path string) (err error) {
- 		AutoUpdate   bool   `yaml:"auto_update"`
+@@ -173,7 +173,7 @@ func (cfg *Config) applyFile(path string) (err error) {
+ 		SyntheticsAgent bool   `yaml:"synthetics_agent"`
  	}
  	w.SendMetrics = true
 -	w.AutoUpdate = true
 +	w.AutoUpdate = false
+ 	w.SyntheticsAgent = true
  
  	if err = unmarshal(path, &w); err == nil {
- 		cfg.AccessToken = w.AccessToken
 -- 
-2.41.0
+2.45.2
 
diff --git a/third_party/nixpkgs/pkgs/development/web/netlify-cli/composition.nix b/third_party/nixpkgs/pkgs/development/web/netlify-cli/composition.nix
index d9c0daef78..2e54104d7d 100644
--- a/third_party/nixpkgs/pkgs/development/web/netlify-cli/composition.nix
+++ b/third_party/nixpkgs/pkgs/development/web/netlify-cli/composition.nix
@@ -8,7 +8,7 @@ let
   nodeEnv = import ./node-env.nix {
     inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript;
     inherit pkgs nodejs;
-    libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
+    libtool = if pkgs.stdenv.isDarwin then pkgs.cctools or pkgs.darwin.cctools else null;
   };
 in
 import ./node-packages.nix {
diff --git a/third_party/nixpkgs/pkgs/development/web/nodejs/bypass-xcodebuild.diff b/third_party/nixpkgs/pkgs/development/web/nodejs/bypass-xcodebuild.diff
deleted file mode 100644
index 5c900dd214..0000000000
--- a/third_party/nixpkgs/pkgs/development/web/nodejs/bypass-xcodebuild.diff
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -Naur node-v12.18.4/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py node-v12.18.4-new/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py
---- node-v12.18.4/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py	2020-09-15 09:08:46.000000000 +0200
-+++ node-v12.18.4-new/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py	2020-12-03 16:55:43.781860687 +0100
-@@ -436,7 +436,14 @@
-     # Since the CLT has no SDK paths anyway, returning None is the
-     # most sensible route and should still do the right thing.
-     try:
--      return GetStdoutQuiet(['xcodebuild', '-version', '-sdk', sdk, infoitem])
-+      # Return fake data that xcodebuild would normally return
-+
-+      xcodedata = {
-+        "Path": "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk",
-+        "ProductBuildVersion": "19A547",
-+        "ProductVersion": "10.15"
-+      }
-+      return xcodedata[infoitem]
-     except GypError:
-       pass
- 
-@@ -1271,7 +1278,7 @@
-   version = ""
-   build = ""
-   try:
--    version_list = GetStdoutQuiet(['xcodebuild', '-version']).splitlines()
-+    version_list = []
-     # In some circumstances xcodebuild exits 0 but doesn't return
-     # the right results; for example, a user on 10.7 or 10.8 with
-     # a bogus path set via xcode-select
diff --git a/third_party/nixpkgs/pkgs/development/web/nodejs/gyp-patches-pre-v22-import-sys.patch b/third_party/nixpkgs/pkgs/development/web/nodejs/gyp-patches-pre-v22-import-sys.patch
new file mode 100644
index 0000000000..fa499c6491
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/web/nodejs/gyp-patches-pre-v22-import-sys.patch
@@ -0,0 +1,24 @@
+Add missing import statement for gyp-patches.nix.
+
+--- a/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/make.py
++++ b/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/make.py
+@@ -25,6 +25,7 @@
+ import os
+ import re
+ import subprocess
++import sys
+ import gyp
+ import gyp.common
+ import gyp.xcode_emulation
+
+--- a/tools/gyp/pylib/gyp/generator/make.py
++++ b/tools/gyp/pylib/gyp/generator/make.py
+@@ -25,6 +25,7 @@
+ import os
+ import re
+ import subprocess
++import sys
+ import gyp
+ import gyp.common
+ import gyp.xcode_emulation
+
diff --git a/third_party/nixpkgs/pkgs/development/web/nodejs/gyp-patches-v22-import-sys.patch b/third_party/nixpkgs/pkgs/development/web/nodejs/gyp-patches-v22-import-sys.patch
new file mode 100644
index 0000000000..4f1abea901
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/web/nodejs/gyp-patches-v22-import-sys.patch
@@ -0,0 +1,14 @@
+For some reason Node.js v22 has two different GYP versions vendored, and
+only one of them contains `import sys`.
+
+--- a/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/make.py
++++ b/deps/npm/node_modules/node-gyp/gyp/pylib/gyp/generator/make.py
+@@ -25,6 +25,7 @@
+ import os
+ import re
+ import subprocess
++import sys
+ import gyp
+ import gyp.common
+ import gyp.xcode_emulation
+
diff --git a/third_party/nixpkgs/pkgs/development/web/nodejs/gyp-patches.nix b/third_party/nixpkgs/pkgs/development/web/nodejs/gyp-patches.nix
new file mode 100644
index 0000000000..67a2a2a128
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/development/web/nodejs/gyp-patches.nix
@@ -0,0 +1,22 @@
+{ fetchpatch2 }:
+let
+  name = "gyp-darwin-sandbox.patch";
+  url = "https://github.com/nodejs/gyp-next/commit/706d04aba5bd18f311dc56f84720e99f64c73466.patch";
+in
+[
+  # Fixes builds with Nix sandbox on Darwin for gyp.
+  # See https://github.com/NixOS/nixpkgs/issues/261820
+  # and https://github.com/nodejs/gyp-next/pull/216
+  (fetchpatch2 {
+    inherit name url;
+    hash = "sha256-l8FzgLq9CbVJCkXfnTyDQ+vXKCz65wpaffE74oSU+kY=";
+    stripLen = 1;
+    extraPrefix = "tools/gyp/";
+  })
+  (fetchpatch2 {
+    inherit name url;
+    hash = "sha256-UVUn4onXfJgFoAdApLAbliiBgM9rxDdIo53WjFryoBI=";
+    stripLen = 1;
+    extraPrefix = "deps/npm/node_modules/node-gyp/gyp/";
+  })
+]
diff --git a/third_party/nixpkgs/pkgs/development/web/nodejs/nodejs.nix b/third_party/nixpkgs/pkgs/development/web/nodejs/nodejs.nix
index 4835ed4286..c6ed6a116a 100644
--- a/third_party/nixpkgs/pkgs/development/web/nodejs/nodejs.nix
+++ b/third_party/nixpkgs/pkgs/development/web/nodejs/nodejs.nix
@@ -1,5 +1,6 @@
 { lib, stdenv, fetchurl, openssl, python, zlib, libuv, util-linux, http-parser, bash
 , pkg-config, which, buildPackages
+, testers
 # for `.pkgs` attribute
 , callPackage
 # Updater dependencies
@@ -66,8 +67,6 @@ let
       NIX_CFLAGS_COMPILE = "-D__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__=101300";
     };
 
-    CC_host = "cc";
-    CXX_host = "c++";
     depsBuildBuild = [ buildPackages.stdenv.cc openssl libuv zlib icu ];
 
     # NB: technically, we do not need bash in build inputs since all scripts are
@@ -112,6 +111,11 @@ let
 
     dontDisableStatic = true;
 
+    configureScript = writeScript "nodejs-configure" ''
+      export CC_host="$CC_FOR_BUILD" CXX_host="$CXX_FOR_BUILD"
+      exec ${python.executable} configure.py "$@"
+    '';
+
     enableParallelBuilding = true;
 
     # Don't allow enabling content addressed conversion as `nodejs`
@@ -134,7 +138,11 @@ let
 
     inherit patches;
 
-    doCheck = lib.versionAtLeast version "16"; # some tests fail on v14
+    __darwinAllowLocalNetworking = true; # for tests
+
+    # TODO: what about tests when cross-compiling?
+    # Note that currently stdenv does not run check phase if build ≠ host.
+    doCheck = true;
 
     # Some dependencies required for tools/doc/node_modules (and therefore
     # test-addons, jstest and others) target are not included in the tarball.
@@ -144,6 +152,12 @@ let
       "build-node-api-tests"
       "tooltest"
       "cctest"
+    ] ++ lib.optionals (!stdenv.buildPlatform.isDarwin || lib.versionAtLeast version "20") [
+      # There are some test failures on macOS before v20 that are not worth the
+      # time to debug for a version that would be eventually removed in less
+      # than a year (Node.js 18 will be EOL at 2025-04-30). Note that these
+      # failures are specific to Nix sandbox on macOS and should not affect
+      # actual functionality.
     ] ++ lib.optionals (!stdenv.isDarwin) [
       # TODO: JS test suite is too flaky on Darwin; revisit at a later date.
       "test-ci-js"
@@ -152,9 +166,48 @@ let
     checkFlags = [
       # Do not create __pycache__ when running tests.
       "PYTHONDONTWRITEBYTECODE=1"
+    ] ++ lib.optionals (!stdenv.buildPlatform.isDarwin || lib.versionAtLeast version "20") [
       "FLAKY_TESTS=skip"
       # Skip some tests that are not passing in this context
-      "CI_SKIP_TESTS=test-setproctitle,test-tls-cli-max-version-1.3,test-tls-client-auth,test-child-process-exec-env,test-fs-write-stream-eagain,test-tls-sni-option,test-https-foafssl,test-child-process-uid-gid,test-process-euid-egid,test-process-initgroups,test-process-uid-gid,test-process-setgroups"
+      "CI_SKIP_TESTS=${lib.concatStringsSep "," ([
+        "test-child-process-exec-env"
+        "test-child-process-uid-gid"
+        "test-fs-write-stream-eagain"
+        "test-https-foafssl"
+        "test-process-euid-egid"
+        "test-process-initgroups"
+        "test-process-setgroups"
+        "test-process-uid-gid"
+        "test-setproctitle"
+        "test-tls-cli-max-version-1.3"
+        "test-tls-client-auth"
+        "test-tls-sni-option"
+      ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
+        # Disable tests that don’t work under macOS sandbox.
+        "test-macos-app-sandbox"
+        "test-os"
+        "test-os-process-priority"
+        # This is a bit weird, but for some reason fs watch tests fail with
+        # sandbox.
+        "test-fs-promises-watch"
+        "test-fs-watch"
+        "test-fs-watch-encoding"
+        "test-fs-watch-non-recursive"
+        "test-fs-watch-recursive-add-file"
+        "test-fs-watch-recursive-add-file-to-existing-subfolder"
+        "test-fs-watch-recursive-add-file-to-new-folder"
+        "test-fs-watch-recursive-add-file-with-url"
+        "test-fs-watch-recursive-add-folder"
+        "test-fs-watch-recursive-assert-leaks"
+        "test-fs-watch-recursive-promise"
+        "test-fs-watch-recursive-symlink"
+        "test-fs-watch-recursive-sync-write"
+        "test-fs-watch-recursive-update-file"
+        "test-fs-watchfile"
+        "test-runner-run"
+        "test-runner-watch-mode"
+        "test-watch-mode-files_watcher"
+      ])}"
     ];
 
     postInstall = ''
@@ -215,6 +268,13 @@ let
       EOF
     '';
 
+    passthru.tests = {
+      version = testers.testVersion {
+        package = self;
+        version = "v${version}";
+      };
+    };
+
     passthru.updateScript = import ./update.nix {
       inherit writeScript coreutils gnugrep jq curl common-updater-scripts gnupg nix runtimeShell;
       inherit lib;
diff --git a/third_party/nixpkgs/pkgs/development/web/nodejs/v18.nix b/third_party/nixpkgs/pkgs/development/web/nodejs/v18.nix
index b44dbc8e51..1101fbdf72 100644
--- a/third_party/nixpkgs/pkgs/development/web/nodejs/v18.nix
+++ b/third_party/nixpkgs/pkgs/development/web/nodejs/v18.nix
@@ -16,11 +16,15 @@ let
     buildPackages = buildPackages // { stdenv = ensureCompatibleCC buildPackages; };
     python = python311;
   };
+
+  gypPatches = callPackage ./gyp-patches.nix { } ++ [
+    ./gyp-patches-pre-v22-import-sys.patch
+  ];
 in
 buildNodejs {
   inherit enableNpm;
-  version = "18.20.2";
-  sha256 = "sha256-iq6nycfpJ/sJ2RSY2jEbbk0YIzOQ4jxyOlO4kfrUxz8=";
+  version = "18.20.4";
+  sha256 = "sha256-p2x+oblq62ljoViAYmDICUtiRNZKaWUp0CBUe5qVyio=";
   patches = [
     ./disable-darwin-v8-system-instrumentation.patch
     ./bypass-darwin-xcrun-node16.patch
@@ -33,5 +37,5 @@ buildNodejs {
       url = "https://github.com/nodejs/node/commit/534c122de166cb6464b489f3e6a9a544ceb1c913.patch";
       hash = "sha256-4q4LFsq4yU1xRwNsM1sJoNVphJCnxaVe2IyL6AeHJ/I=";
     })
-  ];
+  ] ++ gypPatches;
 }
diff --git a/third_party/nixpkgs/pkgs/development/web/nodejs/v20.nix b/third_party/nixpkgs/pkgs/development/web/nodejs/v20.nix
index 1fb2d61fba..bf0e2f7fef 100644
--- a/third_party/nixpkgs/pkgs/development/web/nodejs/v20.nix
+++ b/third_party/nixpkgs/pkgs/development/web/nodejs/v20.nix
@@ -5,11 +5,15 @@ let
     inherit openssl;
     python = python3;
   };
+
+  gypPatches = callPackage ./gyp-patches.nix { } ++ [
+    ./gyp-patches-pre-v22-import-sys.patch
+  ];
 in
 buildNodejs {
   inherit enableNpm;
-  version = "20.14.0";
-  sha256 = "sha256-CGVQKPDYQ26IFj+RhgRNY10/Nqhe5Sjza9BbbF5Gwbs=";
+  version = "20.15.1";
+  sha256 = "sha256-/dU6VynZNmkaKhFRBG+0iXchy4sPyir5V4I6m0D+DDQ=";
   patches = [
     ./disable-darwin-v8-system-instrumentation-node19.patch
     ./bypass-darwin-xcrun-node16.patch
@@ -23,5 +27,5 @@ buildNodejs {
       url = "https://github.com/nodejs/node/commit/14863e80584e579fd48c55f6373878c821c7ff7e.patch";
       hash = "sha256-I7Wjc7DE059a/ZyXAvAqEGvDudPjxQqtkBafckHCFzo=";
     })
-  ];
+  ] ++ gypPatches;
 }
diff --git a/third_party/nixpkgs/pkgs/development/web/nodejs/v22.nix b/third_party/nixpkgs/pkgs/development/web/nodejs/v22.nix
index 4bc7c46c15..44737d2ba8 100644
--- a/third_party/nixpkgs/pkgs/development/web/nodejs/v22.nix
+++ b/third_party/nixpkgs/pkgs/development/web/nodejs/v22.nix
@@ -5,22 +5,20 @@ let
     inherit openssl;
     python = python3;
   };
+
+  gypPatches = callPackage ./gyp-patches.nix { } ++ [
+    ./gyp-patches-v22-import-sys.patch
+  ];
 in
 buildNodejs {
   inherit enableNpm;
-  version = "22.3.0";
-  sha256 = "0k0h4s9s2y0ms3g6xhynsqsrkl9hz001dmj6j0gpc5x5vk8mpf5z";
+  version = "22.4.1";
+  sha256 = "sha256-ZfyFf1qoJWqvyQCzRMARXJrq4loCVB/Vzg29Tf0cX7k=";
   patches = [
     ./disable-darwin-v8-system-instrumentation-node19.patch
     ./bypass-darwin-xcrun-node16.patch
     ./node-npm-build-npm-package-logic.patch
     ./use-correct-env-in-tests.patch
     ./bin-sh-node-run-v22.patch
-    (fetchpatch2 {
-      # Fixes OpenSSL 3.0.14 compatibility in tests.
-      # See https://github.com/nodejs/node/pull/53373
-      url = "https://github.com/nodejs/node/commit/14863e80584e579fd48c55f6373878c821c7ff7e.patch";
-      hash = "sha256-I7Wjc7DE059a/ZyXAvAqEGvDudPjxQqtkBafckHCFzo=";
-    })
-  ];
+  ] ++ gypPatches;
 }
diff --git a/third_party/nixpkgs/pkgs/development/web/playwright-test/default.nix b/third_party/nixpkgs/pkgs/development/web/playwright-test/default.nix
index d9c0daef78..e59fd8a77f 100644
--- a/third_party/nixpkgs/pkgs/development/web/playwright-test/default.nix
+++ b/third_party/nixpkgs/pkgs/development/web/playwright-test/default.nix
@@ -8,7 +8,7 @@ let
   nodeEnv = import ./node-env.nix {
     inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript;
     inherit pkgs nodejs;
-    libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
+    libtool = if pkgs.stdenv.isDarwin then pkgs.darwin or pkgs.darwin.cctools else null;
   };
 in
 import ./node-packages.nix {
diff --git a/third_party/nixpkgs/pkgs/games/antsimulator/default.nix b/third_party/nixpkgs/pkgs/games/antsimulator/default.nix
index 637c53d1b3..204b1c50f2 100644
--- a/third_party/nixpkgs/pkgs/games/antsimulator/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/games/armagetronad/default.nix b/third_party/nixpkgs/pkgs/games/armagetronad/default.nix
index d4bfba671d..1db364ce6f 100644
--- a/third_party/nixpkgs/pkgs/games/armagetronad/default.nix
+++ b/third_party/nixpkgs/pkgs/games/armagetronad/default.nix
@@ -22,6 +22,8 @@
 , libxml2
 , protobuf
 , xvfb-run
+, gnugrep
+, nixosTests
 , dedicatedServer ? false
 }:
 
@@ -54,22 +56,21 @@ let
     # https://gitlab.com/armagetronad/armagetronad/-/commits/trunk/?ref_type=heads
     ${unstableVersionMajor} =
       let
-        rev = "e7f41fd26363e7c6a72f0c673470ed06ab54ae08";
-        hash = "sha256-Uxxk6L7WPxKYQ4CNxWwEtvbZjK8BqYNTuwwdleZ44Ro=";
+        rev = "391a74625c1222dd180f069f1b61c3e069a3ba8c";
+        hash = "sha256-fUY0dBj85k0QhnAoDzyBmmKmRh9oCYC6r6X4ukt7/L0=";
       in dedicatedServer: {
         version = "${unstableVersionMajor}-${builtins.substring 0 8 rev}";
         src = fetchArmagetron rev hash;
         extraBuildInputs = [ protobuf boost ]
           ++ lib.optionals (!dedicatedServer) [ glew ftgl freetype SDL2 SDL2_image SDL2_mixer ];
         extraNativeBuildInputs = [ bison ];
-        extraNativeInstallCheckInputs = lib.optionals (!dedicatedServer) [ xvfb-run ];
       };
 
     # https://gitlab.com/armagetronad/armagetronad/-/commits/hack-0.2.8-sty+ct+ap/?ref_type=heads
     "${latestVersionMajor}-sty+ct+ap" =
       let
-        rev = "a5bffe9dda2b43d330433f76f14eb374701f326a";
-        hash = "sha256-cNABxfg3MSmbxU/R78QyPOMwXGqJEamaFOPNw5yhDGE=";
+        rev = "5a17cc9fb6e1e27a358711afbd745ae54d4a8c60";
+        hash = "sha256-111C1j/hSaASGcvYy3//TyHs4Z+3fuiOvCmtcWLdFd4=";
       in dedicatedServer: {
         version = "${latestVersionMajor}-sty+ct+ap-${builtins.substring 0 8 rev}";
         src = fetchArmagetron rev hash;
@@ -130,13 +131,15 @@ let
       ] ++ lib.optional dedicatedServer "--enable-dedicated"
         ++ lib.optional (!dedicatedServer) "--enable-music";
 
-      buildInputs = [ libxml2 ]
+      buildInputs = lib.singleton (libxml2.override { enableHttp = true; })
         ++ (resolvedParams.extraBuildInputs or []);
 
       nativeBuildInputs = [ autoconf automake gnum4 pkg-config which python3 ]
         ++ (resolvedParams.extraNativeBuildInputs or []);
 
-      nativeInstallCheckInputs = resolvedParams.extraNativeInstallCheckInputs or [];
+      nativeInstallCheckInputs = [ gnugrep ]
+        ++ lib.optional (!dedicatedServer) xvfb-run
+        ++ (resolvedParams.extraNativeInstallCheckInputs or []);
 
       postInstall = lib.optionalString (!dedicatedServer) ''
         mkdir -p $out/share/{applications,icons/hicolor}
@@ -154,18 +157,21 @@ let
         else
           run="$bin"
         fi
+        echo "Checking game info:" >&2
         version="$($run --version || true)"
+        echo "  - Version: $version" >&2
         prefix="$($run --prefix || true)"
-        rubber="$($run --doc | grep -m1 CYCLE_RUBBER)"
-
-        echo "Version: $version" >&2
-        echo "Prefix: $prefix" >&2
-        echo "Docstring: $rubber" >&2
+        echo "  - Prefix: $prefix" >&2
+        rubber="$(($run --doc || true) | grep -m1 CYCLE_RUBBER)"
+        echo "  - Docstring: $rubber" >&2
 
         if [[ "$version" != *"${resolvedParams.version}"* ]] || \
            [ "$prefix" != "$out" ] || \
            [[ ! "$rubber" =~ ^CYCLE_RUBBER[[:space:]]+Niceness[[:space:]]factor ]]; then
+          echo "Something didn't match. :-(" >&2
           exit 1
+        else
+          echo "Everything is ok." >&2
         fi
       '';
 
@@ -186,6 +192,7 @@ let
           {
             # Allow both a "dedicated" passthru and a passthru for all the options other than the latest version, which this is.
             dedicated = mkArmagetron fn true;
+            tests.armagetronad = nixosTests.armagetronad;
           };
 
       meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/games/badlion-client/default.nix b/third_party/nixpkgs/pkgs/games/badlion-client/default.nix
index 8102da7673..78278be9fc 100644
--- a/third_party/nixpkgs/pkgs/games/badlion-client/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/games/blackshades/default.nix b/third_party/nixpkgs/pkgs/games/blackshades/default.nix
index 17bd0e2e96..a8467dc167 100644
--- a/third_party/nixpkgs/pkgs/games/blackshades/default.nix
+++ b/third_party/nixpkgs/pkgs/games/blackshades/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://git.sr.ht/~cnx/blackshades/refs/${finalAttrs.version}";
     mainProgram = "blackshades";
     license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ McSinyx viric ];
+    maintainers = with lib.maintainers; [ McSinyx ];
     platforms = lib.platforms.linux;
   };
 })
diff --git a/third_party/nixpkgs/pkgs/games/blightmud/default.nix b/third_party/nixpkgs/pkgs/games/blightmud/default.nix
index 237fed69ff..0669753ba0 100644
--- a/third_party/nixpkgs/pkgs/games/blightmud/default.nix
+++ b/third_party/nixpkgs/pkgs/games/blightmud/default.nix
@@ -6,7 +6,7 @@
 , alsa-lib
 , openssl
 , withTTS ? false
-, speechd
+, speechd-minimal
 , darwin
 }:
 let
@@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec {
   nativeBuildInputs = [ pkg-config rustPlatform.bindgenHook ];
 
   buildInputs = [ openssl ]
-    ++ lib.optionals (withTTS && stdenv.isLinux) [ speechd ]
+    ++ lib.optionals (withTTS && stdenv.isLinux) [ speechd-minimal ]
     ++ lib.optionals stdenv.isLinux [ alsa-lib ]
     ++ lib.optionals (withTTS && stdenv.isDarwin) [ AVFoundation AppKit ]
     ++ lib.optionals stdenv.isDarwin [ CoreAudio AudioUnit ];
diff --git a/third_party/nixpkgs/pkgs/games/boohu/default.nix b/third_party/nixpkgs/pkgs/games/boohu/default.nix
index 0d74d8dbe5..14aa6d43a5 100644
--- a/third_party/nixpkgs/pkgs/games/boohu/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/games/bzflag/default.nix b/third_party/nixpkgs/pkgs/games/bzflag/default.nix
index 7f43e8949b..400fa33e68 100644
--- a/third_party/nixpkgs/pkgs/games/bzflag/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/games/cgoban/default.nix b/third_party/nixpkgs/pkgs/games/cgoban/default.nix
index dbd14127ff..5b453b728d 100644
--- a/third_party/nixpkgs/pkgs/games/cgoban/default.nix
+++ b/third_party/nixpkgs/pkgs/games/cgoban/default.nix
@@ -1,7 +1,7 @@
 { lib
 , stdenv
 , writers
-, adoptopenjdk-jre-bin
+, temurin-jre-bin-17
 , fetchurl
 , makeWrapper
 }:
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   pname = "cgoban";
   version = "3.5.144";
 
-  nativeBuildInputs = [ adoptopenjdk-jre-bin makeWrapper ];
+  nativeBuildInputs = [ temurin-jre-bin-17 makeWrapper ];
 
   src = fetchurl {
     url = "https://web.archive.org/web/20240314222506/https://files.gokgs.com/javaBin/cgoban.jar";
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   installPhase = ''
     runHook preInstall
     install -D $src $out/lib/cgoban.jar
-    makeWrapper ${adoptopenjdk-jre-bin}/bin/java $out/bin/cgoban --add-flags "-jar $out/lib/cgoban.jar"
+    makeWrapper ${temurin-jre-bin-17}/bin/java $out/bin/cgoban --add-flags "-jar $out/lib/cgoban.jar"
     runHook postInstall
   '';
 
@@ -35,6 +35,6 @@ stdenv.mkDerivation rec {
     sourceProvenance = with sourceTypes; [ binaryBytecode ];
     license = licenses.free;
     maintainers = with maintainers; [ savannidgerinel ];
-    platforms = adoptopenjdk-jre-bin.meta.platforms;
+    platforms = temurin-jre-bin-17.meta.platforms;
   };
 }
diff --git a/third_party/nixpkgs/pkgs/games/chiaki/default.nix b/third_party/nixpkgs/pkgs/games/chiaki/default.nix
index 7482a1cd27..ed1867aeff 100644
--- a/third_party/nixpkgs/pkgs/games/chiaki/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/games/chiaki4deck/default.nix b/third_party/nixpkgs/pkgs/games/chiaki4deck/default.nix
index cd0a8f07d8..509fa9eccb 100644
--- a/third_party/nixpkgs/pkgs/games/chiaki4deck/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/games/cl-wordle/default.nix b/third_party/nixpkgs/pkgs/games/cl-wordle/default.nix
index 505c5166e4..8765638b05 100644
--- a/third_party/nixpkgs/pkgs/games/cl-wordle/default.nix
+++ b/third_party/nixpkgs/pkgs/games/cl-wordle/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-wFTvzAzboUFQg3fauIwIdRChK7rmLES92jK+8ff1D3s=";
   };
 
-  cargoSha256 = "sha256-PtJbLpAUH44alupFY6wX++t/QsKknn5bXvnXzdYsd9o=";
+  cargoHash = "sha256-PtJbLpAUH44alupFY6wX++t/QsKknn5bXvnXzdYsd9o=";
 
   meta = with lib; {
     description = "Wordle TUI in Rust";
diff --git a/third_party/nixpkgs/pkgs/games/ddnet/default.nix b/third_party/nixpkgs/pkgs/games/ddnet/default.nix
index 56a24073ac..7356e9395d 100644
--- a/third_party/nixpkgs/pkgs/games/ddnet/default.nix
+++ b/third_party/nixpkgs/pkgs/games/ddnet/default.nix
@@ -36,19 +36,19 @@
 
 stdenv.mkDerivation rec {
   pname = "ddnet";
-  version = "18.3.1";
+  version = "18.4";
 
   src = fetchFromGitHub {
     owner = "ddnet";
     repo = pname;
     rev = version;
-    hash = "sha256-OHhybYXmy+kBXtGA19agK7v9TCK2nvFC+goahogCvbU=";
+    hash = "sha256-BoEFh0lCd2pCIod5sFafnOs/TQHj/SlIAU8P4o+cjyE=";
   };
 
   cargoDeps = rustPlatform.fetchCargoTarball {
     name = "${pname}-${version}";
     inherit src;
-    hash = "sha256-a0KRSrozP4mdsl5NOUfCd9nm+pxzXpXZv+K5vSrdZ7E=";
+    hash = "sha256-1MJ5cP4lyRSZ7VRED8RL5scnqpcy8/avmBKW1Zmt6FU=";
   };
 
   nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/games/doom-ports/chocolate-doom/default.nix b/third_party/nixpkgs/pkgs/games/doom-ports/chocolate-doom/default.nix
index 10b96eb905..7eb2824020 100644
--- a/third_party/nixpkgs/pkgs/games/doom-ports/chocolate-doom/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/games/doom-ports/dhewm3/default.nix b/third_party/nixpkgs/pkgs/games/doom-ports/dhewm3/default.nix
index 19cf87110c..94e4e4dc3d 100644
--- a/third_party/nixpkgs/pkgs/games/doom-ports/dhewm3/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/games/doom-ports/eternity-engine/default.nix b/third_party/nixpkgs/pkgs/games/doom-ports/eternity-engine/default.nix
index 5239cae4d8..92ae7ea0c9 100644
--- a/third_party/nixpkgs/pkgs/games/doom-ports/eternity-engine/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/games/doom-ports/odamex/default.nix b/third_party/nixpkgs/pkgs/games/doom-ports/odamex/default.nix
index 095c928915..fb3b9a2fda 100644
--- a/third_party/nixpkgs/pkgs/games/doom-ports/odamex/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/games/easyrpg-player/default.nix b/third_party/nixpkgs/pkgs/games/easyrpg-player/default.nix
index 48ad870bd4..558f3755d1 100644
--- a/third_party/nixpkgs/pkgs/games/easyrpg-player/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/games/eduke32/default.nix b/third_party/nixpkgs/pkgs/games/eduke32/default.nix
index 5bb9966602..740d0bc47e 100644
--- a/third_party/nixpkgs/pkgs/games/eduke32/default.nix
+++ b/third_party/nixpkgs/pkgs/games/eduke32/default.nix
@@ -83,9 +83,6 @@ in stdenv.mkDerivation (finalAttrs: {
 
   makeFlags = [
     "SDLCONFIG=${SDL2}/bin/sdl2-config"
-  ] ++ lib.optionals stdenv.isDarwin [
-    # broken, see: https://github.com/NixOS/nixpkgs/issues/19098
-    "LTO=0"
   ];
 
   buildFlags = [
diff --git a/third_party/nixpkgs/pkgs/games/extremetuxracer/default.nix b/third_party/nixpkgs/pkgs/games/extremetuxracer/default.nix
index 8e774a63ee..b794543ff4 100644
--- a/third_party/nixpkgs/pkgs/games/extremetuxracer/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/games/freedroidrpg/default.nix b/third_party/nixpkgs/pkgs/games/freedroidrpg/default.nix
index 1f31c20c7e..702e259b97 100644
--- a/third_party/nixpkgs/pkgs/games/freedroidrpg/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/games/freenukum/default.nix b/third_party/nixpkgs/pkgs/games/freenukum/default.nix
index ed6c41edac..af202ffd52 100644
--- a/third_party/nixpkgs/pkgs/games/freenukum/default.nix
+++ b/third_party/nixpkgs/pkgs/games/freenukum/default.nix
@@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-Tk9n2gPwyPin6JZ4RSO8d/+xVpEz4rF8C2eGKwrAXU0=";
   };
 
-  cargoSha256 = "sha256-8RfiObWDqZJg+sjjDBk+sRoS5CiECIdNPH79T+O8e8M=";
+  cargoHash = "sha256-8RfiObWDqZJg+sjjDBk+sRoS5CiECIdNPH79T+O8e8M=";
 
   nativeBuildInputs = [
     installShellFiles
diff --git a/third_party/nixpkgs/pkgs/games/garden-of-coloured-lights/default.nix b/third_party/nixpkgs/pkgs/games/garden-of-coloured-lights/default.nix
index 27b0255eba..00bf3a9d42 100644
--- a/third_party/nixpkgs/pkgs/games/garden-of-coloured-lights/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/games/gltron/default.nix b/third_party/nixpkgs/pkgs/games/gltron/default.nix
index cbc8510775..819914dec8 100644
--- a/third_party/nixpkgs/pkgs/games/gltron/default.nix
+++ b/third_party/nixpkgs/pkgs/games/gltron/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     description = "Game based on the movie Tron";
     mainProgram = "gltron";
     license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [viric];
+    maintainers = [ ];
     platforms = with lib.platforms; linux;
   };
 }
diff --git a/third_party/nixpkgs/pkgs/games/gnome-hexgl/default.nix b/third_party/nixpkgs/pkgs/games/gnome-hexgl/default.nix
index 1c7627582d..41cc79f26c 100644
--- a/third_party/nixpkgs/pkgs/games/gnome-hexgl/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/games/harmonist/default.nix b/third_party/nixpkgs/pkgs/games/harmonist/default.nix
index 12715ff924..34e996f499 100644
--- a/third_party/nixpkgs/pkgs/games/harmonist/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/games/ivan/default.nix b/third_party/nixpkgs/pkgs/games/ivan/default.nix
index 30620bea71..3d6eb81f38 100644
--- a/third_party/nixpkgs/pkgs/games/ivan/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/games/lincity/default.nix b/third_party/nixpkgs/pkgs/games/lincity/default.nix
index e03dda491c..3f77d9bbe4 100644
--- a/third_party/nixpkgs/pkgs/games/lincity/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/games/linthesia/default.nix b/third_party/nixpkgs/pkgs/games/linthesia/default.nix
index 8bb0f795a8..7bb3e30ef6 100644
--- a/third_party/nixpkgs/pkgs/games/linthesia/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/games/minecraft-servers/default.nix b/third_party/nixpkgs/pkgs/games/minecraft-servers/default.nix
index f3d4aad166..d49adda6da 100644
--- a/third_party/nixpkgs/pkgs/games/minecraft-servers/default.nix
+++ b/third_party/nixpkgs/pkgs/games/minecraft-servers/default.nix
@@ -12,7 +12,11 @@ let
       name = "vanilla-${escapeVersion version}";
       value = callPackage ./derivation.nix {
         inherit (value) version url sha1;
-        jre_headless = getJavaVersion (if value.javaVersion == null then 8 else value.javaVersion); # versions <= 1.6 will default to 8
+        jre_headless = getJavaVersion (
+          if value.javaVersion == null then 8
+          else if value.javaVersion == 16 then 17
+          else value.javaVersion
+        ); # versions <= 1.6 will default to 8
       };
     })
     versions;
diff --git a/third_party/nixpkgs/pkgs/games/mrrescue/default.nix b/third_party/nixpkgs/pkgs/games/mrrescue/default.nix
index 17e24d3af1..60650015a3 100644
--- a/third_party/nixpkgs/pkgs/games/mrrescue/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/games/neverball/default.nix b/third_party/nixpkgs/pkgs/games/neverball/default.nix
index 5e8e3f41c7..e0555ded7b 100644
--- a/third_party/nixpkgs/pkgs/games/neverball/default.nix
+++ b/third_party/nixpkgs/pkgs/games/neverball/default.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
     homepage = "https://neverball.org/";
     description = "Tilt the floor to roll a ball";
     license = "GPL";
-    maintainers = with lib.maintainers; [viric];
+    maintainers = [ ];
     platforms = with lib.platforms; linux;
   };
 }
diff --git a/third_party/nixpkgs/pkgs/games/nudoku/default.nix b/third_party/nixpkgs/pkgs/games/nudoku/default.nix
index e9ebeadf45..aa1100b339 100644
--- a/third_party/nixpkgs/pkgs/games/nudoku/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/games/openclonk/default.nix b/third_party/nixpkgs/pkgs/games/openclonk/default.nix
index 47c4cc6e46..bbc1c3be11 100644
--- a/third_party/nixpkgs/pkgs/games/openclonk/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/games/opendune/default.nix b/third_party/nixpkgs/pkgs/games/opendune/default.nix
index a7c5fa3d02..c50379d0c4 100644
--- a/third_party/nixpkgs/pkgs/games/opendune/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/games/openxcom/default.nix b/third_party/nixpkgs/pkgs/games/openxcom/default.nix
index bfd22c3825..2af9368640 100644
--- a/third_party/nixpkgs/pkgs/games/openxcom/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/games/osu-lazer/bin.nix b/third_party/nixpkgs/pkgs/games/osu-lazer/bin.nix
index 42ba68c851..016705ec96 100644
--- a/third_party/nixpkgs/pkgs/games/osu-lazer/bin.nix
+++ b/third_party/nixpkgs/pkgs/games/osu-lazer/bin.nix
@@ -7,22 +7,22 @@
 
 let
   pname = "osu-lazer-bin";
-  version = "2024.726.0";
+  version = "2024.727.0";
 
   src = {
     aarch64-darwin = fetchzip {
       url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Apple.Silicon.zip";
-      hash = "sha256-XsgKTBXfGFxbWyBdr/1BNP58p6VwMiTo3gblSkrilbY=";
+      hash = "sha256-yoNtCfL0wrwAUrwYTZLDsR7udUa82Jh1CIcgVQ8TBX4=";
       stripRoot = false;
     };
     x86_64-darwin = fetchzip {
       url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Intel.zip";
-      hash = "sha256-eeLrbaS/IiwLaRymwpQrHVDirCWcUBmVLHxA/K4V2SM=";
+      hash = "sha256-rdRGwD9tDxZFR8Qbd1bVG/YsbuMGZAj0roA9vRO+wQE=";
       stripRoot = false;
     };
     x86_64-linux = fetchurl {
       url = "https://github.com/ppy/osu/releases/download/${version}/osu.AppImage";
-      hash = "sha256-GhX0qSicoRbmHvtyAB37AGr2dWh4OCDJApi9RcUVzwY=";
+      hash = "sha256-wRahb7XvhdfP42iwyVsDGR8gFdsK9G8vDANS6Q3RySM=";
     };
   }.${stdenv.system} or (throw "${pname}-${version}: ${stdenv.system} is unsupported.");
 
diff --git a/third_party/nixpkgs/pkgs/games/osu-lazer/default.nix b/third_party/nixpkgs/pkgs/games/osu-lazer/default.nix
index 392836f9cf..831cb35bea 100644
--- a/third_party/nixpkgs/pkgs/games/osu-lazer/default.nix
+++ b/third_party/nixpkgs/pkgs/games/osu-lazer/default.nix
@@ -17,13 +17,13 @@
 
 buildDotnetModule rec {
   pname = "osu-lazer";
-  version = "2024.726.0";
+  version = "2024.727.0";
 
   src = fetchFromGitHub {
     owner = "ppy";
     repo = "osu";
     rev = version;
-    hash = "sha256-SakrmL8Cx+r2C1cNV0ZARwsdC2D8saO1TibDJbAyzxI=";
+    hash = "sha256-pw1UkP3VktQ2xFTBOcFAOGQuAOF+uGiU7rZsxKBQ10w=";
   };
 
   projectFile = "osu.Desktop/osu.Desktop.csproj";
diff --git a/third_party/nixpkgs/pkgs/games/papermc/versions.json b/third_party/nixpkgs/pkgs/games/papermc/versions.json
index fcd5f38201..4105b13797 100644
--- a/third_party/nixpkgs/pkgs/games/papermc/versions.json
+++ b/third_party/nixpkgs/pkgs/games/papermc/versions.json
@@ -56,7 +56,7 @@
         "version": "1.20.6-148"
     },
     "1.21": {
-        "hash": "sha256-rODj39/o2jGuZ92533ewLlCBbwy35s/r+biHS6fxDTU=",
-        "version": "1.21-62"
+        "hash": "sha256-+WMhuewhpGB/JbVFhZAy+5HmIWwIbbY9fOOD/5oghco=",
+        "version": "1.21-108"
     }
 }
diff --git a/third_party/nixpkgs/pkgs/games/path-of-building/default.nix b/third_party/nixpkgs/pkgs/games/path-of-building/default.nix
index a9f95d9b85..9fad36ed78 100644
--- a/third_party/nixpkgs/pkgs/games/path-of-building/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/games/pioneers/default.nix b/third_party/nixpkgs/pkgs/games/pioneers/default.nix
index f4122dc6bf..ae1eb8c877 100644
--- a/third_party/nixpkgs/pkgs/games/pioneers/default.nix
+++ b/third_party/nixpkgs/pkgs/games/pioneers/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     description = "Addicting game based on The Settlers of Catan";
     homepage = "https://pio.sourceforge.net/";  # https does not work
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ viric ];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/third_party/nixpkgs/pkgs/games/qqwing/default.nix b/third_party/nixpkgs/pkgs/games/qqwing/default.nix
index 185b1c7a68..39f1d43fb4 100644
--- a/third_party/nixpkgs/pkgs/games/qqwing/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/games/quake2/yquake2/default.nix b/third_party/nixpkgs/pkgs/games/quake2/yquake2/default.nix
index edfcfccade..4135706c98 100644
--- a/third_party/nixpkgs/pkgs/games/quake2/yquake2/default.nix
+++ b/third_party/nixpkgs/pkgs/games/quake2/yquake2/default.nix
@@ -13,13 +13,13 @@ let
 
   yquake2 = stdenv.mkDerivation rec {
     pname = "yquake2";
-    version = "8.30";
+    version = "8.40";
 
     src = fetchFromGitHub {
       owner = "yquake2";
       repo = "yquake2";
       rev = "QUAKE2_${builtins.replaceStrings ["."] ["_"] version}";
-      sha256 = "sha256-2x/qxrhvy+An/HitmWAhmwuDJ2djMeTsLhAtijuvbzE=";
+      sha256 = "sha256-licz659DFS56/5P/hmPSE0YuVPTp1r4yrzS7FIg4Okc=";
     };
 
     postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/games/rpg-cli/default.nix b/third_party/nixpkgs/pkgs/games/rpg-cli/default.nix
index b72a4f7800..cdd6eb0e57 100644
--- a/third_party/nixpkgs/pkgs/games/rpg-cli/default.nix
+++ b/third_party/nixpkgs/pkgs/games/rpg-cli/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-rhG/EK68PWvQYoZdjhk0w7oNmh/QiTaAt4/WgEkgxEA=";
   };
 
-  cargoSha256 = "sha256-YXQohmDmkClziaLkL2N4cGURZ0tewyt7BuNY4hS+a4w=";
+  cargoHash = "sha256-YXQohmDmkClziaLkL2N4cGURZ0tewyt7BuNY4hS+a4w=";
 
   # tests assume the authors macbook, and thus fail
   doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/games/shticker-book-unwritten/unwrapped.nix b/third_party/nixpkgs/pkgs/games/shticker-book-unwritten/unwrapped.nix
index 71b4477f49..f81cf8b2c7 100644
--- a/third_party/nixpkgs/pkgs/games/shticker-book-unwritten/unwrapped.nix
+++ b/third_party/nixpkgs/pkgs/games/shticker-book-unwritten/unwrapped.nix
@@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-jI2uL8tMUmjZ5jPkCV2jb98qtKwi9Ti4NVCPfuO3iB4=";
   };
 
-  cargoSha256 = "sha256-Tney9SG9MZh7AUIT1h/dlgJyRrSPX7mUhfsKD1Rfsfc=";
+  cargoHash = "sha256-Tney9SG9MZh7AUIT1h/dlgJyRrSPX7mUhfsKD1Rfsfc=";
 
   nativeBuildInputs = [ pkg-config ];
 
diff --git a/third_party/nixpkgs/pkgs/games/simutrans/default.nix b/third_party/nixpkgs/pkgs/games/simutrans/default.nix
index 5c66855702..0a4ec4f326 100644
--- a/third_party/nixpkgs/pkgs/games/simutrans/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/games/sm64ex/generic.nix b/third_party/nixpkgs/pkgs/games/sm64ex/generic.nix
index bf2175ed27..fcdd6616a5 100644
--- a/third_party/nixpkgs/pkgs/games/sm64ex/generic.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/games/steam-tui/default.nix b/third_party/nixpkgs/pkgs/games/steam-tui/default.nix
index 7a42404500..e21e353737 100644
--- a/third_party/nixpkgs/pkgs/games/steam-tui/default.nix
+++ b/third_party/nixpkgs/pkgs/games/steam-tui/default.nix
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-3vBIpPIsh+7PjTuNNqp7e/pdciOYnzuGkjb/Eks6QJw=";
   };
 
-  cargoSha256 = "sha256-poNPdrMguV79cwo2Eq1dGVUN0E4yG84Q63kU9o+eABo=";
+  cargoHash = "sha256-poNPdrMguV79cwo2Eq1dGVUN0E4yG84Q63kU9o+eABo=";
 
   nativeBuildInputs = [
     openssl
diff --git a/third_party/nixpkgs/pkgs/games/stockfish/default.nix b/third_party/nixpkgs/pkgs/games/stockfish/default.nix
index 74eff702ad..2e6d142b71 100644
--- a/third_party/nixpkgs/pkgs/games/stockfish/default.nix
+++ b/third_party/nixpkgs/pkgs/games/stockfish/default.nix
@@ -30,12 +30,6 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-ASy2vIP94lnSKgxixK1GoC84yAysaJpxeyuggV4MrP4=";
   };
 
-  # This addresses a linker issue with Darwin
-  # https://github.com/NixOS/nixpkgs/issues/19098
-  preBuild = lib.optionalString stdenv.isDarwin ''
-    sed -i.orig '/^\#\#\# 3.*Link Time Optimization/,/^\#\#\# 3/d' Makefile
-  '';
-
   postUnpack = ''
     sourceRoot+=/src
     echo ${nnue}
diff --git a/third_party/nixpkgs/pkgs/games/tibia/default.nix b/third_party/nixpkgs/pkgs/games/tibia/default.nix
index 0fee9ce6c6..5b932afbc4 100644
--- a/third_party/nixpkgs/pkgs/games/tibia/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/games/torcs/default.nix b/third_party/nixpkgs/pkgs/games/torcs/default.nix
index 46831a5033..476495bf88 100644
--- a/third_party/nixpkgs/pkgs/games/torcs/default.nix
+++ b/third_party/nixpkgs/pkgs/games/torcs/default.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation rec {
     description = "Car racing game";
     homepage = "https://torcs.sourceforge.net/";
     license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [viric];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
     hydraPlatforms = [];
   };
diff --git a/third_party/nixpkgs/pkgs/games/trigger/default.nix b/third_party/nixpkgs/pkgs/games/trigger/default.nix
index 4ea3dd6200..86b47f5541 100644
--- a/third_party/nixpkgs/pkgs/games/trigger/default.nix
+++ b/third_party/nixpkgs/pkgs/games/trigger/default.nix
@@ -65,7 +65,7 @@ stdenv.mkDerivation rec {
     mainProgram = "trigger-rally";
     homepage = "http://trigger-rally.sourceforge.net/";
     license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [viric];
+    maintainers = [ ];
     platforms = with lib.platforms; linux;
   };
 }
diff --git a/third_party/nixpkgs/pkgs/games/ufoai/default.nix b/third_party/nixpkgs/pkgs/games/ufoai/default.nix
index 0200d919d2..ecaaa26a4d 100644
--- a/third_party/nixpkgs/pkgs/games/ufoai/default.nix
+++ b/third_party/nixpkgs/pkgs/games/ufoai/default.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
     homepage = "http://ufoai.org";
     description = "Squad-based tactical strategy game in the tradition of X-Com";
     license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [viric];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
     hydraPlatforms = [];
   };
diff --git a/third_party/nixpkgs/pkgs/games/ultimatestunts/default.nix b/third_party/nixpkgs/pkgs/games/ultimatestunts/default.nix
index 0ffe86efee..66906e5d50 100644
--- a/third_party/nixpkgs/pkgs/games/ultimatestunts/default.nix
+++ b/third_party/nixpkgs/pkgs/games/ultimatestunts/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     homepage = "http://www.ultimatestunts.nl/";
     description = "Remake of the popular racing DOS-game Stunts";
     license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [viric];
+    maintainers = [ ];
     platforms = with lib.platforms; linux;
   };
 }
diff --git a/third_party/nixpkgs/pkgs/games/vdrift/default.nix b/third_party/nixpkgs/pkgs/games/vdrift/default.nix
index a88adbdf19..7f10560b53 100644
--- a/third_party/nixpkgs/pkgs/games/vdrift/default.nix
+++ b/third_party/nixpkgs/pkgs/games/vdrift/default.nix
@@ -52,7 +52,7 @@ let
       mainProgram = "vdrift";
       homepage = "http://vdrift.net/";
       license = lib.licenses.gpl2Plus;
-      maintainers = with lib.maintainers; [ viric ];
+      maintainers = [ ];
       platforms = lib.platforms.linux;
     };
   };
diff --git a/third_party/nixpkgs/pkgs/games/voxelands/default.nix b/third_party/nixpkgs/pkgs/games/voxelands/default.nix
index 906c3b9bd3..bac78ab72f 100644
--- a/third_party/nixpkgs/pkgs/games/voxelands/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/games/wireworld/default.nix b/third_party/nixpkgs/pkgs/games/wireworld/default.nix
index a7f0e9f37b..2b23144c00 100644
--- a/third_party/nixpkgs/pkgs/games/wireworld/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/kde/frameworks/kimageformats/default.nix b/third_party/nixpkgs/pkgs/kde/frameworks/kimageformats/default.nix
index 21c84cb569..e15c863003 100644
--- a/third_party/nixpkgs/pkgs/kde/frameworks/kimageformats/default.nix
+++ b/third_party/nixpkgs/pkgs/kde/frameworks/kimageformats/default.nix
@@ -4,6 +4,9 @@
   libheif,
   libjxl,
   libavif,
+  dav1d,
+  libaom,
+  libyuv,
   libraw,
   openexr_3,
 }:
@@ -12,5 +15,5 @@ mkKdeDerivation {
 
   extraCmakeFlags = ["-DKIMAGEFORMATS_HEIF=1"];
   extraNativeBuildInputs = [pkg-config];
-  extraBuildInputs = [libheif libjxl libavif libraw openexr_3];
+  extraBuildInputs = [libheif libjxl libavif dav1d libaom libyuv libraw openexr_3];
 }
diff --git a/third_party/nixpkgs/pkgs/kde/gear/kdenlive/default.nix b/third_party/nixpkgs/pkgs/kde/gear/kdenlive/default.nix
index 059ed9456f..cee597bce7 100644
--- a/third_party/nixpkgs/pkgs/kde/gear/kdenlive/default.nix
+++ b/third_party/nixpkgs/pkgs/kde/gear/kdenlive/default.nix
@@ -36,7 +36,6 @@ mkKdeDerivation {
     mlt
     shared-mime-info
     libv4l
-    glaxnimate
   ];
 
   qtWrapperArgs = [
diff --git a/third_party/nixpkgs/pkgs/kde/misc/marknote/default.nix b/third_party/nixpkgs/pkgs/kde/misc/marknote/default.nix
index 86c1d72bfb..13043d6adf 100644
--- a/third_party/nixpkgs/pkgs/kde/misc/marknote/default.nix
+++ b/third_party/nixpkgs/pkgs/kde/misc/marknote/default.nix
@@ -8,11 +8,11 @@
 }:
 mkKdeDerivation rec {
   pname = "marknote";
-  version = "1.2.1";
+  version = "1.3.0";
 
   src = fetchurl {
     url = "mirror://kde/stable/marknote/marknote-${version}.tar.xz";
-    hash = "sha256-HzImkm8l8Rqiuyq2QezfdqJ1hxIdLZhiIGVM9xzpyaA=";
+    hash = "sha256-/5lZhBWmzKWQDLTRDStypvOS6v4Hh0tuLrQun3qzvSg=";
   };
 
   extraBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/misc/autoadb/default.nix b/third_party/nixpkgs/pkgs/misc/autoadb/default.nix
index 8832d314df..6b3ef21277 100644
--- a/third_party/nixpkgs/pkgs/misc/autoadb/default.nix
+++ b/third_party/nixpkgs/pkgs/misc/autoadb/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-9Sv38dCtvbqvxSnRpq+HsIwF/rfLUVZbi0J+mltLres=";
   };
 
-  cargoSha256 = "1gzg1lhq8gp790mrc8fw8dg146k8lg20pnk45m2ssnmdka0826f7";
+  cargoHash = "sha256-xxmBgJqtWq1FLWTaC8SjaBoSXkPcIZYrSOc+hCEN778=";
 
   meta = with lib; {
     description = "Execute a command whenever a device is adb-connected";
diff --git a/third_party/nixpkgs/pkgs/misc/base16-builder/node-packages.nix b/third_party/nixpkgs/pkgs/misc/base16-builder/node-packages.nix
index 2bf491c2e6..66550148c8 100644
--- a/third_party/nixpkgs/pkgs/misc/base16-builder/node-packages.nix
+++ b/third_party/nixpkgs/pkgs/misc/base16-builder/node-packages.nix
@@ -12,7 +12,7 @@ let
   nodeEnv = import ../../development/node-packages/node-env.nix {
     inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript;
     inherit pkgs nodejs;
-    libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
+    libtool = if pkgs.stdenv.isDarwin then pkgs.cctools or pkgs.darwin.cctools else null;
   };
 in
 import ./node-packages-generated.nix {
diff --git a/third_party/nixpkgs/pkgs/misc/cups/default.nix b/third_party/nixpkgs/pkgs/misc/cups/default.nix
index 3fc4ab361e..194074ce9c 100644
--- a/third_party/nixpkgs/pkgs/misc/cups/default.nix
+++ b/third_party/nixpkgs/pkgs/misc/cups/default.nix
@@ -23,11 +23,11 @@
 
 stdenv.mkDerivation rec {
   pname = "cups";
-  version = "2.4.8";
+  version = "2.4.10";
 
   src = fetchurl {
     url = "https://github.com/OpenPrinting/cups/releases/download/v${version}/cups-${version}-source.tar.gz";
-    sha256 = "sha256-dcMmtLpzl178yaJQeMSwTNtO4zPKqtDQgj29UixkeaA=";
+    sha256 = "sha256-11dXwrwPeiiwLuTVLKnksaoboq/+FrmFhU9TNpQOWtc=";
   };
 
   outputs = [ "out" "lib" "dev" "man" ];
diff --git a/third_party/nixpkgs/pkgs/misc/cups/drivers/cnijfilter2/default.nix b/third_party/nixpkgs/pkgs/misc/cups/drivers/cnijfilter2/default.nix
index f5ec8e29b6..5be4e17581 100644
--- a/third_party/nixpkgs/pkgs/misc/cups/drivers/cnijfilter2/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/misc/cups/drivers/fxlinuxprint/default.nix b/third_party/nixpkgs/pkgs/misc/cups/drivers/fxlinuxprint/default.nix
index 4bd6174b7c..4c64152e6c 100644
--- a/third_party/nixpkgs/pkgs/misc/cups/drivers/fxlinuxprint/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix b/third_party/nixpkgs/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix
index 4770026523..a76ecd6dcb 100644
--- a/third_party/nixpkgs/pkgs/misc/cups/drivers/samsung/1.00.36/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/misc/cups/drivers/splix/default.nix b/third_party/nixpkgs/pkgs/misc/cups/drivers/splix/default.nix
index fae7414d36..142f32dd25 100644
--- a/third_party/nixpkgs/pkgs/misc/cups/drivers/splix/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/misc/jackaudio/tools.nix b/third_party/nixpkgs/pkgs/misc/jackaudio/tools.nix
index f299d3075c..e0e51a0ba4 100644
--- a/third_party/nixpkgs/pkgs/misc/jackaudio/tools.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/misc/opcua-client-gui/default.nix b/third_party/nixpkgs/pkgs/misc/opcua-client-gui/default.nix
index c53634a8b4..c37568cfc9 100644
--- a/third_party/nixpkgs/pkgs/misc/opcua-client-gui/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/misc/screensavers/electricsheep/default.nix b/third_party/nixpkgs/pkgs/misc/screensavers/electricsheep/default.nix
index 6691feeec6..7a6b47f868 100644
--- a/third_party/nixpkgs/pkgs/misc/screensavers/electricsheep/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/misc/screensavers/xtrlock-pam/default.nix b/third_party/nixpkgs/pkgs/misc/screensavers/xtrlock-pam/default.nix
index b87374df14..25ac901759 100644
--- a/third_party/nixpkgs/pkgs/misc/screensavers/xtrlock-pam/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/misc/tmux-plugins/default.nix b/third_party/nixpkgs/pkgs/misc/tmux-plugins/default.nix
index d05d6831fe..6343c5b1b9 100644
--- a/third_party/nixpkgs/pkgs/misc/tmux-plugins/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/misc/tpm2-pkcs11/default.nix b/third_party/nixpkgs/pkgs/misc/tpm2-pkcs11/default.nix
index 797f515c1a..80d9a1c452 100644
--- a/third_party/nixpkgs/pkgs/misc/tpm2-pkcs11/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/misc/uq/default.nix b/third_party/nixpkgs/pkgs/misc/uq/default.nix
index 99ebe5a8be..414403d81e 100644
--- a/third_party/nixpkgs/pkgs/misc/uq/default.nix
+++ b/third_party/nixpkgs/pkgs/misc/uq/default.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1qqqmdk0v1d3ckasmmw5lbrkvhkv0nws4bzi9cfi1ndhrbvbkbxb";
   };
 
-  cargoSha256 = "1p6008vxm2pi9v31qhsq7zysanal6rcvcl8553373bkqlfd7w5c4";
+  cargoHash = "sha256-hBV+mqN4rnHGKAVRtlk2VFml/T9YQxzGTvGK2jcCwNw=";
 
   meta = with lib; {
     description = "Simple, user-friendly alternative to sort | uniq";
diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/default.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/default.nix
index 2d599a7c56..ac4809d7a2 100644
--- a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/lib/default.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/lib/default.nix
index 3fea3bc3e7..d8d975ef71 100644
--- a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/lib/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/lib/default.nix
@@ -8,6 +8,40 @@
   inherit version;
 
   mkBsdArch =
+    stdenv':
+    {
+      x86_64 = "amd64";
+      aarch64 = "aarch64";
+      i486 = "i386";
+      i586 = "i386";
+      i686 = "i386";
+      armv6l = "armv6";
+      armv7l = "armv7";
+      powerpc = "powerpc";
+      powerpc64 = "powerpc64";
+      powerpc64le = "powerpc64le";
+      riscv64 = "riscv64";
+    }
+    .${stdenv'.hostPlatform.parsed.cpu.name} or stdenv'.hostPlatform.parsed.cpu.name;
+
+  mkBsdCpuArch =
+    stdenv':
+    {
+      x86_64 = "amd64";
+      aarch64 = "aarch64";
+      i486 = "i386";
+      i586 = "i386";
+      i686 = "i386";
+      armv6l = "arm";
+      armv7l = "arm";
+      powerpc = "powerpc";
+      powerpc64 = "powerpc";
+      powerpc64le = "powerpc";
+      riscv64 = "riscv";
+    }
+    .${stdenv'.hostPlatform.parsed.cpu.name} or stdenv'.hostPlatform.parsed.cpu.name;
+
+  mkBsdMachine =
     stdenv':
     {
       x86_64 = "amd64";
@@ -15,6 +49,12 @@
       i486 = "i386";
       i586 = "i386";
       i686 = "i386";
+      armv6l = "arm";
+      armv7l = "arm";
+      powerpc = "powerpc";
+      powerpc64 = "powerpc";
+      powerpc64le = "powerpc";
+      riscv64 = "riscv";
     }
     .${stdenv'.hostPlatform.parsed.cpu.name} or stdenv'.hostPlatform.parsed.cpu.name;
 
diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.0/bmake-no-compiler-rt.patch b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.1/bmake-no-compiler-rt.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.0/bmake-no-compiler-rt.patch
rename to third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.1/bmake-no-compiler-rt.patch
diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.0/compat-fix-typedefs-locations.patch b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.1/compat-fix-typedefs-locations.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.0/compat-fix-typedefs-locations.patch
rename to third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.1/compat-fix-typedefs-locations.patch
diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.0/compat-install-dirs.patch b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.1/compat-install-dirs.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.0/compat-install-dirs.patch
rename to third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.1/compat-install-dirs.patch
diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.1/fsck-path.patch b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.1/fsck-path.patch
new file mode 100644
index 0000000000..d1e49d2010
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.0/install-bootstrap-Makefile.patch b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.1/install-bootstrap-Makefile.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.0/install-bootstrap-Makefile.patch
rename to third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.1/install-bootstrap-Makefile.patch
diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.0/libc-msun-arch-subdir.patch b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.1/libc-msun-arch-subdir.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.0/libc-msun-arch-subdir.patch
rename to third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.1/libc-msun-arch-subdir.patch
diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.0/libc-no-force--lcompiler-rt.patch b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.1/libc-no-force--lcompiler-rt.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.0/libc-no-force--lcompiler-rt.patch
rename to third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.1/libc-no-force--lcompiler-rt.patch
diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.0/libcxxrt-headers.patch b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.1/libcxxrt-headers.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.0/libcxxrt-headers.patch
rename to third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.1/libcxxrt-headers.patch
diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.0/libifconfig-no-internal.patch b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.1/libifconfig-no-internal.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.0/libifconfig-no-internal.patch
rename to third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.1/libifconfig-no-internal.patch
diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.0/libnetbsd-do-install.patch b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.1/libnetbsd-do-install.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.0/libnetbsd-do-install.patch
rename to third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.1/libnetbsd-do-install.patch
diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.0/librpcsvc-include-subdir.patch b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.1/librpcsvc-include-subdir.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.0/librpcsvc-include-subdir.patch
rename to third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.1/librpcsvc-include-subdir.patch
diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.0/localedef.patch b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.1/localedef.patch
similarity index 98%
rename from third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.0/localedef.patch
rename to third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.1/localedef.patch
index 73a0341bd3..4800879ab0 100644
--- a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.0/localedef.patch
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.0/mount-use-path.patch b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.1/mount-use-path.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.0/mount-use-path.patch
rename to third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.1/mount-use-path.patch
diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.0/mtree-Makefile.patch b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.1/mtree-Makefile.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.0/mtree-Makefile.patch
rename to third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.1/mtree-Makefile.patch
diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.0/no-perms-BSD.include.dist.patch b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.1/no-perms-BSD.include.dist.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.0/no-perms-BSD.include.dist.patch
rename to third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.1/no-perms-BSD.include.dist.patch
diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.0/rc-user.patch b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.1/rc-user.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.0/rc-user.patch
rename to third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.1/rc-user.patch
diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.0/rtld-no-force--lcompiler-rt.patch b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.1/rtld-no-force--lcompiler-rt.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.0/rtld-no-force--lcompiler-rt.patch
rename to third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.1/rtld-no-force--lcompiler-rt.patch
diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.0/sys-gnu-date.patch b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.1/sys-gnu-date.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.0/sys-gnu-date.patch
rename to third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.1/sys-gnu-date.patch
diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.0/sys-no-explicit-intrinsics-dep.patch b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.1/sys-no-explicit-intrinsics-dep.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.0/sys-no-explicit-intrinsics-dep.patch
rename to third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.1/sys-no-explicit-intrinsics-dep.patch
diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.0/tinfo-host-cc.patch b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.1/tinfo-host-cc.patch
similarity index 100%
rename from third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.0/tinfo-host-cc.patch
rename to third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/patches/14.1/tinfo-host-cc.patch
diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/compat/package.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/compat/package.nix
index f597d6e370..920c1effdc 100644
--- a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/compat/package.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/compat/package.nix
@@ -14,7 +14,7 @@
 }:
 
 let
-  inherit (freebsd-lib) mkBsdArch;
+  inherit (freebsd-lib) mkBsdMachine;
 in
 
 mkDerivation {
@@ -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"
@@ -78,7 +81,7 @@ mkDerivation {
       "sys/sys/elf64.h"
       "sys/sys/elf_common.h"
       "sys/sys/elf_generic.h"
-      "sys/${mkBsdArch stdenv}/include"
+      "sys/${mkBsdMachine stdenv}/include"
     ]
     ++ lib.optionals stdenv.hostPlatform.isx86 [ "sys/x86/include" ]
     ++ [
@@ -118,8 +121,8 @@ mkDerivation {
     ''
       NIX_CFLAGS_COMPILE+=' -I../../include -I../../sys'
 
-      cp ../../sys/${mkBsdArch stdenv}/include/elf.h ../../sys/sys
-      cp ../../sys/${mkBsdArch stdenv}/include/elf.h ../../sys/sys/${mkBsdArch stdenv}
+      cp ../../sys/${mkBsdMachine stdenv}/include/elf.h ../../sys/sys
+      cp ../../sys/${mkBsdMachine stdenv}/include/elf.h ../../sys/sys/${mkBsdMachine stdenv}
     ''
     + lib.optionalString stdenv.hostPlatform.isx86 ''
       cp ../../sys/x86/include/elf.h ../../sys/x86
diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/csu.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/csu.nix
index 020a08c1d0..5d4bad19ad 100644
--- a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/csu.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/fsck.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/fsck.nix
index ba55a5f651..e6febd1ee2 100644
--- a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/fsck.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/fsck_ffs.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/fsck_ffs.nix
new file mode 100644
index 0000000000..a6082d569b
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/fsck_msdosfs.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/fsck_msdosfs.nix
new file mode 100644
index 0000000000..99b8d74ec4
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/kldxref.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/kldxref.nix
new file mode 100644
index 0000000000..6c930a51db
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/libc/package.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/libc/package.nix
index a991e69265..6d31b1fc49 100644
--- a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/libc/package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/libelf.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/libelf.nix
index a116aff81f..0a077e5aee 100644
--- a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/libelf.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/mkDerivation.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/mkDerivation.nix
index 19b4b17203..aae852c487 100644
--- a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/mkDerivation.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/mkDerivation.nix
@@ -65,9 +65,9 @@ lib.makeOverridable (
       # amd64 not x86_64 for this on unlike NetBSD
       MACHINE_ARCH = freebsd-lib.mkBsdArch stdenv';
 
-      MACHINE = freebsd-lib.mkBsdArch stdenv';
+      MACHINE = freebsd-lib.mkBsdMachine stdenv';
 
-      MACHINE_CPUARCH = MACHINE_ARCH;
+      MACHINE_CPUARCH = freebsd-lib.mkBsdCpuArch stdenv';
 
       COMPONENT_PATH = attrs.path or null;
 
diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/mount.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/mount.nix
index a4885871ad..69ce44762e 100644
--- a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/mount.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/mount_msdosfs.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/mount_msdosfs.nix
index da42260ffb..60e03134d3 100644
--- a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/mount_msdosfs.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/rc.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/rc.nix
index 92b645851b..352d0e238d 100644
--- a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/rc.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/stand-efi.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/stand-efi.nix
index c2d42af781..1bb3926f2a 100644
--- a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/stand-efi.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/sys/package.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/sys/package.nix
index 5bca922692..62a78dcded 100644
--- a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/pkgs/sys/package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/versions.json b/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/versions.json
index 3f781b4eea..198b999578 100644
--- a/third_party/nixpkgs/pkgs/os-specific/bsd/freebsd/versions.json
+++ b/third_party/nixpkgs/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",
-    "supported": true,
-    "version": {
-      "branch": "STABLE",
-      "major": 13,
-      "minor": 3,
-      "reldate": "1303503",
-      "release": "13.3-STABLE",
-      "revision": "13.3",
-      "type": "FreeBSD",
-      "version": "FreeBSD 13.3-STABLE"
-    }
-  },
-  "stable/14": {
-    "hash": "sha256-iAj75IXJi4Oium6BqFvsyQipDP2crBZIGg0Dac8Zf1g=",
-    "ref": "stable/14",
-    "refType": "branch",
-    "rev": "a3b8266f5420601e231bc08c5402d9a4929fbdc0",
+    "rev": "8d87e47b8d1093a264ca954620b9e58b81fb9b34",
     "supported": true,
     "version": {
       "branch": "PRERELEASE",
+      "major": 13,
+      "minor": 4,
+      "reldate": "1303503",
+      "release": "13.4-PRERELEASE",
+      "revision": "13.4",
+      "type": "FreeBSD",
+      "version": "FreeBSD 13.4-PRERELEASE"
+    }
+  },
+  "stable/14": {
+    "hash": "sha256-ImSKU2m2Ecss1A4uTGvh0Z4ZyhN2jem0If9jlan9tM0=",
+    "ref": "stable/14",
+    "refType": "branch",
+    "rev": "2c75d993783ca4b0d1bf8dcdf424643781326e4b",
+    "supported": true,
+    "version": {
+      "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/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/default.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/default.nix
index e288e6d216..7dff70cc4f 100644
--- a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/default.nix
@@ -56,7 +56,6 @@ makeScopeWithSplicing' {
 
       compat = self.callPackage ./pkgs/compat/package.nix {
         inherit (buildPackages) coreutils;
-        inherit (buildPackages.darwin) cctools-port;
         inherit (buildNetbsd) makeMinimal;
         inherit (self) install;
       };
diff --git a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/compat/package.nix b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/compat/package.nix
index 0f7483ce55..40113028bb 100644
--- a/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/compat/package.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/bsd/netbsd/pkgs/compat/package.nix
@@ -5,7 +5,7 @@
   zlib,
   defaultMakeFlags,
   coreutils,
-  cctools-port,
+  cctools,
   install,
   bsdSetupHook,
   netbsdSetupHook,
@@ -72,7 +72,7 @@ mkDerivation (
       ++ lib.optionals stdenv.hostPlatform.isDarwin [
         # GNU objcopy produces broken .a libs which won't link into dependers.
         # Makefiles only invoke `$OBJCOPY -x/-X`, so cctools strip works here.
-        "OBJCOPY=${cctools-port}/bin/strip"
+        "OBJCOPY=${cctools}/bin/strip"
       ];
     RENAME = "-D";
 
diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/apparency/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/apparency/default.nix
index 54a8395f48..8fd9af7056 100644
--- a/third_party/nixpkgs/pkgs/os-specific/darwin/apparency/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/darwin/apple-sdk-12.3/frameworks/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-sdk-12.3/frameworks/default.nix
index 113633c556..8ae0cd649c 100644
--- a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-sdk-12.3/frameworks/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/darwin/apple-sdk/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-sdk/default.nix
index 7298eba6c5..30081c8243 100644
--- a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-sdk/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-sdk/default.nix
@@ -363,7 +363,7 @@ in rec {
 
   objc4 = pkgs.darwin.libobjc;
 
-  sdkRoot = pkgs.callPackage ./sdkRoot.nix { sdkVersion = "10.12"; };
+  sdkRoot = pkgs.callPackage ./sdkRoot.nix { sdkVersion = "10.12.4"; };
 
   inherit (pkgs.darwin) Libsystem;
 
diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/AvailabilityVersions/0001-Support-setting-an-upper-bound-on-versions.patch b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/AvailabilityVersions/0001-Support-setting-an-upper-bound-on-versions.patch
new file mode 100644
index 0000000000..6dcf8eef36
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/AvailabilityVersions/0001-Support-setting-an-upper-bound-on-versions.patch
@@ -0,0 +1,244 @@
+From dd3a2378cca465ec783fd792158b2fc11f83722c Mon Sep 17 00:00:00 2001
+From: Randy Eckenrode <randy@largeandhighquality.com>
+Date: Tue, 2 Jul 2024 20:04:56 -0400
+Subject: [PATCH] Support setting an upper bound on versions
+
+---
+ availability | 94 ++++++++++++++++++++++++++++++++++------------------
+ 1 file changed, 61 insertions(+), 33 deletions(-)
+
+diff --git a/availability b/availability
+index 8ebd250..5bb9edb 100755
+--- a/availability
++++ b/availability
+@@ -17,12 +17,34 @@ MIN_PYTHON = (3, 7) #Required for ordered dictionaries as default
+ if sys.version_info < MIN_PYTHON:
+     sys.exit("Python %s.%s or later is required.\n" % MIN_PYTHON)
+ 
++
++def parse_version(ver):
++    if hasattr(ver, "string"):
++        ver = ver.string()
++
++    return (tuple(map(int, ver.split("."))) + (0, 0))[:3]
++
++
++def version_older_or_equal(lhs, rhs):
++    if not rhs:
++        return True
++
++    lhs_major, lhs_minor, lhs_patch = parse_version(lhs)
++    rhs_major, rhs_minor, rhs_patch = parse_version(rhs)
++
++    return (
++        lhs_major < rhs_major
++        or (lhs_major == rhs_major and lhs_minor < rhs_minor)
++        or (lhs_major == rhs_major and lhs_minor == rhs_minor and lhs_patch <= rhs_patch)
++    )  
++     
++
+ # The build script will embed the DSL content here, otherwise we build it at runtime
+ dslContent = None
+ # @@INSERT_DSL_CONTENT()@@
+ 
+ class VersionSetDSL:
+-    def __init__(self, data):   self.parsedDSL = self.Parser(data)
++    def __init__(self, data, threshold):   self.parsedDSL = self.Parser(data, threshold)
+     def sets(self):             return self.parsedDSL.version_sets
+     def platforms(self):        return self.parsedDSL.platforms
+ 
+@@ -104,12 +126,15 @@ class VersionSetDSL:
+                 self.availability_deprecation_define_name = optionals["availability_deprecation_define_name"]
+             if "version_define_name" in optionals:
+                 self.availability_define_prefix = f"__{optionals['version_define_name']}_"
+-        def add_version(self, version): return self.versions.append(version);
++        def add_version(self, version, threshold):
++            if version_older_or_equal(version, threshold):
++                self.versions.append(version)
+         def add_variant(self, variant): return self.variants.append(variant);
+     class Parser:
+         platforms       = {}
+         version_sets    = []
+-        def __init__(self, data):
++        def __init__(self, data, threshold):
++            self.threshold = threshold
+             for line in data.splitlines():
+                 line = line.strip().split('#',1)[0]
+                 if not line:
+@@ -129,7 +154,7 @@ class VersionSetDSL:
+         def set(self, name, version, uversion):
+             platforms = {}
+             for (platformName, platform) in self.platforms.items():
+-                if platform.versioned:
++                if platform.versioned and platform.versions:
+                     platforms[platformName] = platform.versions[-1]
+             version_set                 = {}
+             version_set["name"]         = name
+@@ -138,7 +163,7 @@ class VersionSetDSL:
+             self.version_sets.append(version_set)
+             # TODO add error checking for version decrease
+         def version(self, platform, version):
+-            if platform in self.platforms: self.platforms[platform].add_version(VersionSetDSL.Version(version))
++            if platform in self.platforms: self.platforms[platform].add_version(VersionSetDSL.Version(version), self.threshold)
+             else:
+                 print(f"Unknown platform \"{platform}\"")
+                 exit(-1)
+@@ -165,9 +190,8 @@ if not dslContent:
+             parts = line.split()
+             if uversion and parts and parts[0] == "set" and parts[3] == uversion:
+                 break
+-versions = VersionSetDSL(dslContent)
+ 
+-def print_sets():
++def print_sets(versions):
+     print("---")
+     for set in versions.sets():
+         print(f'{set["name"]}:')
+@@ -178,7 +202,8 @@ def print_versions(platform):
+     print(" ".join([version.string() for version in versions.platforms()[platform].versions]))
+ 
+ class Preprocessor:
+-    def __init__(self, inputFile, outputFile):
++    def __init__(self, versions, inputFile, outputFile):
++        self.versions = versions
+         bufferedOutput = ""
+         with tempfile.NamedTemporaryFile('w') as tmp:
+             with open(inputFile, 'r') as input:
+@@ -207,10 +232,10 @@ class Preprocessor:
+         output.write("\"\"\"\n")
+     def VERSION_MAP(self, output):
+         sets = []
+-        for set in versions.sets():
++        for set in self.versions.sets():
+             set_string = ", ".join(sorted({".{} = {}".format(os,osVersion.hex()) for (os,osVersion) in set["platforms"].items()}))
+             sets.append("\t{{ .set = {}, {} }}".format(set["version"].hex(), set_string))
+-        platform_string = "\n".join(["    uint32_t {} = 0;".format(name) for name in versions.platforms().keys()])  
++        platform_string = "\n".join(["    uint32_t {} = 0;".format(name) for name in self.versions.platforms().keys()])
+         output.write("""
+ #include <set>
+ #include <array>
+@@ -229,16 +254,16 @@ static const std::array<VersionSetEntry, {}> sVersionMap = {{{{
+ }};
+ """.format(platform_string, len(sets), ",\n".join(sets)))
+     def DYLD_HEADER_VERSIONS(self, output):
+-        for (name,platform) in versions.platforms().items():
++        for (name,platform) in self.versions.platforms().items():
+             for version in platform.versions:
+                 output.write(f"#define {platform.dyld_version_define_name + version.symbol() : <48}{version.hex()}\n");
+             output.write("\n")
+-        for set in versions.sets():
++        for set in self.versions.sets():
+             set_string = " / ".join(sorted({"{} {}".format(os,osVersion.string()) for(os,osVersion) in set["platforms"].items()}))
+             output.write("// dyld_{}_os_versions => {}\n".format(set["name"], set_string))
+             output.write("#define dyld_{}_os_versions".format(set["name"]).ljust(56, ' '))
+             output.write("({{ (dyld_build_version_t){{0xffffffff, {}}}; }})\n\n".format(set["version"].hex()))
+-        for (name,platform) in versions.platforms().items():
++        for (name,platform) in self.versions.platforms().items():
+             for version in platform.versions:
+                 output.write("#define dyld_platform_version_{}_{}".format(platform.stylized_name, version.symbol()).ljust(56, ' '))
+                 output.write("({{ (dyld_build_version_t){{{}, {}{}}}; }})\n".format(platform.platform_define, platform.dyld_version_define_name, version.symbol()))
+@@ -247,14 +272,14 @@ static const std::array<VersionSetEntry, {}> sVersionMap = {{{{
+     def ALIAS_VERSION_MACROS(self, output, platformString, newName, oldName, **optionals):
+         minVersion =  literal_eval(optionals.get("minVersion", "0x00000000"))
+         maxVersion =  literal_eval(optionals.get("maxVersion", "0xFFFFFFFF"))
+-        platform = versions.platforms()[platformString];
++        platform = self.versions.platforms()[platformString];
+         for version in platform.versions:
+             if literal_eval(version.hex()) < minVersion: continue
+             if literal_eval(version.hex()) >= maxVersion: continue
+             output.write(f'#define {newName + version.symbol() : <48} {oldName + version.symbol()}\n')
+     def AVAILABILITY_DEFINES(self, output):
+-        for platformString in versions.platforms():
+-            platform = versions.platforms()[platformString];
++        for platformString in self.versions.platforms():
++            platform = self.versions.platforms()[platformString];
+             if platform.bleached:
+                 output.write(f"#ifndef __APPLE_BLEACH_SDK__\n")
+             output.write(f"#ifndef __API_TO_BE_DEPRECATED_{platform.availability_deprecation_define_name}\n")
+@@ -268,16 +293,16 @@ static const std::array<VersionSetEntry, {}> sVersionMap = {{{{
+                 output.write(f"#endif /* __APPLE_BLEACH_SDK__ */\n")
+             output.write(f"\n");
+     def AVAILABILITY_VERSION_DEFINES(self, output):
+-        for platformString in versions.platforms():
+-            short = platform = versions.platforms()[platformString].short_version_numbers
+-            platform = versions.platforms()[platformString];
++        for platformString in self.versions.platforms():
++            short = platform = self.versions.platforms()[platformString].short_version_numbers
++            platform = self.versions.platforms()[platformString];
+             for version in platform.versions:
+                 output.write(f"#define {platform.availability_define_prefix + version.symbol() : <48}{version.decimal(short)}\n")
+             output.write(f"/* {platform.availability_define_prefix}_NA is not defined to a value but is used as a token by macros to indicate that the API is unavailable */\n\n")
+     def AVAILABILITY_MIN_MAX_DEFINES(self, output):
+-        for platformString in versions.platforms():
+-            platform = versions.platforms()[platformString];
+-            if not platform.versioned:
++        for platformString in self.versions.platforms():
++            platform = self.versions.platforms()[platformString];
++            if not platform.versioned or not platform.versions:
+                 continue
+             if platform.bleached:
+                 output.write(f"#ifndef __APPLE_BLEACH_SDK__\n")
+@@ -310,8 +335,8 @@ static const std::array<VersionSetEntry, {}> sVersionMap = {{{{
+             output.write(f"   #define __API_UNAVAILABLE_PLATFORM_{displayName} {realName},unavailable\n")
+         output.write(f"#if defined(__has_feature) && defined(__has_attribute)\n")
+         output.write(f" #if __has_attribute(availability)\n")
+-        for platformString in versions.platforms():
+-            platform = versions.platforms()[platformString];
++        for platformString in self.versions.platforms():
++            platform = self.versions.platforms()[platformString];
+             if platform.bleached:
+                 output.write(f"#ifndef __APPLE_BLEACH_SDK__\n")
+             writeDefines(platformString, platformString, platform.versioned)
+@@ -326,9 +351,9 @@ static const std::array<VersionSetEntry, {}> sVersionMap = {{{{
+         output.write(f" #endif /* __has_attribute(availability) */\n")
+         output.write(f"#endif /* defined(__has_feature) && defined(__has_attribute) */\n")
+     def AVAILABILITY_MACRO_IMPL(self, output, prefix, dispatcher, **optionals):
+-        count = len(versions.platforms())
+-        for platformString in versions.platforms():
+-            platform = versions.platforms()[platformString]
++        count = len(self.versions.platforms())
++        for platformString in self.versions.platforms():
++            platform = self.versions.platforms()[platformString]
+             count = count + len(platform.variants)
+         platformList    = []
+         argList         = []
+@@ -344,9 +369,9 @@ static const std::array<VersionSetEntry, {}> sVersionMap = {{{{
+         scoped_availablity = False
+         if "scoped_availablity" in optionals and optionals["scoped_availablity"] == "TRUE":
+             scoped_availablity=True
+-        count = len(versions.platforms())
+-        for platformString in versions.platforms():
+-            platform = versions.platforms()[platformString]
++        count = len(self.versions.platforms())
++        for platformString in self.versions.platforms():
++            platform = self.versions.platforms()[platformString]
+             count = count + len(platform.variants)
+         argList = ','.join([f'{macroName}{x}' for x in reversed(range(0, count))])
+         if "argCount" in optionals:
+@@ -358,8 +383,9 @@ static const std::array<VersionSetEntry, {}> sVersionMap = {{{{
+             output.write(f"    #define {name}(...) {macroName}_GET_MACRO(__VA_ARGS__,{argList},0)(__VA_ARGS__)\n")
+ 
+ parser = argparse.ArgumentParser()
++parser.add_argument("--threshold",                          default=False,                      help='Specifies the maximum version (inclusive) included in pre-processed headers')
+ group = parser.add_mutually_exclusive_group()
+-for (name, platform) in versions.platforms().items():
++for (name, platform) in VersionSetDSL(dslContent, threshold=None).platforms().items():
+     group.add_argument("--{}".format(name), default=False, action='store_true', help="Prints all SDK versions defined for {}".format(name))
+     for alias in platform.cmd_aliases:
+         group.add_argument("--{}".format(alias), dest=name, default=False, action='store_true', help="Alias for --{}".format(name))
+@@ -367,8 +393,10 @@ group.add_argument("--sets",                                default=False, actio
+ group.add_argument("--preprocess",                          nargs=2,                            help=argparse.SUPPRESS)
+ args = parser.parse_args()
+ 
+-if args.sets:                                   print_sets();
+-elif args.preprocess:                           Preprocessor(args.preprocess[0], args.preprocess[1]);
++versions = VersionSetDSL(dslContent, threshold=args.threshold)
++
++if args.sets:                                   print_sets(versions);
++elif args.preprocess:                           Preprocessor(versions, args.preprocess[0], args.preprocess[1]);
+ else:
+     for platform in versions.platforms().keys():
+         if getattr(args, platform, None):
+-- 
+2.45.2
+
diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/AvailabilityVersions/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/AvailabilityVersions/default.nix
new file mode 100644
index 0000000000..c80dd6235e
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/AvailabilityVersions/default.nix
@@ -0,0 +1,99 @@
+{
+  lib,
+  stdenvNoCC,
+  appleDerivation',
+  gnused,
+  python3,
+  unifdef,
+}:
+
+appleDerivation' stdenvNoCC {
+  nativeBuildInputs = [ unifdef ];
+
+  patches = [ ./0001-Support-setting-an-upper-bound-on-versions.patch ];
+
+  buildPhase = ''
+    runHook preBuild
+
+    declare -a unifdef_sources=(
+      os_availability.modulemap
+      os_availability_private.modulemap
+      AvailabilityPrivate.modulemap
+    )
+    unifdef -x2 -UBUILD_FOR_DRIVERKIT -m $(for x in "''${unifdef_sources[@]}"; do echo templates/$x; done)
+
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p "$out/bin" "$out/libexec" "$out/share/availability"
+
+    cp -r availability.dsl templates "$out/share/availability/"
+
+    substitute availability "$out/libexec/availability" \
+      --replace-fail '/usr/bin/env python3' '${lib.getBin python3}/bin/python3' \
+      --replace-fail 'f"{os.path.abspath(os.path.dirname(sys.argv[0]))}/' "\"$out/share/availability/"
+    chmod a+x "$out/libexec/availability"
+
+    cat <<SCRIPT > "$out/bin/gen-headers"
+    #!/usr/bin/env bash
+    set -eu
+
+    declare -a headers=(
+      Availability.h
+      AvailabilityInternal.h
+      AvailabilityInternalLegacy.h
+      AvailabilityMacros.h
+      AvailabilityVersions.h
+      os/availability.h
+    )
+
+    dest=\$2
+    threshold=\$1
+
+    for header in "\''${headers[@]}"; do
+      header_src=\''${header/\//_}
+      mkdir -p "\$(dirname "\$dest/include/\$header")"
+      "$out/libexec/availability" \\
+        --threshold "\$threshold" \\
+        --preprocess "$out/share/availability/templates/\$header_src" "\$dest/include/\$header"
+    done
+
+    # `__ENVIRONMENT_OS_VERSION_MIN_REQUIRED__` is only defined by clang 17+, so define it for older versions.
+    ${lib.getExe gnused} -E '/#ifndef __MAC_OS_X_VERSION_MIN_REQUIRED/{
+        i#ifndef __ENVIRONMENT_OS_VERSION_MIN_REQUIRED__
+        i#define __ENVIRONMENT_OS_VERSION_MIN_REQUIRED__ __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__
+        i#endif
+      }' \\
+      -i "\$dest/include/AvailabilityInternal.h"
+
+    # Remove macros from newer SDKs because they can confuse some programs about the SDK version.
+    declare -a versionParts=(\''${threshold//./ })
+    if [ "\''${versionParts[0]}" == "10" ]; then
+      sdkMajor=\''${versionParts[1]}
+      sdkMinor=\''${versionParts[2]:-0}
+      for minor in \$(seq \$(("\$sdkMinor" + 1)) 9); do
+        ${lib.getExe gnused} \\
+          -E "/VERSION_10_\''${sdkMajor}_\$minor/,/#endif/c\\ */" \\
+          -i "\$dest/include/AvailabilityMacros.h"
+      done
+      for major in \$(seq \$(("\$sdkMajor" + 1)) 15); do
+        ${lib.getExe gnused} \\
+          -E "/VERSION_10_\$major/,/#endif/c\\ */" \\
+          -i "\$dest/include/AvailabilityMacros.h"
+      done
+    fi
+
+    cp "$out/share/availability/templates/os_availability.modulemap" "\$dest/include/"
+    SCRIPT
+    chmod a+x "$out/bin/gen-headers"
+
+    patchShebangs "$out/bin"
+
+    runHook postInstall
+  '';
+
+  meta.mainProgram = "gen-headers";
+}
diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix
index ed5e998714..f0376e527a 100644
--- a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/ICU/default.nix
@@ -11,31 +11,34 @@ let
 in
 
 appleDerivation {
+  patches = [ ./suppress-icu-check-crash.patch ];
+
   nativeBuildInputs = [ python3 ];
 
   depsBuildBuild = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ buildPackages.stdenv.cc ];
 
   postPatch = ''
     substituteInPlace makefile \
-      --replace "/usr/bin/" "" \
-      --replace "xcrun --sdk macosx --find" "echo -n" \
-      --replace "xcrun --sdk macosx.internal --show-sdk-path" "echo -n /dev/null" \
-      --replace "-install_name " "-install_name $out"
+      --replace-fail "/usr/bin/" "" \
+      --replace-fail "xcrun --sdk macosx --find" "echo -n" \
+      --replace-fail "xcrun --sdk macosx.internal --show-sdk-path" "echo -n /dev/null" \
+      --replace-fail "-install_name " "-install_name $out" \
+      --replace-fail '-x -u -r -S' '-x --keep-undefined -S'
 
     substituteInPlace icuSources/config/mh-darwin \
-      --replace "-install_name " "-install_name $out/"
+      --replace-fail "-install_name " "-install_name $out/"
 
     # drop using impure /var/db/timezone/icutz
     substituteInPlace makefile \
-      --replace '-DU_TIMEZONE_FILES_DIR=\"\\\"$(TZDATA_LOOKUP_DIR)\\\"\" -DU_TIMEZONE_PACKAGE=\"\\\"$(TZDATA_PACKAGE)\\\"\"' ""
+      --replace-fail '-DU_TIMEZONE_FILES_DIR=\"\\\"$(TZDATA_LOOKUP_DIR)\\\"\" -DU_TIMEZONE_PACKAGE=\"\\\"$(TZDATA_PACKAGE)\\\"\"' ""
 
     # FIXME: This will cause `ld: warning: OS version (12.0) too small, changing to 13.0.0`, APPLE should fix it.
     substituteInPlace makefile \
-      --replace "ZIPPERING_LDFLAGS=-Wl,-iosmac_version_min,12.0" "ZIPPERING_LDFLAGS="
+      --replace-fail "ZIPPERING_LDFLAGS=-Wl,-iosmac_version_min,12.0" "ZIPPERING_LDFLAGS="
 
     # skip test for missing encodingSamples data
     substituteInPlace icuSources/test/cintltst/ucsdetst.c \
-      --replace "&TestMailFilterCSS" "NULL"
+      --replace-fail "&TestMailFilterCSS" "NULL"
 
     patchShebangs icuSources
   '' + lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
@@ -44,7 +47,7 @@ appleDerivation {
     # propagate the correct value of CC, CXX, etc, but has the following double
     # expansion that results in the empty string.
     substituteInPlace makefile \
-      --replace '$($(ENV_BUILDHOST))' '$(ENV_BUILDHOST)'
+      --replace-fail '$($(ENV_BUILDHOST))' '$(ENV_BUILDHOST)'
   '';
 
   # APPLE is using makefile to save its default configuration and call ./configure, so we hack makeFlags
diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/ICU/suppress-icu-check-crash.patch b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/ICU/suppress-icu-check-crash.patch
new file mode 100644
index 0000000000..f3dfb15c49
--- /dev/null
+++ b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/ICU/suppress-icu-check-crash.patch
@@ -0,0 +1,13 @@
+diff --git a/icuSources/test/cintltst/cmsgtst.c b/icuSources/test/cintltst/cmsgtst.c
+index cb328707..1073e6c1 100644
+--- a/icuSources/test/cintltst/cmsgtst.c
++++ b/icuSources/test/cintltst/cmsgtst.c
+@@ -231,7 +231,7 @@ static void MessageFormatTest( void )
+                         austrdup(result), austrdup(testResultStrings[i]) );
+                 }
+ 
+-#if (U_PLATFORM == U_PF_LINUX) /* add platforms here .. */
++#if (U_PLATFORM == U_PF_LINUX || U_PLATFORM == U_PF_DARWIN) /* add platforms here .. */
+                 log_verbose("Skipping potentially crashing test for mismatched varargs.\n");
+ #else
+                 log_verbose("Note: the next is a platform dependent test. If it crashes, add an exclusion for your platform near %s:%d\n", __FILE__, __LINE__); 
diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix
index af37143835..520f4a8236 100644
--- a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Libsystem/default.nix
@@ -1,5 +1,5 @@
 { lib, stdenv, buildPackages, fetchzip, fetchFromGitHub
-, appleDerivation', xnu, Libc, Libm, libdispatch, Libinfo
+, appleDerivation', AvailabilityVersions, sdkRoot, xnu, Libc, Libm, libdispatch, Libinfo
 , dyld, Csu, architecture, libclosure, CarbonHeaders, ncurses, CommonCrypto
 , copyfile, removefile, libresolvHeaders, libresolv, Libnotify, libmalloc, libplatform, libpthread
 , mDNSResponder, launchd, libutilHeaders, hfsHeaders, darwin-stubs
@@ -48,9 +48,11 @@ appleDerivation' stdenv {
 
     # Set up our include directories
     (cd ${xnu}/include && find . -name '*.h' -or -name '*.defs' | copyHierarchy $out/include)
-    cp ${xnu}/Library/Frameworks/Kernel.framework/Versions/A/Headers/Availability*.h $out/include
     cp ${xnu}/Library/Frameworks/Kernel.framework/Versions/A/Headers/stdarg.h        $out/include
 
+    # These headers are from a newer SDK, but they’re more compatible with GCC (and still work with older SDKs).
+    ${lib.getExe AvailabilityVersions} ${lib.getVersion sdkRoot} "$out"
+
     for dep in ${Libc} ${Libm} ${Libinfo} ${dyld} ${architecture} \
                ${libclosure} ${CarbonHeaders} ${libdispatch} ${ncurses.dev} \
                ${CommonCrypto} ${copyfile} ${removefile} ${libresolvHeaders} \
@@ -59,7 +61,7 @@ appleDerivation' stdenv {
       (cd $dep/include && find . -name '*.h' | copyHierarchy $out/include)
     done
 
-    (cd ${lib.getDev buildPackages.darwin.cctools}/include/mach-o && find . -name '*.h' | copyHierarchy $out/include/mach-o)
+    (cd ${lib.getDev buildPackages.cctools}/include/mach-o && find . -name '*.h' | copyHierarchy $out/include/mach-o)
 
     for header in pthread.h pthread_impl.h pthread_spis.h sched.h; do
       ln -s "$out/include/pthread/$header" "$out/include/$header"
@@ -74,27 +76,6 @@ appleDerivation' stdenv {
     cp ${darling.src}/src/libc/os/log.h $out/include/os
     cp ${darling.src}/src/duct/include/os/trace.h $out/include/os
 
-    cat <<EOF > $out/include/os/availability.h
-    #ifndef __OS_AVAILABILITY__
-    #define __OS_AVAILABILITY__
-    #include <AvailabilityInternal.h>
-
-    #if defined(__has_feature) && defined(__has_attribute) && __has_attribute(availability)
-      #define API_AVAILABLE(...) __API_AVAILABLE_GET_MACRO(__VA_ARGS__, __API_AVAILABLE4, __API_AVAILABLE3, __API_AVAILABLE2, __API_AVAILABLE1)(__VA_ARGS__)
-      #define API_DEPRECATED(...) __API_DEPRECATED_MSG_GET_MACRO(__VA_ARGS__, __API_DEPRECATED_MSG5, __API_DEPRECATED_MSG4, __API_DEPRECATED_MSG3, __API_DEPRECATED_MSG2, __API_DEPRECATED_MSG1)(__VA_ARGS__)
-      #define API_DEPRECATED_WITH_REPLACEMENT(...) __API_DEPRECATED_REP_GET_MACRO(__VA_ARGS__, __API_DEPRECATED_REP5, __API_DEPRECATED_REP4, __API_DEPRECATED_REP3, __API_DEPRECATED_REP2, __API_DEPRECATED_REP1)(__VA_ARGS__)
-      #define API_UNAVAILABLE(...) __API_UNAVAILABLE_GET_MACRO(__VA_ARGS__, __API_UNAVAILABLE3, __API_UNAVAILABLE2, __API_UNAVAILABLE1)(__VA_ARGS__)
-    #else
-
-      #define API_AVAILABLE(...)
-      #define API_DEPRECATED(...)
-      #define API_DEPRECATED_WITH_REPLACEMENT(...)
-      #define API_UNAVAILABLE(...)
-
-    #endif
-    #endif
-    EOF
-
     cat <<EOF > $out/include/TargetConditionals.h
     #ifndef __TARGETCONDITIONALS__
     #define __TARGETCONDITIONALS__
diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Libsystem/headers.txt b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Libsystem/headers.txt
index b6e608f81e..e5547ece2c 100644
--- a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Libsystem/headers.txt
+++ b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/Libsystem/headers.txt
@@ -1,7 +1,9 @@
 AssertMacros.h
 Availability.h
 AvailabilityInternal.h
+AvailabilityInternalLegacy.h
 AvailabilityMacros.h
+AvailabilityVersions.h
 Block.h
 Block_private.h
 CommonCrypto/CommonBaseXX.h
@@ -1050,8 +1052,7 @@ os/overflow.h
 os/semaphore_private.h
 os/trace.h
 os/tsd.h
-os/voucher_activity_private.h
-os/voucher_private.h
+os_availability.modulemap
 osfmk/UserNotification/KUNCUserNotifications.h
 osfmk/UserNotification/UNDReply.defs
 osfmk/UserNotification/UNDRequest.defs
diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/configd/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/configd/default.nix
index 998bc867e7..b46cf7628c 100644
--- a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/configd/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/configd/default.nix
@@ -1,13 +1,29 @@
-{ lib, stdenv, runCommand, appleDerivation', launchd, bootstrap_cmds, swift-corelibs-foundation, xnu, xpc, ppp, IOKit, eap8021x, Security
+{ lib, stdenv, stdenvNoCC, appleDerivation', launchd, bootstrap_cmds, swift-corelibs-foundation, xnu, xpc, ppp, IOKit, eap8021x, Security
 , headersOnly ? false }:
 
 let
-  privateHeaders = runCommand "swift-corelibs-foundation-private" { } ''
-    mkdir -p $out/include/CoreFoundation
+  # Copy the headers out of CF instead of building it to avoid an infinite recursion.
+  privateHeaders = stdenvNoCC.mkDerivation {
+    pname = "swift-corelibs-foundation-private";
+    inherit (swift-corelibs-foundation) version src;
 
-    cp ${swift-corelibs-foundation}/Library/Frameworks/CoreFoundation.framework/PrivateHeaders/* \
-      $out/include/CoreFoundation
-  '';
+    buildCommand = ''
+      unpackFile "$src"
+
+      mkdir -p "$out/include/CoreFoundation"
+
+      declare -a privateHeaders=(
+        Base.subproj/CFRuntime.h
+        PlugIn.subproj/CFBundlePriv.h
+        RunLoop.subproj/CFRunLoop.h
+        String.subproj/CFStringDefaultEncoding.h
+      )
+
+      for header in "''${privateHeaders[@]}"; do
+        cp source/CoreFoundation/$header $out/include/CoreFoundation
+      done
+    '';
+  };
 in
 appleDerivation' stdenv {
   meta.broken = stdenv.cc.nativeLibc;
diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/default.nix
index aae3d515a6..491f2b6675 100644
--- a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/default.nix
@@ -10,6 +10,9 @@ let
   # a stdenv out of something like this. With some care we can probably get rid of this, but for
   # now it's staying here.
   versions = {
+    "macos-14.4" = {
+      AvailabilityVersions = "140.1";
+    };
     "macos-14.3" = {
       system_cmds   = "970.0.4";
     };
@@ -36,6 +39,9 @@ let
       libpthread    = "218.60.3";
       hfs           = "366.70.1";
     };
+    "osx-10.12.4" = {
+      libdispatch = "703.50.37";
+    };
     "osx-10.11.6" = {
       PowerManagement = "572.50.1";
       dtrace        = "168";
@@ -248,6 +254,7 @@ developerToolsPackages_11_3_1 // macosPackages_11_0_1 // {
 
     inherit (adv_cmds-boot) ps locale;
     architecture    = applePackage "architecture"      "osx-10.11.6"     "sha256-cUKeMx6mOAxBSRHIdfzsrR65Qv86m7+20XvpKqVfwVI=" {};
+    AvailabilityVersions = applePackage "AvailabilityVersions" "macos-14.4" "sha256-O9/EOsbK5ZXxh6iDSTwGWWrY5GX/viUwdfG3tdvZwcQ=" {};
     bsdmake         = applePackage "bsdmake"           "dev-tools-3.2.6" "sha256-CW8zP5QZMhWTGp+rhrm8oHE/vSLsRlv1VRAGe1OUDmI=" {};
     CarbonHeaders   = applePackage "CarbonHeaders"     "osx-10.6.2"      "sha256-UNaHvxzYzEBnYYuoMLqWUVprZa6Wqn/3XleoSCco050=" {};
     CommonCrypto    = applePackage "CommonCrypto"      "osx-10.12.6"     "sha256-FLgODBrfv+XsGaAjddncYAm/BIJJYw6LcwX/z7ncKFM=" {};
@@ -271,7 +278,7 @@ developerToolsPackages_11_3_1 // macosPackages_11_0_1 // {
       };
     };
     libclosure      = applePackage "libclosure"        "osx-10.11.6"     "sha256-L5rQ+UBpf3B+W1U+gZKk7fXulslHsc8lxnCsplV+nr0=" {};
-    libdispatch     = applePackage "libdispatch"       "osx-10.10.5"     "sha256-jfAEk0OLrJa9AIZVikIoHomd+l+4rCfc320Xh50qK5M=" {};
+    libdispatch     = applePackage "libdispatch"       "osx-10.12.4"     "sha256-xUqoG5JK4P3nXeoVUOBzodVK9fjH/I3xJ6WRtM39bdw=" {};
     Libinfo         = applePackage "Libinfo"           "osx-10.11.6"     "sha256-6F7wiwerv4nz/xXHtp1qCHSaFzZgzcRN+jbmXA5oWOQ=" {};
     Libm            = applePackage "Libm"              "osx-10.7.4"      "sha256-KjMETfT4qJm0m0Ux/F6Rq8bI4Q4UVnFx6IKbKxXd+Es=" {};
     Libnotify       = applePackage "Libnotify"         "osx-10.12.6"     "sha256-6wvMBxAUfiYcQtmlfYCj1d3kFmFM/jdboTd7hRvi3e4=" {};
@@ -283,7 +290,7 @@ developerToolsPackages_11_3_1 // macosPackages_11_0_1 // {
     else macosPackages_11_0_1.libplatform;
     libpthread      = applePackage "libpthread"        "osx-10.12.6"     "sha256-QvJ9PERmrCWBiDmOWrLvQUKZ4JxHuh8gS5nlZKDLqE8=" {};
     libresolv       = applePackage "libresolv"         "osx-10.12.6"     "sha256-FtvwjJKSFX6j9APYPC8WLXVOjbHLZa1Gcoc8yxLy8qE=" {};
-    Libsystem       = applePackage "Libsystem"         "osx-10.12.6"     "sha256-zvRdCP//TjKCGAqm/5nJXPppshU1cv2fg/L/yK/olGQ=" {};
+    Libsystem       = applePackage "Libsystem"         "osx-10.12.6"     "sha256-zvRdCP//TjKCGAqm/5nJXPppshU1cv2fg/L/yK/olGQ=" { inherit (pkgs.darwin.apple_sdk) sdkRoot; };
     libutil         = applePackage "libutil"           "osx-10.12.6"     "sha256-4PFuk+CTLwvd/Ll9GLBkiIM0Sh/CVaiKwh5m1noheRs=" {};
     libunwind       = applePackage "libunwind"         "osx-10.12.6"     "sha256-CC0sndP/mKYe3dZu3v7fjuDASV4V4w7dAcnWMvpoquE=" {};
     mDNSResponder   = applePackage "mDNSResponder"     "osx-10.12.6"     "sha256-ddZr6tropkpdMJhq/kUlm3OwO8b0yxtkrMpwec8R4FY=" {};
diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/libdispatch/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/libdispatch/default.nix
index 176cb8646f..335115f8fe 100644
--- a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/libdispatch/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/libdispatch/default.nix
@@ -1,13 +1,12 @@
-{ appleDerivation', stdenvNoCC }:
+{ lib, appleDerivation', stdenvNoCC }:
 
-appleDerivation' stdenvNoCC {
+appleDerivation' stdenvNoCC (finalAttrs: {
   dontConfigure = true;
   dontBuild = true;
   installPhase = ''
     mkdir -p $out/include/dispatch $out/include/os
 
     # Move these headers so CF can find <os/voucher_private.h>
-    mv private/voucher*.h  $out/include/os
     cp -r private/*.h  $out/include/dispatch
 
     cp -r dispatch/*.h $out/include/dispatch
@@ -15,7 +14,7 @@ appleDerivation' stdenvNoCC {
 
     # gcc compatibility. Source: https://stackoverflow.com/a/28014302/3714556
     substituteInPlace $out/include/dispatch/object.h \
-      --replace 'typedef void (^dispatch_block_t)(void);' \
+      --replace-fail 'typedef void (^dispatch_block_t)(void);' \
                 '#ifdef __clang__
                  typedef void (^dispatch_block_t)(void);
                  #else
@@ -46,9 +45,14 @@ appleDerivation' stdenvNoCC {
     dispatch/source.h
     dispatch/source_private.h
     dispatch/time.h
+  ''
+  + lib.optionalString (lib.versionAtLeast "1271.40.12" finalAttrs.version) ''
+    dispatch/time_private.h
+    dispatch/workloop.h
+    dispatch/workloop_private.h
+  ''
+  + ''
     os/object.h
     os/object_private.h
-    os/voucher_activity_private.h
-    os/voucher_private.h
   '';
-}
+})
diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix
index 2820df1db1..1ba9a278ec 100644
--- a/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/darwin/apple-source-releases/xnu/default.nix
@@ -44,8 +44,7 @@ appleDerivation' (if headersOnly then stdenvNoCC else stdenv) (
       --replace " -o 0" "" \
       --replace '$SRC/$mig' '-I$DSTROOT/include $SRC/$mig' \
       --replace '$SRC/servers/netname.defs' '-I$DSTROOT/include $SRC/servers/netname.defs' \
-      --replace '$BUILT_PRODUCTS_DIR/mig_hdr' '$BUILT_PRODUCTS_DIR' \
-      --replace 'MACHINE_ARCH=armv7' 'MACHINE_ARCH=arm64' # this might break the comments saying 32-bit is required
+      --replace '$BUILT_PRODUCTS_DIR/mig_hdr' '$BUILT_PRODUCTS_DIR'
 
     patchShebangs .
   '' + lib.optionalString (lib.versionAtLeast stdenv.hostPlatform.darwinSdkVersion "11") ''
@@ -72,11 +71,7 @@ appleDerivation' (if headersOnly then stdenvNoCC else stdenv) (
   HOST_FLEX = "flex";
   HOST_BISON = "bison";
   HOST_GM4 = "m4";
-  # use unwrapped clang to generate headers because wrapper is not compatible with a 32 bit -arch.
-  # aarch64 should likely do this as well and remove the --replace MACHINE_ARCH above
-  MIGCC = if stdenv.isx86_64 && lib.versionAtLeast stdenv.hostPlatform.darwinSdkVersion "11"
-    then "${lib.getBin pkgsBuildBuild.stdenv.cc.cc}/bin/clang"
-    else "cc";
+  MIGCC = "${lib.getBin pkgsBuildBuild.stdenv.cc.cc}/bin/clang";
   ARCHS = arch;
   ARCH_CONFIGS = arch;
 
diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/binutils/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/binutils/default.nix
index ee9a80518a..f01b8d43a2 100644
--- a/third_party/nixpkgs/pkgs/os-specific/darwin/binutils/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/darwin/binutils/default.nix
@@ -3,6 +3,7 @@
   stdenvNoCC,
   cctools,
   clang-unwrapped,
+  ld64,
   llvm,
   llvm-manpages,
   makeWrapper,
@@ -17,6 +18,7 @@ let
     "addr2line"
     "ar"
     "c++filt"
+    "dwarfdump"
     "dsymutil"
     "nm"
     "objcopy"
@@ -90,7 +92,7 @@ stdenvNoCC.mkDerivation {
       ${linkManPages (lib.getMan cctools) "$tool" "$tool"}
     done
     ${
-      # These unprefixed because some tools expect to invoke them without it when cross-compiling to Darwin:
+      # These are unprefixed because some tools expect to invoke them without it when cross-compiling to Darwin:
       # - clang needs `dsymutil` when building with debug information;
       # - meson needs `lipo` when cross-compiling to Darwin; and
       # - meson also needs `install_name_tool` and `otool` when performing rpath cleanup on installation.
@@ -104,10 +106,10 @@ stdenvNoCC.mkDerivation {
     makeWrapper "${lib.getBin clang-unwrapped}/bin/clang" "$out/bin/${targetPrefix}as" \
       --add-flags "-x assembler -integrated-as -c"
 
-    ln -s '${lib.getBin cctools}/bin/${targetPrefix}ld' "$out/bin/${targetPrefix}ld"
-    ${linkManPages (lib.getMan cctools) "ld" "ld"}
-    # ${linkManPages (lib.getMan cctools) "ld-classic" "ld-classic"}
-    ${linkManPages (lib.getMan cctools) "ld64" "ld64"}
+    ln -s '${lib.getBin ld64}/bin/${targetPrefix}ld' "$out/bin/${targetPrefix}ld"
+    ${linkManPages (lib.getMan ld64) "ld" "ld"}
+    ${linkManPages (lib.getMan ld64) "ld-classic" "ld-classic"}
+    ${linkManPages (lib.getMan ld64) "ld64" "ld64"}
   '';
 
   __structuredAttrs = true;
diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/cctools/apple.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/cctools/apple.nix
deleted file mode 100644
index dee4e20062..0000000000
--- a/third_party/nixpkgs/pkgs/os-specific/darwin/cctools/apple.nix
+++ /dev/null
@@ -1,122 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, symlinkJoin, xcbuildHook, tcsh, libobjc, libtapi, libunwind, llvm, memstreamHook, xar }:
-
-let
-
-cctools = stdenv.mkDerivation rec {
-  pname = "cctools";
-  version = "973.0.1";
-
-  src = fetchFromGitHub {
-    owner = "apple-oss-distributions";
-    repo = "cctools";
-    rev = "${pname}-${version}";
-    hash = "sha256-0NlDqy3zeg4D0MbDipx0sMYDfzYa63Jxfsckzz/928o=";
-  };
-
-  patches = [
-    ./cctools-add-missing-vtool-libstuff-dep.patch
-  ];
-
-  postPatch = ''
-    for file in libstuff/writeout.c misc/libtool.c misc/lipo.c; do
-      substituteInPlace "$file" \
-        --replace '__builtin_available(macOS 10.12, *)' '0'
-    done
-    substituteInPlace libmacho/swap.c \
-      --replace '#ifndef RLD' '#if 1'
-  '';
-
-  nativeBuildInputs = [ xcbuildHook memstreamHook ];
-  buildInputs = [ libobjc llvm ];
-
-  xcbuildFlags = [
-    "MACOSX_DEPLOYMENT_TARGET=10.12"
-  ];
-
-  doCheck = true;
-  checkPhase = ''
-    runHook preCheck
-
-    Products/Release/libstuff_test
-    rm Products/Release/libstuff_test
-
-    runHook postCheck
-  '';
-
-  installPhase = ''
-    runHook preInstall
-
-    rm -rf "$out/usr"
-    mkdir -p "$out/bin"
-    find Products/Release -maxdepth 1 -type f -perm 755 -exec cp {} "$out/bin/" \;
-    cp -r include "$out/"
-
-    ln -s ./nm-classic "$out"/bin/nm
-    ln -s ./otool-classic "$out"/bin/otool
-
-    runHook postInstall
-  '';
-};
-
-ld64 = stdenv.mkDerivation rec {
-  pname = "ld64";
-  version = "609";
-
-  src = fetchFromGitHub {
-    owner = "apple-oss-distributions";
-    repo = "ld64";
-    rev = "${pname}-${version}";
-    hash = "sha256-WAaphem6NS4eCHL/pISlDXnO1CDYTgSrVGzcothh4/Q=";
-  };
-
-  postPatch = ''
-    substituteInPlace ld64.xcodeproj/project.pbxproj \
-      --replace "/bin/csh" "${tcsh}/bin/tcsh" \
-      --replace 'F9E8D4BE07FCAF2A00FD5801 /* PBXBuildRule */,' "" \
-      --replace 'F9E8D4BD07FCAF2000FD5801 /* PBXBuildRule */,' ""
-
-    sed -i src/ld/Options.cpp -e '1iconst char ldVersionString[] = "${version}";'
-  '';
-
-  nativeBuildInputs = [ xcbuildHook ];
-  buildInputs = [
-    libtapi
-    libunwind
-    llvm
-    xar
-  ];
-
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p "$out/bin"
-    find Products/Release-assert -maxdepth 1 -type f -perm 755 -exec cp {} "$out/bin/" \;
-
-    runHook postInstall
-  '';
-};
-
-in
-
-symlinkJoin rec {
-  name = "cctools-${version}";
-  version = "${cctools.version}-${ld64.version}";
-
-  paths = [
-    cctools
-    ld64
-  ];
-
-  # workaround for the fetch-tarballs script
-  passthru = {
-    inherit (cctools) src;
-    ld64_src = ld64.src;
-  };
-
-  meta = with lib; {
-    description = "MacOS Compiler Tools";
-    homepage = "http://www.opensource.apple.com/source/cctools/";
-    license = licenses.apple-psl20;
-    platforms = platforms.darwin;
-  };
-}
diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/cctools/cctools-add-missing-vtool-libstuff-dep.patch b/third_party/nixpkgs/pkgs/os-specific/darwin/cctools/cctools-add-missing-vtool-libstuff-dep.patch
deleted file mode 100644
index 1cd65ec6bc..0000000000
--- a/third_party/nixpkgs/pkgs/os-specific/darwin/cctools/cctools-add-missing-vtool-libstuff-dep.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ru a/cctools.xcodeproj/project.pbxproj b/cctools.xcodeproj/project.pbxproj
---- a/cctools.xcodeproj/project.pbxproj	2021-02-24 20:30:55.000000000 -0500
-+++ b/cctools.xcodeproj/project.pbxproj	2022-01-31 20:01:09.000000000 -0500
-@@ -2558,6 +2558,7 @@
- 			isa = PBXFrameworksBuildPhase;
- 			buildActionMask = 2147483647;
- 			files = (
-+				DE97E92421F3B86100C7947D /* libstuff.a in Frameworks */,
- 			);
- 			runOnlyForDeploymentPostprocessing = 0;
- 		};
diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/cctools/darwin-memstream.patch b/third_party/nixpkgs/pkgs/os-specific/darwin/cctools/darwin-memstream.patch
deleted file mode 100644
index 3e0d0a43ba..0000000000
--- a/third_party/nixpkgs/pkgs/os-specific/darwin/cctools/darwin-memstream.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/cctools/include/stuff/diagnostics.h
-+++ b/cctools/include/stuff/diagnostics.h
-@@ -60,13 +60,6 @@ void diagnostics_log_msg(enum diagnostic_level level, const char* message);
-  */
- void diagnostics_write(void);
- 
--#if defined(__APPLE__ ) && defined(__has_builtin)
--#  if __has_builtin(__builtin_available)
--#    define HAVE_OPENMEMSTREAM_RUNTIME __builtin_available(macOS 10.13, *)
--#  endif
--#endif
--#ifndef HAVE_OPENMEMSTREAM_RUNTIME
--#  define HAVE_OPENMEMSTREAM_RUNTIME 1
--#endif
-+#define HAVE_OPENMEMSTREAM_RUNTIME 1
- 
- #endif /* diagnostics_h */
diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/cctools/ld-ignore-rpath-link.patch b/third_party/nixpkgs/pkgs/os-specific/darwin/cctools/ld-ignore-rpath-link.patch
deleted file mode 100644
index fc87f69ac3..0000000000
--- a/third_party/nixpkgs/pkgs/os-specific/darwin/cctools/ld-ignore-rpath-link.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/cctools/ld64/src/ld/Options.cpp b/cctools/ld64/src/ld/Options.cpp
-index 2565518..9250016 100644
---- a/cctools/ld64/src/ld/Options.cpp
-+++ b/cctools/ld64/src/ld/Options.cpp
-@@ -2522,6 +2522,11 @@ void Options::parse(int argc, const char* argv[])
- 					throw "missing argument to -rpath";
- 				fRPaths.push_back(path);
- 			}
-+			else if ( strcmp(arg, "-rpath-link") == 0 ) {
-+				const char* path = argv[++i];
-+				if ( path == NULL )
-+					throw "missing argument to -rpath-link";
-+			}
- 			else if ( strcmp(arg, "-read_only_stubs") == 0 ) {
- 				fReadOnlyx86Stubs = true;
- 			}
diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/cctools/ld-rpath-nonfinal.patch b/third_party/nixpkgs/pkgs/os-specific/darwin/cctools/ld-rpath-nonfinal.patch
deleted file mode 100644
index 17ad9053f3..0000000000
--- a/third_party/nixpkgs/pkgs/os-specific/darwin/cctools/ld-rpath-nonfinal.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff --git a/cctools/ld64/src/ld/Options.cpp b/cctools/ld64/src/ld/Options.cpp
-index e4b37ec..4189ebc 100644
---- a/cctools/ld64/src/ld/Options.cpp
-+++ b/cctools/ld64/src/ld/Options.cpp
-@@ -5800,24 +5800,6 @@ void Options::checkIllegalOptionCombinations()
- 	if ( fDeadStrip && (fOutputKind == Options::kObjectFile) )
- 		throw "-r and -dead_strip cannot be used together";
- 
--	// can't use -rpath unless targeting 10.5 or later
--	if ( fRPaths.size() > 0 ) {
--		if ( !platforms().minOS(ld::version2008) )
--			throw "-rpath can only be used when targeting Mac OS X 10.5 or later";
--		switch ( fOutputKind ) {
--			case Options::kDynamicExecutable:
--			case Options::kDynamicLibrary:
--			case Options::kDynamicBundle:
--				break;
--			case Options::kStaticExecutable:
--			case Options::kObjectFile:
--			case Options::kDyld:
--			case Options::kPreload:
--			case Options::kKextBundle:
--				throw "-rpath can only be used when creating a dynamic final linked image";
--		}
--	}
--	
- 	if ( fPositionIndependentExecutable ) {
- 		switch ( fOutputKind ) {
- 			case Options::kDynamicExecutable:
diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/cctools/llvm.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/cctools/llvm.nix
deleted file mode 100644
index f2986bf872..0000000000
--- a/third_party/nixpkgs/pkgs/os-specific/darwin/cctools/llvm.nix
+++ /dev/null
@@ -1,113 +0,0 @@
-# Create a cctools-compatible bintools that uses equivalent tools from LLVM in place of the ones
-# from cctools when possible.
-
-{ lib, stdenv, makeWrapper, cctools-port, llvmPackages, enableManpages ? stdenv.targetPlatform == stdenv.hostPlatform }:
-
-let
-  inherit (stdenv) targetPlatform hostPlatform;
-
-  cctoolsVersion = lib.getVersion cctools-port;
-  llvmVersion = llvmPackages.release_version;
-
-  # `bitcode_strip` is not available until LLVM 12.
-  useLLVMBitcodeStrip = lib.versionAtLeast llvmVersion "12";
-
-  # A compatible implementation of `otool` was not added until LLVM 13.
-  useLLVMOtool = lib.versionAtLeast llvmVersion "13";
-
-  # Older versions of `strip` cause problems for the version of `codesign_allocate` available in
-  # the version of cctools in nixpkgs. The version of `codesign_allocate` in cctools-1005.2 does
-  # not appear to have issues, but the source is not available yet (as of June 2023).
-  useLLVMStrip = lib.versionAtLeast llvmVersion "15" || lib.versionAtLeast cctoolsVersion "1005.2";
-
-  # Clang 11 performs an optimization on x86_64 that is sensitive to the presence of debug info.
-  # This causes GCC to fail to bootstrap due to object file differences between stages 2 and 3.
-  useClangAssembler = lib.versionAtLeast llvmVersion "12" || !stdenv.isx86_64;
-
-  llvm_bins = [
-    "dwarfdump"
-    "nm"
-    "objdump"
-    "size"
-    "strings"
-  ]
-  ++ lib.optional useLLVMBitcodeStrip "bitcode-strip"
-  ++ lib.optional useLLVMOtool "otool"
-  ++ lib.optional useLLVMStrip "strip";
-
-  # Only include the tools that LLVM doesn’t provide and that are present normally on Darwin.
-  # The only exceptions are the following tools, which should be reevaluated when LLVM is bumped.
-  # - install_name_tool (llvm-objcopy): unrecognized linker commands when building open source CF;
-  # - libtool (llvm-libtool-darwin): not fully compatible when used with xcbuild; and
-  # - lipo (llvm-lipo): crashes when running the LLVM test suite.
-  cctools_bins = [
-    "cmpdylib"
-    "codesign_allocate"
-    "ctf_insert"
-    "install_name_tool"
-    "ld"
-    "libtool"
-    "lipo"
-    "nmedit"
-    "pagestuff"
-    "ranlib"
-    "segedit"
-    "vtool"
-  ]
-  ++ lib.optional (!useLLVMBitcodeStrip) "bitcode_strip"
-  ++ lib.optional (!useLLVMOtool) "otool"
-  ++ lib.optional (!useLLVMStrip) "strip"
-  ++ lib.optional (!useClangAssembler) "as";
-
-  targetPrefix = lib.optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-";
-
-  linkManPages = pkg: source: target: lib.optionalString enableManpages ''
-    sourcePath=${pkg}/share/man/man1/${source}.1.gz
-    targetPath=$man/share/man/man1/${target}.1.gz
-
-    if [ -f "$sourcePath" ]; then
-      mkdir -p "$(dirname "$targetPath")"
-      ln -s "$sourcePath" "$targetPath"
-    fi
-  '';
-in
-stdenv.mkDerivation {
-  pname = "cctools-llvm";
-  version = "${llvmVersion}-${cctoolsVersion}";
-
-  nativeBuildInputs = [ makeWrapper ];
-
-  # The `man` output has to be included unconditionally because darwin.binutils expects it.
-  outputs = [ "out" "dev" "man" ];
-
-  buildCommand = ''
-    mkdir -p "$out/bin" "$man"
-    ln -s ${lib.getDev cctools-port} "$dev"
-
-  '' + lib.optionalString useClangAssembler ''
-    # Use the clang-integrated assembler instead of using `as` from cctools.
-    makeWrapper "${lib.getBin llvmPackages.clang-unwrapped}/bin/clang" "$out/bin/${targetPrefix}as" \
-      --add-flags "-x assembler -integrated-as -c"
-
-  '' + ''
-    ln -s "${lib.getBin llvmPackages.bintools-unwrapped}/bin/${targetPrefix}llvm-ar" "$out/bin/${targetPrefix}ar"
-    ${linkManPages llvmPackages.llvm-manpages "llvm-ar" "ar"}
-
-    for tool in ${toString llvm_bins}; do
-      cctoolsTool=''${tool/-/_}
-      ln -s "${lib.getBin llvmPackages.llvm}/bin/llvm-$tool" "$out/bin/${targetPrefix}$cctoolsTool"
-      ${linkManPages llvmPackages.llvm-manpages "llvm-$tool" "$cctoolsTool"}
-    done
-
-    for tool in ${toString cctools_bins}; do
-      ln -s "${lib.getBin cctools-port}/bin/${targetPrefix}$tool" "$out/bin/${targetPrefix}$tool"
-      ${linkManPages (lib.getMan cctools-port) "$tool" "$tool"}
-    done
-
-    ${linkManPages (lib.getMan cctools-port) "ld64" "ld64"}
-    ${lib.optionalString (!useLLVMOtool)  # The actual man page for otool in cctools is llvm-otool
-      (linkManPages (lib.getMan cctools-port) "llvm-otool" "llvm-otool")}
-  '';
-
-  passthru = { inherit targetPrefix; };
-}
diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/cctools/port.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/cctools/port.nix
deleted file mode 100644
index cc162d870a..0000000000
--- a/third_party/nixpkgs/pkgs/os-specific/darwin/cctools/port.nix
+++ /dev/null
@@ -1,198 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, autoreconfHook, memstreamHook
-, installShellFiles
-, libuuid
-, libobjc ? null, maloader ? null
-, enableTapiSupport ? true, libtapi
-, fetchpatch
-}:
-
-let
-
-  # The targetPrefix prepended to binary names to allow multiple binuntils on the
-  # PATH to both be usable.
-  targetPrefix = lib.optionalString
-    (stdenv.targetPlatform != stdenv.hostPlatform)
-    "${stdenv.targetPlatform.config}-";
-in
-
-# Non-Darwin alternatives
-assert (!stdenv.hostPlatform.isDarwin) -> maloader != null;
-
-stdenv.mkDerivation {
-  pname = "${targetPrefix}cctools-port";
-  version = "973.0.1";
-
-  src = fetchFromGitHub {
-    owner  = "tpoechtrager";
-    repo   = "cctools-port";
-    # This is the commit before: https://github.com/tpoechtrager/cctools-port/pull/114
-    # That specific change causes trouble for us (see the PR discussion), but
-    # is also currently the last commit on master at the time of writing, so we
-    # can just go back one step.
-    rev    = "457dc6ddf5244ebf94f28e924e3a971f1566bd66";
-    sha256 = "0ns12q7vg9yand4dmdsps1917cavfbw67yl5q7bm6kb4ia5kkx13";
-  };
-
-  outputs = [ "out" "dev" "gas" "man" ];
-
-  nativeBuildInputs = [ autoconf automake libtool autoreconfHook installShellFiles ]
-    ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ memstreamHook ];
-  buildInputs = [ libuuid ]
-    ++ lib.optionals stdenv.isDarwin [ libobjc ]
-    ++ lib.optional enableTapiSupport libtapi;
-
-  patches = [
-    ./ld-ignore-rpath-link.patch
-    ./ld-rpath-nonfinal.patch
-    (fetchpatch {
-      url = "https://github.com/tpoechtrager/cctools-port/commit/4a734070cd2838e49658464003de5b92271d8b9e.patch";
-      hash = "sha256-72KaJyu7CHXxJJ1GNq/fz+kW1RslO3UaKI91LhBtiXA=";
-    })
-    (fetchpatch {
-      url = "https://github.com/MercuryTechnologies/cctools-port/commit/025899b7b3593dedb0c681e689e57c0e7bbd9b80.patch";
-      hash = "sha256-SWVUzFaJHH2fu9y8RcU3Nx/QKx60hPE5zFx0odYDeQs=";
-    })
-    # Always use `open_memstream`. This is provided by memstream via hook on x86_64-darwin.
-    ./darwin-memstream.patch
-  ];
-
-  __propagatedImpureHostDeps = [
-    # As far as I can tell, otool from cctools is the only thing that depends on these two, and we should fix them
-    "/usr/lib/libobjc.A.dylib"
-    "/usr/lib/libobjc.dylib"
-  ];
-
-  enableParallelBuilding = true;
-
-  # TODO(@Ericson2314): Always pass "--target" and always targetPrefix.
-  configurePlatforms = [ "build" "host" ]
-    ++ lib.optional (stdenv.targetPlatform != stdenv.hostPlatform) "target";
-  configureFlags = [ "--disable-clang-as" ]
-    ++ lib.optionals enableTapiSupport [
-      "--enable-tapi-support"
-      "--with-libtapi=${libtapi}"
-    ];
-
-  postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
-    substituteInPlace cctools/Makefile.am --replace libobjc2 ""
-  '' + ''
-    sed -i -e 's/addStandardLibraryDirectories = true/addStandardLibraryDirectories = false/' cctools/ld64/src/ld/Options.cpp
-
-    # FIXME: there are far more absolute path references that I don't want to fix right now
-    substituteInPlace cctools/configure.ac \
-      --replace "-isystem /usr/local/include -isystem /usr/pkg/include" "" \
-      --replace "-L/usr/local/lib" "" \
-
-    # Appears to use new libdispatch API not available in macOS SDK 10.12.
-    substituteInPlace cctools/ld64/src/ld/libcodedirectory.c \
-      --replace "#define LIBCD_PARALLEL 1" ""
-
-    patchShebangs tools
-    sed -i -e 's/which/type -P/' tools/*.sh
-
-    cd cctools
-  '';
-
-  preInstall = ''
-    installManPage ar/ar.{1,5}
-
-    # The makefile rules for installing headers are missing in 973.0.1.
-    # The below is derived from 949.0.1.
-    mkdir -p $dev/include/mach-o/i386
-    mkdir -p $dev/include/mach-o/ppc
-    mkdir -p $dev/include/mach-o/x86_64
-    mkdir -p $dev/include/mach-o/arm
-    mkdir -p $dev/include/mach-o/arm64
-    mkdir -p $dev/include/mach-o/m68k
-    mkdir -p $dev/include/mach-o/sparc
-    mkdir -p $dev/include/mach-o/hppa
-    mkdir -p $dev/include/mach-o/i860
-    mkdir -p $dev/include/mach-o/m88k
-    mkdir -p $dev/include/dyld
-    mkdir -p $dev/include/cbt
-
-    pushd include/mach-o
-    install -c -m 444  arch.h ldsyms.h reloc.h \
-      stab.h loader.h fat.h swap.h getsect.h nlist.h \
-      ranlib.h $dev/include/mach-o
-    popd
-
-    pushd include/mach-o/i386
-    install -c -m 444  swap.h \
-      $dev/include/mach-o/i386
-    popd
-
-    pushd include/mach-o/ppc
-    install -c -m 444  reloc.h swap.h \
-      $dev/include/mach-o/ppc
-    popd
-
-    pushd include/mach-o/x86_64
-    install -c -m 444  reloc.h \
-      $dev/include/mach-o/x86_64
-    popd
-
-    pushd include/mach-o/arm
-    install -c -m 444  reloc.h \
-      $dev/include/mach-o/arm
-    popd
-
-    pushd include/mach-o/arm64
-    install -c -m 444  reloc.h \
-      $dev/include/mach-o/arm64
-    popd
-
-    pushd include/mach-o/m68k
-    install -c -m 444  swap.h \
-      $dev/include/mach-o/m68k
-    popd
-
-    pushd include/mach-o/sparc
-    install -c -m 444  reloc.h swap.h \
-      $dev/include/mach-o/sparc
-    popd
-
-    pushd include/mach-o/hppa
-    install -c -m 444  reloc.h swap.h \
-      $dev/include/mach-o/hppa
-    popd
-
-    pushd include/mach-o/i860
-    install -c -m 444  reloc.h swap.h \
-      $dev/include/mach-o/i860
-    popd
-
-    pushd include/mach-o/m88k
-    install -c -m 444  reloc.h swap.h \
-      $dev/include/mach-o/m88k
-    popd
-
-    pushd include/stuff
-    install -c -m 444  bool.h \
-      $dev/include/dyld
-    popd
-
-    pushd include/cbt
-    install -c -m 444  libsyminfo.h \
-      $dev/include/cbt
-    popd
-  '';
-
-  postInstall = ''
-    # Move GNU as to its own output to prevent it from being used accidentally.
-    moveToOutput bin/gas "$gas"
-    moveToOutput libexec "$gas"
-  '';
-
-  passthru = {
-    inherit targetPrefix;
-  };
-
-  meta = {
-    broken = !stdenv.targetPlatform.isDarwin; # Only supports darwin targets
-    homepage = "http://www.opensource.apple.com/source/cctools/";
-    description = "MacOS Compiler Tools (cross-platform port)";
-    license = lib.licenses.apple-psl20;
-    maintainers = with lib.maintainers; [ matthewbauer ];
-  };
-}
diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/defaultbrowser/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/defaultbrowser/default.nix
index 2246efa0aa..7d50924625 100644
--- a/third_party/nixpkgs/pkgs/os-specific/darwin/defaultbrowser/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/darwin/karabiner-elements/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/karabiner-elements/default.nix
index 21500ad16d..367f7bc0ad 100644
--- a/third_party/nixpkgs/pkgs/os-specific/darwin/karabiner-elements/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/darwin/libtapi/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/libtapi/default.nix
deleted file mode 100644
index cb6b3cf4b7..0000000000
--- a/third_party/nixpkgs/pkgs/os-specific/darwin/libtapi/default.nix
+++ /dev/null
@@ -1,75 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, pkgsBuildBuild, cmake, python3, ncurses }:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "libtapi";
-  version = "1100.0.11"; # determined by looking at VERSION.txt
-
-  src = fetchFromGitHub {
-    owner = "tpoechtrager";
-    repo = "apple-libtapi";
-    rev = "664b8414f89612f2dfd35a9b679c345aa5389026";
-    sha256 = "1y1yl46msabfy14z0rln333a06087bk14f5h7q1cdawn8nmvbdbr";
-  };
-
-  sourceRoot = "${finalAttrs.src.name}/src/llvm";
-
-  # Backported from newer llvm, fixes configure error when cross compiling.
-  # Also means we don't have to manually fix the result with install_name_tool.
-  patches = [
-    ./disable-rpath.patch
-  ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
-    # TODO: make unconditional and rebuild the world
-    # TODO: send upstream
-    ./native-clang-tblgen.patch
-  ];
-
-  nativeBuildInputs = [ cmake python3 ];
-
-  # ncurses is required here to avoid a reference to bootstrap-tools, which is
-  # not allowed for the stdenv.
-  buildInputs = [ ncurses ];
-
-  cmakeFlags = [ "-DLLVM_INCLUDE_TESTS=OFF" ]
-    ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
-      "-DCMAKE_CROSSCOMPILING=True"
-      # This package could probably have a llvm_6 llvm-tblgen and clang-tblgen
-      # provided to reduce some building. This package seems intended to
-      # include all of its dependencies, including enough of LLVM to build the
-      # required tablegens.
-      (
-        let
-          nativeCC = pkgsBuildBuild.stdenv.cc;
-          nativeBintools = nativeCC.bintools.bintools;
-          nativeToolchainFlags = [
-            "-DCMAKE_C_COMPILER=${nativeCC}/bin/${nativeCC.targetPrefix}cc"
-            "-DCMAKE_CXX_COMPILER=${nativeCC}/bin/${nativeCC.targetPrefix}c++"
-            "-DCMAKE_AR=${nativeBintools}/bin/${nativeBintools.targetPrefix}ar"
-            "-DCMAKE_STRIP=${nativeBintools}/bin/${nativeBintools.targetPrefix}strip"
-            "-DCMAKE_RANLIB=${nativeBintools}/bin/${nativeBintools.targetPrefix}ranlib"
-          ];
-        in "-DCROSS_TOOLCHAIN_FLAGS_NATIVE:list=${lib.concatStringsSep ";" nativeToolchainFlags}"
-      )
-    ];
-
-  # fixes: fatal error: 'clang/Basic/Diagnostic.h' file not found
-  # adapted from upstream
-  # https://github.com/tpoechtrager/apple-libtapi/blob/3cb307764cc5f1856c8a23bbdf3eb49dfc6bea48/build.sh#L58-L60
-  preConfigure = ''
-    INCLUDE_FIX="-I $PWD/projects/clang/include"
-    INCLUDE_FIX+=" -I $PWD/build/projects/clang/include"
-
-    cmakeFlagsArray+=(-DCMAKE_CXX_FLAGS="$INCLUDE_FIX")
-  '';
-
-  buildFlags = [ "clangBasic" "libtapi" "tapi" ];
-
-  installTargets = [ "install-libtapi" "install-tapi-headers" "install-tapi" ];
-
-  meta = with lib; {
-    description = "Replaces the Mach-O Dynamic Library Stub files in Apple's SDKs to reduce the size";
-    mainProgram = "tapi";
-    homepage = "https://github.com/tpoechtrager/apple-libtapi";
-    license = licenses.ncsa;
-    maintainers = with maintainers; [ matthewbauer ];
-  };
-})
diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/libtapi/disable-rpath.patch b/third_party/nixpkgs/pkgs/os-specific/darwin/libtapi/disable-rpath.patch
deleted file mode 100644
index 87c0cf3330..0000000000
--- a/third_party/nixpkgs/pkgs/os-specific/darwin/libtapi/disable-rpath.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/src/llvm/cmake/modules/AddLLVM.cmake b/src/llvm/cmake/modules/AddLLVM.cmake
-index a53016eb0..b65e608a4 100644
---- a/cmake/modules/AddLLVM.cmake
-+++ b/cmake/modules/AddLLVM.cmake
-@@ -1683,8 +1683,7 @@ function(llvm_setup_rpath name)
-   endif()
- 
-   if (APPLE)
--    set(_install_name_dir INSTALL_NAME_DIR "@rpath")
--    set(_install_rpath "@loader_path/../lib" ${extra_libdir})
-+    set(_install_name_dir)
-   elseif(UNIX)
-     set(_install_rpath "\$ORIGIN/../lib${LLVM_LIBDIR_SUFFIX}" ${extra_libdir})
-     if(${CMAKE_SYSTEM_NAME} MATCHES "(FreeBSD|DragonFly)")
diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/libtapi/native-clang-tblgen.patch b/third_party/nixpkgs/pkgs/os-specific/darwin/libtapi/native-clang-tblgen.patch
deleted file mode 100644
index 9b715766a1..0000000000
--- a/third_party/nixpkgs/pkgs/os-specific/darwin/libtapi/native-clang-tblgen.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diffprojects/libtapi/CMakeLists.txt b/src/llvm/projects/libtapi/CMakeLists.txt
-index 8ee6d8138..8277be147 100644
---- a/projects/libtapi/CMakeLists.txt
-+++ b/projects/libtapi/CMakeLists.txt
-@@ -193,7 +193,15 @@ if (NOT DEFINED CLANG_VERSION)
-   set(CLANG_VERSION "${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH}")
- endif ()
- if (NOT DEFINED CLANG_TABLEGEN_EXE)
--  set(CLANG_TABLEGEN_EXE "${LLVM_TOOLS_BINARY_DIR}/clang-tblgen")
-+  if(LLVM_USE_HOST_TOOLS)
-+    if (NOT CMAKE_CONFIGURATION_TYPES)
-+      set(CLANG_TABLEGEN_EXE "${LLVM_NATIVE_BUILD}/bin/clang-tblgen")
-+    else()
-+      set(CLANG_TABLEGEN_EXE "${LLVM_NATIVE_BUILD}/Release/bin/clang-tblgen")
-+    endif()
-+  else()
-+    set(CLANG_TABLEGEN_EXE "${LLVM_TOOLS_BINARY_DIR}/clang-tblgen")
-+  endif ()
- endif ()
- 
- # Include must go first.
diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/m-cli/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/m-cli/default.nix
index 9134fad601..41f112cf48 100644
--- a/third_party/nixpkgs/pkgs/os-specific/darwin/m-cli/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/darwin/shortcat/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/shortcat/default.nix
index 81086bec3a..59009fede2 100644
--- a/third_party/nixpkgs/pkgs/os-specific/darwin/shortcat/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/linux/amdctl/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/amdctl/default.nix
index f95d54e64b..3d07d6be1e 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/amdctl/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/linux/atop/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/atop/default.nix
index df6bc7c3d7..7e191f01fb 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/atop/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/atop/default.nix
@@ -14,11 +14,11 @@
 
 stdenv.mkDerivation rec {
   pname = "atop";
-  version = "2.10.0";
+  version = "2.11.0";
 
   src = fetchurl {
     url = "https://www.atoptool.nl/download/atop-${version}.tar.gz";
-    hash = "sha256-56ZzzyyCV4592C7LDeyD/Z7LMIKLJWHCip+lqvddX5M=";
+    hash = "sha256-m5TGZmAu//e/QC7M5wbDR/OMOctjSY+dOWJoYeVkbiA=";
   };
 
   nativeBuildInputs = lib.optionals withAtopgpu [
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/audit/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/audit/default.nix
index 00afda1c60..e3a6eaa694 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/audit/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/audit/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-v0ItQSard6kqTDrDneVHPyeNw941ck0lGKSMe+FdVNg=";
   };
 
-  patches = lib.optionals (!stdenv.hostPlatform.isGnu) [
+  patches = [
     (fetchpatch {
       name = "musl.patch";
       url = "https://github.com/linux-audit/audit-userspace/commit/64cb48e1e5137b8a389c7528e611617a98389bc7.patch";
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/broadcom-sta/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/broadcom-sta/default.nix
index bb482d34e7..e4bff61698 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/broadcom-sta/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/linux/catfs/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/catfs/default.nix
index 0530035ec3..52ade30af0 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/catfs/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/linux/cpustat/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/cpustat/default.nix
index 6364600795..fbf7c1f48f 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/cpustat/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/linux/dddvb/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/dddvb/default.nix
index 925edb6147..02c4b3a1a7 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/dddvb/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/linux/dmidecode/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/dmidecode/default.nix
index db1be06717..2425a053e3 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/dmidecode/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/linux/dracut/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/dracut/default.nix
index 39fc54d2a2..c915222b1d 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/dracut/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/linux/dstat/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/dstat/default.nix
index 7fbd314a8e..99a6b37e95 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/dstat/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/linux/ell/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/ell/default.nix
index 1a5e119ef4..6514937463 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/ell/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/ell/default.nix
@@ -9,14 +9,14 @@
 
 stdenv.mkDerivation rec {
   pname = "ell";
-  version = "0.65";
+  version = "0.67";
 
   outputs = [ "out" "dev" ];
 
   src = fetchgit {
     url = "https://git.kernel.org/pub/scm/libs/ell/ell.git";
     rev = version;
-    hash = "sha256-q0C9KfWHxdmrG7xcbb8zpFL4ro+BJb7BL2tyKdFIhew=";
+    hash = "sha256-PIxPhKqsxybkLQerkQ15kTRh0oW812lWbCGEig11KQk=";
   };
 
   nativeBuildInputs = [
@@ -32,6 +32,9 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  # Runs multiple dbus instances on the same port failing the bind.
+  enableParallelChecking = false;
+
   # tests sporadically fail on musl
   doCheck = !stdenv.hostPlatform.isMusl;
 
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ena/0001-workaround-patch-for-kernel-6.10.patch b/third_party/nixpkgs/pkgs/os-specific/linux/ena/0001-workaround-patch-for-kernel-6.10.patch
new file mode 100644
index 0000000000..ae684d9be2
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/linux/ena/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/ena/default.nix
index 9ce71745cd..4b0af28791 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/ena/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/linux/ena/override-features-api-detection.patch b/third_party/nixpkgs/pkgs/os-specific/linux/ena/override-features-api-detection.patch
deleted file mode 100644
index 099530b121..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/linux/esdm/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/esdm/default.nix
index 95fdd9648f..f49f25ece6 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/esdm/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/esdm/default.nix
@@ -59,13 +59,13 @@ assert cryptoBackend == "openssl" || cryptoBackend == "botan" || cryptoBackend =
 
 stdenv.mkDerivation rec {
   pname = "esdm";
-  version = "1.1.0";
+  version = "1.1.1";
 
   src = fetchFromGitHub {
     owner = "smuellerDD";
     repo = "esdm";
     rev = "v${version}";
-    sha256 = "sha256-UH6ws/hfHdcmbLETyZ0b4wDm8nHPdLsot3ZhIljpUlw=";
+    hash = "sha256-Z8cIjNI+Qi6O2e72vbEefbCCXyIA+lcEMDzWJReGrUs=";
   };
 
   nativeBuildInputs = [ meson pkg-config ninja ];
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ethq/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/ethq/default.nix
index 94f18cccd9..37d0767834 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/ethq/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/linux/evdi/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/evdi/default.nix
index be7b9f37e1..7a7a511237 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/evdi/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/linux/eventstat/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/eventstat/default.nix
index beb3cc6e97..e54135f3e7 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/eventstat/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/linux/fanctl/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/fanctl/default.nix
index e5ae081d5a..072ecda1e3 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/fanctl/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/fanctl/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-XmawybmqRJ9Lj6ii8TZBFwqdQZVp0pOLN4xiSLkU/bw=";
   };
 
-  cargoSha256 = "sha256-tj00DXQEqC/8+3uzTMWcph+1fNTTVZLSJbV/5lLFkFs=";
+  cargoHash = "sha256-tj00DXQEqC/8+3uzTMWcph+1fNTTVZLSJbV/5lLFkFs=";
 
   meta = with lib; {
     description = "Replacement for fancontrol with more fine-grained control interface in its config file";
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ffado/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/ffado/default.nix
index cc6ba5443c..2196a5730a 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/ffado/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/ffado/default.nix
@@ -1,13 +1,10 @@
 {
   lib,
   stdenv,
-  mkDerivation,
   argp-standalone,
   dbus,
   dbus_cplusplus,
-  desktop-file-utils,
   fetchurl,
-  fetchpatch,
   glibmm,
   libavc1394,
   libconfig,
@@ -18,20 +15,25 @@
   python311,
   scons,
   which,
-  wrapQtAppsHook,
+  withMixer ? false,
+  qt5,
 }:
 
 let
-  python = python311.withPackages (
-    pkgs: with pkgs; [
-      pyqt5
-      dbus-python
-    ]
-  );
+  python =
+    if withMixer then
+      python311.withPackages (
+        pkgs: with pkgs; [
+          pyqt5
+          dbus-python
+        ]
+      )
+    else
+      python311;
 in
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "ffado";
-  version = "2.4.8";
+  version = "2.4.9";
 
   outputs = [
     "out"
@@ -41,7 +43,7 @@ mkDerivation rec {
 
   src = fetchurl {
     url = "http://www.ffado.org/files/libffado-${version}.tgz";
-    hash = "sha256-0iFXYyGctOoHCdc232Ud80/wV81tiS7ItiS0uLKyq2Y=";
+    hash = "sha256-xELFL60Ryv1VE7tOhGyFHxAchIT4karFRe0ZDo/U0Q8=";
   };
 
   prePatch = ''
@@ -49,35 +51,27 @@ mkDerivation rec {
       --replace /lib/modules/ "/run/booted-system/kernel-modules/lib/modules/"
   '';
 
-  patches = [
-    # fix installing metainfo file
-    ./fix-build.patch
-
-    (fetchpatch {
-      name = "musl.patch";
-      url = "http://subversion.ffado.org/changeset?format=diff&new=2846&old=2845";
-      stripLen = 2;
-      hash = "sha256-iWeYnb5J69Uvo1lftc7MWg7WrLa+CGZyOwJPOe8/PKg=";
-    })
-  ];
-
-  nativeBuildInputs = [
-    desktop-file-utils
-    (scons.override { python3 = python311; })
-    pkg-config
-    which
-    python
-    python.pkgs.pyqt5
-    wrapQtAppsHook
-  ];
+  nativeBuildInputs =
+    [
+      (scons.override {
+        # SConstruct script depends on distutils removed in Python 3.12
+        python3Packages = python311.pkgs;
+      })
+      pkg-config
+      which
+    ]
+    ++ lib.optionals withMixer [
+      python
+      python.pkgs.pyqt5
+      qt5.wrapQtAppsHook
+    ];
 
   prefixKey = "PREFIX=";
   sconsFlags = [
     "DEBUG=False"
     "ENABLE_ALL=True"
     "BUILD_TESTS=True"
-    "WILL_DEAL_WITH_XDG_MYSELF=True"
-    "BUILD_MIXER=True"
+    "BUILD_MIXER=${if withMixer then "True" else "False"}"
     "UDEVDIR=${placeholder "out"}/lib/udev/rules.d"
     "PYPKGDIR=${placeholder "out"}/${python.sitePackages}"
     "BINDIR=${placeholder "bin"}/bin"
@@ -105,19 +99,12 @@ mkDerivation rec {
   dontWrapQtApps = true;
 
   postInstall = ''
-    desktop="$bin/share/applications/ffado-mixer.desktop"
-    install -DT -m 444 support/xdg/ffado.org-ffadomixer.desktop $desktop
-    substituteInPlace "$desktop" \
-      --replace Exec=ffado-mixer "Exec=$bin/bin/ffado-mixer" \
-      --replace hi64-apps-ffado ffado-mixer
-    install -DT -m 444 support/xdg/hi64-apps-ffado.png "$bin/share/icons/hicolor/64x64/apps/ffado-mixer.png"
-
     # prevent build tools from leaking into closure
     echo 'See `nix-store --query --tree ${placeholder "out"}`.' > $out/lib/libffado/static_info.txt
   '';
 
-  preFixup = ''
-    wrapQtApp $bin/bin/ffado-mixer
+  preFixup = lib.optionalString withMixer ''
+    wrapQtApp "$bin/bin/ffado-mixer"
   '';
 
   meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/fwupd-efi/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/fwupd-efi/default.nix
index 0faec11702..972f8a9764 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/fwupd-efi/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/linux/firmware/ipu6-camera-bins/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/ipu6-camera-bins/default.nix
index 31ac23df39..4c3bede4fb 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/ipu6-camera-bins/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/linux/firmware/ivsc-firmware/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/ivsc-firmware/default.nix
index 3ad52b3145..9674cea222 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/ivsc-firmware/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix
index 4ff7bf48b9..3f1a0ed04b 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/raspberrypi/armstubs.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/linux/gasket/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/gasket/default.nix
index e8df9acf8e..a25bbeee40 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/gasket/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/gasket/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "gasket";
-  version = "1.0-18-unstable-2023-09-05";
+  version = "1.0-18-unstable-2024-04-25";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "gasket-driver";
-    rev = "09385d485812088e04a98a6e1227bf92663e0b59";
-    sha256 = "fcnqCBh04e+w8g079JyuyY2RPu34M+/X+Q8ObE+42i4=";
+    rev = "5815ee3908a46a415aac616ac7b9aedcb98a504c";
+    sha256 = "O17+msok1fY5tdX1DvqYVw6plkUDF25i8sqwd6mxYf8=";
   };
 
   makeFlags = kernel.makeFlags ++ [
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/gt/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/gt/default.nix
index e5a6967579..964566b57d 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/gt/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/linux/hostapd/0007-RADIUS-Require-Message-Authenticator-attribute-in-MA.patch b/third_party/nixpkgs/pkgs/os-specific/linux/hostapd/0007-RADIUS-Require-Message-Authenticator-attribute-in-MA.patch
deleted file mode 100644
index e895e47925..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/linux/hostapd/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/hostapd/default.nix
index 5988dc0436..10abb04f77 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/hostapd/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/linux/hwdata/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/hwdata/default.nix
index 484e63bb35..81cf885dca 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/hwdata/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/hwdata/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "hwdata";
-  version = "0.383";
+  version = "0.384";
 
   src = fetchFromGitHub {
     owner = "vcrhonek";
     repo = "hwdata";
     rev = "v${version}";
-    hash = "sha256-jYD1/sl9ffe+lmrICLe32NU1u0Hi7ZfZrD4zWH+bxsk=";
+    hash = "sha256-FuqjvJ0Jtz4hl7fBPXAkz8fGRXkHN8mnZZ3owdzfrnE=";
   };
 
   configureFlags = [ "--datadir=${placeholder "out"}/share" ];
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/i810switch/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/i810switch/default.nix
index a5e24b1eb2..68ce1add6a 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/i810switch/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/linux/iproute/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/iproute/default.nix
index 15b8987b8c..d14b6210f2 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/iproute/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/iproute/default.nix
@@ -1,16 +1,16 @@
 { lib, stdenv, fetchurl
 , buildPackages, bison, flex, pkg-config
-, db, iptables, elfutils, libmnl
+, db, iptables, elfutils, libmnl ,libbpf
 , gitUpdater
 }:
 
 stdenv.mkDerivation rec {
   pname = "iproute2";
-  version = "6.9.0";
+  version = "6.10.0";
 
   src = fetchurl {
     url = "mirror://kernel/linux/utils/net/${pname}/${pname}-${version}.tar.xz";
-    hash = "sha256-L2Q9CeoRpKKgQ8kuK0abX3MijL8kGugGdgKW7Q7EE9A=";
+    hash = "sha256-kaYvgnN7RJBaAPqAM2nER9VJ6RTpoqQBj911sdVOjc4=";
   };
 
   postPatch = ''
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
 
   depsBuildBuild = [ buildPackages.stdenv.cc ]; # netem requires $HOSTCC
   nativeBuildInputs = [ bison flex pkg-config ];
-  buildInputs = [ db iptables libmnl ]
+  buildInputs = [ db iptables libmnl libbpf ]
     # needed to uploaded bpf programs
     ++ lib.optionals (!stdenv.hostPlatform.isStatic) [ elfutils ];
 
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ipu6-drivers/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/ipu6-drivers/default.nix
index cb1cf06b53..304f27dfb4 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/ipu6-drivers/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/linux/ivsc-driver/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/ivsc-driver/default.nix
index 1308ff5f37..74ad354a98 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/ivsc-driver/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/linux/iwd/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/iwd/default.nix
index 5c1d153b83..f19c73f7bf 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/iwd/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/iwd/default.nix
@@ -13,12 +13,12 @@
 
 stdenv.mkDerivation rec {
   pname = "iwd";
-  version = "2.17";
+  version = "2.19";
 
   src = fetchgit {
     url = "https://git.kernel.org/pub/scm/network/wireless/iwd.git";
     rev = version;
-    hash = "sha256-o/Q8vUtB4Yiz1x+/6+8LUKUQNtiAmwcdh++/tTUN4mM=";
+    hash = "sha256-LIzcV8OvtHItMpgFVHDQhUisD3kaMPMESd3cgOaIu/8=";
   };
 
   outputs = [ "out" "man" "doc" ]
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix
index af4158fc57..bbfb317d67 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix
@@ -511,6 +511,7 @@ let
       # Support configuring jack functions via fw mechanism at boot
       SND_HDA_PATCH_LOADER = yes;
       SND_HDA_CODEC_CA0132_DSP = whenOlder "5.7" yes; # Enable DSP firmware loading on Creative Soundblaster Z/Zx/ZxR/Recon
+      SND_HDA_CODEC_CS8409 = whenAtLeast "6.6" module; # Cirrus Logic HDA Bridge CS8409
       SND_OSSEMUL         = yes;
       SND_USB_CAIAQ_INPUT = yes;
       SND_USB_AUDIO_MIDI_V2 = whenAtLeast "6.5" yes;
@@ -1028,12 +1029,15 @@ let
       SERIAL_DEV_CTRL_TTYPORT = yes; # enables support for TTY serial devices
 
       BT_HCIBTUSB_MTK = whenAtLeast "5.3" yes; # MediaTek protocol support
-      BT_HCIUART_QCA = yes; # Qualcomm Atheros protocol support
+
+      BT_HCIUART        = module; # required for BT devices with serial port interface (QCA6390)
+      BT_HCIUART_BCM    = option yes; # Broadcom Bluetooth support
+      BT_HCIUART_BCSP   = option yes; # CSR BlueCore support
+      BT_HCIUART_H4     = option yes; # UART (H4) protocol support
+      BT_HCIUART_LL     = option yes; # Texas Instruments BRF
+      BT_HCIUART_QCA    = yes; # Qualcomm Atheros support
       BT_HCIUART_SERDEV = yes; # required by BT_HCIUART_QCA
-      BT_HCIUART = module; # required for BT devices with serial port interface (QCA6390)
-      BT_HCIUART_BCSP = option yes;
-      BT_HCIUART_H4   = option yes; # UART (H4) protocol support
-      BT_HCIUART_LL   = option yes;
+
       BT_RFCOMM_TTY   = option yes; # RFCOMM TTY support
       BT_QCA = module; # enables QCA6390 bluetooth
 
@@ -1048,6 +1052,12 @@ let
       EFI_STUB            = yes; # EFI bootloader in the bzImage itself
       EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER =
           whenOlder "6.2" (whenAtLeast "5.8" yes); # initrd kernel parameter for EFI
+
+      # Generic compression support for EFI payloads
+      # Add new platforms only after they have been verified to build and boot.
+      # This is unsupported on x86 due to a custom decompression mechanism.
+      EFI_ZBOOT = mkIf stdenv.hostPlatform.isAarch64 (whenAtLeast "6.1" yes);
+
       CGROUPS             = yes; # used by systemd
       FHANDLE             = yes; # used by systemd
       SECCOMP             = yes; # used by systemd >= 231
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/kernels-org.json b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/kernels-org.json
index bc585f07c0..3ed0e9a75e 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -1,42 +1,42 @@
 {
     "testing": {
-        "version": "6.10-rc7",
-        "hash": "sha256:0i29ga9lzqd4zcsbr4bbb122i8nyfhcalihnq3bgsg04dwb36s19"
+        "version": "6.11-rc1",
+        "hash": "sha256:0c9an2xlils8lk9yx883jb3li6ylj4k1jpbqp5k0z71xifa5fxb1"
     },
     "6.1": {
-        "version": "6.1.101",
-        "hash": "sha256:0k5kjb2n78dcfpqqj8n76fxqbmifs2gqd2z1g9had7s2d2m9yigi"
+        "version": "6.1.102",
+        "hash": "sha256:1v4p4i8pfg4i6v90dr7m65npkxjnqv3fxcj8zs3pbb8y84xzk98v"
     },
     "5.15": {
-        "version": "5.15.163",
-        "hash": "sha256:00mkipkhz0i5xld7kyaxcj8cj8faw4gmjl5fribg832nn7ccfpq2"
+        "version": "5.15.164",
+        "hash": "sha256:11linb9jzarr8wz0vim3g9gkhi5ldqm82bkpl5xs9f34xpx9hq7c"
     },
     "5.10": {
-        "version": "5.10.222",
-        "hash": "sha256:1jshn64g165rdshyjvq38ni6pkbskp50048pbz407fss7f00cbbv"
+        "version": "5.10.223",
+        "hash": "sha256:189b3yl4lsjzh6qpza0phj8hgsvnyh38cgrd70rnqw3rddmdh2fa"
     },
     "5.4": {
-        "version": "5.4.280",
-        "hash": "sha256:0hix0dywf2ybvzxkijjsjmkrj7sx61hwq6mg1wqsq317p1zccxm9"
+        "version": "5.4.281",
+        "hash": "sha256:1ckja83km101h2dwlp86xrnnlzdzvjly48iywhy53xric3kw7824"
     },
     "4.19": {
-        "version": "4.19.318",
-        "hash": "sha256:14vl0288apl76rvxa9yxfggrc4600bjsn4gw097m4gy5ldiaapqd"
+        "version": "4.19.319",
+        "hash": "sha256:0c7bhb31hpbbw1is1ykppk9lm0x025yyd4hrmlg1s6yg75rxqkal"
     },
     "6.6": {
-        "version": "6.6.42",
-        "hash": "sha256:10z6fjvpiv3l11rpsd6fgi7dr6a3d38c6zlp8ihffx6pjz1ch0c8"
+        "version": "6.6.43",
+        "hash": "sha256:0pha226h5011kl5r2iiddxi0rib3xraslmcdjjnil2kq38d3pn0a"
     },
     "6.8": {
         "version": "6.8.12",
         "hash": "sha256:0fb0m0fv4521g63gq04d7lm6hy8169s1rykiav5bkd99s9b1kcqr"
     },
     "6.9": {
-        "version": "6.9.11",
-        "hash": "sha256:1q8kyn9cxc1ykf3cvifmfqk2p2p4x53l7h704hh92gichgh89pyy"
+        "version": "6.9.12",
+        "hash": "sha256:08ngskni7d9wi93vlwcmbdg7sb2jl1drhhzn62k9nsrg1r7crrss"
     },
     "6.10": {
-        "version": "6.10.1",
-        "hash": "sha256:0szpkhrwfqwj068vz032daf3zycv5c93gjxiisjziifi3kyrs43h"
+        "version": "6.10.2",
+        "hash": "sha256:0w4vsb0c8bp34j90l89qms50nx6r6mmyf23jbvyar9fbv46m5n3k"
     }
 }
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix
index 127d7e6635..070a5714ee 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix
@@ -6,7 +6,7 @@
 , ... } @ args:
 
 let
-  version = "5.15.160-rt77"; # updated by ./update-rt.sh
+  version = "5.15.163-rt78"; # 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/v5.x/linux-${kversion}.tar.xz";
-    sha256 = "018v19a7rhzc4szybzzn86jlnk42x7jm6xkadfd2d3xq6f7727pl";
+    sha256 = "00mkipkhz0i5xld7kyaxcj8cj8faw4gmjl5fribg832nn7ccfpq2";
   };
 
   kernelPatches = let rt-patch = {
     name = "rt";
     patch = fetchurl {
       url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
-      sha256 = "0id4m1k1xq84bxgnchm8r2iwfqw6nacv5n1ksgyzj6q6v66ik3wk";
+      sha256 = "030aycnrcnjhylkqj0wrfi992v2l26v17rgvxl16514zpdjmiv1x";
     };
   }; in [ rt-patch ] ++ kernelPatches;
 
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix
index ac18aa2634..00cda68dc4 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-6.6.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-6.6.nix
index 710e7d9562..3fce66f247 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-6.6.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/linux/kernel/manual-config.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/manual-config.nix
index 5f20d14137..9c30f1fd70 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/manual-config.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/manual-config.nix
@@ -121,7 +121,6 @@ let
         pahole
         perl
         elfutils
-        hexdump
         # module makefiles often run uname commands to find out the kernel version
         (buildPackages.deterministic-uname.override { inherit modDirVersion; })
       ]
@@ -158,6 +157,7 @@ let
         zstd
         python3Minimal
         kmod
+        hexdump
       ] ++ optional  needsUbootTools ubootTools
         ++ optionals (lib.versionAtLeast version "5.2")  [ cpio pahole zlib ]
         ++ optionals withRust [ rustc rust-bindgen ];
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/update-mainline.py b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/update-mainline.py
index bf5001ee37..320d5065fe 100755
--- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/update-mainline.py
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/update-mainline.py
@@ -1,5 +1,7 @@
 #!/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
 import pathlib
@@ -11,7 +13,7 @@ from enum import Enum
 
 from bs4 import BeautifulSoup, NavigableString, Tag
 from packaging.version import parse as parse_version, Version
-from typing import List
+
 
 HERE = pathlib.Path(__file__).parent
 ROOT = HERE.parent.parent.parent.parent
@@ -28,17 +30,30 @@ 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 = columns[1].get_text().rstrip(" [EOL]")
@@ -51,7 +66,6 @@ def parse_release(release: Tag) -> KernelRelease | None:
 
     return KernelRelease(
         nature=nature,
-        branch=get_branch(version),
         version=version,
         date=date,
         link=link,
@@ -59,15 +73,6 @@ def parse_release(release: Tag) -> KernelRelease | None:
     )
 
 
-def get_branch(version: str):
-    # This is a testing kernel.
-    if "rc" in version:
-        return "testing"
-    else:
-        major, minor, *_ = version.split(".")
-        return f"{major}.{minor}"
-
-
 def get_hash(kernel: KernelRelease):
     if kernel.branch == "testing":
         args = ["--unpack"]
@@ -108,13 +113,16 @@ 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 kernel in parsed_releases:
-        branch = get_branch(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 = all_kernels.get(branch, {}).get("version")
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/zen-kernels.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/zen-kernels.nix
index 698e25a698..ae16c3bd7d 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/zen-kernels.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/zen-kernels.nix
@@ -4,16 +4,16 @@ let
   # comments with variant added for update script
   # ./update-zen.py zen
   zenVariant = {
-    version = "6.9.8"; #zen
+    version = "6.10.1"; #zen
     suffix = "zen1"; #zen
-    sha256 = "1ixrdx2a6jp1x8kryjmxnrgl0fsrjg6fngg5c48vbl2574nizlbz"; #zen
+    sha256 = "0lr9qjz4hlvx3yc0lj65fnmbciyh6symycbi9ass761l1niswbk5"; #zen
     isLqx = false;
   };
   # ./update-zen.py lqx
   lqxVariant = {
-    version = "6.9.8"; #lqx
+    version = "6.9.11"; #lqx
     suffix = "lqx1"; #lqx
-    sha256 = "1r5ld2xibr0qkwi1yy7h746sclsmd8cq68z0zdpbbn2qrgyx302k"; #lqx
+    sha256 = "0i6i0ak10gswlk60pnkn5dlz74g4nd7n1xbnvf24nnwwp69kkd44"; #lqx
     isLqx = true;
   };
   zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // {
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kmod/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kmod/default.nix
index 3f971e7a6e..1ea3a90005 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/kmod/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/kmod/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchzip, autoconf, automake, docbook_xml_dtd_42
+{ stdenv, lib, fetchzip, fetchpatch, autoconf, automake, docbook_xml_dtd_42
 , docbook_xml_dtd_43, docbook_xsl, gtk-doc, libtool, pkg-config
 , libxslt, xz, zstd, elf-header
 , withDevdoc ? stdenv.hostPlatform == stdenv.buildPlatform
@@ -48,8 +48,14 @@ in stdenv.mkDerivation rec {
     (lib.enableFeature withDevdoc "gtk-doc")
   ] ++ lib.optional withStatic "--enable-static";
 
-  patches = [ ./module-dir.patch ]
-    ++ lib.optional withStatic ./enable-static.patch;
+  patches = [
+    ./module-dir.patch
+    (fetchpatch {
+      name = "musl.patch";
+      url = "https://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git/patch/?id=11eb9bc67c319900ab00523997323a97d2d08ad2";
+      hash = "sha256-CYG615elMWces6QGQRg2H/NL7W4XsG9Zvz5H+xsdFFo=";
+    })
+  ] ++ lib.optional withStatic ./enable-static.patch;
 
   postInstall = ''
     for prog in rmmod insmod lsmod modinfo modprobe depmod; do
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/latencytop/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/latencytop/default.nix
index 43d1fddde9..bee5fa9f28 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/latencytop/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/latencytop/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     description = "Tool to show kernel reports on latencies (LATENCYTOP option)";
     mainProgram = "latencytop";
     license = lib.licenses.gpl2Only;
-    maintainers = [ lib.maintainers.viric ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
   };
 }
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/libaio/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/libaio/default.nix
index d2cccef37b..4986f0abf4 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/libaio/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/linux/libbpf/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/libbpf/default.nix
index 032283711c..1875848889 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/libbpf/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/libbpf/default.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libbpf";
-  version = "1.4.3";
+  version = "1.4.5";
 
   src = fetchFromGitHub {
     owner = "libbpf";
     repo = "libbpf";
     rev = "v${version}";
-    sha256 = "sha256-lcIOgghlBKrDCBDdO0hryjt8KADQd6aroQMun3ein2o=";
+    hash = "sha256-GQbx3LaGrFTwEtUsP7V/Y1Keoa4dSmDxhmSTsML+tVk=";
   };
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/libcap/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/libcap/default.nix
index 3fb3003d77..fdeae8dc65 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/libcap/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/libcap/default.nix
@@ -19,11 +19,11 @@ assert usePam -> pam != null;
 
 stdenv.mkDerivation rec {
   pname = "libcap";
-  version = "2.69";
+  version = "2.70";
 
   src = fetchurl {
     url = "mirror://kernel/linux/libs/security/linux-privs/libcap2/${pname}-${version}.tar.xz";
-    sha256 = "sha256-8xH489rYRpnQVm0db37JQ6kpiyj3FMrjyTHf1XSS1+s=";
+    sha256 = "sha256-I6bviq2vHj6HX2M7stEWz++JUtunvHxWmxNFjhlSsw8=";
   };
 
   outputs = [ "out" "dev" "lib" "man" "doc" ]
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/libsepol/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/libsepol/default.nix
index 9c7f1abb3a..c1224a9dd5 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/libsepol/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/libsepol/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   pname = "libsepol";
-  version = "3.6";
+  version = "3.7";
   se_url = "https://github.com/SELinuxProject/selinux/releases/download";
 
   outputs = [ "bin" "out" "dev" "man" ];
 
   src = fetchurl {
     url = "${se_url}/${version}/libsepol-${version}.tar.gz";
-    sha256 = "sha256-ydxYXqlJA9eE1ZfIYc1dzmRZFo+V4isxoOqxzdgAl1o=";
+    sha256 = "sha256-zXQeJSROfvbNk01jNhQTGiZsPq6rM9i/pF6Kk7RcyQE=";
   };
 
   postPatch = lib.optionalString stdenv.hostPlatform.isStatic ''
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/libsmbios/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/libsmbios/default.nix
index 9f0bfacf07..cf01f43ca7 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/libsmbios/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/linux/mbpfan/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/mbpfan/default.nix
index 4992fdbf1d..0178e3e751 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/mbpfan/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/linux/microcode/intel.nix b/third_party/nixpkgs/pkgs/os-specific/linux/microcode/intel.nix
index 6e133564e2..eea619f783 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/microcode/intel.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/linux/miraclecast/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/miraclecast/default.nix
index 0b03aeb3c2..f781366e19 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/miraclecast/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/linux/netatop/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/netatop/default.nix
index b1a9d244a8..91b525af0c 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/netatop/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/netatop/default.nix
@@ -51,6 +51,6 @@ stdenv.mkDerivation {
     homepage = "https://www.atoptool.nl/downloadnetatop.php";
     license = lib.licenses.gpl2Only;
     platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ viric ];
+    maintainers = [ ];
   };
 }
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/nixos-rebuild/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/nixos-rebuild/default.nix
index 63f8c92e23..12c5856edb 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/nixos-rebuild/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/nixos-rebuild/default.nix
@@ -10,6 +10,8 @@
 , lib
 , nixosTests
 , installShellFiles
+, binlore
+, nixos-rebuild
 }:
 let
   fallback = import ./../../../../nixos/modules/installer/tools/nix-fallback-paths.nix;
@@ -49,6 +51,13 @@ substitute {
     target-host = nixosTests.nixos-rebuild-target-host;
   };
 
+  # nixos-rebuild can’t execute its arguments
+  # (but it can run ssh with the with the options stored in $NIX_SSHOPTS,
+  # and ssh can execute its arguments...)
+  passthru.binlore.out = binlore.synthesize nixos-rebuild ''
+    execer cannot bin/nixos-rebuild
+  '';
+
   meta = {
     description = "Rebuild your NixOS configuration and switch to it, on local hosts and remote";
     homepage = "https://github.com/NixOS/nixpkgs/tree/master/pkgs/os-specific/linux/nixos-rebuild";
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/numad/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/numad/default.nix
index 0a52222ceb..99c34a7f2f 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/numad/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/builder.sh b/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/builder.sh
index dea9ab721a..06303d0337 100755
--- a/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/builder.sh
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix
index 568027999e..612fa58740 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/generic.nix b/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/generic.nix
index 3f6c5d1caa..5907c6e81e 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/generic.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/settings.nix b/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/settings.nix
index a26acd1441..df05a859b4 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/settings.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/settings.nix
@@ -9,6 +9,7 @@ nvidia_x11: sha256:
 , jansson
 , gtk2
 , dbus
+, vulkan-headers
 , gtk3
 , libXv
 , libXrandr
@@ -17,7 +18,7 @@ nvidia_x11: sha256:
 , libvdpau
 , librsvg
 , wrapGAppsHook3
-, addOpenGLRunpath
+, addDriverRunpath
 , withGtk2 ? false
 , withGtk3 ? true
 }:
@@ -114,10 +115,10 @@ stdenv.mkDerivation {
     fi
   '';
 
-  nativeBuildInputs = [ pkg-config m4 addOpenGLRunpath ]
+  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 ];
 
@@ -145,7 +146,7 @@ stdenv.mkDerivation {
     patchelf --set-rpath "$(patchelf --print-rpath $out/bin/$binaryName):$out/lib:${libXv}/lib" \
       $out/bin/$binaryName
 
-    addOpenGLRunpath $out/bin/$binaryName
+    addDriverRunpath $out/bin/$binaryName
   '';
 
   passthru = {
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/otpw/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/otpw/default.nix
index 12920c0c34..337e422eeb 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/otpw/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/linux/oxtools/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/oxtools/default.nix
index fcb5d17dee..f0a2e1b374 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/oxtools/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/oxtools/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "0xtools";
-  version = "2.0.2";
+  version = "2.0.3";
 
   src = fetchFromGitHub {
     owner = "tanelpoder";
     repo = "0xtools";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-S2jGF6wyjE9okbren/+p37zDr+eHUE8gJe/sbsXX4f4=";
+    hash = "sha256-QWH3sKYFiEWuexZkMlyWQPHmKJpcaiWI5szhdx5yKtM=";
   };
 
   postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/pflask/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/pflask/default.nix
index 0394a3311b..53ed1e5a34 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/pflask/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/linux/pipework/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/pipework/default.nix
index 56d192ad30..fa3698b362 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/pipework/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/linux/procps-ng/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/procps-ng/default.nix
index 70df91d31e..da2c809341 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/procps-ng/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/procps-ng/default.nix
@@ -15,6 +15,9 @@
   # exception is ‘watch’ which is portable enough to run on pretty much
   # any UNIX-compatible system.
 , watchOnly ? !(stdenv.isLinux || stdenv.isCygwin)
+
+, binlore
+, procps
 }:
 
 stdenv.mkDerivation rec {
@@ -61,6 +64,12 @@ stdenv.mkDerivation rec {
     install -m 0644 -D watch.1 $out/share/man/man1/watch.1
   '';
 
+  # no obvious exec in documented arguments; haven't trawled source
+  # to figure out what exec binlore hits on
+  passthru.binlore.out = binlore.synthesize procps ''
+    execer cannot bin/{ps,top,free}
+  '';
+
   meta = with lib; {
     homepage = "https://gitlab.com/procps-ng/procps";
     description = "Utilities that give information about processes using the /proc filesystem";
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/psftools/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/psftools/default.nix
index 5d8c39bb14..8ece64950c 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/psftools/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/psftools/default.nix
@@ -1,10 +1,10 @@
 { lib, stdenv, fetchurl }:
 stdenv.mkDerivation rec {
   pname = "psftools";
-  version = "1.1.1";
+  version = "1.1.2";
   src = fetchurl {
     url = "https://www.seasip.info/Unix/PSF/${pname}-${version}.tar.gz";
-    sha256 = "sha256-MecY4JsIXTgHdkrFkQ+C3fC6OEFRUgjUgf7qxfKeZtM=";
+    sha256 = "sha256-d/XlKPqYy9x8KNT+8G6zv9ST/uU53Tg4pYrlA17Jh94=";
   };
   outputs = ["out" "man" "dev" "lib"];
 
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/r8168/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/r8168/default.nix
index 274fcd06ff..9806ddebb8 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/r8168/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/linux/restool/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/restool/default.nix
index 7f7c094007..98e4a9c325 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/restool/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/linux/shadow/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/shadow/default.nix
index 8329e9e8f9..98cb0c061e 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/shadow/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/shadow/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, fetchpatch
+{ lib, stdenv, fetchFromGitHub
 , runtimeShell, nixosTests
 , autoreconfHook, bison, flex
 , docbook_xml_dtd_45, docbook_xsl
@@ -17,13 +17,13 @@ in
 
 stdenv.mkDerivation rec {
   pname = "shadow";
-  version = "4.14.6";
+  version = "4.16.0";
 
   src = fetchFromGitHub {
     owner = "shadow-maint";
     repo = pname;
     rev = version;
-    hash = "sha256-+klU1a0cSgHPwZkDnbCSjKnBUKIm2Z3OGUvR/zrqQxo=";
+    hash = "sha256-GAwwpyIN5qWSIapjGFfOxPbOx5G6//fEbTpPmkXh6uA=";
   };
 
   outputs = [ "out" "su" "dev" "man" ];
@@ -47,13 +47,6 @@ stdenv.mkDerivation rec {
     ./respect-xml-catalog-files-var.patch
     ./runtime-shell.patch
     ./fix-install-with-tcb.patch
-    # Fix build against `clang-16` and upcoming `gcc-14`:
-    #   https://github.com/shadow-maint/shadow/pull/857
-    (fetchpatch {
-      name = "fix-implicit-getdef_bool.patch";
-      url = "https://github.com/shadow-maint/shadow/commit/5abe0811b880208600f646356549b7e5cad89060.patch";
-      hash = "sha256-XqvVv8mYY58uXJBKRwncHQRSI45PUkp3dQNn44gzezU=";
-    })
   ];
 
   # The nix daemon often forbids even creating set[ug]id files.
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/swapview/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/swapview/default.nix
index 2cfc8e57c0..520b2ba475 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/swapview/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/swapview/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0339biydk997j5r72vzp7djwkscsz89xr3936nshv23fmxjh2rzj";
   };
 
-  cargoSha256 = "03yi6bsjjnl8hznxr1nrnxx5lrqb574625j2lkxqbl9vrg9mswdz";
+  cargoHash = "sha256-v3Fd08s70YX7pEIWYcgpC2daerfZhtzth4haKfUy0Q8=";
 
   meta = with lib; {
     description = "Simple program to view processes' swap usage on Linux";
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/system76-power/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/system76-power/default.nix
index 0dba9894d2..850fac9f6c 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/system76-power/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/system76-power/default.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ dbus libusb1 ];
 
-  cargoSha256 = "sha256-Vps02ZRVmeOQ8jDFZJYAUb502MhqY+2YV2W1/9XGY+0=";
+  cargoHash = "sha256-Vps02ZRVmeOQ8jDFZJYAUb502MhqY+2YV2W1/9XGY+0=";
 
   postInstall = ''
     install -D -m 0644 data/com.system76.PowerDaemon.conf $out/etc/dbus-1/system.d/com.system76.PowerDaemon.conf
@@ -28,6 +28,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/pop-os/system76-power";
     license = licenses.gpl3Plus;
     platforms = [ "i686-linux" "x86_64-linux" ];
-    maintainers = [];
+    maintainers = [ ];
   };
 }
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/system76-scheduler/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/system76-scheduler/default.nix
index 0608fd1c10..9378c59ee0 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/system76-scheduler/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/system76-scheduler/default.nix
@@ -17,7 +17,7 @@ in rustPlatform.buildRustPackage {
     rev = version;
     hash = "sha256-o4noaLBXHDe7pMBHfQ85uzKJzwbBE5mkWq8h9l6iIZs=";
   };
-  cargoSha256 = "sha256-hpFDAhOzm4v3lBWwAl/10pS5xvKCScdKsp5wpCeQ+FE=";
+  cargoHash = "sha256-hpFDAhOzm4v3lBWwAl/10pS5xvKCScdKsp5wpCeQ+FE=";
 
   nativeBuildInputs = [ pkg-config rustPlatform.bindgenHook ];
   buildInputs = [ dbus pipewire ];
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch
index b08026278e..9dd9344a83 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch
@@ -13,17 +13,17 @@ unit.  (However, this ignores the fsck unit, so it's not perfect...)
  1 file changed, 4 deletions(-)
 
 diff --git a/rules.d/99-systemd.rules.in b/rules.d/99-systemd.rules.in
-index 0d68f31d36..6b52f7ed4b 100644
+index ad0c7e2fb5..79f3086e78 100644
 --- a/rules.d/99-systemd.rules.in
 +++ b/rules.d/99-systemd.rules.in
-@@ -22,10 +22,6 @@ SUBSYSTEM=="block", TAG+="systemd"
- SUBSYSTEM=="block", ENV{DM_SUSPENDED}=="1", IMPORT{db}="SYSTEMD_READY", GOTO="systemd_end"
- SUBSYSTEM=="block", ACTION=="add", ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}=="1", ENV{SYSTEMD_READY}="0"
+@@ -26,10 +26,6 @@ SUBSYSTEM=="block", ACTION=="add", KERNEL=="dm-*", ENV{DM_NAME}!="?*", ENV{SYSTE
+ # Import previous SYSTEMD_READY state.
+ SUBSYSTEM=="block", ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}=="1", ENV{SYSTEMD_READY}=="", IMPORT{db}="SYSTEMD_READY"
  
 -# Ignore encrypted devices with no identified superblock on it, since
 -# we are probably still calling mke2fs or mkswap on it.
 -SUBSYSTEM=="block", ENV{DM_UUID}=="CRYPT-*", ENV{ID_PART_TABLE_TYPE}=="", ENV{ID_FS_USAGE}=="", ENV{SYSTEMD_READY}="0"
 -
- # Explicitly set SYSTEMD_READY=1 for DM devices that don't have it set yet, so that we always have something to import above
- SUBSYSTEM=="block", ENV{DM_UUID}=="?*", ENV{SYSTEMD_READY}=="", ENV{SYSTEMD_READY}="1"
- 
+ # add symlink to GPT root disk
+ SUBSYSTEM=="block", ENV{ID_PART_GPT_AUTO_ROOT}=="1", ENV{ID_FS_TYPE}!="crypto_LUKS", SYMLINK+="gpt-auto-root"
+ SUBSYSTEM=="block", ENV{ID_PART_GPT_AUTO_ROOT}=="1", ENV{ID_FS_TYPE}=="crypto_LUKS", SYMLINK+="gpt-auto-root-luks"
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch
index 8507bb583c..6adbe5d6f6 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch
@@ -14,7 +14,7 @@ Original-Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
  2 files changed, 6 insertions(+), 2 deletions(-)
 
 diff --git a/src/shared/fstab-util.c b/src/shared/fstab-util.c
-index 55e76b6e16..015a608035 100644
+index eac5bb8d3b..d8187bfa99 100644
 --- a/src/shared/fstab-util.c
 +++ b/src/shared/fstab-util.c
 @@ -66,6 +66,8 @@ bool fstab_is_extrinsic(const char *mount, const char *opts) {
@@ -27,7 +27,7 @@ index 55e76b6e16..015a608035 100644
                          "/etc"))
                  return true;
 diff --git a/src/shutdown/umount.c b/src/shutdown/umount.c
-index 1a9b99d761..04ef9af1ea 100644
+index ca6d36e054..0a9227c9a8 100644
 --- a/src/shutdown/umount.c
 +++ b/src/shutdown/umount.c
 @@ -170,8 +170,10 @@ int mount_points_list_get(const char *mountinfo, MountPoint **head) {
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch
index 535ca3d864..68bb9914e4 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch
@@ -10,10 +10,10 @@ container, so checking early whether it exists will fail.
  1 file changed, 2 insertions(+)
 
 diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
-index 38196ef3d6..57d1750b00 100644
+index 4fee8a693c..756ce11b1f 100644
 --- a/src/nspawn/nspawn.c
 +++ b/src/nspawn/nspawn.c
-@@ -5602,6 +5602,7 @@ static int run(int argc, char *argv[]) {
+@@ -6028,6 +6028,7 @@ static int run(int argc, char *argv[]) {
                                  goto finish;
                          }
                  } else {
@@ -21,7 +21,7 @@ index 38196ef3d6..57d1750b00 100644
                          _cleanup_free_ char *p = NULL;
  
                          if (arg_pivot_root_new)
-@@ -5618,6 +5619,7 @@ static int run(int argc, char *argv[]) {
+@@ -6044,6 +6045,7 @@ static int run(int argc, char *argv[]) {
                                                      "Directory %s doesn't look like it has an OS tree (/usr/ directory is missing). Refusing.", arg_directory);
                                  goto finish;
                          }
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0004-Add-some-NixOS-specific-unit-directories.patch b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0004-Add-some-NixOS-specific-unit-directories.patch
index d2232765f7..46623e87e8 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0004-Add-some-NixOS-specific-unit-directories.patch
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0004-Add-some-NixOS-specific-unit-directories.patch
@@ -16,10 +16,10 @@ Original-Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
  2 files changed, 6 insertions(+), 20 deletions(-)
 
 diff --git a/src/basic/path-lookup.c b/src/basic/path-lookup.c
-index 4e3d59fc56..0d18b9a2d0 100644
+index 540256b73b..a115ec09a3 100644
 --- a/src/basic/path-lookup.c
 +++ b/src/basic/path-lookup.c
-@@ -92,11 +92,7 @@ int xdg_user_data_dir(char **ret, const char *suffix) {
+@@ -123,11 +123,7 @@ int runtime_directory(char **ret, RuntimeScope scope, const char *suffix) {
  }
  
  static const char* const user_data_unit_paths[] = {
@@ -31,7 +31,7 @@ index 4e3d59fc56..0d18b9a2d0 100644
          NULL
  };
  
-@@ -613,16 +609,13 @@ int lookup_paths_init(
+@@ -634,16 +630,13 @@ int lookup_paths_init(
                                          persistent_config,
                                          SYSTEM_CONFIG_UNIT_DIR,
                                          "/etc/systemd/system",
@@ -49,7 +49,7 @@ index 4e3d59fc56..0d18b9a2d0 100644
                                          STRV_IFNOTNULL(generator_late));
                          break;
  
-@@ -638,14 +631,11 @@ int lookup_paths_init(
+@@ -659,14 +652,11 @@ int lookup_paths_init(
                                          persistent_config,
                                          USER_CONFIG_UNIT_DIR,
                                          "/etc/systemd/user",
@@ -65,7 +65,7 @@ index 4e3d59fc56..0d18b9a2d0 100644
                                          STRV_IFNOTNULL(generator_late));
                          break;
  
-@@ -805,7 +795,6 @@ char **generator_binary_paths(RuntimeScope scope) {
+@@ -825,7 +815,6 @@ char **generator_binary_paths(RuntimeScope scope) {
                  case RUNTIME_SCOPE_SYSTEM:
                          add = strv_new("/run/systemd/system-generators",
                                         "/etc/systemd/system-generators",
@@ -73,7 +73,7 @@ index 4e3d59fc56..0d18b9a2d0 100644
                                         SYSTEM_GENERATOR_DIR);
                          break;
  
-@@ -813,7 +802,6 @@ char **generator_binary_paths(RuntimeScope scope) {
+@@ -833,7 +822,6 @@ char **generator_binary_paths(RuntimeScope scope) {
                  case RUNTIME_SCOPE_USER:
                          add = strv_new("/run/systemd/user-generators",
                                         "/etc/systemd/user-generators",
@@ -81,7 +81,7 @@ index 4e3d59fc56..0d18b9a2d0 100644
                                         USER_GENERATOR_DIR);
                          break;
  
-@@ -852,14 +840,12 @@ char **env_generator_binary_paths(RuntimeScope runtime_scope) {
+@@ -872,14 +860,12 @@ char **env_generator_binary_paths(RuntimeScope runtime_scope) {
                  case RUNTIME_SCOPE_SYSTEM:
                          add = strv_new("/run/systemd/system-environment-generators",
                                          "/etc/systemd/system-environment-generators",
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0005-Get-rid-of-a-useless-message-in-user-sessions.patch b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0005-Get-rid-of-a-useless-message-in-user-sessions.patch
index a0bcc6afaa..5c1684281b 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0005-Get-rid-of-a-useless-message-in-user-sessions.patch
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0005-Get-rid-of-a-useless-message-in-user-sessions.patch
@@ -13,10 +13,10 @@ in containers.
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/src/core/manager.c b/src/core/manager.c
-index e61ebee253..22cc5cc843 100644
+index 04103e0fe9..e26c6c5cfd 100644
 --- a/src/core/manager.c
 +++ b/src/core/manager.c
-@@ -1562,7 +1562,8 @@ static unsigned manager_dispatch_stop_when_bound_queue(Manager *m) {
+@@ -1611,7 +1611,8 @@ static unsigned manager_dispatch_stop_when_bound_queue(Manager *m) {
                  if (!unit_is_bound_by_inactive(u, &culprit))
                          continue;
  
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0006-hostnamed-localed-timedated-disable-methods-that-cha.patch b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0006-hostnamed-localed-timedated-disable-methods-that-cha.patch
index b350e36bc5..c60c5a4cbf 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0006-hostnamed-localed-timedated-disable-methods-that-cha.patch
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0006-hostnamed-localed-timedated-disable-methods-that-cha.patch
@@ -11,10 +11,10 @@ Subject: [PATCH] hostnamed, localed, timedated: disable methods that change
  3 files changed, 25 insertions(+)
 
 diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c
-index e1d53f2395..a224e6dadc 100644
+index 82d08803fa..8e40b77eba 100644
 --- a/src/hostname/hostnamed.c
 +++ b/src/hostname/hostnamed.c
-@@ -1053,6 +1053,9 @@ static int method_set_static_hostname(sd_bus_message *m, void *userdata, sd_bus_
+@@ -1116,6 +1116,9 @@ static int method_set_static_hostname(sd_bus_message *m, void *userdata, sd_bus_
          if (r < 0)
                  return r;
  
@@ -24,7 +24,7 @@ index e1d53f2395..a224e6dadc 100644
          name = empty_to_null(name);
  
          context_read_etc_hostname(c);
-@@ -1116,6 +1119,9 @@ static int set_machine_info(Context *c, sd_bus_message *m, int prop, sd_bus_mess
+@@ -1178,6 +1181,9 @@ static int set_machine_info(Context *c, sd_bus_message *m, int prop, sd_bus_mess
          if (r < 0)
                  return r;
  
@@ -35,10 +35,10 @@ index e1d53f2395..a224e6dadc 100644
  
          context_read_machine_info(c);
 diff --git a/src/locale/localed.c b/src/locale/localed.c
-index 5d96237fae..9af35cd29c 100644
+index c0d104578d..51a714ee23 100644
 --- a/src/locale/localed.c
 +++ b/src/locale/localed.c
-@@ -229,6 +229,9 @@ static int method_set_locale(sd_bus_message *m, void *userdata, sd_bus_error *er
+@@ -226,6 +226,9 @@ static int method_set_locale(sd_bus_message *m, void *userdata, sd_bus_error *er
  
          use_localegen = locale_gen_check_available();
  
@@ -48,7 +48,7 @@ index 5d96237fae..9af35cd29c 100644
          /* If single locale without variable name is provided, then we assume it is LANG=. */
          if (strv_length(l) == 1 && !strchr(l[0], '=')) {
                  if (!locale_is_valid(l[0]))
-@@ -347,6 +350,9 @@ static int method_set_vc_keyboard(sd_bus_message *m, void *userdata, sd_bus_erro
+@@ -343,6 +346,9 @@ static int method_set_vc_keyboard(sd_bus_message *m, void *userdata, sd_bus_erro
          if (r < 0)
                  return bus_log_parse_error(r);
  
@@ -58,7 +58,7 @@ index 5d96237fae..9af35cd29c 100644
          vc_context_empty_to_null(&in);
  
          r = vc_context_verify_and_warn(&in, LOG_ERR, error);
-@@ -465,6 +471,9 @@ static int method_set_x11_keyboard(sd_bus_message *m, void *userdata, sd_bus_err
+@@ -460,6 +466,9 @@ static int method_set_x11_keyboard(sd_bus_message *m, void *userdata, sd_bus_err
          if (r < 0)
                  return bus_log_parse_error(r);
  
@@ -69,10 +69,10 @@ index 5d96237fae..9af35cd29c 100644
  
          r = x11_context_verify_and_warn(&in, LOG_ERR, error);
 diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c
-index c7be30f563..50f8aa8675 100644
+index e3b4367ec0..448aa7e94d 100644
 --- a/src/timedate/timedated.c
 +++ b/src/timedate/timedated.c
-@@ -659,6 +659,10 @@ static int method_set_timezone(sd_bus_message *m, void *userdata, sd_bus_error *
+@@ -673,6 +673,10 @@ static int method_set_timezone(sd_bus_message *m, void *userdata, sd_bus_error *
          if (r < 0)
                  return r;
  
@@ -83,7 +83,7 @@ index c7be30f563..50f8aa8675 100644
          if (!timezone_is_valid(z, LOG_DEBUG))
                  return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid or not installed time zone '%s'", z);
  
-@@ -737,6 +741,9 @@ static int method_set_local_rtc(sd_bus_message *m, void *userdata, sd_bus_error
+@@ -750,6 +754,9 @@ static int method_set_local_rtc(sd_bus_message *m, void *userdata, sd_bus_error
          if (r < 0)
                  return r;
  
@@ -93,7 +93,7 @@ index c7be30f563..50f8aa8675 100644
          if (lrtc == c->local_rtc && !fix_system)
                  return sd_bus_reply_method_return(m, NULL);
  
-@@ -917,6 +924,9 @@ static int method_set_ntp(sd_bus_message *m, void *userdata, sd_bus_error *error
+@@ -928,6 +935,9 @@ static int method_set_ntp(sd_bus_message *m, void *userdata, sd_bus_error *error
          if (r < 0)
                  return r;
  
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0007-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0007-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch
index 30178675f7..b73489f56b 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0007-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0007-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch
@@ -13,7 +13,7 @@ NixOS uses this path.
  5 files changed, 13 insertions(+), 13 deletions(-)
 
 diff --git a/man/localtime.xml b/man/localtime.xml
-index e486474c44..5f373d0723 100644
+index 3a13e04a27..4fd58068a1 100644
 --- a/man/localtime.xml
 +++ b/man/localtime.xml
 @@ -20,7 +20,7 @@
@@ -35,7 +35,7 @@ index e486474c44..5f373d0723 100644
      <literal>Etc/UTC</literal>. The resulting link should lead to the
      corresponding binary
 diff --git a/src/basic/time-util.c b/src/basic/time-util.c
-index f9014dc560..3ee0363369 100644
+index b94f37c31c..48f5a2526b 100644
 --- a/src/basic/time-util.c
 +++ b/src/basic/time-util.c
 @@ -1412,7 +1412,7 @@ static int get_timezones_from_zone1970_tab(char ***ret) {
@@ -65,20 +65,20 @@ index f9014dc560..3ee0363369 100644
  
          fd = open(t, O_RDONLY|O_CLOEXEC);
          if (fd < 0)
-@@ -1625,7 +1625,7 @@ int get_timezone(char **ret) {
+@@ -1617,7 +1617,7 @@ int get_timezone(char **ret) {
          if (r < 0)
-                 return r; /* returns EINVAL if not a symlink */
+                 return r; /* Return EINVAL if not a symlink */
  
--        e = PATH_STARTSWITH_SET(t, "/usr/share/zoneinfo/", "../usr/share/zoneinfo/");
-+        e = PATH_STARTSWITH_SET(t, "/etc/zoneinfo/", "../etc/zoneinfo/");
+-        const char *e = PATH_STARTSWITH_SET(t, "/usr/share/zoneinfo/", "../usr/share/zoneinfo/");
++        const char *e = PATH_STARTSWITH_SET(t, "/etc/zoneinfo/", "../etc/zoneinfo/");
          if (!e)
                  return -EINVAL;
- 
+         if (!timezone_is_valid(e, LOG_DEBUG))
 diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c
-index f77a5f6266..63bac85b29 100644
+index 6afabef430..c1e3af77e1 100644
 --- a/src/firstboot/firstboot.c
 +++ b/src/firstboot/firstboot.c
-@@ -632,7 +632,7 @@ static int process_timezone(int rfd) {
+@@ -648,7 +648,7 @@ static int process_timezone(int rfd) {
          if (isempty(arg_timezone))
                  return 0;
  
@@ -88,10 +88,10 @@ index f77a5f6266..63bac85b29 100644
          r = symlinkat_atomic_full(e, pfd, f, /* make_relative= */ false);
          if (r < 0)
 diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
-index e48ebe8342..41796f3358 100644
+index 756ce11b1f..436804b3bd 100644
 --- a/src/nspawn/nspawn.c
 +++ b/src/nspawn/nspawn.c
-@@ -1845,8 +1845,8 @@ int userns_mkdir(const char *root, const char *path, mode_t mode, uid_t uid, gid
+@@ -1862,8 +1862,8 @@ int userns_mkdir(const char *root, const char *path, mode_t mode, uid_t uid, gid
  static const char *timezone_from_path(const char *path) {
          return PATH_STARTSWITH_SET(
                          path,
@@ -103,10 +103,10 @@ index e48ebe8342..41796f3358 100644
  
  static bool etc_writable(void) {
 diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c
-index 50f8aa8675..aff156ab42 100644
+index 448aa7e94d..2161e09579 100644
 --- a/src/timedate/timedated.c
 +++ b/src/timedate/timedated.c
-@@ -276,7 +276,7 @@ static int context_read_data(Context *c) {
+@@ -280,7 +280,7 @@ static int context_read_data(Context *c) {
  
          r = get_timezone(&t);
          if (r == -EINVAL)
@@ -115,7 +115,7 @@ index 50f8aa8675..aff156ab42 100644
          else if (r < 0)
                  log_warning_errno(r, "Failed to get target of /etc/localtime: %m");
  
-@@ -300,7 +300,7 @@ static int context_write_data_timezone(Context *c) {
+@@ -304,7 +304,7 @@ static int context_write_data_timezone(Context *c) {
  
          if (isempty(c->zone) || streq(c->zone, "UTC")) {
  
@@ -124,7 +124,7 @@ index 50f8aa8675..aff156ab42 100644
  
                          if (unlink("/etc/localtime") < 0 && errno != ENOENT)
                                  return -errno;
-@@ -308,9 +308,9 @@ static int context_write_data_timezone(Context *c) {
+@@ -312,9 +312,9 @@ static int context_write_data_timezone(Context *c) {
                          return 0;
                  }
  
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0009-add-rootprefix-to-lookup-dir-paths.patch b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0009-add-rootprefix-to-lookup-dir-paths.patch
index 15fe403c28..d7a11e3996 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0009-add-rootprefix-to-lookup-dir-paths.patch
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0009-add-rootprefix-to-lookup-dir-paths.patch
@@ -12,10 +12,10 @@ files that I might have missed.
  1 file changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/src/basic/constants.h b/src/basic/constants.h
-index 6bb5f3c281..678d13737d 100644
+index e70817c51f..859e673a67 100644
 --- a/src/basic/constants.h
 +++ b/src/basic/constants.h
-@@ -65,13 +65,15 @@
+@@ -62,13 +62,15 @@
          "/etc/" n "\0"                          \
          "/run/" n "\0"                          \
          "/usr/local/lib/" n "\0"                \
@@ -23,7 +23,7 @@ index 6bb5f3c281..678d13737d 100644
 +        "/usr/lib/" n "\0"                      \
 +        PREFIX "/lib/" n "\0"
  
- #define CONF_PATHS_USR(n)                       \
+ #define CONF_PATHS(n)                           \
          "/etc/" n,                              \
          "/run/" n,                              \
          "/usr/local/lib/" n,                    \
@@ -31,5 +31,5 @@ index 6bb5f3c281..678d13737d 100644
 +        "/usr/lib/" n,                          \
 +        PREFIX "/lib/" n
  
- #define CONF_PATHS(n)                           \
-         CONF_PATHS_USR(n)
+ #define CONF_PATHS_STRV(n)                      \
+         STRV_MAKE(CONF_PATHS(n))
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0010-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0010-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch
index 6f0b81a32a..24c74216b7 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0010-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0010-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch
@@ -10,10 +10,10 @@ This is needed for NixOS to use such scripts as systemd directory is immutable.
  1 file changed, 1 insertion(+)
 
 diff --git a/src/shutdown/shutdown.c b/src/shutdown/shutdown.c
-index b976b7d8cf..b1c02df6fd 100644
+index 67f44e16e9..dda6614561 100644
 --- a/src/shutdown/shutdown.c
 +++ b/src/shutdown/shutdown.c
-@@ -336,6 +336,7 @@ static void init_watchdog(void) {
+@@ -358,6 +358,7 @@ static void notify_supervisor(void) {
  int main(int argc, char *argv[]) {
          static const char* const dirs[] = {
                  SYSTEM_SHUTDOWN_PATH,
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0011-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0011-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch
index a5ed574afa..733e042ec0 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0011-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0011-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch
@@ -9,10 +9,10 @@ This is needed for NixOS to use such scripts as systemd directory is immutable.
  1 file changed, 1 insertion(+)
 
 diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c
-index 21af3e9e52..6d096e3c78 100644
+index c96207428d..1e95eec7f1 100644
 --- a/src/sleep/sleep.c
 +++ b/src/sleep/sleep.c
-@@ -215,6 +215,7 @@ static int execute(
+@@ -217,6 +217,7 @@ static int execute(
          };
          static const char* const dirs[] = {
                  SYSTEM_SLEEP_PATH,
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0012-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0012-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch
index 55e556288c..b546c7eeb6 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0012-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0012-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch
@@ -10,19 +10,20 @@ systemd itself uses extensively.
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/src/basic/path-util.h b/src/basic/path-util.h
-index 6d943e967f..d4380aa7e3 100644
+index fcb3aa9399..b9e69cbf91 100644
 --- a/src/basic/path-util.h
 +++ b/src/basic/path-util.h
-@@ -25,9 +25,9 @@
- #  define PATH_SBIN_BIN_NULSTR(x) PATH_NORMAL_SBIN_BIN_NULSTR(x)
- #endif
+@@ -17,10 +17,10 @@
+ #define PATH_MERGED_BIN(x) x "bin"
+ #define PATH_MERGED_BIN_NULSTR(x) x "bin\0"
  
--#define DEFAULT_PATH PATH_SBIN_BIN("/usr/local/") ":" PATH_SBIN_BIN("/usr/")
--#define DEFAULT_PATH_NULSTR PATH_SBIN_BIN_NULSTR("/usr/local/") PATH_SBIN_BIN_NULSTR("/usr/")
--#define DEFAULT_PATH_COMPAT PATH_SPLIT_SBIN_BIN("/usr/local/") ":" PATH_SPLIT_SBIN_BIN("/usr/") ":" PATH_SPLIT_SBIN_BIN("/")
-+#define DEFAULT_PATH "@defaultPathNormal@"
-+#define DEFAULT_PATH_NULSTR "@defaultPathNormal@\0"
-+#define DEFAULT_PATH_COMPAT DEFAULT_PATH
+-#define DEFAULT_PATH_WITH_SBIN PATH_SPLIT_BIN("/usr/local/") ":" PATH_SPLIT_BIN("/usr/")
+-#define DEFAULT_PATH_WITHOUT_SBIN PATH_MERGED_BIN("/usr/local/") ":" PATH_MERGED_BIN("/usr/")
++#define DEFAULT_PATH_WITH_SBIN "@defaultPathNormal@"
++#define DEFAULT_PATH_WITHOUT_SBIN DEFAULT_PATH_WITH_SBIN
+ 
+-#define DEFAULT_PATH_COMPAT PATH_SPLIT_BIN("/usr/local/") ":" PATH_SPLIT_BIN("/usr/") ":" PATH_SPLIT_BIN("/")
++#define DEFAULT_PATH_COMPAT DEFAULT_PATH_WITH_SBIN
+ 
+ const char* default_PATH(void);
  
- #ifndef DEFAULT_USER_PATH
- #  define DEFAULT_USER_PATH DEFAULT_PATH
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0013-inherit-systemd-environment-when-calling-generators.patch b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0013-inherit-systemd-environment-when-calling-generators.patch
index 8bccf55390..e17d281a61 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0013-inherit-systemd-environment-when-calling-generators.patch
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0013-inherit-systemd-environment-when-calling-generators.patch
@@ -16,10 +16,10 @@ executables that are being called from managers.
  1 file changed, 8 insertions(+)
 
 diff --git a/src/core/manager.c b/src/core/manager.c
-index 22cc5cc843..5dc7d4504f 100644
+index e26c6c5cfd..6cc1642684 100644
 --- a/src/core/manager.c
 +++ b/src/core/manager.c
-@@ -3914,9 +3914,17 @@ static int build_generator_environment(Manager *m, char ***ret) {
+@@ -4035,9 +4035,17 @@ static int build_generator_environment(Manager *m, char ***ret) {
           * adjust generated units to that. Let's pass down some bits of information that are easy for us to
           * determine (but a bit harder for generator scripts to determine), as environment variables. */
  
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0014-core-don-t-taint-on-unmerged-usr.patch b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0014-core-don-t-taint-on-unmerged-usr.patch
index 8b86291850..0fd274d7a5 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0014-core-don-t-taint-on-unmerged-usr.patch
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0014-core-don-t-taint-on-unmerged-usr.patch
@@ -13,20 +13,25 @@ so showing the taint isn't really helpful.
 
 See also: https://github.com/systemd/systemd/issues/24191
 ---
- src/core/manager.c | 3 ---
- 1 file changed, 3 deletions(-)
+ src/core/taint.c | 8 --------
+ 1 file changed, 8 deletions(-)
 
-diff --git a/src/core/manager.c b/src/core/manager.c
-index 5dc7d4504f..6208c9aa31 100644
---- a/src/core/manager.c
-+++ b/src/core/manager.c
-@@ -4800,9 +4800,6 @@ char* manager_taint_string(const Manager *m) {
-         const char* stage[12] = {};
-         size_t n = 0;
+diff --git a/src/core/taint.c b/src/core/taint.c
+index 969b37f209..de64e8f1f9 100644
+--- a/src/core/taint.c
++++ b/src/core/taint.c
+@@ -41,14 +41,6 @@ char* taint_string(void) {
  
--        _cleanup_free_ char *usrbin = NULL;
--        if (readlink_malloc("/bin", &usrbin) < 0 || !PATH_IN_SET(usrbin, "usr/bin", "/usr/bin"))
+         _cleanup_free_ char *bin = NULL, *usr_sbin = NULL, *var_run = NULL;
+ 
+-        if (readlink_malloc("/bin", &bin) < 0 || !PATH_IN_SET(bin, "usr/bin", "/usr/bin"))
 -                stage[n++] = "unmerged-usr";
+-
+-        /* Note that the check is different from default_PATH(), as we want to taint on uncanonical symlinks
+-         * too. */
+-        if (readlink_malloc("/usr/sbin", &usr_sbin) < 0 || !PATH_IN_SET(usr_sbin, "bin", "/usr/bin"))
+-                stage[n++] = "unmerged-bin";
+-
+         if (readlink_malloc("/var/run", &var_run) < 0 || !PATH_IN_SET(var_run, "../run", "/run"))
+                 stage[n++] = "var-run-bad";
  
-         if (access("/proc/cgroups", F_OK) < 0)
-                 stage[n++] = "cgroups-missing";
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0015-tpm2_context_init-fix-driver-name-checking.patch b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0015-tpm2_context_init-fix-driver-name-checking.patch
index 768f57e133..57ca20fdcb 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0015-tpm2_context_init-fix-driver-name-checking.patch
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0015-tpm2_context_init-fix-driver-name-checking.patch
@@ -27,10 +27,10 @@ filename_is_valid with path_is_valid.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/shared/tpm2-util.c b/src/shared/tpm2-util.c
-index 5e07b88a89..8dd7315009 100644
+index 10a78adfaf..6493d5d270 100644
 --- a/src/shared/tpm2-util.c
 +++ b/src/shared/tpm2-util.c
-@@ -654,7 +654,7 @@ int tpm2_context_new(const char *device, Tpm2Context **ret_context) {
+@@ -670,7 +670,7 @@ int tpm2_context_new(const char *device, Tpm2Context **ret_context) {
                  fn = strjoina("libtss2-tcti-", driver, ".so.0");
  
                  /* Better safe than sorry, let's refuse strings that cannot possibly be valid driver early, before going to disk. */
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0016-systemctl-edit-suggest-systemdctl-edit-runtime-on-sy.patch b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0016-systemctl-edit-suggest-systemdctl-edit-runtime-on-sy.patch
index 96cd420221..cc7106f9bb 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0016-systemctl-edit-suggest-systemdctl-edit-runtime-on-sy.patch
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0016-systemctl-edit-suggest-systemdctl-edit-runtime-on-sy.patch
@@ -30,7 +30,7 @@ are written into `$XDG_CONFIG_HOME/systemd/user`.
  1 file changed, 3 insertions(+)
 
 diff --git a/src/systemctl/systemctl-edit.c b/src/systemctl/systemctl-edit.c
-index 367afa20f7..5777154d01 100644
+index 15398f8364..8d440cee59 100644
 --- a/src/systemctl/systemctl-edit.c
 +++ b/src/systemctl/systemctl-edit.c
 @@ -322,6 +322,9 @@ int verb_edit(int argc, char *argv[], void *userdata) {
@@ -40,6 +40,6 @@ index 367afa20f7..5777154d01 100644
 +        if (!arg_runtime && arg_runtime_scope == RUNTIME_SCOPE_SYSTEM)
 +                return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "The unit-directory '/etc/systemd/system' is read-only on NixOS, so it's not possible to edit system-units directly. Use 'systemctl edit --runtime' instead.");
 +
-         if (!on_tty())
+         if (!on_tty() && !arg_stdin)
                  return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Cannot edit units if not on a tty.");
  
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0017-meson.build-do-not-create-systemdstatedir.patch b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0017-meson.build-do-not-create-systemdstatedir.patch
index fd38aa9a28..7d941c33b9 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0017-meson.build-do-not-create-systemdstatedir.patch
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0017-meson.build-do-not-create-systemdstatedir.patch
@@ -8,14 +8,14 @@ Subject: [PATCH] meson.build: do not create systemdstatedir
  1 file changed, 1 deletion(-)
 
 diff --git a/meson.build b/meson.build
-index 7419e2b0b0..c82a527976 100644
+index cecdbc3aa7..bd7f8ec580 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -2497,7 +2497,6 @@ install_data('LICENSE.GPL2',
+@@ -2652,7 +2652,6 @@ install_data('LICENSE.GPL2',
  install_subdir('LICENSES',
                 install_dir : docdir)
  
 -install_emptydir(systemdstatedir)
  
- ############################################################
+ #####################################################################
  
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0018-timesyncd-disable-NSCD-when-DNSSEC-validation-is-dis.patch b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0018-timesyncd-disable-NSCD-when-DNSSEC-validation-is-dis.patch
index 68ae226448..eb06459a56 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0018-timesyncd-disable-NSCD-when-DNSSEC-validation-is-dis.patch
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/0018-timesyncd-disable-NSCD-when-DNSSEC-validation-is-dis.patch
@@ -1,4 +1,4 @@
-From 7a27556920fe1feefd17096841c8f3ca1294a1b3 Mon Sep 17 00:00:00 2001
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: Yuri Nesterov <yuriy.nesterov@unikie.com>
 Date: Wed, 21 Jun 2023 17:17:38 +0300
 Subject: [PATCH] timesyncd: disable NSCD when DNSSEC validation is disabled
@@ -13,7 +13,7 @@ directly.
  1 file changed, 11 insertions(+)
 
 diff --git a/src/timesync/timesyncd.c b/src/timesync/timesyncd.c
-index 1d8ebecc91..2b0ae361ff 100644
+index 5c308a04bc..81aa3d3334 100644
 --- a/src/timesync/timesyncd.c
 +++ b/src/timesync/timesyncd.c
 @@ -21,6 +21,11 @@
@@ -32,7 +32,7 @@ index 1d8ebecc91..2b0ae361ff 100644
          if (r < 0)
                  return log_error_errno(r, "Failed to parse fallback server strings: %m");
  
-+        r = getenv_bool_secure("SYSTEMD_NSS_RESOLVE_VALIDATE");
++        r = secure_getenv_bool("SYSTEMD_NSS_RESOLVE_VALIDATE");
 +        if (r == 0) {
 +                log_info("Disabling NSCD because DNSSEC validation is turned off");
 +                __nss_disable_nscd(register_traced_file);
@@ -41,6 +41,3 @@ index 1d8ebecc91..2b0ae361ff 100644
          log_debug("systemd-timesyncd running as pid " PID_FMT, getpid_cached());
  
          notify_message = notify_start("READY=1\n"
--- 
-2.34.1
-
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/default.nix
index 11691f1563..c45ddbfd41 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/default.nix
+++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/default.nix
@@ -6,6 +6,7 @@
 , pkgsCross
 , fetchFromGitHub
 , fetchzip
+, fetchpatch
 , buildPackages
 , makeBinaryWrapper
 , ninja
@@ -16,6 +17,7 @@
 , gperf
 , getent
 , glibcLocales
+, autoPatchelfHook
 
   # glib is only used during tests (test-bus-gvariant, test-bus-marshal)
 , glib
@@ -67,6 +69,7 @@
 , p11-kit
 , libpwquality
 , qrencode
+, libarchive
 
   # the (optional) BPF feature requires bpftool, libbpf, clang and llvm-strip to
   # be available during build time.
@@ -153,6 +156,7 @@
   # building disk images for non-NixOS systems. To save users from trying to use it
   # on their live NixOS system, we disable it by default.
 , withKernelInstall ? false
+, withLibarchive ? true
   # tests assume too much system access for them to be feasible for us right now
 , withTests ? false
   # build only libudev and libsystemd
@@ -179,14 +183,14 @@ assert withBootloader -> withEfi;
 let
   wantCurl = withRemote || withImportd;
   wantGcrypt = withResolved || withImportd;
-  version = "255.6";
+  version = "256.2";
 
   # Use the command below to update `releaseTimestamp` on every (major) version
   # change. More details in the commentary at mesonFlags.
   # command:
   #  $ curl -s https://api.github.com/repos/systemd/systemd/releases/latest | \
   #     jq '.created_at|strptime("%Y-%m-%dT%H:%M:%SZ")|mktime'
-  releaseTimestamp = "1701895110";
+  releaseTimestamp = "1720202583";
 in
 stdenv.mkDerivation (finalAttrs: {
   inherit pname version;
@@ -195,9 +199,9 @@ stdenv.mkDerivation (finalAttrs: {
   # This has proven to be less error-prone than the previous systemd fork.
   src = fetchFromGitHub {
     owner = "systemd";
-    repo = "systemd-stable";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-ah0678iNfy0c5NhHhjn0roY6RoM8OE0hWyEt+qEGKRQ=";
+    repo = "systemd";
+    rev = "v${version}";
+    hash = "sha256-fyHzL+oe192YYuwyoTrov10IlrB0NSfY/XKVWzJrQEI=";
   };
 
   # On major changes, or when otherwise required, you *must* :
@@ -226,38 +230,54 @@ stdenv.mkDerivation (finalAttrs: {
     ./0015-tpm2_context_init-fix-driver-name-checking.patch
     ./0016-systemctl-edit-suggest-systemdctl-edit-runtime-on-sy.patch
     ./0017-meson.build-do-not-create-systemdstatedir.patch
+
+    # https://github.com/systemd/systemd/pull/33258
+    # Remove after 256.3
+    (fetchpatch {
+      url = "https://github.com/systemd/systemd/compare/b268a71069786a45460807967e669d505ba3c5a2..f26b2ec46118a4493608618da2253bb9dfc6b517.patch";
+      hash = "sha256-OmuPDm3NykrDeNTA3NcYt9iTXEUFwKJ5apPP4KqtABg=";
+    })
+
+    # https://github.com/systemd/systemd/pull/33400
+    (fetchpatch {
+      url = "https://github.com/systemd/systemd/compare/051d462b42fe6c27824046c15cd3c84fa5afe05b..5e2d802c018f0b6d5dd58745f64d6958fa261096.patch";
+      hash = "sha256-drGAnx+ECixOjIP0DUSbCG/emUgoVips9WQL5ny3NKQ=";
+    })
   ] ++ lib.optional (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isGnu) [
     ./0018-timesyncd-disable-NSCD-when-DNSSEC-validation-is-dis.patch
   ] ++ lib.optional stdenv.hostPlatform.isMusl (
     let
       oe-core = fetchzip {
-        url = "https://git.openembedded.org/openembedded-core/snapshot/openembedded-core-6fdf03bd950e55ef7881041606f6e76141033716.tar.gz";
-        sha256 = "/+9aJdOxBY8Y4vJPftOCxmyK8L2nvR82KmJxil1a2aY=";
+        url = "https://git.openembedded.org/openembedded-core/snapshot/openembedded-core-89b75b46371d5e9172cb496b461824d8551a2af5.tar.gz";
+        hash = "sha256-etdIIdo3FezVafEYP5uAS9pO36Rdea2A+Da1P44cPXg=";
       };
       musl-patches = oe-core + "/meta/recipes-core/systemd/systemd";
     in
     [
-      (musl-patches + "/0017-Adjust-for-musl-headers.patch")
-      (musl-patches + "/0016-pass-correct-parameters-to-getdents64.patch")
-      (musl-patches + "/0018-test-bus-error-strerror-is-assumed-to-be-GNU-specifi.patch")
-      (musl-patches + "/0001-missing_type.h-add-comparison_fn_t.patch")
-      (musl-patches + "/0002-add-fallback-parse_printf_format-implementation.patch")
-      (musl-patches + "/0003-src-basic-missing.h-check-for-missing-strndupa.patch")
-      (musl-patches + "/0004-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch")
-      (musl-patches + "/0005-add-missing-FTW_-macros-for-musl.patch")
-      (musl-patches + "/0006-Use-uintmax_t-for-handling-rlim_t.patch")
-      (musl-patches + "/0007-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch")
-      (musl-patches + "/0008-Define-glibc-compatible-basename-for-non-glibc-syste.patch")
-      (musl-patches + "/0009-Do-not-disable-buffering-when-writing-to-oom_score_a.patch")
-      (musl-patches + "/0010-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch")
-      (musl-patches + "/0011-avoid-redefinition-of-prctl_mm_map-structure.patch")
-      (musl-patches + "/0012-do-not-disable-buffer-in-writing-files.patch")
-      (musl-patches + "/0013-Handle-__cpu_mask-usage.patch")
-      (musl-patches + "/0014-Handle-missing-gshadow.patch")
-      (musl-patches + "/0015-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch")
-      (musl-patches + "/0020-sd-event-Make-malloc_trim-conditional-on-glibc.patch")
-      (musl-patches + "/0021-shared-Do-not-use-malloc_info-on-musl.patch")
-      (musl-patches + "/0022-avoid-missing-LOCK_EX-declaration.patch")
+      (musl-patches + "/0004-missing_type.h-add-comparison_fn_t.patch")
+      (musl-patches + "/0005-add-fallback-parse_printf_format-implementation.patch")
+      (musl-patches + "/0006-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch")
+      (musl-patches + "/0007-add-missing-FTW_-macros-for-musl.patch")
+      (musl-patches + "/0008-Use-uintmax_t-for-handling-rlim_t.patch")
+      (musl-patches + "/0009-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch")
+      (musl-patches + "/0010-Define-glibc-compatible-basename-for-non-glibc-syste.patch")
+      (musl-patches + "/0011-Do-not-disable-buffering-when-writing-to-oom_score_a.patch")
+      (musl-patches + "/0012-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch")
+      (musl-patches + "/0013-avoid-redefinition-of-prctl_mm_map-structure.patch")
+      (musl-patches + "/0014-do-not-disable-buffer-in-writing-files.patch")
+      (musl-patches + "/0015-Handle-__cpu_mask-usage.patch")
+      (musl-patches + "/0016-Handle-missing-gshadow.patch")
+      (musl-patches + "/0017-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch")
+      (musl-patches + "/0018-pass-correct-parameters-to-getdents64.patch")
+      (musl-patches + "/0019-Adjust-for-musl-headers.patch")
+      (musl-patches + "/0020-test-bus-error-strerror-is-assumed-to-be-GNU-specifi.patch")
+      (musl-patches + "/0022-sd-event-Make-malloc_trim-conditional-on-glibc.patch")
+      (musl-patches + "/0023-shared-Do-not-use-malloc_info-on-musl.patch")
+      (musl-patches + "/0024-avoid-missing-LOCK_EX-declaration.patch")
+      (musl-patches + "/0025-include-signal.h-to-avoid-the-undeclared-error.patch")
+      (musl-patches + "/0026-undef-stdin-for-references-using-stdin-as-a-struct-m.patch")
+      (musl-patches + "/0027-adjust-header-inclusion-order-to-avoid-redeclaration.patch")
+      (musl-patches + "/0028-build-path.c-avoid-boot-time-segfault-for-musl.patch")
     ]
   );
 
@@ -274,129 +294,6 @@ stdenv.mkDerivation (finalAttrs: {
       --replace \
       "/usr/lib/systemd/boot/efi" \
       "$out/lib/systemd/boot/efi"
-  '' + (
-    let
-      # The following patches references to dynamic libraries to ensure that all
-      # the features that are implemented via dlopen(3) are available (or
-      # explicitly deactivated) by pointing dlopen to the absolute store path
-      # instead of relying on the linkers runtime lookup code.
-      #
-      # All of the shared library references have to be handled. When new ones
-      # are introduced by upstream (or one of our patches) they must be
-      # explicitly declared, otherwise the build will fail.
-      #
-      # As of systemd version 247 we've seen a few errors like `libpcre2.… not
-      # found` when using e.g. --grep with journalctl. Those errors should
-      # become less unexpected now.
-      #
-      # There are generally two classes of dlopen(3) calls. Those that we want
-      # to support and those that should be deactivated / unsupported. This
-      # change enforces that we handle all dlopen calls explicitly. Meaning:
-      # There is not a single dlopen call in the source code tree that we did
-      # not explicitly handle.
-      #
-      # In order to do this we introduced a list of attributes that maps from
-      # shared object name to the package that contains them. The package can be
-      # null meaning the reference should be nuked and the shared object will
-      # never be loadable during runtime (because it points at an invalid store
-      # path location).
-      #
-      # To get a list of dynamically loaded libraries issue something like
-      #   `grep -ri '"lib[a-zA-Z0-9-]*\.so[\.0-9a-zA-z]*"'' $src`
-      # and update the list below.
-      dlopenLibs =
-        let
-          opt = condition: pkg: if condition then pkg else null;
-        in
-        [
-          # bpf compilation support. We use libbpf 1 now.
-          { name = "libbpf.so.1"; pkg = opt withLibBPF libbpf; }
-          { name = "libbpf.so.0"; pkg = null; }
-
-          # We did never provide support for libxkbcommon
-          { name = "libxkbcommon.so.0"; pkg = null; }
-
-          # qrencode
-          { name = "libqrencode.so.4"; pkg = opt withQrencode qrencode; }
-          { name = "libqrencode.so.3"; pkg = null; }
-
-          # Password quality
-          # We currently do not package passwdqc, only libpwquality.
-          { name = "libpwquality.so.1"; pkg = opt withPasswordQuality libpwquality; }
-          { name = "libpasswdqc.so.1"; pkg = null; }
-
-          # Only include cryptsetup if it is enabled. We might not be able to
-          # provide it during "bootstrap" in e.g. the minimal systemd build as
-          # cryptsetup has udev (aka systemd) in it's dependencies.
-          { name = "libcryptsetup.so.12"; pkg = opt withCryptsetup cryptsetup; }
-
-          # We are using libidn2 so we only provide that and ignore the others.
-          # Systemd does this decision during configure time and uses ifdef's to
-          # enable specific branches. We can safely ignore (nuke) the libidn "v1"
-          # libraries.
-          { name = "libidn2.so.0"; pkg = opt withLibidn2 libidn2; }
-          { name = "libidn.so.12"; pkg = null; }
-          { name = "libidn.so.11"; pkg = null; }
-
-          # journalctl --grep requires libpcre so let's provide it
-          { name = "libpcre2-8.so.0"; pkg = pcre2; }
-
-          # Support for TPM2 in systemd-cryptsetup, systemd-repart and systemd-cryptenroll
-          { name = "libtss2-esys.so.0"; pkg = opt withTpm2Tss tpm2-tss; }
-          { name = "libtss2-rc.so.0"; pkg = opt withTpm2Tss tpm2-tss; }
-          { name = "libtss2-mu.so.0"; pkg = opt withTpm2Tss tpm2-tss; }
-          { name = "libtss2-tcti-"; pkg = opt withTpm2Tss tpm2-tss; }
-          { name = "libfido2.so.1"; pkg = opt withFido2 libfido2; }
-
-          # inspect-elf support
-          { name = "libelf.so.1"; pkg = opt withCoredump elfutils; }
-          { name = "libdw.so.1"; pkg = opt withCoredump elfutils; }
-
-          # Support for PKCS#11 in systemd-cryptsetup, systemd-cryptenroll and systemd-homed
-          { name = "libp11-kit.so.0"; pkg = opt (withHomed || withCryptsetup) p11-kit; }
-
-          { name = "libip4tc.so.2"; pkg = opt withIptables iptables; }
-        ];
-
-      patchDlOpen = dl:
-        let
-          library = "${lib.makeLibraryPath [ dl.pkg ]}/${dl.name}";
-        in
-        if dl.pkg == null then ''
-          # remove the dependency on the library by replacing it with an invalid path
-          for file in $(grep -lr '"${dl.name}"' src); do
-            echo "patching dlopen(\"${dl.name}\", …) in $file to an invalid store path ("${builtins.storeDir}/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-not-implemented/${dl.name}")…"
-            substituteInPlace "$file" --replace '"${dl.name}"' '"${builtins.storeDir}/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-not-implemented/${dl.name}"'
-          done
-        '' else ''
-          # ensure that the library we provide actually exists
-          if ! [ -e ${library} ]; then
-            # exceptional case, details:
-            # https://github.com/systemd/systemd-stable/blob/v249-stable/src/shared/tpm2-util.c#L157
-            if ! [[ "${library}" =~ .*libtss2-tcti-$ ]]; then
-              echo 'The shared library `${library}` does not exist but was given as substitute for `${dl.name}`'
-              exit 1
-            fi
-          fi
-          # make the path to the dependency explicit
-          for file in $(grep -lr '"${dl.name}"' src); do
-            echo "patching dlopen(\"${dl.name}\", …) in $file to ${library}…"
-            substituteInPlace "$file" --replace '"${dl.name}"' '"${library}"'
-          done
-
-        '';
-    in
-    # patch all the dlopen calls to contain absolute paths to the libraries
-    lib.concatMapStringsSep "\n" patchDlOpen dlopenLibs
-  )
-  # finally ensure that there are no left-over dlopen calls (or rather strings
-  # pointing to shared libraries) that we didn't handle
-  + ''
-    if grep -qr '"lib[a-zA-Z0-9-]*\.so[\.0-9a-zA-z]*"' src; then
-      echo "Found unhandled dynamic library calls: "
-      grep -r '"lib[a-zA-Z0-9-]*\.so[\.0-9a-zA-z]*"' src
-      exit 1
-    fi
   ''
   # Finally, patch shebangs in scripts used at build time. This must not patch
   # scripts that will end up in the output, to avoid build platform references
@@ -412,7 +309,8 @@ stdenv.mkDerivation (finalAttrs: {
   hardeningDisable = [
     # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=111523
     "trivialautovarinit"
-  ];
+    # breaks clang -target bpf; should be fixed to filter target?
+  ] ++ (lib.optional withLibBPF "zerocallusedregs");
 
   nativeBuildInputs =
     [
@@ -424,6 +322,7 @@ stdenv.mkDerivation (finalAttrs: {
       glibcLocales
       getent
       m4
+      autoPatchelfHook
 
       intltool
       gettext
@@ -476,6 +375,7 @@ stdenv.mkDerivation (finalAttrs: {
     ++ lib.optional withUkify (python3Packages.python.withPackages (ps: with ps; [ pefile ]))
     ++ lib.optionals withPasswordQuality [ libpwquality ]
     ++ lib.optionals withQrencode [ qrencode ]
+    ++ lib.optionals withLibarchive [ libarchive ]
   ;
 
   mesonBuildType = "release";
@@ -492,13 +392,11 @@ stdenv.mkDerivation (finalAttrs: {
     #   https://github.com/systemd/systemd/blob/60e930fc3e6eb8a36fbc184773119eb8d2f30364/NEWS#L258-L266
     (lib.mesonOption "time-epoch" releaseTimestamp)
 
-    (lib.mesonOption "version-tag" finalAttrs.version)
+    (lib.mesonOption "version-tag" version)
     (lib.mesonOption "mode" "release")
     (lib.mesonOption "tty-gid" "3") # tty in NixOS has gid 3
     (lib.mesonOption "debug-shell" "${bashInteractive}/bin/bash")
     (lib.mesonOption "pamconfdir" "${placeholder "out"}/etc/pam.d")
-    # Use cgroupsv2. This is already the upstream default, but better be explicit.
-    (lib.mesonOption "default-hierarchy" "unified")
     (lib.mesonOption "kmod-path" "${kmod}/bin/kmod")
 
     # Attempts to check /usr/sbin and that fails in macOS sandbox because
@@ -524,8 +422,8 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.mesonOption "sbat-distro" "nixos")
     (lib.mesonOption "sbat-distro-summary" "NixOS")
     (lib.mesonOption "sbat-distro-url" "https://nixos.org/")
-    (lib.mesonOption "sbat-distro-pkgname" finalAttrs.pname)
-    (lib.mesonOption "sbat-distro-version" finalAttrs.version)
+    (lib.mesonOption "sbat-distro-pkgname" pname)
+    (lib.mesonOption "sbat-distro-version" version)
 
     # Users
     (lib.mesonOption "system-uid-max" "999")
@@ -543,6 +441,11 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.mesonOption "mount-path" "${lib.getOutput "mount" util-linux}/bin/mount")
     (lib.mesonOption "umount-path" "${lib.getOutput "mount" util-linux}/bin/umount")
 
+    # SSH
+    # Disabled for now until someone makes this work.
+    (lib.mesonOption "sshconfdir" "no")
+    (lib.mesonOption "sshdconfdir" "no")
+
 
     # Features
 
@@ -606,6 +509,7 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.mesonEnable "kmod" withKmod)
     (lib.mesonEnable "qrencode" withQrencode)
     (lib.mesonEnable "vmspawn" withVmspawn)
+    (lib.mesonEnable "libarchive" withLibarchive)
     (lib.mesonEnable "xenctrl" false)
     (lib.mesonEnable "gnutls" false)
     (lib.mesonEnable "xkbcommon" false)
@@ -873,7 +777,8 @@ stdenv.mkDerivation (finalAttrs: {
     interfaceVersion = 2;
 
     inherit withBootloader withCryptsetup withEfi withHostnamed withImportd withKmod
-      withLocaled withMachined withPortabled withTimedated withUtmp util-linux kmod kbd;
+      withLocaled withMachined withPortabled withTimedated withTpm2Tss withUtmp
+      util-linux kmod kbd;
 
     tests = {
       inherit (nixosTests)
diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/unscd/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/unscd/default.nix
index 9f77fa01b0..e384210714 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/unscd/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/linux/usbtop/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/usbtop/default.nix
index 587d82d9e7..af16a70138 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/usbtop/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/linux/vendor-reset/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/vendor-reset/default.nix
index f4430f3224..7c0a4f1ed1 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/vendor-reset/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/linux/wpa_supplicant/0001-Implement-read-only-mode-for-ssids.patch b/third_party/nixpkgs/pkgs/os-specific/linux/wpa_supplicant/0001-Implement-read-only-mode-for-ssids.patch
deleted file mode 100644
index d459de8a7f..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/linux/wpa_supplicant/Use-unique-IDs-for-networks-and-credentials.patch b/third_party/nixpkgs/pkgs/os-specific/linux/wpa_supplicant/Use-unique-IDs-for-networks-and-credentials.patch
deleted file mode 100644
index 09e5b3673a..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/linux/wpa_supplicant/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/wpa_supplicant/default.nix
index e63bbd7a3f..f163978b95 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/wpa_supplicant/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/linux/xp-pen-drivers/g430/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/xp-pen-drivers/g430/default.nix
index f428ef803b..10169ff3fe 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/xp-pen-drivers/g430/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/linux/xsensors/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/xsensors/default.nix
index d229c22ee0..a67dcc9e71 100644
--- a/third_party/nixpkgs/pkgs/os-specific/linux/xsensors/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/os-specific/windows/pthread-w32/default.nix b/third_party/nixpkgs/pkgs/os-specific/windows/pthread-w32/default.nix
index 96e02bd9f3..b17d839554 100644
--- a/third_party/nixpkgs/pkgs/os-specific/windows/pthread-w32/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/alice-lg/default.nix b/third_party/nixpkgs/pkgs/servers/alice-lg/default.nix
index f478c1e4c8..720dda3f61 100644
--- a/third_party/nixpkgs/pkgs/servers/alice-lg/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/amqp/qpid-cpp/default.nix b/third_party/nixpkgs/pkgs/servers/amqp/qpid-cpp/default.nix
index a8588663a8..1760814771 100644
--- a/third_party/nixpkgs/pkgs/servers/amqp/qpid-cpp/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/amqp/rabbitmq-server/default.nix b/third_party/nixpkgs/pkgs/servers/amqp/rabbitmq-server/default.nix
index 70fc3e44e9..79493f310d 100644
--- a/third_party/nixpkgs/pkgs/servers/amqp/rabbitmq-server/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/atlassian/crowd.nix b/third_party/nixpkgs/pkgs/servers/atlassian/crowd.nix
index 6c87e3c071..44c44a0d26 100644
--- a/third_party/nixpkgs/pkgs/servers/atlassian/crowd.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/bindle/default.nix b/third_party/nixpkgs/pkgs/servers/bindle/default.nix
index 9c0920ee3a..b9ff3937e9 100644
--- a/third_party/nixpkgs/pkgs/servers/bindle/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/bindle/default.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security;
 
-  cargoSha256 = "sha256-RECEeo0uoGO5bBe+r++zpTjYYX3BIkT58uht2MLYkN0=";
+  cargoHash = "sha256-RECEeo0uoGO5bBe+r++zpTjYYX3BIkT58uht2MLYkN0=";
 
   cargoBuildFlags = [
     "--bin" "bindle"
@@ -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/third_party/nixpkgs/pkgs/servers/birdwatcher/default.nix b/third_party/nixpkgs/pkgs/servers/birdwatcher/default.nix
index 57840e5268..744be38224 100644
--- a/third_party/nixpkgs/pkgs/servers/birdwatcher/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/dns/bind/default.nix b/third_party/nixpkgs/pkgs/servers/dns/bind/default.nix
index 4690fa7693..a7c3f564af 100644
--- a/third_party/nixpkgs/pkgs/servers/dns/bind/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/dns/bind/default.nix
@@ -1,6 +1,7 @@
 { stdenv
 , lib
 , fetchurl
+, darwin
 , perl
 , pkg-config
 , libcap
@@ -41,7 +42,8 @@ stdenv.mkDerivation rec {
   buildInputs = [ libidn2 libtool libxml2 openssl libuv nghttp2 jemalloc ]
     ++ lib.optional stdenv.isLinux libcap
     ++ lib.optional enableGSSAPI libkrb5
-    ++ lib.optional enablePython (python3.withPackages (ps: with ps; [ ply ]));
+    ++ lib.optional enablePython (python3.withPackages (ps: with ps; [ ply ]))
+    ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices ];
 
   depsBuildBuild = [ buildPackages.stdenv.cc ];
 
diff --git a/third_party/nixpkgs/pkgs/servers/documize-community/default.nix b/third_party/nixpkgs/pkgs/servers/documize-community/default.nix
index c1b03e1f66..129993903d 100644
--- a/third_party/nixpkgs/pkgs/servers/documize-community/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/fcgiwrap/default.nix b/third_party/nixpkgs/pkgs/servers/fcgiwrap/default.nix
index 0df4bc5a38..4271ed91ec 100644
--- a/third_party/nixpkgs/pkgs/servers/fcgiwrap/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/gortr/default.nix b/third_party/nixpkgs/pkgs/servers/gortr/default.nix
index 408b528938..f947e6b9bd 100644
--- a/third_party/nixpkgs/pkgs/servers/gortr/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix
index 5e127da20a..704801e3c5 100644
--- a/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix
+++ b/third_party/nixpkgs/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; [
@@ -771,6 +775,7 @@
       aiodhcpwatcher
       aiodiscover
       async-upnp-client
+      av
       bleak
       bleak-retry-connector
       bluetooth-adapters
@@ -779,7 +784,6 @@
       cached-ipaddress
       dbus-fast
       fnv-hash-fast
-      ha-av
       ha-ffmpeg
       habluetooth
       hass-nabucasa
@@ -1484,7 +1488,7 @@
       aio-georss-gdacs
     ];
     "generic" = ps: with ps; [
-      ha-av
+      av
       pillow
     ];
     "generic_hygrostat" = ps: with ps; [
@@ -4301,7 +4305,7 @@
     "stookwijzer" = ps: with ps; [
     ]; # missing inputs: stookwijzer
     "stream" = ps: with ps; [
-      ha-av
+      av
       numpy_1
       pyturbojpeg
     ];
@@ -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/third_party/nixpkgs/pkgs/servers/home-assistant/custom-lovelace-modules/android-tv-card/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-lovelace-modules/android-tv-card/default.nix
index 17d7339fdb..f10c7d6e5b 100644
--- a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-lovelace-modules/android-tv-card/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-lovelace-modules/android-tv-card/default.nix
@@ -5,18 +5,18 @@
 
 buildNpmPackage rec {
   pname = "android-tv-card";
-  version = "3.8.2";
+  version = "3.9.2";
 
   src = fetchFromGitHub {
     owner = "Nerwyn";
     repo = "android-tv-card";
     rev = version;
-    hash = "sha256-jGcicGeELUge1s92Gz6dHvQ2bzmk0sx1bmiQOiiP2Xo=";
+    hash = "sha256-kqMHwUyQGfD8dL6VZPFCrQ91/h7j5KJVnAL0hHNk/qg=";
   };
 
   patches = [ ./dont-call-git.patch ];
 
-  npmDepsHash = "sha256-kkwr4G+xyccr38ppXkiwfokOQL86mSDx+7DVKlzB9ww=";
+  npmDepsHash = "sha256-zoEZibm0i3AgM3mGgwIIkqtsNkMXWErUfQ9Kaprs+Ag=";
 
   installPhase = ''
     runHook preInstall
diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-lovelace-modules/atomic-calendar-revive/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-lovelace-modules/atomic-calendar-revive/default.nix
new file mode 100644
index 0000000000..a9e8e5485c
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/home-assistant/custom-lovelace-modules/atomic-calendar-revive/package.json b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-lovelace-modules/atomic-calendar-revive/package.json
new file mode 100644
index 0000000000..c6c7707172
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/home-assistant/custom-lovelace-modules/atomic-calendar-revive/update.sh b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-lovelace-modules/atomic-calendar-revive/update.sh
new file mode 100755
index 0000000000..62d943291b
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/home-assistant/custom-lovelace-modules/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-lovelace-modules/default.nix
index ad49333bbc..5af0caced5 100644
--- a/third_party/nixpkgs/pkgs/servers/home-assistant/custom-lovelace-modules/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/home-assistant/custom-lovelace-modules/rmv-card/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-lovelace-modules/rmv-card/default.nix
new file mode 100644
index 0000000000..ec1fc6b201
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/home-assistant/custom-lovelace-modules/template-entity-row/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/custom-lovelace-modules/template-entity-row/default.nix
new file mode 100644
index 0000000000..d4fbd31640
--- /dev/null
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix
index 0aca399b89..a57f0d32c4 100644
--- a/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix
@@ -150,16 +150,6 @@ let
         ];
       });
 
-      ha-av = super.av.overridePythonAttrs (oldAttrs: rec {
-        pname = "ha-av";
-        version = "10.1.1";
-
-        src = fetchPypi {
-          inherit pname version;
-          hash = "sha256-QaMFVvglipN0kG1+ZQNKk7WTydSyIPn2qa32UtvLidw=";
-        };
-      });
-
       intellifire4py = super.intellifire4py.overridePythonAttrs (oldAttrs: rec {
         version = "2.2.2";
         src = fetchFromGitHub {
@@ -478,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";
@@ -496,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/third_party/nixpkgs/pkgs/servers/home-assistant/stubs.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/stubs.nix
index b5c963f2c4..de2f6c2852 100644
--- a/third_party/nixpkgs/pkgs/servers/home-assistant/stubs.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/home-assistant/update-component-packages.py b/third_party/nixpkgs/pkgs/servers/home-assistant/update-component-packages.py
index e46f297174..1889aff361 100755
--- a/third_party/nixpkgs/pkgs/servers/home-assistant/update-component-packages.py
+++ b/third_party/nixpkgs/pkgs/servers/home-assistant/update-component-packages.py
@@ -41,6 +41,7 @@ PKG_SET = "home-assistant.python.pkgs"
 PKG_PREFERENCES = {
     "fiblary3": "fiblary3-fork",  # https://github.com/home-assistant/core/issues/66466
     "HAP-python": "hap-python",
+    "ha-av": "av",
     "numpy": "numpy_1",
     "ollama-hass": "ollama",
     "paho-mqtt": "paho-mqtt_1",
diff --git a/third_party/nixpkgs/pkgs/servers/home-automation/evcc/default.nix b/third_party/nixpkgs/pkgs/servers/home-automation/evcc/default.nix
index 07c45ac177..cd44147138 100644
--- a/third_party/nixpkgs/pkgs/servers/home-automation/evcc/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/home-automation/evcc/default.nix
@@ -16,16 +16,16 @@
 
 buildGoModule rec {
   pname = "evcc";
-  version = "0.128.3";
+  version = "0.129.0";
 
   src = fetchFromGitHub {
     owner = "evcc-io";
     repo = "evcc";
     rev = version;
-    hash = "sha256-85ViDQeGybR2GQm9qaBl0K/xOVF4E8YxIKTdkStaPew=";
+    hash = "sha256-LoDY6mVV2iDWUo1fUPrOjTTaQudkxrBTkCeIGQWSN8M=";
   };
 
-  vendorHash = "sha256-xrpa5pfeWpBwS9QL/78JixDpenDGM/331vWBIwsuP2M=";
+  vendorHash = "sha256-AY1MXFgd6dK1w36iV0vur7ACGn5FTfPICEHXCnRfcb8=";
 
   npmDeps = fetchNpmDeps {
     inherit src;
@@ -79,6 +79,7 @@ buildGoModule rec {
       "TestTemplates/elering"
       "TestTemplates/energinet"
       "TestTemplates/grünstromindex"
+      "TestTemplates/keba-modbus"
       "TestTemplates/pun"
       "TestTemplates/entsoe"
       "TestTemplates/ngeso"
diff --git a/third_party/nixpkgs/pkgs/servers/hqplayerd/default.nix b/third_party/nixpkgs/pkgs/servers/hqplayerd/default.nix
index aa08f78112..3cbec0b648 100644
--- a/third_party/nixpkgs/pkgs/servers/hqplayerd/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/hqplayerd/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib
-, addOpenGLRunpath
+, addDriverRunpath
 , alsa-lib
 , autoPatchelfHook
 , cairo
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
     ${rpmextract}/bin/rpmextract $src
   '';
 
-  nativeBuildInputs = [ addOpenGLRunpath autoPatchelfHook rpmextract ];
+  nativeBuildInputs = [ addDriverRunpath autoPatchelfHook rpmextract ];
 
   buildInputs = [
     alsa-lib
@@ -94,11 +94,11 @@ stdenv.mkDerivation rec {
       --replace "NetworkManager-wait-online.service" ""
   '';
 
-  # NB: addOpenGLRunpath needs to run _after_ autoPatchelfHook, which runs in
+  # NB: addDriverRunpath needs to run _after_ autoPatchelfHook, which runs in
   # postFixup, so we tack it on here.
   doInstallCheck = true;
   installCheckPhase = ''
-    addOpenGLRunpath $out/bin/hqplayerd
+    addDriverRunpath $out/bin/hqplayerd
     $out/bin/hqplayerd --version
   '';
 
diff --git a/third_party/nixpkgs/pkgs/servers/http/apache-httpd/2.4.nix b/third_party/nixpkgs/pkgs/servers/http/apache-httpd/2.4.nix
index 3f8bcba099..035a11c8e4 100644
--- a/third_party/nixpkgs/pkgs/servers/http/apache-httpd/2.4.nix
+++ b/third_party/nixpkgs/pkgs/servers/http/apache-httpd/2.4.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ which ];
 
-  buildInputs = [ perl libxcrypt ] ++
+  buildInputs = [ perl libxcrypt zlib ] ++
     lib.optional brotliSupport brotli ++
     lib.optional sslSupport openssl ++
     lib.optional modTlsSupport rustls-ffi ++
diff --git a/third_party/nixpkgs/pkgs/servers/http/apache-modules/mod_dnssd/default.nix b/third_party/nixpkgs/pkgs/servers/http/apache-modules/mod_dnssd/default.nix
index 7f574f9fd9..fd310504f3 100644
--- a/third_party/nixpkgs/pkgs/servers/http/apache-modules/mod_dnssd/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/http/apache-modules/mod_perl/default.nix b/third_party/nixpkgs/pkgs/servers/http/apache-modules/mod_perl/default.nix
index c0a9e11a6c..09089855d1 100644
--- a/third_party/nixpkgs/pkgs/servers/http/apache-modules/mod_perl/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/http/apache-modules/mod_python/default.nix b/third_party/nixpkgs/pkgs/servers/http/apache-modules/mod_python/default.nix
index a859cf3dee..ddd33184e0 100644
--- a/third_party/nixpkgs/pkgs/servers/http/apache-modules/mod_python/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/http/hiawatha/default.nix b/third_party/nixpkgs/pkgs/servers/http/hiawatha/default.nix
index adf60cdf32..79797167dd 100644
--- a/third_party/nixpkgs/pkgs/servers/http/hiawatha/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/http/hiawatha/default.nix
@@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
     license = licenses.gpl2Only;
     platforms = platforms.unix;    # "Hiawatha runs perfectly on Linux, BSD and MacOS X"
     mainProgram = "hiawatha";
-    maintainers = [];
+    maintainers = [ ];
   };
 
 })
diff --git a/third_party/nixpkgs/pkgs/servers/http/jboss/jdbc/mysql/default.nix b/third_party/nixpkgs/pkgs/servers/http/jboss/jdbc/mysql/default.nix
index 078ae4d511..c666868893 100644
--- a/third_party/nixpkgs/pkgs/servers/http/jboss/jdbc/mysql/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/http/nginx/modules.nix b/third_party/nixpkgs/pkgs/servers/http/nginx/modules.nix
index 591e085224..b167cb64da 100644
--- a/third_party/nixpkgs/pkgs/servers/http/nginx/modules.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/http/spawn-fcgi/default.nix b/third_party/nixpkgs/pkgs/servers/http/spawn-fcgi/default.nix
index 3a4d9c8597..e8232f90b9 100644
--- a/third_party/nixpkgs/pkgs/servers/http/spawn-fcgi/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/http/tomcat/tomcat-native.nix b/third_party/nixpkgs/pkgs/servers/http/tomcat/tomcat-native.nix
index 31d2889995..d95296b761 100644
--- a/third_party/nixpkgs/pkgs/servers/http/tomcat/tomcat-native.nix
+++ b/third_party/nixpkgs/pkgs/servers/http/tomcat/tomcat-native.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "tomcat-native";
-  version = "2.0.7";
+  version = "2.0.8";
 
   src = fetchurl {
     url = "mirror://apache/tomcat/tomcat-connectors/native/${version}/source/${pname}-${version}-src.tar.gz";
-    hash = "sha256-LFr8ftw4PkdmBkfppwca2B9Y5Rx/dlwS9+evySA7LU0=";
+    hash = "sha256-x8U4L8taZHpc5v7QuWch6UGY+i9XJc9RJPW2URsF3+8=";
   };
 
   sourceRoot = "${pname}-${version}-src/native";
diff --git a/third_party/nixpkgs/pkgs/servers/irker/default.nix b/third_party/nixpkgs/pkgs/servers/irker/default.nix
index 7fae20bc1e..a3b6874ef1 100644
--- a/third_party/nixpkgs/pkgs/servers/irker/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/komga/default.nix b/third_party/nixpkgs/pkgs/servers/komga/default.nix
index bfe3f14f51..de6594a992 100644
--- a/third_party/nixpkgs/pkgs/servers/komga/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/komga/default.nix
@@ -8,11 +8,11 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "komga";
-  version = "1.11.1";
+  version = "1.11.2";
 
   src = fetchurl {
     url = "https://github.com/gotson/${pname}/releases/download/${version}/${pname}-${version}.jar";
-    sha256 = "sha256-L6fdR8j60x2YL5S5g6THN1LL+dy6kzHijjNR47Kuylo=";
+    sha256 = "sha256-gbn0vhk+lYBPnAPwWwbAd+2AQKOkYW+akal/9tUVKVI=";
   };
 
   nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/servers/mail/mailpit/source.nix b/third_party/nixpkgs/pkgs/servers/mail/mailpit/source.nix
index d04d36e804..1402764e81 100644
--- a/third_party/nixpkgs/pkgs/servers/mail/mailpit/source.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/mail/mailpit/update.sh b/third_party/nixpkgs/pkgs/servers/mail/mailpit/update.sh
index 979cd11cda..f54862d3fd 100755
--- a/third_party/nixpkgs/pkgs/servers/mail/mailpit/update.sh
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/matrix-synapse/plugins/pam.nix b/third_party/nixpkgs/pkgs/servers/matrix-synapse/plugins/pam.nix
index 3f51631a75..a2f0324883 100644
--- a/third_party/nixpkgs/pkgs/servers/matrix-synapse/plugins/pam.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/matrix-synapse/plugins/s3-storage-provider.nix b/third_party/nixpkgs/pkgs/servers/matrix-synapse/plugins/s3-storage-provider.nix
index 386849f178..08baf4a785 100644
--- a/third_party/nixpkgs/pkgs/servers/matrix-synapse/plugins/s3-storage-provider.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/mattermost/matterircd.nix b/third_party/nixpkgs/pkgs/servers/mattermost/matterircd.nix
index 9a3b5b6357..3aba439aff 100644
--- a/third_party/nixpkgs/pkgs/servers/mattermost/matterircd.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/mautrix-discord/default.nix b/third_party/nixpkgs/pkgs/servers/mautrix-discord/default.nix
index bd1e72c579..dc3bbcff8a 100644
--- a/third_party/nixpkgs/pkgs/servers/mautrix-discord/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/mautrix-discord/default.nix
@@ -9,16 +9,16 @@
 
 buildGoModule rec {
   pname = "mautrix-discord";
-  version = "0.6.5";
+  version = "0.7.0";
 
   src = fetchFromGitHub {
     owner = "mautrix";
     repo = "discord";
     rev = "v${version}";
-    hash = "sha256-kjIBjkRI0BrbMNkb1Tdv7d+ZFOKRkUL9KxtQMtvxpIM=";
+    hash = "sha256-N6CepP+P63TIKKi6FQLJEuV5hFtiv1CcBM+1Y/QPZrI=";
   };
 
-  vendorHash = "sha256-qRIgdkDp1pd/bA/AIU4PvoXcvrQam0kmr0hu4yAl+IY=";
+  vendorHash = "sha256-QdH98NA5Y9YKkvL8Gq8ChgvHFOyOBFXDDulxwql6v5c=";
 
   ldflags = [ "-s" "-w" ];
 
diff --git a/third_party/nixpkgs/pkgs/servers/meteor/default.nix b/third_party/nixpkgs/pkgs/servers/meteor/default.nix
index 7830d309b0..2036d31e5b 100644
--- a/third_party/nixpkgs/pkgs/servers/meteor/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/microserver/default.nix b/third_party/nixpkgs/pkgs/servers/microserver/default.nix
index c6ca5edd70..acc223627f 100644
--- a/third_party/nixpkgs/pkgs/servers/microserver/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/microserver/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-VgzOdJ1JLe0acjRYvaysCPox5acFmc4VD2f6HZWxT8M=";
   };
 
-  cargoSha256 = "sha256-JGsMtlWuww1rYE4w6i2VlyD6gGHqnLehLDZmW57R+Fo=";
+  cargoHash = "sha256-JGsMtlWuww1rYE4w6i2VlyD6gGHqnLehLDZmW57R+Fo=";
 
   buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security ]);
 
diff --git a/third_party/nixpkgs/pkgs/servers/misc/oven-media-engine/default.nix b/third_party/nixpkgs/pkgs/servers/misc/oven-media-engine/default.nix
index dc19615bcd..5b7442cfde 100644
--- a/third_party/nixpkgs/pkgs/servers/misc/oven-media-engine/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/misc/oven-media-engine/default.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation rec {
   pname = "oven-media-engine";
-  version = "0.16.6";
+  version = "0.16.8";
 
   src = fetchFromGitHub {
     owner = "AirenSoft";
     repo = "OvenMediaEngine";
     rev = "v${version}";
-    sha256 = "sha256-FM55vca2mUrd+X5D2KC22uY1X/RoHjEE8IngjzgxYMM=";
+    sha256 = "sha256-f0kZTOI2XzhnXwWLJzWqUJmz3d7c9wGN/D5LC0nY/08=";
   };
 
   sourceRoot = "${src.name}/src";
diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/alerta/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/alerta/default.nix
index 3a360ca0f8..61e878286c 100644
--- a/third_party/nixpkgs/pkgs/servers/monitoring/alerta/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix
index ad28595686..a26d3418e0 100644
--- a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix
@@ -6,19 +6,9 @@
 , faketty
 }:
 
-let
-  # Grafana seems to just set it to the latest version available
-  # nowadays.
-  patchGoVersion = ''
-    substituteInPlace go.{mod,work} pkg/build/wire/go.mod \
-      --replace-fail "go 1.22.4" "go 1.22.3"
-    substituteInPlace Makefile \
-      --replace-fail "GO_VERSION = 1.22.4" "GO_VERSION = 1.22.3"
-  '';
-in
 buildGoModule rec {
   pname = "grafana";
-  version = "11.1.0";
+  version = "11.1.3";
 
   subPackages = [ "pkg/cmd/grafana" "pkg/cmd/grafana-server" "pkg/cmd/grafana-cli" ];
 
@@ -26,7 +16,7 @@ buildGoModule rec {
     owner = "grafana";
     repo = "grafana";
     rev = "v${version}";
-    hash = "sha256-iTTT10YN8jBT4/ukGXNK1QHcyzXnAqg2LiFtNiwnENw=";
+    hash = "sha256-PfkKBKegMk+VjVJMocGj+GPTuUJipjD8+857skwmoco=";
   };
 
   # borrowed from: https://github.com/NixOS/nixpkgs/blob/d70d9425f49f9aba3c49e2c389fe6d42bac8c5b0/pkgs/development/tools/analysis/snyk/default.nix#L20-L22
@@ -46,9 +36,6 @@ buildGoModule rec {
       jq moreutils python3
     # @esfx/equatable@npm:1.0.2 fails to build on darwin as it requires `xcbuild`
     ] ++ lib.optionals stdenv.isDarwin [ xcbuild.xcbuild ];
-    postPatch = ''
-      ${patchGoVersion}
-    '';
     buildPhase = ''
       runHook preBuild
       export HOME="$(mktemp -d)"
@@ -73,17 +60,13 @@ buildGoModule rec {
 
   disallowedRequisites = [ offlineCache ];
 
-  vendorHash = "sha256-Ny/SoelFVPvBBn50QpHcLTuVY3ynKbCegM1uQkJzB9Y=";
+  vendorHash = "sha256-vd3hb7+lmhQPTZO/Xqi59XSPGj5sd218xQAD1bRbUz8=";
 
   proxyVendor = true;
 
   nativeBuildInputs = [ wire yarn jq moreutils removeReferencesTo python3 faketty ]
     ++ lib.optionals stdenv.isDarwin [ xcbuild.xcbuild ];
 
-  postPatch = ''
-    ${patchGoVersion}
-  '';
-
   postConfigure = ''
     # Generate DI code that's required to compile the package.
     # From https://github.com/grafana/grafana/blob/v8.2.3/Makefile#L33-L35
diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/kapacitor/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/kapacitor/default.nix
index fe1cf89fd2..20525bfbf9 100644
--- a/third_party/nixpkgs/pkgs/servers/monitoring/kapacitor/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/monitoring/kapacitor/default.nix
@@ -40,7 +40,7 @@ let
       })
     ];
     sourceRoot = "${src.name}/libflux";
-    cargoSha256 = "sha256-oAMoGGdR0QEjSzZ0/J5J9s/ekSlryCcRBSo5N2r70Ko=";
+    cargoHash = "sha256-oAMoGGdR0QEjSzZ0/J5J9s/ekSlryCcRBSo5N2r70Ko=";
     nativeBuildInputs = [ rustPlatform.bindgenHook ];
     buildInputs = lib.optional stdenv.isDarwin libiconv;
     pkgcfg = ''
diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/matrix-alertmanager/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/matrix-alertmanager/default.nix
index 952da144b3..13ddfc651c 100644
--- a/third_party/nixpkgs/pkgs/servers/monitoring/matrix-alertmanager/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/influxdb-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/influxdb-exporter.nix
index 2690481b45..3f4bcb6646 100644
--- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/influxdb-exporter.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/jitsi-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/jitsi-exporter.nix
index 13ce969b82..775818ca15 100644
--- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/jitsi-exporter.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/pihole-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/pihole-exporter.nix
index a5dba8e437..61a91bfd6d 100644
--- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/pihole-exporter.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix
index 6c012111c4..f1d7f534c7 100644
--- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/rabbitmq-exporter.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/redis-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/redis-exporter.nix
index 946c485f6e..bff0677642 100644
--- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/redis-exporter.nix
+++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/redis-exporter.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "redis_exporter";
-  version = "1.61.0";
+  version = "1.62.0";
 
   src = fetchFromGitHub {
     owner = "oliver006";
     repo = "redis_exporter";
     rev = "v${version}";
-    sha256 = "sha256-ZfjOsPUr72Ex+5SR2oVMybbR20hwqlto3teTJcdtALA=";
+    sha256 = "sha256-EKI/oF0bAiwDYjkdEPi84R8H8wExaCxFK3uPx8MrHk8=";
   };
 
   vendorHash = "sha256-nrEglhb22LANgm6hiZToPVPfGpkpxpJ7TQlLW0Z7+/4=";
diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/smartctl-exporter/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/smartctl-exporter/default.nix
index b03a006982..707c8bbb0c 100644
--- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/smartctl-exporter/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/smartctl-exporter/default.nix
@@ -2,6 +2,7 @@
 , fetchFromGitHub
 , buildGoModule
 , nixosTests
+, smartmontools
 }:
 
 buildGoModule rec {
@@ -17,6 +18,11 @@ buildGoModule rec {
 
   vendorHash = "sha256-WUB2FgBl4Tybz7T0yvcSYIlG75NEhXpn1F0yuB9F21g=";
 
+  postPatch = ''
+    substituteInPlace main.go README.md \
+      --replace-fail /usr/sbin/smartctl ${lib.getExe smartmontools}
+  '';
+
   ldflags = [
     "-X github.com/prometheus/common/version.Version=${version}"
   ];
diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/v2ray-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/v2ray-exporter.nix
index 0d5afa432a..841837325d 100644
--- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/v2ray-exporter.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix
index bee50744cc..50fe085d4a 100644
--- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix
+++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/wireguard-exporter.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-2e31ZuGJvpvu7L2Lb+n6bZWpC1JhETzEzSiNaxxsAtA=";
   };
 
-  cargoSha256 = "sha256-NsxGpjuZPpz4gCJRp5IOcfRFh8DTud47nV2bE0/kc2Q=";
+  cargoHash = "sha256-NsxGpjuZPpz4gCJRp5IOcfRFh8DTud47nV2bE0/kc2Q=";
 
   postPatch = ''
     # drop hardcoded linker names, fixing static build
diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/riemann/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/riemann/default.nix
index 3e27634965..0b678a0a0f 100644
--- a/third_party/nixpkgs/pkgs/servers/monitoring/riemann/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/monitoring/riemann/default.nix
@@ -29,6 +29,6 @@ stdenv.mkDerivation rec {
     sourceProvenance = with sourceTypes; [ binaryBytecode ];
     license = licenses.epl10;
     platforms = platforms.all;
-    maintainers = [];
+    maintainers = [ ];
   };
 }
diff --git a/third_party/nixpkgs/pkgs/servers/mx-puppet-discord/node-composition.nix b/third_party/nixpkgs/pkgs/servers/mx-puppet-discord/node-composition.nix
index bd96f55055..c5d958bef2 100644
--- a/third_party/nixpkgs/pkgs/servers/mx-puppet-discord/node-composition.nix
+++ b/third_party/nixpkgs/pkgs/servers/mx-puppet-discord/node-composition.nix
@@ -8,7 +8,7 @@ let
   nodeEnv = import ../../development/node-packages/node-env.nix {
     inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript;
     inherit pkgs nodejs;
-    libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
+    libtool = if pkgs.stdenv.isDarwin then pkgs.cctools or pkgs.darwin.cctools else null;
   };
 in
 import ./node-packages.nix {
diff --git a/third_party/nixpkgs/pkgs/servers/neard/default.nix b/third_party/nixpkgs/pkgs/servers/neard/default.nix
index 6518e8694f..12bfc31963 100644
--- a/third_party/nixpkgs/pkgs/servers/neard/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/nosql/aerospike/default.nix b/third_party/nixpkgs/pkgs/servers/nosql/aerospike/default.nix
index fbc277f770..7ff8c19888 100644
--- a/third_party/nixpkgs/pkgs/servers/nosql/aerospike/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/nosql/mongodb/mongodb.nix b/third_party/nixpkgs/pkgs/servers/nosql/mongodb/mongodb.nix
index 3d0bf072ff..b8a007c0e9 100644
--- a/third_party/nixpkgs/pkgs/servers/nosql/mongodb/mongodb.nix
+++ b/third_party/nixpkgs/pkgs/servers/nosql/mongodb/mongodb.nix
@@ -13,7 +13,7 @@
 , openldap
 , openssl
 , libpcap
-, python311
+, python311Packages
 , curl
 , Security
 , CoreFoundation
@@ -33,7 +33,7 @@ with lib;
 }:
 
 let
-  scons = buildPackages.scons.override{ python3 = python311; };
+  scons = buildPackages.scons.override{ python3Packages = python311Packages; };
   python = scons.python.withPackages (ps: with ps; [
     pyyaml
     cheetah3
diff --git a/third_party/nixpkgs/pkgs/servers/osmocom/libasn1c/default.nix b/third_party/nixpkgs/pkgs/servers/osmocom/libasn1c/default.nix
index c86475c69b..f83ff06fc9 100644
--- a/third_party/nixpkgs/pkgs/servers/osmocom/libasn1c/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/osmocom/osmo-bsc/default.nix b/third_party/nixpkgs/pkgs/servers/osmocom/osmo-bsc/default.nix
index eab88ea99c..71b936f0d6 100644
--- a/third_party/nixpkgs/pkgs/servers/osmocom/osmo-bsc/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/osmocom/osmo-bts/default.nix b/third_party/nixpkgs/pkgs/servers/osmocom/osmo-bts/default.nix
index 1484c07f62..632b57de70 100644
--- a/third_party/nixpkgs/pkgs/servers/osmocom/osmo-bts/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/osmocom/osmo-ggsn/default.nix b/third_party/nixpkgs/pkgs/servers/osmocom/osmo-ggsn/default.nix
index 3c1cac479b..1c034ddc60 100644
--- a/third_party/nixpkgs/pkgs/servers/osmocom/osmo-ggsn/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/osmocom/osmo-hlr/default.nix b/third_party/nixpkgs/pkgs/servers/osmocom/osmo-hlr/default.nix
index a8e017fabc..3b0a42ca41 100644
--- a/third_party/nixpkgs/pkgs/servers/osmocom/osmo-hlr/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/osmocom/osmo-hnbgw/default.nix b/third_party/nixpkgs/pkgs/servers/osmocom/osmo-hnbgw/default.nix
index 7d9b8c54ff..fc3798fde1 100644
--- a/third_party/nixpkgs/pkgs/servers/osmocom/osmo-hnbgw/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/osmocom/osmo-hnodeb/default.nix b/third_party/nixpkgs/pkgs/servers/osmocom/osmo-hnodeb/default.nix
index b187ddd4f5..9455b14aad 100644
--- a/third_party/nixpkgs/pkgs/servers/osmocom/osmo-hnodeb/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/osmocom/osmo-iuh/default.nix b/third_party/nixpkgs/pkgs/servers/osmocom/osmo-iuh/default.nix
index a5653a31c9..98629719ee 100644
--- a/third_party/nixpkgs/pkgs/servers/osmocom/osmo-iuh/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/osmocom/osmo-mgw/default.nix b/third_party/nixpkgs/pkgs/servers/osmocom/osmo-mgw/default.nix
index 9298695237..e67e8e138f 100644
--- a/third_party/nixpkgs/pkgs/servers/osmocom/osmo-mgw/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/osmocom/osmo-msc/default.nix b/third_party/nixpkgs/pkgs/servers/osmocom/osmo-msc/default.nix
index de73eb980b..3b252aacbe 100644
--- a/third_party/nixpkgs/pkgs/servers/osmocom/osmo-msc/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/osmocom/osmo-pcu/default.nix b/third_party/nixpkgs/pkgs/servers/osmocom/osmo-pcu/default.nix
index 1d079d3a8c..265ba665e2 100644
--- a/third_party/nixpkgs/pkgs/servers/osmocom/osmo-pcu/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/osmocom/osmo-sgsn/default.nix b/third_party/nixpkgs/pkgs/servers/osmocom/osmo-sgsn/default.nix
index 0bcd2218a5..97d1027aba 100644
--- a/third_party/nixpkgs/pkgs/servers/osmocom/osmo-sgsn/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/osmocom/osmo-sip-connector/default.nix b/third_party/nixpkgs/pkgs/servers/osmocom/osmo-sip-connector/default.nix
index 77e4b8df3c..16eeb78296 100644
--- a/third_party/nixpkgs/pkgs/servers/osmocom/osmo-sip-connector/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/pocketbase/default.nix b/third_party/nixpkgs/pkgs/servers/pocketbase/default.nix
index 75bb2c48e2..80188ec663 100644
--- a/third_party/nixpkgs/pkgs/servers/pocketbase/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/pocketbase/default.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "pocketbase";
-  version = "0.22.17";
+  version = "0.22.18";
 
   src = fetchFromGitHub {
     owner = "pocketbase";
     repo = "pocketbase";
     rev = "v${version}";
-    hash = "sha256-BQmqd8h1wc0AKaKECBAyOMYfXio/+nJrDfYs8Qbq5PY=";
+    hash = "sha256-XR1A4ViYeguXg9qynUWpjRkfgm4vaHR6mZGWSbx89Bs=";
   };
 
-  vendorHash = "sha256-KG1etP/wrjoDCTNYB9J5gmW2NMgBZQcdA1QfXKGipO8=";
+  vendorHash = "sha256-9i4ieAlrhtnFhCJvIJyS+9GJfq1bX4BE45vV2SvhY2s=";
 
   # This is the released subpackage from upstream repo
   subPackages = [ "examples/base" ];
diff --git a/third_party/nixpkgs/pkgs/servers/pr-tracker/default.nix b/third_party/nixpkgs/pkgs/servers/pr-tracker/default.nix
index 750ac015c0..6c9e317298 100644
--- a/third_party/nixpkgs/pkgs/servers/pr-tracker/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/radarr/default.nix b/third_party/nixpkgs/pkgs/servers/radarr/default.nix
index c8acc5debb..43ed4e175e 100644
--- a/third_party/nixpkgs/pkgs/servers/radarr/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/radarr/default.nix
@@ -10,15 +10,15 @@ let
   }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
 
   hash = {
-    x64-linux_hash = "sha256-MlnT16a2l209uqu9DuXLwqf4yiWBn9MggqVubzg0pM4=";
-    arm64-linux_hash = "sha256-2NkklAOjpDbAXid+rayiQ+jndLluIAMEiKz0MA1Hg0k=";
-    x64-osx_hash = "sha256-OzUZsXUwE7jF4h/rCvWAY5mh97z/cUbhh6MK0ozHC+A=";
-    arm64-osx_hash = "sha256-ggNqWCixkHxhiWTYfUx9qeZ9ocTyJEEgSZJqgGOnL+Q=";
+    x64-linux_hash = "sha256-2UkdzOvJZ7fWag/kyfFffPtCVEXil0TTcTReykPKWuU=";
+    arm64-linux_hash = "sha256-IuLtPWsUukiIk9H/0yf74SipYcbvn1p5MZUbptypCJs=";
+    x64-osx_hash = "sha256-vLkY9rqdQwr/ntpmUMK5bCIjLWGCt1xEhH/QQzgkZV8=";
+    arm64-osx_hash = "sha256-Y0aXaMnOCdzrIiM7BqGdHAIO60VFNWUb5ISGaVDX/9s=";
   }."${arch}-${os}_hash";
 
 in stdenv.mkDerivation rec {
   pname = "radarr";
-  version = "5.7.0.8882";
+  version = "5.8.3.8933";
 
   src = fetchurl {
     url = "https://github.com/Radarr/Radarr/releases/download/v${version}/Radarr.master.${version}.${os}-core-${arch}.tar.gz";
diff --git a/third_party/nixpkgs/pkgs/servers/redpanda/default.nix b/third_party/nixpkgs/pkgs/servers/redpanda/default.nix
index 307e762881..09b8828069 100644
--- a/third_party/nixpkgs/pkgs/servers/redpanda/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/rinetd/default.nix b/third_party/nixpkgs/pkgs/servers/rinetd/default.nix
index 1cd7d19059..e9abb0ceab 100644
--- a/third_party/nixpkgs/pkgs/servers/rinetd/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/roapi/http.nix b/third_party/nixpkgs/pkgs/servers/roapi/http.nix
index 885293d6be..019c979b47 100644
--- a/third_party/nixpkgs/pkgs/servers/roapi/http.nix
+++ b/third_party/nixpkgs/pkgs/servers/roapi/http.nix
@@ -22,7 +22,7 @@ in
 #     sha256 = "sha256-qHAO3h+TTCQQ7vdd4CoXVGfKZ1fIxTWKqbUNnRsJaok=";
 #   };
 
-#   cargoSha256 = "sha256-qDJKC6MXeKerPFwJsNND3WkziFtGkTvCgVEsdPbBGAo=";
+#   cargoHash = "sha256-qDJKC6MXeKerPFwJsNND3WkziFtGkTvCgVEsdPbBGAo=";
 
 #   buildAndTestSubdir = "roapi-http";
 
diff --git a/third_party/nixpkgs/pkgs/servers/rpiplay/default.nix b/third_party/nixpkgs/pkgs/servers/rpiplay/default.nix
index 72bffc0a29..90f773c73d 100644
--- a/third_party/nixpkgs/pkgs/servers/rpiplay/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/rustypaste/default.nix b/third_party/nixpkgs/pkgs/servers/rustypaste/default.nix
index 622c33b979..97fdacecb9 100644
--- a/third_party/nixpkgs/pkgs/servers/rustypaste/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/rustypaste/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "rustypaste";
-  version = "0.15.0";
+  version = "0.15.1";
 
   src = fetchFromGitHub {
     owner = "orhun";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-mDNWIqA3t8AGNTqryiH2q8Tvg4k5d0II3EBkf7tdoNo=";
+    sha256 = "sha256-C/ndU09+yQTXEUWDO3u9Bl5M3x3aaRHVuWpomUAa/B8=";
   };
 
-  cargoHash = "sha256-ZmlA6O/9ZVLHvBHMkY+hpb6Eb0o0RxfXpwop6BLCdWc=";
+  cargoHash = "sha256-b9KZzevaTl52pduN4gkF8k6yqgDcE8x5sOwmPxzYfWA=";
 
   buildInputs = lib.optionals stdenv.isDarwin [
     darwin.apple_sdk.frameworks.CoreServices
diff --git a/third_party/nixpkgs/pkgs/servers/scaphandre/default.nix b/third_party/nixpkgs/pkgs/servers/scaphandre/default.nix
index 07aee5a715..4d7d0c5060 100644
--- a/third_party/nixpkgs/pkgs/servers/scaphandre/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/scaphandre/default.nix
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-cXwgPYTgom4KrL/PH53Fk6ChtALuMYyJ/oTrUKHCrzE=";
   };
 
-  cargoSha256 = "sha256-Vdkq9ShbHWepvIgHPjhKY+LmhjS+Pl84QelgEpen7Qs=";
+  cargoHash = "sha256-Vdkq9ShbHWepvIgHPjhKY+LmhjS+Pl84QelgEpen7Qs=";
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ openssl ];
diff --git a/third_party/nixpkgs/pkgs/servers/search/weaviate/default.nix b/third_party/nixpkgs/pkgs/servers/search/weaviate/default.nix
index d3786881af..191a2fc531 100644
--- a/third_party/nixpkgs/pkgs/servers/search/weaviate/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/search/weaviate/default.nix
@@ -5,16 +5,16 @@
 
 buildGoModule rec {
   pname = "weaviate";
-  version = "1.25.8";
+  version = "1.25.9";
 
   src = fetchFromGitHub {
     owner = "weaviate";
     repo = "weaviate";
     rev = "v${version}";
-    hash = "sha256-MmOA0kO5OCXz5MIqz1netXFUShZc0TkMCFKNfbD1uEM=";
+    hash = "sha256-liy3mw0+KJsac7AH1PEU6vk+MLo+ybEVCBeSU7MkoY0=";
   };
 
-  vendorHash = "sha256-D+/gB1HbwXWHJ6e5J6s+HgN4yPQX1nYbvMY2oLIQFwQ=";
+  vendorHash = "sha256-5kfXX+VqGY2ka/w79sdtVHS/0XlF7DyHcq5hvFFIHK0=";
 
   subPackages = [ "cmd/weaviate-server" ];
 
diff --git a/third_party/nixpkgs/pkgs/servers/shishi/default.nix b/third_party/nixpkgs/pkgs/servers/shishi/default.nix
index 7bfa18a6e9..6f8f92e3ac 100644
--- a/third_party/nixpkgs/pkgs/servers/shishi/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/shishi/default.nix
@@ -22,6 +22,8 @@ stdenv.mkDerivation rec {
     sha256 = "032qf72cpjdfffq1yq54gz3ahgqf2ijca4vl31sfabmjzq9q370d";
   };
 
+  separateDebugInfo = true;
+
   # Fixes support for gcrypt 1.6+
   patches = [ ./gcrypt-fix.patch ./freebsd-unistd.patch ];
 
diff --git a/third_party/nixpkgs/pkgs/servers/silc-server/default.nix b/third_party/nixpkgs/pkgs/servers/silc-server/default.nix
index dcb5eb4e99..6ed1a2dd5e 100644
--- a/third_party/nixpkgs/pkgs/servers/silc-server/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/silc-server/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
     description = "Secure Internet Live Conferencing server";
     mainProgram = "silcd";
     license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [viric];
+    maintainers = [ ];
     platforms = with lib.platforms; linux;
   };
 }
diff --git a/third_party/nixpkgs/pkgs/servers/sip/sipwitch/default.nix b/third_party/nixpkgs/pkgs/servers/sip/sipwitch/default.nix
index 4f4f5e44ee..0c11ffe8c1 100644
--- a/third_party/nixpkgs/pkgs/servers/sip/sipwitch/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/sks/default.nix b/third_party/nixpkgs/pkgs/servers/sks/default.nix
index 6acb07c82a..afb46a2950 100644
--- a/third_party/nixpkgs/pkgs/servers/sks/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/skydns/default.nix b/third_party/nixpkgs/pkgs/servers/skydns/default.nix
index 73d0adef93..ff628ba2e3 100644
--- a/third_party/nixpkgs/pkgs/servers/skydns/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/sql/mariadb/default.nix b/third_party/nixpkgs/pkgs/servers/sql/mariadb/default.nix
index cab00249d3..dfa16d4796 100644
--- a/third_party/nixpkgs/pkgs/servers/sql/mariadb/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/sql/mariadb/default.nix
@@ -247,21 +247,18 @@ in
       # TODO should be removed
       version = "10.5.25";
       hash = "sha256-lhnQ9R6GQ1dGayxjMBo0pT99/ZnxjE/UUvqyK/Obpk4=";
-      inherit (self.darwin) cctools;
       inherit (self.darwin.apple_sdk.frameworks) CoreServices;
     };
     mariadb_106 = self.callPackage generic {
       # Supported until 2026-07-06
       version = "10.6.18";
       hash = "sha256-aJihER9HEwcJ4ouix70aV+S7VxAfbhCeWX1R5tOFzxg=";
-      inherit (self.darwin) cctools;
       inherit (self.darwin.apple_sdk.frameworks) CoreServices;
     };
     mariadb_1011 = self.callPackage generic {
       # Supported until 2028-02-16
       version = "10.11.8";
       hash = "sha256-XwTz4z2fHL7/BeecVNQdMCYwUAyZWu5ysGOOL5383w8=";
-      inherit (self.darwin) cctools;
       inherit (self.darwin.apple_sdk.frameworks) CoreServices;
     };
     mariadb_110 = self.callPackage generic {
@@ -269,7 +266,6 @@ in
       # TODO should be removed
       version = "11.0.6";
       hash = "sha256-AYnWKUbDfG20a/GkaLqVgLy6joDwWVjsSDwzh+zPmgA=";
-      inherit (self.darwin) cctools;
       inherit (self.darwin.apple_sdk.frameworks) CoreServices;
     };
   }
diff --git a/third_party/nixpkgs/pkgs/servers/sql/mysql/jdbc/default.nix b/third_party/nixpkgs/pkgs/servers/sql/mysql/jdbc/default.nix
index 8ddb02aa03..1a92e75b93 100644
--- a/third_party/nixpkgs/pkgs/servers/sql/mysql/jdbc/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/sql/patroni/default.nix b/third_party/nixpkgs/pkgs/servers/sql/patroni/default.nix
index 119218bada..619e269f15 100644
--- a/third_party/nixpkgs/pkgs/servers/sql/patroni/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/sql/patroni/default.nix
@@ -6,13 +6,13 @@
 
 pythonPackages.buildPythonApplication rec {
   pname = "patroni";
-  version = "3.3.1";
+  version = "3.3.2";
 
   src = fetchFromGitHub {
     owner = "zalando";
     repo = pname;
     rev = "refs/tags/v${version}";
-    sha256 = "sha256-GyPPBoYcJnuMer9FYGhWqursX/qJLaAlc9zFULoJqo4=";
+    sha256 = "sha256-7Tq7i6AH6tt9Uyx276rVBwvbxxETRyVKnhhTijW02sU=";
   };
 
   propagatedBuildInputs = with pythonPackages; [
diff --git a/third_party/nixpkgs/pkgs/servers/sql/percona-server/default.nix b/third_party/nixpkgs/pkgs/servers/sql/percona-server/default.nix
index 8cab6ec656..002765a04c 100644
--- a/third_party/nixpkgs/pkgs/servers/sql/percona-server/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/sql/percona-server/default.nix
@@ -1,13 +1,13 @@
 pkgs: {
   percona-server_lts = pkgs.callPackage ./lts.nix {
-    inherit (pkgs.darwin) cctools developer_cmds DarwinTools;
+    inherit (pkgs.darwin) developer_cmds DarwinTools;
     inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices;
     boost = pkgs.boost177; # Configure checks for specific version.
     icu = pkgs.icu69;
     protobuf = pkgs.protobuf_21;
   };
   percona-server_innovation = pkgs.callPackage ./innovation.nix {
-    inherit (pkgs.darwin) cctools developer_cmds DarwinTools;
+    inherit (pkgs.darwin) developer_cmds DarwinTools;
     inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices;
     # newer versions cause linking failures against `libabsl_spinlock_wait`
     protobuf = pkgs.protobuf_21;
diff --git a/third_party/nixpkgs/pkgs/servers/sql/pgpool/default.nix b/third_party/nixpkgs/pkgs/servers/sql/pgpool/default.nix
index b169b0240b..f1762be17f 100644
--- a/third_party/nixpkgs/pkgs/servers/sql/pgpool/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/age.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/age.nix
index a758e9b98a..2c68d6dcbb 100644
--- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/age.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/citus.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/citus.nix
index 211216d866..28d6139f0a 100644
--- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/citus.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/h3-pg.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/h3-pg.nix
index 4a5786e03d..2b8edb366f 100644
--- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/h3-pg.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_embedding.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_embedding.nix
index e858d6f0c5..5306a61903 100644
--- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_embedding.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/plv8/default.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/plv8/default.nix
index 615dcb3a80..af1cee81fa 100644
--- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/plv8/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb.nix
index 3701ae6e84..cf75d52e7a 100644
--- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/timescaledb.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/sql/postgresql/generic.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/generic.nix
index 9104396a3f..907646dc72 100644
--- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/generic.nix
+++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/generic.nix
@@ -2,7 +2,7 @@ let
 
   generic =
       # dependencies
-      { stdenv, lib, fetchurl, makeWrapper
+      { stdenv, lib, fetchurl, fetchpatch, makeWrapper
       , glibc, zlib, readline, openssl, icu, lz4, zstd, systemd, libossp_uuid
       , pkg-config, libxml2, tzdata, libkrb5, substituteAll, darwin
       , linux-pam
@@ -120,6 +120,22 @@ let
         locale = "${if stdenv.isDarwin then darwin.adv_cmds else lib.getBin stdenv.cc.libc}/bin/locale";
       })
 
+      (
+        if atLeast "16" then
+          fetchpatch {
+            name = "libxml2-2.13-compat.patch";
+            # This one is for 16 branch upstream.
+            url = "https://github.com/postgres/postgres/commit/f85c91a1867b45742bb28e4578ca2b4a0976383f.diff";
+            hash = "sha256-4YcXfo98uVuCu+ybVw3bM4x8Y0I1xfjdjBZOlhyF21w=";
+          }
+        else
+          fetchpatch {
+            name = "libxml2-2.13-compat.patch";
+            # This one is for 15 branch upstream, but it also applies well to all our older branches.
+            url = "https://github.com/postgres/postgres/commit/f68d6aabb7e2c803818185b49a3d356bdb2b2974.diff";
+            hash = "sha256-Nelb0mbjx0Xq9UJuVv7cs3ifCtUPP7UZraPMPGb2wyQ=";
+          }
+      )
     ] ++ lib.optionals stdenv'.hostPlatform.isMusl (
       # Using fetchurl instead of fetchpatch on purpose: https://github.com/NixOS/nixpkgs/issues/240141
       map fetchurl (lib.attrValues muslPatches)
diff --git a/third_party/nixpkgs/pkgs/servers/tarssh/default.nix b/third_party/nixpkgs/pkgs/servers/tarssh/default.nix
index 9e07304de8..d2ce6e56c8 100644
--- a/third_party/nixpkgs/pkgs/servers/tarssh/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/tarssh/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-AoKc8VF6rqYIsijIfgvevwu+6+suOO7XQCXXgAPNgLk=";
   };
 
-  cargoSha256 = "sha256-w1MNsMSGONsAAjyvAHjio2K88j1sqyP1Aqmw3EMya+c=";
+  cargoHash = "sha256-w1MNsMSGONsAAjyvAHjio2K88j1sqyP1Aqmw3EMya+c=";
 
   meta = with lib; {
     description = "Simple SSH tarpit inspired by endlessh";
diff --git a/third_party/nixpkgs/pkgs/servers/udpt/default.nix b/third_party/nixpkgs/pkgs/servers/udpt/default.nix
index b5c601a930..59dd539e40 100644
--- a/third_party/nixpkgs/pkgs/servers/udpt/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/udpt/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-G3LzbV3b1Y/2SPIBS1kZDuLuGF5gV/H1LFBRhevpdjU=";
   };
 
-  cargoSha256 = "sha256-ebLVyUB65fW8BWctxXnYxrnl/2IESd4YJXeiMsMXn9s=";
+  cargoHash = "sha256-ebLVyUB65fW8BWctxXnYxrnl/2IESd4YJXeiMsMXn9s=";
 
   postInstall = ''
     install -D udpt.toml $out/share/udpt/udpt.toml
diff --git a/third_party/nixpkgs/pkgs/servers/unifiedpush-common-proxies/default.nix b/third_party/nixpkgs/pkgs/servers/unifiedpush-common-proxies/default.nix
index 34d787b847..0c0910893b 100644
--- a/third_party/nixpkgs/pkgs/servers/unifiedpush-common-proxies/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/unpackerr/default.nix b/third_party/nixpkgs/pkgs/servers/unpackerr/default.nix
index 5d0b90265d..f839689364 100644
--- a/third_party/nixpkgs/pkgs/servers/unpackerr/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/unpfs/default.nix b/third_party/nixpkgs/pkgs/servers/unpfs/default.nix
index b67cf7ce05..4c879a14c9 100644
--- a/third_party/nixpkgs/pkgs/servers/unpfs/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/unpfs/default.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
 
   sourceRoot = "${src.name}/example/unpfs";
 
-  cargoSha256 = "sha256-v8hbxKuxux0oYglEIK5dM9q0oBQzjyYDP1JB1cYR/T0=";
+  cargoHash = "sha256-v8hbxKuxux0oYglEIK5dM9q0oBQzjyYDP1JB1cYR/T0=";
 
   RUSTC_BOOTSTRAP = 1;
 
diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/discourse/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/discourse/default.nix
index 5ad3209fd5..73810fa139 100644
--- a/third_party/nixpkgs/pkgs/servers/web-apps/discourse/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/web-apps/discourse/default.nix
@@ -47,13 +47,13 @@
 }@args:
 
 let
-  version = "3.2.4";
+  version = "3.2.5";
 
   src = fetchFromGitHub {
     owner = "discourse";
     repo = "discourse";
     rev = "v${version}";
-    sha256 = "sha256-bwYMLkBtdfgfAX8vKpsFRg5tpBtoaURKGF0rs/CtJ2U=";
+    sha256 = "sha256-+at4IiJ0yRPq9XyvAwa2Kuc0wYQOB5hw7E1jmQAAkc4=";
   };
 
   ruby = ruby_3_2;
diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-voting/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-voting/default.nix
index 3ddbc37cf7..f479e16cfd 100644
--- a/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-voting/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/web-apps/discourse/plugins/discourse-voting/default.nix
@@ -5,8 +5,8 @@ mkDiscoursePlugin {
   src = fetchFromGitHub {
     owner = "discourse";
     repo = "discourse-voting";
-    rev = "ba41633e0abe0535fd358a0809e0b4e0c79be128";
-    sha256 = "sha256-Ni+g9mWftvYsknIoSFBRoq7IMIWPbj4mgGM+k8fjOuI=";
+    rev = "fdb1f98a963adac049ffe9cd4fc506d77dd38cca";
+    sha256 = "sha256-H1rTWfWlq1Hdo7UpcAgAz/zMFwick0nPSn4k1aUyYe0=";
   };
   meta = with lib; {
     homepage = "https://github.com/discourse/discourse-voting";
diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/engelsystem/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/engelsystem/default.nix
index 264c3243d2..fd3de6d695 100644
--- a/third_party/nixpkgs/pkgs/servers/web-apps/engelsystem/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/web-apps/ethercalc/node-packages.nix b/third_party/nixpkgs/pkgs/servers/web-apps/ethercalc/node-packages.nix
index 22b4c99d08..e9c5ff0e4f 100644
--- a/third_party/nixpkgs/pkgs/servers/web-apps/ethercalc/node-packages.nix
+++ b/third_party/nixpkgs/pkgs/servers/web-apps/ethercalc/node-packages.nix
@@ -8,7 +8,7 @@ let
   nodeEnv = import ../../../development/node-packages/node-env.nix {
     inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript;
     inherit pkgs nodejs;
-    libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
+    libtool = if pkgs.stdenv.isDarwin then pkgs.cctools or pkgs.darwin.cctools else null;
   };
 in
 import ./node-packages-generated.nix {
diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/galene/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/galene/default.nix
index d8742978d0..6bc8b9fdc2 100644
--- a/third_party/nixpkgs/pkgs/servers/web-apps/galene/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/web-apps/galene/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "galene";
-  version = "0.9";
+  version = "0.9.1";
 
   src = fetchFromGitHub {
     owner = "jech";
     repo = "galene";
     rev = "galene-${version}";
-    hash = "sha256-wklWAs5Ag9FZu85vLPNXoiS7TVQe98fLbRiMIp2OsaI=";
+    hash = "sha256-Ky38PM9HX1jV1LTMUeqaY8fUjZAxe4uK52YKQF8WOMA=";
   };
 
   vendorHash = "sha256-U8DH3b2KbFQbEV+7suVsBiTA42FEl6DebH+GJDaH6aE=";
diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/phylactery/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/phylactery/default.nix
index 2dfccdabbb..43c6032f10 100644
--- a/third_party/nixpkgs/pkgs/servers/web-apps/phylactery/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/web-apps/phylactery/default.nix
@@ -1,22 +1,16 @@
-{ lib, buildGoModule, fetchFromSourcehut, nixosTests }:
+{ lib, buildGoModule, fetchzip, nixosTests }:
 
 buildGoModule rec {
   pname = "phylactery";
-  version = "0.1.2";
+  version = "0.2.0";
 
-  src = fetchFromSourcehut {
-    owner = "~cnx";
-    repo = pname;
-    rev = version;
-    hash = "sha256-HQN6wJ/4YeuQaDcNgdHj0RgYnn2NxXGRfxybmv60EdQ=";
+  src = fetchzip {
+    url = "https://trong.loang.net/phylactery/snapshot/phylactery-${version}.tar.gz";
+    hash = "sha256-UokK6rVjpzbcKOkZteo5kU7rFMm1meBUM4bkYAYM8rI=";
   };
 
   vendorHash = null;
 
-  preBuild = ''
-    cp ${./go.mod} go.mod
-  '';
-
   ldflags = [ "-s" "-w" ];
 
   passthru.tests.phylactery = nixosTests.phylactery;
@@ -24,7 +18,7 @@ buildGoModule rec {
   meta = with lib; {
     description = "Old school comic web server";
     mainProgram = "phylactery";
-    homepage = "https://git.sr.ht/~cnx/phylactery";
+    homepage = "https://trong.loang.net/phylactery/about";
     license = licenses.agpl3Plus;
     maintainers = with maintainers; [ McSinyx ];
     platforms = platforms.all;
diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/phylactery/go.mod b/third_party/nixpkgs/pkgs/servers/web-apps/phylactery/go.mod
deleted file mode 100644
index 4ec9652e23..0000000000
--- a/third_party/nixpkgs/pkgs/servers/web-apps/phylactery/go.mod
+++ /dev/null
@@ -1,3 +0,0 @@
-module git.sr.ht/~cnx/phylactery
-
-go 1.18
diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/sogo/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/sogo/default.nix
index 89175e5e5a..a6740f7422 100644
--- a/third_party/nixpkgs/pkgs/servers/web-apps/sogo/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/servers/webmetro/default.nix b/third_party/nixpkgs/pkgs/servers/webmetro/default.nix
index 11cbfa5adb..f738c9e504 100644
--- a/third_party/nixpkgs/pkgs/servers/webmetro/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/webmetro/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1n2c7ygs8qsd5zgii6fqqcwg427bsij082bg4ijnzkq5630dx651";
   };
 
-  cargoSha256 = "1n4498byy2m2f928hamfn959abrrn693wcc323ifqqrvnbkckdz8";
+  cargoHash = "sha256-6LfJ5rI7Y+ziEIMxPpKxOS+VSrKuKohEcqIK7xdKhNg=";
 
   meta = with lib; {
     description = "Simple relay server for broadcasting a WebM stream";
diff --git a/third_party/nixpkgs/pkgs/servers/wishlist/default.nix b/third_party/nixpkgs/pkgs/servers/wishlist/default.nix
index 4471e10ad9..f2a2912649 100644
--- a/third_party/nixpkgs/pkgs/servers/wishlist/default.nix
+++ b/third_party/nixpkgs/pkgs/servers/wishlist/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "wishlist";
-  version = "0.14.1";
+  version = "0.15.0";
 
   src = fetchFromGitHub {
     owner = "charmbracelet";
     repo = "wishlist";
     rev = "v${version}";
-    sha256 = "sha256-B4p2j/U+vTiku7rTj5Ho6BY84kjrNHLDIkI9pZZdmHI=";
+    sha256 = "sha256-LozGwgm/LGOzCa+zKC77NX40etzT4PDeuw3yh1QMmMY=";
   };
 
-  vendorHash = "sha256-kfeIEpe6g4T9joAZesgqdE5dd9UD9+a0nALceKq1/zc=";
+  vendorHash = "sha256-QdMS1C8I3Ul5q6HQOw7+alinPo0yIZ4s7yIxQ/poEik=";
 
   doCheck = false;
 
diff --git a/third_party/nixpkgs/pkgs/servers/x11/xquartz/default.nix b/third_party/nixpkgs/pkgs/servers/x11/xquartz/default.nix
index 93b2869f8d..dfa9dda457 100644
--- a/third_party/nixpkgs/pkgs/servers/x11/xquartz/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/shells/bash/5.nix b/third_party/nixpkgs/pkgs/shells/bash/5.nix
index 578e338dcb..395fffe293 100644
--- a/third_party/nixpkgs/pkgs/shells/bash/5.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/shells/hishtory/default.nix b/third_party/nixpkgs/pkgs/shells/hishtory/default.nix
index b3d4942620..dfbcc41657 100644
--- a/third_party/nixpkgs/pkgs/shells/hishtory/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/shells/nsh/default.nix b/third_party/nixpkgs/pkgs/shells/nsh/default.nix
index 43938e1e90..fc7e5667a4 100644
--- a/third_party/nixpkgs/pkgs/shells/nsh/default.nix
+++ b/third_party/nixpkgs/pkgs/shells/nsh/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1479wv8h5l2b0cwp27vpybq50nyvszhjxmn76n2bz3fchr0lrcbp";
   };
 
-  cargoSha256 = "1kxjr4ymns95g6jz94107nqmd71m2xh8k19gcsy08650gjrn5cz3";
+  cargoHash = "sha256-47Nis3ygGAS8Zi+FiWAXNZxWsT0gkPSleSVpWz3Jss8=";
 
   doCheck = false;
 
diff --git a/third_party/nixpkgs/pkgs/shells/nushell/default.nix b/third_party/nixpkgs/pkgs/shells/nushell/default.nix
index 34bdab129b..066f31b6e7 100644
--- a/third_party/nixpkgs/pkgs/shells/nushell/default.nix
+++ b/third_party/nixpkgs/pkgs/shells/nushell/default.nix
@@ -21,7 +21,7 @@
 }:
 
 let
-  version = "0.95.0";
+  version = "0.96.1";
 in
 
 rustPlatform.buildRustPackage {
@@ -32,10 +32,10 @@ rustPlatform.buildRustPackage {
     owner = "nushell";
     repo = "nushell";
     rev = version;
-    hash = "sha256-NxdqQ5sWwDptX4jyQCkNX2pVCua5nN4v/VYHZ/Q1LpQ=";
+    hash = "sha256-I9cCvm2qTCwnRonfE86ippBV4V1r8U5HFr9OA96wVqI=";
   };
 
-  cargoHash = "sha256-PNZPljUDXqkyQicjwjaZsiSltxgO6I9/9VJDWKkvUFA=";
+  cargoHash = "sha256-XlsK7zu3Pyc5p5SPVCsBqxIyKedaAPF58Ki7keOZRYM=";
 
   nativeBuildInputs = [ pkg-config ]
     ++ lib.optionals (withDefaultFeatures && stdenv.isLinux) [ python3 ]
@@ -49,6 +49,8 @@ rustPlatform.buildRustPackage {
   buildNoDefaultFeatures = !withDefaultFeatures;
   buildFeatures = additionalFeatures [ ];
 
+  doCheck = ! stdenv.isDarwin; # Skip checks on darwin. Failing tests since 0.96.0
+
   checkPhase = ''
     runHook preCheck
     (
diff --git a/third_party/nixpkgs/pkgs/shells/nushell/plugins/formats.nix b/third_party/nixpkgs/pkgs/shells/nushell/plugins/formats.nix
index a4e3b5dfc4..c7cc591126 100644
--- a/third_party/nixpkgs/pkgs/shells/nushell/plugins/formats.nix
+++ b/third_party/nixpkgs/pkgs/shells/nushell/plugins/formats.nix
@@ -11,7 +11,7 @@
 rustPlatform.buildRustPackage rec {
   pname = "nushell_plugin_formats";
   inherit (nushell) version src;
-  cargoHash = "sha256-DI49nEm7CSoXGspTNvzzR7GsXAbMLcozsLd8d3KsEcQ=";
+  cargoHash = "sha256-R4a+lD0KkdKrh2l7Fuyf/g/SvluDLjgAkolAF2h3Bl4=";
 
   nativeBuildInputs = [ pkg-config ]
     ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ];
diff --git a/third_party/nixpkgs/pkgs/shells/nushell/plugins/gstat.nix b/third_party/nixpkgs/pkgs/shells/nushell/plugins/gstat.nix
index f1f59e66e2..971d886604 100644
--- a/third_party/nixpkgs/pkgs/shells/nushell/plugins/gstat.nix
+++ b/third_party/nixpkgs/pkgs/shells/nushell/plugins/gstat.nix
@@ -11,7 +11,7 @@
 rustPlatform.buildRustPackage rec {
   pname = "nushell_plugin_gstat";
   inherit (nushell) version src;
-  cargoHash = "sha256-stbW+XJvVOMcf93BpcaD1/yFwPioLKvxVQe6kRlJuJ4=";
+  cargoHash = "sha256-lVuCLp18jqeMdpEpIesN5vUgceLTg+un8n7SkGf8xZU=";
 
   nativeBuildInputs = [ pkg-config ]
     ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ];
diff --git a/third_party/nixpkgs/pkgs/shells/nushell/plugins/polars.nix b/third_party/nixpkgs/pkgs/shells/nushell/plugins/polars.nix
index f014c4a939..d24fb5e88c 100644
--- a/third_party/nixpkgs/pkgs/shells/nushell/plugins/polars.nix
+++ b/third_party/nixpkgs/pkgs/shells/nushell/plugins/polars.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   pname = "nushell_plugin_polars";
   inherit (nushell) version src;
 
-  cargoHash = "sha256-OgrJNUVVyoqjRT0SPoX3PGRksLiAz254piw08k3gibo=";
+  cargoHash = "sha256-Ym/ypm3bUPZkKXYVrym9LEDL0RenJCcruN3urpN2cEQ=";
 
   nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ];
   buildInputs =
diff --git a/third_party/nixpkgs/pkgs/shells/nushell/plugins/query.nix b/third_party/nixpkgs/pkgs/shells/nushell/plugins/query.nix
index f9d573f413..defc80275a 100644
--- a/third_party/nixpkgs/pkgs/shells/nushell/plugins/query.nix
+++ b/third_party/nixpkgs/pkgs/shells/nushell/plugins/query.nix
@@ -5,15 +5,19 @@
 , IOKit
 , CoreFoundation
 , nix-update-script
+, pkg-config
+, openssl
 }:
 
 rustPlatform.buildRustPackage {
   pname = "nushell_plugin_query";
   inherit (nushell) version src;
-  cargoHash = "sha256-zFkq+rx1GN6TQvm5jK8O2ocR0pUbtVFk051IlwCu100=";
+  cargoHash = "sha256-m5DYMvvNWfd86e7P7JI7KLlp7AjqtKO+n9jjORaW9ss=";
 
-  nativeBuildInputs = lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ];
-  buildInputs = lib.optionals stdenv.isDarwin [ IOKit CoreFoundation ];
+  nativeBuildInputs = [ pkg-config ]
+    ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ];
+  buildInputs = [ openssl ]
+    ++ lib.optionals stdenv.isDarwin [ IOKit CoreFoundation ];
   cargoBuildFlags = [ "--package nu_plugin_query" ];
 
   checkPhase = ''
diff --git a/third_party/nixpkgs/pkgs/shells/zsh/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/default.nix
index c04d4d4bd6..ac8d3aa9a7 100644
--- a/third_party/nixpkgs/pkgs/shells/zsh/default.nix
+++ b/third_party/nixpkgs/pkgs/shells/zsh/default.nix
@@ -39,6 +39,12 @@ stdenv.mkDerivation {
       hash = "sha256-nXB4w7qqjZJC7/+CDxnNy6wu9qNwmS3ezjj/xK7JfeU=";
       excludes = [ "ChangeLog" ];
     })
+    # Fixes compatibility with texinfo 7.1. This patch can be dropped with the next release of zsh.
+    (fetchpatch {
+      url = "https://github.com/zsh-users/zsh/commit/ecd3f9c9506c7720dc6c0833dc5d5eb00e4459c4.patch";
+      hash = "sha256-oA8GC8LmuqNKGuPqGfiQVhL5nWb7ArLWGUI6wjpsIW8=";
+      excludes = [ "ChangeLog" ];
+    })
   ];
 
   strictDeps = true;
diff --git a/third_party/nixpkgs/pkgs/shells/zsh/fzf-zsh/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/fzf-zsh/default.nix
index 40c4edaff8..089a443a82 100644
--- a/third_party/nixpkgs/pkgs/shells/zsh/fzf-zsh/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/shells/zsh/gradle-completion/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/gradle-completion/default.nix
index fa40db3603..6112c2edfa 100644
--- a/third_party/nixpkgs/pkgs/shells/zsh/gradle-completion/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix
index 1673b86c63..85bd6d5bf2 100644
--- a/third_party/nixpkgs/pkgs/shells/zsh/lambda-mod-zsh-theme/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/shells/zsh/zsh-fzf-history-search/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/zsh-fzf-history-search/default.nix
index 9854d76ce2..d85171530a 100644
--- a/third_party/nixpkgs/pkgs/shells/zsh/zsh-fzf-history-search/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/shells/zsh/zsh-history/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/zsh-history/default.nix
index 146014e2c9..f2afd98de6 100644
--- a/third_party/nixpkgs/pkgs/shells/zsh/zsh-history/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/shells/zsh/zsh-you-should-use/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/zsh-you-should-use/default.nix
index f6d6c8ecb1..222d958be1 100644
--- a/third_party/nixpkgs/pkgs/shells/zsh/zsh-you-should-use/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/stdenv/booter.nix b/third_party/nixpkgs/pkgs/stdenv/booter.nix
index 7fc1fa42b9..896fe717d6 100644
--- a/third_party/nixpkgs/pkgs/stdenv/booter.nix
+++ b/third_party/nixpkgs/pkgs/stdenv/booter.nix
@@ -130,7 +130,7 @@ stageFuns: let
         # code here, we'll cause an infinite recursion. Since a set with
         # clang as its default compiler always means libc++, we can infer this
         # decision statically.
-        then buildPackages.llvmPackages.libcxxClang
+        then buildPackages.pkgsBuildTarget.llvmPackages.libcxxClang
         else buildPackages.gcc
       else
         # This will blow up if anything uses it, but that's OK. The `if
diff --git a/third_party/nixpkgs/pkgs/stdenv/darwin/default.nix b/third_party/nixpkgs/pkgs/stdenv/darwin/default.nix
index 5e5f2be12b..5cc0b88bc7 100644
--- a/third_party/nixpkgs/pkgs/stdenv/darwin/default.nix
+++ b/third_party/nixpkgs/pkgs/stdenv/darwin/default.nix
@@ -174,9 +174,6 @@ let
         overrides = self: super: (overrides self super) // {
           fetchurl = thisStdenv.fetchurlBoot;
           fetchpatch = super.fetchpatch.override { inherit (self) fetchurl; };
-          fetchgit = super.fetchgit.override {
-            git = super.git.override { curl = bootstrapTools; };
-          };
           fetchzip = super.fetchzip.override { inherit (self) fetchurl; };
         };
       };
@@ -192,6 +189,9 @@ in
   ({}: {
     __raw = true;
 
+    cctools = true;
+    ld64 = true;
+
     coreutils = null;
     gnugrep = null;
 
@@ -202,7 +202,6 @@ in
       apple_sdk.sdkRoot = null;
       binutils = null;
       binutils-unwrapped = null;
-      cctools = null;
       print-reexports = null;
       rewrite-tbd = null;
       sigtool = null;
@@ -242,6 +241,97 @@ in
       gnugrep = bootstrapTools;
       pbzx = bootstrapTools;
 
+      cctools = super.stdenv.mkDerivation {
+        pname = "bootstrap-stage0-cctools";
+        version = "boot";
+
+        buildCommand = ''
+          declare -a cctools=(
+            ar
+            bitcode_strip
+            check_dylib
+            checksyms
+            cmpdylib
+            codesign_allocate
+            ctf_insert
+            depinfo
+            diagtest
+            gas
+            gprof
+            install_name_tool
+            libtool
+            lipo
+            mtoc
+            mtor
+            nm
+            nmedit
+            otool
+            pagestuff
+            ranlib
+            redo_prebinding
+            seg_addr_table
+            seg_hack
+            segedit
+            size
+            strings
+            strip
+            vtool
+          )
+
+          mkdir -p "$out/bin"
+          for tool in "''${cctools[@]}"; do
+            toolsrc="${bootstrapTools}/bin/$tool"
+            if [ -e "$toolsrc" ]; then
+              ln -s "$toolsrc" "$out/bin"
+            fi
+          done
+
+          # Copy only the required headers to avoid accidentally linking headers that belong to other packages,
+          # which can cause problems when building Libsystem in the source-based SDK.
+          declare -a machohdrs=(
+            arch.h
+            fat.h
+            fixup-chains.h
+            getsect.h
+            ldsyms.h
+            loader.h
+            nlist.h
+            ranlib.h
+            reloc.h
+            stab.h
+            swap.h
+            arm
+            arm64
+            hppa
+            i386
+            i860
+            m68k
+            m88k
+            ppc
+            sparc
+            x86_64
+          )
+
+          mkdir -p "$out/include/mach-o"
+          for header in "''${machohdrs[@]}"; do
+            machosrc="${bootstrapTools}/include-Libsystem/mach-o/$header"
+            if [ -e "$machosrc" ]; then
+              cp -r "$machosrc" "$out/include/mach-o/$header"
+            fi
+          done
+        '';
+
+        passthru = {
+          isFromBootstrapFiles = true;
+          targetPrefix = "";
+        };
+      };
+
+      ld64 = bootstrapTools // {
+        targetPrefix = "";
+        version = "boot";
+      };
+
       darwin = super.darwin.overrideScope (selfDarwin: superDarwin: {
         # Prevent CF from being propagated to the initial stdenv. Packages that require it
         # will have to manually add it to their build inputs.
@@ -262,7 +352,21 @@ in
 
           bintools = selfDarwin.binutils-unwrapped;
 
-          inherit (selfDarwin) postLinkSignHook signingUtils;
+          # Bootstrap tools cctools needs the hook and wrappers to make sure things are signed properly.
+          # This can be dropped once the bootstrap tools cctools has been updated to 1010.6.
+          extraBuildCommands = ''
+            echo 'source ${selfDarwin.postLinkSignHook}' >> $out/nix-support/post-link-hook
+
+            export signingUtils=${selfDarwin.signingUtils}
+
+            wrap \
+              install_name_tool ${../../build-support/bintools-wrapper/darwin-install_name_tool-wrapper.sh} \
+              "${selfDarwin.binutils-unwrapped}/bin/install_name_tool"
+
+            wrap \
+              strip ${../../build-support/bintools-wrapper/darwin-strip-wrapper.sh} \
+              "${selfDarwin.binutils-unwrapped}/bin/strip"
+          '';
         };
 
         binutils-unwrapped = (superDarwin.binutils-unwrapped.overrideAttrs (old: {
@@ -272,93 +376,6 @@ in
           };
         })).override { enableManpages = false; };
 
-        cctools = super.stdenv.mkDerivation {
-          pname = "bootstrap-stage0-cctools";
-          version = "boot";
-
-          buildCommand = ''
-            declare -a cctools=(
-              ar
-              bitcode_strip
-              check_dylib
-              checksyms
-              cmpdylib
-              codesign_allocate
-              ctf_insert
-              depinfo
-              diagtest
-              ld
-              gas
-              gprof
-              install_name_tool
-              libtool
-              lipo
-              mtoc
-              mtor
-              nm
-              nmedit
-              otool
-              pagestuff
-              ranlib
-              redo_prebinding
-              seg_addr_table
-              seg_hack
-              segedit
-              size
-              strings
-              strip
-              vtool
-            )
-
-            mkdir -p "$out/bin"
-            for tool in "''${cctools[@]}"; do
-              toolsrc="${bootstrapTools}/bin/$tool"
-              if [ -e "$toolsrc" ]; then
-                ln -s "$toolsrc" "$out/bin"
-              fi
-            done
-
-            # Copy only the required headers to avoid accidentally linking headers that belong to other packages,
-            # which can cause problems when building Libsystem in the source-based SDK.
-            declare -a machohdrs=(
-              arch.h
-              fat.h
-              fixup-chains.h
-              getsect.h
-              ldsyms.h
-              loader.h
-              nlist.h
-              ranlib.h
-              reloc.h
-              stab.h
-              swap.h
-              arm
-              arm64
-              hppa
-              i386
-              i860
-              m68k
-              m88k
-              ppc
-              sparc
-              x86_64
-            )
-
-            mkdir -p "$out/include/mach-o"
-            for header in "''${machohdrs[@]}"; do
-              machosrc="${bootstrapTools}/include-Libsystem/mach-o/$header"
-              if [ -e "$machosrc" ]; then
-                cp -r "$machosrc" "$out/include/mach-o/$header"
-              fi
-            done
-          '';
-
-          passthru = {
-            isFromBootstrapFiles = true;
-            targetPrefix = "";
-          };
-        };
-
         locale = self.stdenv.mkDerivation {
           name = "bootstrap-stage0-locale";
           buildCommand = ''
@@ -468,11 +485,8 @@ in
       );
     };
 
-    # The bootstrap tools may use `strip` from cctools, so use a compatible set of flags until LLVM
-    # is rebuilt, and darwin.binutils can use its implementation instead.
     extraPreHook = ''
-      stripAllFlags=" "    # the cctools "strip" command doesn't know "-s"
-      stripDebugFlags="-S" # the cctools "strip" command does something odd with "-p"
+      stripDebugFlags="-S" # llvm-strip does not support "-p" for Mach-O
     '';
   })
 
@@ -482,11 +496,11 @@ in
   (prevStage:
     # previous stage0 stdenv:
     assert lib.all isFromBootstrapFiles (
-      with prevStage; [ bash coreutils cpio gnugrep ] ++ lib.optionals useAppleSDKLibs [ pbzx ]
+      with prevStage; [ bash cctools coreutils cpio gnugrep ld64 ] ++ lib.optionals useAppleSDKLibs [ pbzx ]
     );
 
     assert lib.all isFromBootstrapFiles (with prevStage.darwin; [
-      binutils-unwrapped cctools print-reexports rewrite-tbd sigtool
+      binutils-unwrapped print-reexports rewrite-tbd sigtool
     ]);
 
     assert (! useAppleSDKLibs) -> lib.all isFromBootstrapFiles (with prevStage.darwin; [ Libsystem ]);
@@ -503,9 +517,10 @@ in
 
     overrides = self: super: {
       inherit (prevStage) ccWrapperStdenv
-        coreutils gnugrep;
+        cctools coreutils gnugrep ld64;
 
-      binutils-unwrapped = builtins.throw "nothing in the bootstrap should depend on GNU binutils";
+      binutils-unwrapped = builtins.throw "nothing in the Darwin bootstrap should depend on GNU binutils";
+      curl = builtins.throw "nothing in the Darwin bootstrap can depend on curl";
 
       # Use this stage’s CF to build CMake. It’s required but can’t be included in the stdenv.
       cmake = self.cmakeMinimal;
@@ -532,9 +547,9 @@ in
         buildInputs = old.buildInputs or [ ] ++ [ self.darwin.CF ];
       });
 
-      darwin = super.darwin.overrideScope (selfDarwin: superDarwin: {
-        inherit (prevStage.darwin) cctools;
+      scons = super.scons.override { python3Packages = self.python3Minimal.pkgs; };
 
+      darwin = super.darwin.overrideScope (selfDarwin: superDarwin: {
         apple_sdk = superDarwin.apple_sdk // {
           inherit (prevStage.darwin.apple_sdk) sdkRoot;
         };
@@ -555,17 +570,31 @@ in
         # Rewrap binutils with the real Libsystem
         binutils = superDarwin.binutils.override {
           inherit (self) coreutils;
-          inherit (selfDarwin) postLinkSignHook signingUtils;
-
           bintools = selfDarwin.binutils-unwrapped;
           libc = selfDarwin.Libsystem;
           # TODO(@sternenseemann): can this be removed?
           runtimeShell = "${bootstrapTools}/bin/bash";
+
+          # Bootstrap tools cctools needs the hook to make sure things are signed properly.
+          # This can be dropped once the bootstrap tools cctools has been updated to 1010.6.
+          extraBuildCommands = ''
+            echo 'source ${selfDarwin.postLinkSignHook}' >> $out/nix-support/post-link-hook
+
+            export signingUtils=${selfDarwin.signingUtils}
+
+            wrap \
+              install_name_tool ${../../build-support/bintools-wrapper/darwin-install_name_tool-wrapper.sh} \
+              "${selfDarwin.binutils-unwrapped}/bin/install_name_tool"
+
+            wrap \
+              strip ${../../build-support/bintools-wrapper/darwin-strip-wrapper.sh} \
+              "${selfDarwin.binutils-unwrapped}/bin/strip"
+          '';
         };
 
         # Avoid building unnecessary Python dependencies due to building LLVM manpages.
         binutils-unwrapped = superDarwin.binutils-unwrapped.override {
-          inherit (selfDarwin) cctools;
+          inherit (self) cctools ld64;
           enableManpages = false;
         };
       });
@@ -588,21 +617,16 @@ in
       prevStage.gnu-config
     ];
 
-    # The bootstrap tools may use `strip` from cctools, so use a compatible set of flags until LLVM
-    # is rebuilt, and darwin.binutils can use its implementation instead.
-    extraPreHook = ''
-      stripAllFlags=" "    # the cctools "strip" command doesn't know "-s"
-      stripDebugFlags="-S" # the cctools "strip" command does something odd with "-p"
 
-      # Don’t assume the ld64 in bootstrap tools supports response files. Only recent versions do.
-      export NIX_LD_USE_RESPONSE_FILE=0
+    extraPreHook = ''
+      stripDebugFlags="-S" # llvm-strip does not support "-p" for Mach-O
     '';
   })
 
   # Build sysctl for use by LLVM’s check phase. It must be built separately to avoid an infinite recursion.
   (prevStage:
     # previous stage1 stdenv:
-    assert lib.all isFromBootstrapFiles (with prevStage; [ coreutils gnugrep ]);
+    assert lib.all isFromBootstrapFiles (with prevStage; [ cctools coreutils gnugrep ld64 ]);
 
     assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage; [
       autoconf automake bash bison brotli cmake cpio cyrus_sasl db
@@ -612,9 +636,8 @@ in
       subversion texinfo unzip which xz zlib zstd
     ]);
 
-    assert lib.all isFromBootstrapFiles (with prevStage.darwin; [ cctools ]);
     assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [
-      locale libtapi print-reexports rewrite-tbd sigtool
+      locale print-reexports rewrite-tbd sigtool
     ]);
 
     assert (! useAppleSDKLibs) -> lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [ Libsystem configd ]);
@@ -633,8 +656,8 @@ in
 
     overrides = self: super: {
       inherit (prevStage) ccWrapperStdenv
-        autoconf automake bash binutils binutils-unwrapped bison brotli cmake cmakeMinimal
-        coreutils cpio cyrus_sasl db ed expat flex gettext gmp gnugrep groff icu
+        autoconf automake bash binutils-unwrapped bison brotli cctools cmake cmakeMinimal
+        coreutils cpio curl cyrus_sasl db ed expat flex gettext gmp gnugrep groff icu ld64
         libedit libffi libidn2 libkrb5 libssh2 libtool libunistring libxml2 m4
         ncurses nghttp2 ninja openldap openssh openssl patchutils pbzx perl pkg-config
         python3Minimal scons sed serf sharutils sqlite subversion texinfo unzip which xz
@@ -655,7 +678,7 @@ in
 
       darwin = super.darwin.overrideScope (_: superDarwin: {
         inherit (prevStage.darwin)
-          CF sdkRoot Libsystem binutils-unwrapped cctools cctools-port configd darwin-stubs dyld
+          CF sdkRoot Libsystem binutils binutils-unwrapped configd darwin-stubs dtrace dyld
           launchd libclosure libdispatch libobjc locale objc4 postLinkSignHook
           print-reexports rewrite-tbd signingUtils sigtool;
 
@@ -683,10 +706,8 @@ in
       prevStage.gnu-config
     ];
 
-    # Until LLVM is rebuilt, assume `strip` is the one from cctools.
     extraPreHook = ''
-      stripAllFlags=" "    # the cctools "strip" command doesn't know "-s"
-      stripDebugFlags="-S" # the cctools "strip" command does something odd with "-p"
+      stripDebugFlags="-S" # llvm-strip does not support "-p" for Mach-O
     '';
   })
 
@@ -695,21 +716,23 @@ in
   # but those libraries will be used in the final stdenv.
   #
   # Rebuild coreutils and gnugrep to avoid unwanted references to the bootstrap tools on `PATH`.
+  #
+  # The first build of cctools is deferred until this stage because it depends on LLVM headers
+  # that are not included in the bootstrap tools tarball.
   (prevStage:
     # previous stage-sysctl stdenv:
-    assert lib.all isFromBootstrapFiles (with prevStage; [ coreutils gnugrep ]);
+    assert lib.all isFromBootstrapFiles (with prevStage; [ cctools coreutils gnugrep ld64 ]);
 
     assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage; [
       atf autoconf automake bash bison brotli cmake cpio cyrus_sasl db
       ed expat flex gettext gmp groff icu kyua libedit libffi libiconv libidn2 libkrb5 libssh2
-      libtool libunistring libxml2 m4 meson ncurses nghttp2 ninja openldap openssh openssl
+      libtapi libtool libunistring libxml2 m4 meson ncurses nghttp2 ninja openldap openssh openssl
       patchutils pbzx perl pkg-config.pkg-config python3 python3Minimal scons serf sqlite
       subversion sysctl.provider texinfo unzip which xz zlib zstd
     ]);
 
-    assert lib.all isFromBootstrapFiles (with prevStage.darwin; [ cctools ]);
     assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [
-      locale libtapi print-reexports rewrite-tbd sigtool
+      locale print-reexports rewrite-tbd sigtool
     ]);
 
     assert (! useAppleSDKLibs) -> lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [ Libsystem configd ]);
@@ -726,12 +749,15 @@ in
 
     overrides = self: super: {
       inherit (prevStage) ccWrapperStdenv
-        atf autoconf automake bash binutils binutils-unwrapped bison brotli cmake cmakeMinimal
-        cpio cyrus_sasl db ed expat flex gettext gmp groff icu kyua libedit libffi libiconv
+        atf autoconf automake bash binutils-unwrapped bison brotli cmake cmakeMinimal
+        cpio curl cyrus_sasl db ed expat flex gettext gmp groff icu kyua libedit libffi libiconv
         libidn2 libkrb5 libssh2 libtool libunistring libxml2 m4 meson ncurses nghttp2 ninja
         openldap openssh openssl patchutils pbzx perl pkg-config python3 python3Minimal
         scons sed serf sharutils sqlite subversion sysctl texinfo unzip which xz zlib zstd;
 
+      # Disable ld64’s install check phase because the required LTO libraries are not built yet.
+      ld64 = super.ld64.overrideAttrs { doInstallCheck = false; };
+
       darwin = super.darwin.overrideScope (selfDarwin: superDarwin: {
         inherit (prevStage.darwin)
           CF Libsystem configd darwin-stubs dyld launchd libclosure libdispatch libobjc
@@ -787,8 +813,7 @@ in
     ];
 
     extraPreHook = ''
-      stripAllFlags=" "    # the cctools "strip" command doesn't know "-s"
-      stripDebugFlags="-S" # the cctools "strip" command does something odd with "-p"
+      stripDebugFlags="-S" # llvm-strip does not support "-p" for Mach-O
     '';
   })
 
@@ -797,8 +822,8 @@ in
   (prevStage:
     # previous stage-xclang stdenv:
     assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage; [
-      atf autoconf automake bash bison cmake cmakeMinimal coreutils cpio
-      cyrus_sasl db ed expat flex gettext gmp gnugrep groff icu kyua libedit libtool m4 meson ninja
+      atf autoconf automake bash bison cctools cmake cmakeMinimal coreutils cpio
+      cyrus_sasl db ed expat flex gettext gmp gnugrep groff icu kyua ld64 libedit libtapi libtool m4 meson ninja
       openbsm openldap openpam openssh patchutils pbzx perl pkg-config.pkg-config python3
       python3Minimal scons serf sqlite subversion sysctl.provider texinfo unzip which xz
     ]);
@@ -809,7 +834,7 @@ in
     ]);
 
     assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [
-      cctools locale libtapi print-reexports rewrite-tbd sigtool
+      locale print-reexports rewrite-tbd sigtool
     ]);
 
     assert (! useAppleSDKLibs) -> lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [ Libsystem configd ]);
@@ -825,13 +850,13 @@ in
 
     stageFun prevStage {
 
-    name = "bootstrap-stage2-Libsystem";
+    name = "bootstrap-stage2";
 
     overrides = self: super: {
       inherit (prevStage) ccWrapperStdenv
-        atf autoconf automake binutils-unwrapped bison brotli cmake cmakeMinimal coreutils
-        cpio cyrus_sasl db ed expat flex gettext gmp gnugrep groff icu kyua libedit libffi
-        libiconv libidn2 libkrb5 libssh2 libtool libunistring libxml2 m4 meson ncurses nghttp2
+        atf autoconf automake binutils-unwrapped bison brotli cctools cmake cmakeMinimal coreutils
+        cpio curl cyrus_sasl db ed expat flex gettext gmp gnugrep groff icu kyua ld64 libedit libffi
+        libiconv libidn2 libkrb5 libssh2 libtapi libtool libunistring libxml2 m4 meson ncurses nghttp2
         ninja openbsm openldap openpam openssh openssl patchutils pbzx perl pkg-config
         python3 python3Minimal scons serf sqlite subversion sysctl texinfo unzip which xz
         zlib zstd;
@@ -844,22 +869,39 @@ in
 
       darwin = super.darwin.overrideScope (selfDarwin: superDarwin: {
         inherit (prevStage.darwin)
-          CF binutils-unwrapped cctools configd darwin-stubs launchd libobjc libtapi locale
-          objc4 print-reexports rewrite-tbd signingUtils sigtool;
+          binutils-unwrapped configd darwin-stubs launchd locale postLinkSignHook
+          print-reexports rewrite-tbd signingUtils sigtool;
 
         apple_sdk = superDarwin.apple_sdk // {
           inherit (prevStage.darwin.apple_sdk) sdkRoot;
         };
+
+        # Rewrap binutils so it uses the rebuilt Libsystem.
+        binutils = superDarwin.binutils.override {
+          inherit (prevStage) expand-response-params;
+          libc = selfDarwin.Libsystem;
+        } // {
+          passthru = { inherit (prevStage.bintools.passthru) isFromBootstrapFiles; };
+        };
       });
 
       llvmPackages = super.llvmPackages // (
         let
           tools = super.llvmPackages.tools.extend (_: _: {
-            inherit (prevStage.llvmPackages) clang-unwrapped clangNoCompilerRtWithLibc libclang libllvm llvm;
+            inherit (prevStage.llvmPackages) clang-unwrapped clangNoCompilerRtWithLibc libclang lld libllvm llvm;
           });
 
           libraries = super.llvmPackages.libraries.extend (selfLib: superLib: {
-            inherit (prevStage.llvmPackages) compiler-rt libcxx;
+            inherit (prevStage.llvmPackages) libcxx;
+
+            # Make sure compiler-rt is linked against the CF from this stage, which can be
+            # propagated to the final stdenv. CF is required by ASAN.
+            compiler-rt = superLib.compiler-rt.override ({
+              inherit (self.llvmPackages) libllvm;
+              stdenv = self.stdenv.override {
+                extraBuildInputs = [ self.darwin.CF ];
+              };
+            });
           });
         in
         { inherit tools libraries; inherit (prevStage.llvmPackages) release_version; } // tools // libraries
@@ -888,147 +930,23 @@ in
     '';
   })
 
-  # This stage rebuilds CF, compiler-rt, and the sdkRoot derivation.
-  #
-  # CF requires:
-  # - aarch64-darwin: libobjc (due to being apple_sdk.frameworks.CoreFoundation instead of swift-corefoundation)
-  # - x86_64-darwin: libiconv libxml2 icu zlib
-  (prevStage:
-    # previous stage2-Libsystem stdenv:
-    assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage; [
-      atf autoconf automake bison brotli cmake cmakeMinimal coreutils
-      cpio cyrus_sasl db ed expat flex gettext gmp gnugrep groff icu kyua libedit libidn2
-      libkrb5 libssh2 libtool libunistring m4 meson nghttp2 ninja openbsm openldap openpam openssh
-      openssl patchutils pbzx perl pkg-config.pkg-config python3 python3Minimal scons serf
-      sqlite subversion sysctl.provider texinfo unzip which xz zstd
-    ]);
-
-    assert lib.all isBuiltByNixpkgsCompiler (with prevStage; [ bash ]);
-
-    assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage; [
-      libffi libiconv libxml2 ncurses zlib zstd
-    ]);
-
-    assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [
-      cctools locale libtapi print-reexports rewrite-tbd sigtool
-    ]);
-
-    assert (! useAppleSDKLibs) -> lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [ configd ]);
-    assert (! useAppleSDKLibs) -> lib.all        isBuiltByNixpkgsCompiler (with prevStage.darwin; [ Libsystem ]);
-    assert (! useAppleSDKLibs) -> lib.all                   isFromNixpkgs (with prevStage.darwin; [ CF ]);
-    assert    useAppleSDKLibs  -> lib.all                   isFromNixpkgs (with prevStage.darwin; [ CF Libsystem libobjc ]);
-    assert lib.all isFromNixpkgs (with prevStage.darwin; [ binutils-unwrapped  dyld launchd libclosure libdispatch xnu ]);
-
-    assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage.llvmPackages; [
-      clang-unwrapped libclang libllvm llvm
-    ]);
-    assert lib.all isBuiltByNixpkgsCompiler (with prevStage.llvmPackages; [ libcxx ]);
-    assert prevStage.llvmPackages.compiler-rt == null;
-
-    stageFun prevStage {
-
-    name = "bootstrap-stage2-CF";
-
-    overrides = self: super: {
-      inherit (prevStage) ccWrapperStdenv
-        atf autoconf automake bash bison brotli cmake cmakeMinimal coreutils cpio
-        cyrus_sasl db ed expat flex gettext gmp gnugrep groff kyua libedit libidn2 libkrb5
-        libssh2 libtool libunistring m4 meson ncurses nghttp2 ninja openbsm openldap openpam
-        openssh openssl patchutils pbzx perl pkg-config python3 python3Minimal scons serf
-        sqlite subversion sysctl texinfo unzip which xz zstd;
-
-      # Avoid pulling in a full python and its extra dependencies for the llvm/clang builds.
-      libxml2 = super.libxml2.override { pythonSupport = false; };
-
-      darwin = super.darwin.overrideScope (selfDarwin: superDarwin: {
-        inherit (prevStage.darwin)
-          Libsystem configd darwin-stubs launchd locale print-reexports rewrite-tbd
-          signingUtils sigtool;
-
-        # Rewrap binutils so it uses the rebuilt Libsystem.
-        binutils = superDarwin.binutils.override {
-          inherit (prevStage) expand-response-params;
-          libc = selfDarwin.Libsystem;
-        } // {
-          passthru = { inherit (prevStage.bintools.passthru) isFromBootstrapFiles; };
-        };
-      });
-
-      llvmPackages = super.llvmPackages // (
-        let
-          tools = super.llvmPackages.tools.extend (_: _: {
-            inherit (prevStage.llvmPackages) clang-unwrapped clangNoCompilerRtWithLibc libclang lld libllvm llvm;
-            clang = prevStage.stdenv.cc;
-          });
-
-          libraries = super.llvmPackages.libraries.extend (selfLib: superLib: {
-            inherit (prevStage.llvmPackages) libcxx;
-
-            # Make sure compiler-rt is linked against the CF from this stage, which can be
-            # propagated to the final stdenv. CF is required by ASAN.
-            compiler-rt = superLib.compiler-rt.override ({
-              inherit (self.llvmPackages) libllvm;
-              stdenv = self.stdenv.override {
-                extraBuildInputs = [ self.darwin.CF ];
-              };
-            });
-          });
-        in
-        { inherit tools libraries; inherit (prevStage.llvmPackages) release_version; } // tools // libraries
-      );
-
-      # Don’t link anything in this stage against CF to prevent propagating CF from prior stages to
-      # the final stdenv, which happens because of the rpath hook. Also don’t use a stdenv with
-      # compiler-rt because it needs to be built in this stage.
-      stdenv =
-        let
-          stdenvNoCF = super.stdenv.override {
-            extraBuildInputs = [ ];
-          };
-        in
-        self.overrideCC stdenvNoCF (self.llvmPackages.clangNoCompilerRtWithLibc.override {
-          inherit (self.llvmPackages) libcxx;
-
-          # Make sure the stdenv is using the Libsystem that will be propagated to the final stdenv.
-          libc = self.darwin.Libsystem;
-          bintools = self.llvmPackages.clangNoCompilerRtWithLibc.bintools.override {
-            libc = self.darwin.Libsystem;
-          };
-        });
-    };
-
-    extraNativeBuildInputs = lib.optionals localSystem.isAarch64 [
-      prevStage.updateAutotoolsGnuConfigScriptsHook
-      prevStage.gnu-config
-    ];
-
-    extraPreHook = ''
-      stripDebugFlags="-S" # llvm-strip does not support "-p" for Mach-O
-    '';
-  })
-
   # Rebuild LLVM with LLVM. This stage also rebuilds certain dependencies needed by LLVM.
   #
-  # LLVM requires: libcxx libffi libiconv libxml2 ncurses zlib
+  # LLVM requires: libcxx libffi libiconv libxml2 ncurses python3 zlib
   (prevStage:
-    # previous stage2-CF stdenv:
+    # previous stage2 stdenv:
     assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage; [
-      autoconf automake bison brotli cmake cmakeMinimal coreutils cpio cyrus_sasl
-      db ed expat flex gettext gmp gnugrep groff libedit libidn2 libkrb5 libssh2 libtool
-      libunistring m4 meson ncurses nghttp2 ninja openbsm openldap openpam openssh openssl
+      autoconf automake bison brotli cctools cmake cmakeMinimal coreutils cpio cyrus_sasl
+      db ed expat flex gettext gmp gnugrep groff icu ld64 libedit libffi libiconv libidn2 libkrb5 libssh2 libtool
+      libtapi libunistring libxml2 m4 meson ncurses nghttp2 ninja openbsm openldap openpam openssh openssl
       patchutils pbzx perl pkg-config.pkg-config python3 python3Minimal scons serf sqlite
-      subversion sysctl.provider texinfo unzip which xz zstd
-    ]);
-    assert lib.all isBuiltByNixpkgsCompiler (with prevStage; [
-      bash icu libffi libiconv libxml2 zlib
+      subversion sysctl.provider texinfo unzip which xz zstd zlib
     ]);
+    assert lib.all isBuiltByNixpkgsCompiler (with prevStage; [ bash ]);
 
     assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [
       locale print-reexports rewrite-tbd sigtool
     ]);
-    assert lib.all isBuiltByNixpkgsCompiler (with prevStage.darwin; [
-      cctools libtapi
-    ]);
 
     assert (! useAppleSDKLibs) -> lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [ configd ]);
     assert (! useAppleSDKLibs) -> lib.all        isBuiltByNixpkgsCompiler (with prevStage.darwin; [ Libsystem ]);
@@ -1047,22 +965,22 @@ in
 
     overrides = self: super: {
       inherit (prevStage) ccWrapperStdenv
-        autoconf automake bash binutils binutils-unwrapped bison brotli cmake cmakeMinimal
-        coreutils cpio cyrus_sasl db ed expat flex gettext gmp gnugrep groff libedit
+        autoconf automake bash binutils-unwrapped bison brotli cmake cmakeMinimal
+        coreutils cpio curl cyrus_sasl db ed expat flex gettext gmp gnugrep groff libedit
         libidn2 libkrb5 libssh2 libtool libunistring m4 meson nghttp2 ninja openbsm openldap
         openpam openssh openssl patchutils pbzx perl pkg-config python3 python3Minimal scons
-        sed serf sharutils sqlite subversion sysctl texinfo unzip which xz zstd
-
-        # CF dependencies - don’t rebuild them.
-        icu libiconv libiconv-darwin libxml2 zlib;
+        sed serf sharutils sqlite subversion sysctl texinfo unzip which xz zstd;
 
       # Disable tests because they use dejagnu, which fails to run.
       libffi = super.libffi.override { doCheck = false; };
 
+      # Avoid pulling in a full python and its extra dependencies for the llvm/clang builds.
+      libxml2 = super.libxml2.override { pythonSupport = false; };
+
       darwin = super.darwin.overrideScope (selfDarwin: superDarwin: {
         inherit (prevStage.darwin)
-          CF Libsystem binutils binutils-unwrapped cctools cctools-port configd
-          darwin-stubs dyld launchd libclosure libdispatch libobjc libtapi locale objc4
+          CF Libsystem binutils binutils-unwrapped configd
+          darwin-stubs dyld launchd libclosure libdispatch libobjc locale objc4
           postLinkSignHook print-reexports rewrite-tbd signingUtils sigtool;
 
         apple_sdk = superDarwin.apple_sdk // {
@@ -1103,15 +1021,12 @@ in
     ]);
 
     assert lib.all isBuiltByNixpkgsCompiler (with prevStage; [
-      bash icu libffi libiconv libxml2 zlib
+      bash cctools icu ld64 libtapi libffi libiconv libxml2 zlib
     ]);
 
     assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [
       locale print-reexports rewrite-tbd sigtool
     ]);
-    assert lib.all isBuiltByNixpkgsCompiler (with prevStage.darwin; [
-      cctools libtapi
-    ]);
 
     assert (! useAppleSDKLibs) -> lib.all isBuiltByBootstrapFilesCompiler (with prevStage.darwin; [ configd ]);
     assert (! useAppleSDKLibs) -> lib.all        isBuiltByNixpkgsCompiler (with prevStage.darwin; [ Libsystem ]);
@@ -1129,8 +1044,8 @@ in
 
     overrides = self: super: {
       inherit (prevStage) ccWrapperStdenv
-        autoconf automake bash bison cmake cmakeMinimal cyrus_sasl db expat flex groff
-        libedit libtool m4 meson ninja openldap openssh patchutils perl pkg-config python3 scons
+        autoconf automake bash binutils-unwrapped bison cmake cmakeMinimal curl cyrus_sasl db expat flex groff
+        libedit libtool m4 meson ninja openldap openssh patchutils perl pkg-config python3 python3Minimal scons
         serf sqlite subversion sysctl texinfo unzip which
 
         # CF dependencies - don’t rebuild them.
@@ -1258,15 +1173,13 @@ in
   (prevStage:
     # previous stage4 stdenv:
     assert lib.all isBuiltByNixpkgsCompiler (with prevStage; [
-      bash brotli bzip2 cpio diffutils ed file findutils gawk
-      gettext gmp gnugrep gnumake gnused gnutar gzip icu libffi libiconv libidn2 libkrb5
-      libssh2 libunistring libxml2 libyaml ncurses nghttp2 openbsm openpam openssl patch
-      pbzx pcre python3Minimal xar xz zlib zstd
+      bash brotli bzip2 cctools cpio diffutils ed file findutils gawk
+      gettext gmp gnugrep gnumake gnused gnutar gzip icu ld64 libffi libiconv libidn2 libkrb5
+      libssh2 libtapi libunistring libxml2 libyaml ncurses nghttp2 openbsm openpam openssl patch
+      pbzx pcre xar xz zlib zstd
     ]);
 
-    assert lib.all isBuiltByNixpkgsCompiler (with prevStage.darwin; [
-      cctools libtapi locale print-reexports rewrite-tbd sigtool
-    ]);
+    assert lib.all isBuiltByNixpkgsCompiler (with prevStage.darwin; [ locale print-reexports rewrite-tbd sigtool ]);
 
     assert (! useAppleSDKLibs) -> lib.all isBuiltByNixpkgsCompiler (with prevStage.darwin; [ Libsystem configd ]);
     assert (! useAppleSDKLibs) -> lib.all            isFromNixpkgs (with prevStage.darwin; [ CF ]);
@@ -1279,13 +1192,11 @@ in
 
     assert lib.all isBuiltByBootstrapFilesCompiler (with prevStage; [
       autoconf automake bison cmake cmakeMinimal cyrus_sasl db expat flex groff libedit
-      libtool m4 meson ninja openldap openssh patchutils perl pkg-config.pkg-config python3 scons
+      libtool m4 meson ninja openldap openssh patchutils perl pkg-config.pkg-config python3 python3Minimal scons
       serf sqlite subversion sysctl.provider texinfo unzip which
     ]);
 
     let
-      doSign = localSystem.isAarch64;
-
       cc = prevStage.llvmPackages.clang;
     in
     {
@@ -1337,6 +1248,10 @@ in
         bzip2.bin
         bzip2.out
         cc.expand-response-params
+        cctools
+        ld64.out
+        ld64.lib
+        libtapi.out
         coreutils
         darwin.binutils
         darwin.binutils.bintools
@@ -1363,13 +1278,14 @@ in
         ncurses.out
         openbsm
         openpam
+        openssl.out
         patch
+        xar
         xz.bin
         xz.out
         zlib.dev
         zlib.out
-      ]
-      ++ lib.optionals doSign [ openssl.out ])
+      ])
       ++ lib.optionals localSystem.isAarch64 [
         prevStage.updateAutotoolsGnuConfigScriptsHook
         prevStage.gnu-config
@@ -1389,36 +1305,34 @@ in
       ++ (with prevStage.darwin; [
         CF
         Libsystem
-        cctools-port
         dyld
-        libtapi
         locale
         apple_sdk.sdkRoot
       ]
-      ++ lib.optional useAppleSDKLibs [ objc4 ]
-      ++ lib.optionals doSign [ postLinkSignHook sigtool signingUtils ]);
+      ++ lib.optionals useAppleSDKLibs [ objc4 ]);
 
       __stdenvImpureHostDeps = commonImpureHostDeps;
       __extraImpureHostDeps = commonImpureHostDeps;
 
       overrides = self: super: {
         inherit (prevStage)
-          bash binutils brotli bzip2 coreutils cpio diffutils ed file findutils gawk
+          bash brotli bzip2 coreutils cpio diffutils ed file findutils gawk
           gettext gmp gnugrep gnumake gnused gnutar gzip icu libffi libiconv libiconv-darwin
           libidn2 libssh2 libunistring libxml2 libyaml ncurses nghttp2 openbsm openpam
           openssl patch pbzx pcre python3Minimal xar xz zlib zstd;
 
         darwin = super.darwin.overrideScope (_: superDarwin: {
           inherit (prevStage.darwin)
-            CF ICU Libsystem darwin-stubs dyld locale libobjc libtapi rewrite-tbd xnu;
+            CF Libsystem darwin-stubs dyld locale libobjc rewrite-tbd xnu;
 
           apple_sdk = superDarwin.apple_sdk // {
             inherit (prevStage.darwin.apple_sdk) sdkRoot;
           };
         } // lib.optionalAttrs (super.stdenv.targetPlatform == localSystem) {
-          inherit (prevStage.darwin) binutils binutils-unwrapped cctools-port;
+          inherit (prevStage.darwin) binutils binutils-unwrapped;
         });
       } // lib.optionalAttrs (super.stdenv.targetPlatform == localSystem) {
+        inherit (prevStage) cctools ld64 libtapi;
         inherit (prevStage.llvmPackages) clang llvm;
 
         # Need to get rid of these when cross-compiling.
@@ -1437,13 +1351,14 @@ in
     };
   })
 
-  # This "no-op" stage is just a place to put the assertions about stage6.
+  # This "no-op" stage is just a place to put the assertions about the final stage.
   (prevStage:
     # previous final stage stdenv:
+    assert isBuiltByNixpkgsCompiler prevStage.cctools;
+    assert isBuiltByNixpkgsCompiler prevStage.ld64;
     assert isBuiltByNixpkgsCompiler prevStage.darwin.sigtool;
     assert isBuiltByNixpkgsCompiler prevStage.darwin.print-reexports;
     assert isBuiltByNixpkgsCompiler prevStage.darwin.rewrite-tbd;
-    assert isBuiltByNixpkgsCompiler prevStage.darwin.cctools;
 
     assert            isFromNixpkgs prevStage.darwin.CF;
     assert            isFromNixpkgs prevStage.darwin.Libsystem;
@@ -1457,6 +1372,7 @@ in
     # Make sure these evaluate since they were disabled explicitly in the bootstrap.
     assert isBuiltByNixpkgsCompiler prevStage.binutils-unwrapped;
     assert            isFromNixpkgs prevStage.binutils-unwrapped.src;
+    assert isBuiltByNixpkgsCompiler prevStage.curl;
 
     { inherit (prevStage) config overlays stdenv; })
 ]
diff --git a/third_party/nixpkgs/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/third_party/nixpkgs/pkgs/stdenv/darwin/make-bootstrap-tools.nix
index 3d1894315f..95a0834192 100644
--- a/third_party/nixpkgs/pkgs/stdenv/darwin/make-bootstrap-tools.nix
+++ b/third_party/nixpkgs/pkgs/stdenv/darwin/make-bootstrap-tools.nix
@@ -112,6 +112,7 @@ rec {
       for i in as ld ar ranlib nm strip otool install_name_tool lipo codesign_allocate; do
         cp ${getBin darwin.binutils-unwrapped}/bin/$i $out/bin
       done
+      cp -d ${getLib ld64}/lib/libcodedirectory*.dylib $out/lib
 
       # Copy coreutils, bash, etc.
       cp ${getBin coreutils_}/bin/* $out/bin
diff --git a/third_party/nixpkgs/pkgs/stdenv/freebsd/default.nix b/third_party/nixpkgs/pkgs/stdenv/freebsd/default.nix
index 2a2259e840..08768e0b91 100644
--- a/third_party/nixpkgs/pkgs/stdenv/freebsd/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/stdenv/freebsd/make-bootstrap-tools.nix b/third_party/nixpkgs/pkgs/stdenv/freebsd/make-bootstrap-tools.nix
index d65c420fa1..fe133eb72a 100644
--- a/third_party/nixpkgs/pkgs/stdenv/freebsd/make-bootstrap-tools.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/stdenv/generic/default.nix b/third_party/nixpkgs/pkgs/stdenv/generic/default.nix
index 2cda43d563..2cbd2636a4 100644
--- a/third_party/nixpkgs/pkgs/stdenv/generic/default.nix
+++ b/third_party/nixpkgs/pkgs/stdenv/generic/default.nix
@@ -114,14 +114,9 @@ let
         export NIX_NO_SELF_RPATH=1
       '' + lib.optionalString (hostPlatform.isDarwin && hostPlatform.isMacOS) ''
         export MACOSX_DEPLOYMENT_TARGET=${hostPlatform.darwinMinVersion}
-      ''
-      # TODO this should be uncommented, but it causes stupid mass rebuilds. I
-      # think the best solution would just be to fixup linux RPATHs so we don't
-      # need to set `-rpath` anywhere.
-      # + lib.optionalString targetPlatform.isDarwin ''
-      #   export NIX_DONT_SET_RPATH_FOR_TARGET=1
-      # ''
-      ;
+      '' + lib.optionalString targetPlatform.isDarwin ''
+        export NIX_DONT_SET_RPATH_FOR_TARGET=1
+      '';
 
       inherit initialPath shell
         defaultNativeBuildInputs defaultBuildInputs;
diff --git a/third_party/nixpkgs/pkgs/stdenv/generic/setup.sh b/third_party/nixpkgs/pkgs/stdenv/generic/setup.sh
index b5b7a70377..40bf655418 100644
--- a/third_party/nixpkgs/pkgs/stdenv/generic/setup.sh
+++ b/third_party/nixpkgs/pkgs/stdenv/generic/setup.sh
@@ -355,8 +355,10 @@ _accumFlagsArray() {
             local -n nameref="$name"
             case "$name" in
                 *Array)
+                    # shellcheck disable=SC2206
                     flagsArray+=( ${nameref+"${nameref[@]}"} ) ;;
                 *)
+                    # shellcheck disable=SC2206
                     flagsArray+=( ${nameref-} ) ;;
             esac
         done
@@ -576,7 +578,9 @@ findInputs() {
     # Sanity check
     (( hostOffset <= targetOffset )) || exit 1
 
+    # shellcheck disable=SC1087
     local varVar="${pkgAccumVarVars[hostOffset + 1]}"
+    # shellcheck disable=SC1087
     local varRef="$varVar[$((targetOffset - hostOffset))]"
     local var="${!varRef}"
     unset -v varVar varRef
@@ -585,6 +589,7 @@ findInputs() {
     # nix-shell doesn't use impure bash. This should replace the O(n)
     # case with an O(1) hash map lookup, assuming bash is implemented
     # well :D.
+    # shellcheck disable=SC1087
     local varSlice="$var[*]"
     # ${..-} to hack around old bash empty array problem
     case "${!varSlice-}" in
@@ -999,12 +1004,12 @@ _allFlags() {
     # so some substitutions such as name don't have to be in the env attrset
     # when __structuredAttrs is enabled
     export system pname name version
-    for varName in $(awk 'BEGIN { for (v in ENVIRON) if (v ~ /^[a-z][a-zA-Z0-9_]*$/) print v }'); do
+    while IFS='' read -r varName; do
         if (( "${NIX_DEBUG:-0}" >= 1 )); then
             printf "@%s@ -> %q\n" "${varName}" "${!varName}" >&2
         fi
         args+=("--subst-var" "$varName")
-    done
+    done < <(awk 'BEGIN { for (v in ENVIRON) if (v ~ /^[a-z][a-zA-Z0-9_]*$/) print v }')
 }
 
 substituteAllStream() {
@@ -1175,6 +1180,7 @@ unpackPhase() {
     if [ -n "$__structuredAttrs" ]; then
         srcsArray=( "${srcs[@]}" )
     else
+        # shellcheck disable=SC2206
         srcsArray=( $srcs )
     fi
 
@@ -1242,8 +1248,10 @@ patchPhase() {
 
     local -a patchesArray
     if [ -n "$__structuredAttrs" ]; then
+        # shellcheck disable=SC2206
         patchesArray=( ${patches:+"${patches[@]}"} )
     else
+        # shellcheck disable=SC2206
         patchesArray=( ${patches:-} )
     fi
 
@@ -1269,7 +1277,7 @@ patchPhase() {
         if [ -n "$__structuredAttrs" ]; then
             flagsArray=( "${patchFlags[@]:--p1}" )
         else
-            # shellcheck disable=SC2086
+            # shellcheck disable=SC2086,SC2206
             flagsArray=( ${patchFlags:--p1} )
         fi
         # "2>&1" is a hack to make patch fail if the decompressor fails (nonexistent patch, etc.)
@@ -1382,7 +1390,7 @@ buildPhase() {
         # shellcheck disable=SC2086
         local flagsArray=(
             ${enableParallelBuilding:+-j${NIX_BUILD_CORES}}
-            SHELL=$SHELL
+            SHELL="$SHELL"
         )
         _accumFlagsArray makeFlags makeFlagsArray buildFlags buildFlagsArray
 
@@ -1407,9 +1415,9 @@ checkPhase() {
     if [[ -z "${checkTarget:-}" ]]; then
         #TODO(@oxij): should flagsArray influence make -n?
         if make -n ${makefile:+-f $makefile} check >/dev/null 2>&1; then
-            checkTarget=check
+            checkTarget="check"
         elif make -n ${makefile:+-f $makefile} test >/dev/null 2>&1; then
-            checkTarget=test
+            checkTarget="test"
         fi
     fi
 
@@ -1420,16 +1428,18 @@ checkPhase() {
         # shellcheck disable=SC2086
         local flagsArray=(
             ${enableParallelChecking:+-j${NIX_BUILD_CORES}}
-            SHELL=$SHELL
+            SHELL="$SHELL"
         )
 
         _accumFlagsArray makeFlags makeFlagsArray
         if [ -n "$__structuredAttrs" ]; then
             flagsArray+=( "${checkFlags[@]:-VERBOSE=y}" )
         else
+            # shellcheck disable=SC2206
             flagsArray+=( ${checkFlags:-VERBOSE=y} )
         fi
         _accumFlagsArray checkFlagsArray
+        # shellcheck disable=SC2206
         flagsArray+=( ${checkTarget} )
 
         echoCmd 'check flags' "${flagsArray[@]}"
@@ -1461,12 +1471,13 @@ installPhase() {
     # shellcheck disable=SC2086
     local flagsArray=(
         ${enableParallelInstalling:+-j${NIX_BUILD_CORES}}
-        SHELL=$SHELL
+        SHELL="$SHELL"
     )
     _accumFlagsArray makeFlags makeFlagsArray installFlags installFlagsArray
     if [ -n "$__structuredAttrs" ]; then
         flagsArray+=( "${installTargets[@]:-install}" )
     else
+        # shellcheck disable=SC2206
         flagsArray+=( ${installTargets:-install} )
     fi
 
@@ -1548,11 +1559,12 @@ installCheckPhase() {
         # shellcheck disable=SC2086
         local flagsArray=(
             ${enableParallelChecking:+-j${NIX_BUILD_CORES}}
-            SHELL=$SHELL
+            SHELL="$SHELL"
         )
 
         _accumFlagsArray makeFlags makeFlagsArray \
           installCheckFlags installCheckFlagsArray
+        # shellcheck disable=SC2206
         flagsArray+=( ${installCheckTarget:-installcheck} )
 
         echoCmd 'installcheck flags' "${flagsArray[@]}"
@@ -1569,6 +1581,7 @@ distPhase() {
 
     local flagsArray=()
     _accumFlagsArray distFlags distFlagsArray
+    # shellcheck disable=SC2206
     flagsArray+=( ${distTarget:-dist} )
 
     echo 'dist flags: %q' "${flagsArray[@]}"
@@ -1627,21 +1640,22 @@ runPhase() {
     showPhaseHeader "$curPhase"
     dumpVars
 
-    local startTime=$(date +"%s")
+    local startTime endTime
+    startTime=$(date +"%s")
 
     # Evaluate the variable named $curPhase if it exists, otherwise the
     # function named $curPhase.
     eval "${!curPhase:-$curPhase}"
 
-    local endTime=$(date +"%s")
+    endTime=$(date +"%s")
 
     showPhaseFooter "$curPhase" "$startTime" "$endTime"
 
     if [ "$curPhase" = unpackPhase ]; then
         # make sure we can cd into the directory
-        [ -n "${sourceRoot:-}" ] && chmod +x "${sourceRoot}"
+        [ -n "${sourceRoot:-}" ] && chmod +x -- "${sourceRoot}"
 
-        cd "${sourceRoot:-.}"
+        cd -- "${sourceRoot:-.}"
     fi
 }
 
diff --git a/third_party/nixpkgs/pkgs/test/cc-wrapper/hardening.nix b/third_party/nixpkgs/pkgs/test/cc-wrapper/hardening.nix
index 41ddaefdfe..270e9a2e87 100644
--- a/third_party/nixpkgs/pkgs/test/cc-wrapper/hardening.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/test/overriding.nix b/third_party/nixpkgs/pkgs/test/overriding.nix
index f2519088f1..e4c1f257c8 100644
--- a/third_party/nixpkgs/pkgs/test/overriding.nix
+++ b/third_party/nixpkgs/pkgs/test/overriding.nix
@@ -5,33 +5,29 @@ let
     let
       p = pkgs.python3Packages.xpybutil.overridePythonAttrs (_: { dontWrapPythonPrograms = true; });
     in
-    [
-      ({
-        name = "overridePythonAttrs";
+    {
+      overridePythonAttrs = {
         expr = !lib.hasInfix "wrapPythonPrograms" p.postFixup;
         expected = true;
-      })
-      ({
-        name = "repeatedOverrides-pname";
+      };
+      repeatedOverrides-pname = {
         expr = repeatedOverrides.pname == "a-better-hello-with-blackjack";
         expected = true;
-      })
-      ({
-        name = "repeatedOverrides-entangled-pname";
+      };
+      repeatedOverrides-entangled-pname = {
         expr = repeatedOverrides.entangled.pname == "a-better-figlet-with-blackjack";
         expected = true;
-      })
-      ({
-        name = "overriding-using-only-attrset";
+      };
+      overriding-using-only-attrset = {
         expr = (pkgs.hello.overrideAttrs { pname = "hello-overriden"; }).pname == "hello-overriden";
         expected = true;
-      })
-      ({
+      };
+      overriding-using-only-attrset-no-final-attrs = {
         name = "overriding-using-only-attrset-no-final-attrs";
         expr = ((stdenvNoCC.mkDerivation { pname = "hello-no-final-attrs"; }).overrideAttrs { pname = "hello-no-final-attrs-overridden"; }).pname == "hello-no-final-attrs-overridden";
         expected = true;
-      })
-    ];
+      };
+    };
 
   addEntangled = origOverrideAttrs: f:
     origOverrideAttrs (
@@ -62,5 +58,5 @@ stdenvNoCC.mkDerivation {
   passthru = { inherit tests; };
   buildCommand = ''
     touch $out
-  '' + lib.concatMapStringsSep "\n" (t: "([[ ${lib.boolToString t.expr} == ${lib.boolToString t.expected} ]] && echo '${t.name} success') || (echo '${t.name} fail' && exit 1)") tests;
+  '' + lib.concatStringsSep "\n" (lib.attrValues (lib.mapAttrs (name: t: "([[ ${lib.boolToString t.expr} == ${lib.boolToString t.expected} ]] && echo '${name} success') || (echo '${name} fail' && exit 1)") tests));
 }
diff --git a/third_party/nixpkgs/pkgs/tools/X11/go-sct/default.nix b/third_party/nixpkgs/pkgs/tools/X11/go-sct/default.nix
index 5e464d43f8..71c1c77fd9 100644
--- a/third_party/nixpkgs/pkgs/tools/X11/go-sct/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/X11/inputplug/default.nix b/third_party/nixpkgs/pkgs/tools/X11/inputplug/default.nix
index a899de8a47..5d756844e3 100644
--- a/third_party/nixpkgs/pkgs/tools/X11/inputplug/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/X11/inputplug/default.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
 
   buildInputs = [ libbsd ];
 
-  cargoSha256 = "161kz47d4psfvh0vm98k8qappg50lpsw1ybyy7s3g3bp6ivfz8jv";
+  cargoHash = "sha256-W6LvdjR3jTf08X75wPWloLx7FUYTpboB3E5f0g75M5g=";
 
   postInstall = ''
     installManPage inputplug.1
diff --git a/third_party/nixpkgs/pkgs/tools/X11/nx-libs/default.nix b/third_party/nixpkgs/pkgs/tools/X11/nx-libs/default.nix
index 3cfeb32272..a3afc4fa26 100644
--- a/third_party/nixpkgs/pkgs/tools/X11/nx-libs/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/X11/x2vnc/default.nix b/third_party/nixpkgs/pkgs/tools/X11/x2vnc/default.nix
index 945743f1d6..2d06c8e630 100644
--- a/third_party/nixpkgs/pkgs/tools/X11/x2vnc/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/X11/x2vnc/default.nix
@@ -9,9 +9,11 @@ stdenv.mkDerivation rec {
     sha256 = "00bh9j3m6snyd2fgnzhj5vlkj9ibh69gfny9bfzlxbnivb06s1yw";
   };
 
+  env.NIX_CFLAGS_COMPILE = "-std=gnu89";
+
   buildInputs = with xorg; [
-      libX11 xorgproto libXext libXrandr
-    ];
+    libX11 xorgproto libXext libXrandr
+  ];
 
   hardeningDisable = [ "format" ];
 
diff --git a/third_party/nixpkgs/pkgs/tools/X11/xbindkeys/default.nix b/third_party/nixpkgs/pkgs/tools/X11/xbindkeys/default.nix
index 5b2f5c8a19..d3c5149705 100644
--- a/third_party/nixpkgs/pkgs/tools/X11/xbindkeys/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/X11/xbindkeys/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     homepage = "https://www.nongnu.org/xbindkeys/xbindkeys.html";
     description = "Launch shell commands with your keyboard or your mouse under X Window";
     license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [ viric ];
+    maintainers = [ ];
     platforms = with lib.platforms; linux;
   };
 }
diff --git a/third_party/nixpkgs/pkgs/tools/X11/xcalib/default.nix b/third_party/nixpkgs/pkgs/tools/X11/xcalib/default.nix
index c1dccf16c8..cb3ac66284 100644
--- a/third_party/nixpkgs/pkgs/tools/X11/xcalib/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/X11/xcalib/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     inherit (src.meta) homepage;
     description = "Tiny monitor calibration loader for X and MS-Windows";
     license = licenses.gpl2Plus;
-    maintainers = [];
+    maintainers = [ ];
     platforms = platforms.linux;
     mainProgram = "xcalib";
   };
diff --git a/third_party/nixpkgs/pkgs/tools/X11/xdotool/default.nix b/third_party/nixpkgs/pkgs/tools/X11/xdotool/default.nix
index bcb48ac44f..55714f10f5 100644
--- a/third_party/nixpkgs/pkgs/tools/X11/xdotool/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/X11/xdotool/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     homepage = "https://www.semicomplete.com/projects/xdotool/";
     description = "Fake keyboard/mouse input, window management, and more";
     license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [viric];
+    maintainers = [ ];
     platforms = with lib.platforms; linux;
     mainProgram = "xdotool";
   };
diff --git a/third_party/nixpkgs/pkgs/tools/X11/xidlehook/default.nix b/third_party/nixpkgs/pkgs/tools/X11/xidlehook/default.nix
index c23acbedaf..80407564a2 100644
--- a/third_party/nixpkgs/pkgs/tools/X11/xidlehook/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/X11/xidlehook/default.nix
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1pl7f8fhxfcy0c6c08vkagp0x1ak96vc5wgamigrk1nkd6l371lb";
   };
 
-  cargoSha256 = "1y7m61j07gvqfqz97mda39nc602sv7a826c06m8l22i7z380xfms";
+  cargoHash = "sha256-uroO0PgnCkFRNYAZgdTZWgDDbBqq1ZM+dni/A2Qw9fg=";
 
   buildInputs = [ xorg.libX11 xorg.libXScrnSaver libpulseaudio ] ++ lib.optional stdenv.isDarwin Security;
   nativeBuildInputs = [ pkg-config patchelf python3 ];
@@ -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/third_party/nixpkgs/pkgs/tools/X11/xloadimage/default.nix b/third_party/nixpkgs/pkgs/tools/X11/xloadimage/default.nix
index ec57089241..c3ef05b0a7 100644
--- a/third_party/nixpkgs/pkgs/tools/X11/xloadimage/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/X11/xtrace/default.nix b/third_party/nixpkgs/pkgs/tools/X11/xtrace/default.nix
index 591b1ef13a..7360603cb7 100644
--- a/third_party/nixpkgs/pkgs/tools/X11/xtrace/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/X11/xtrace/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     homepage = "https://salsa.debian.org/debian/xtrace";
     description = "Tool to trace X11 protocol connections";
     license = licenses.gpl2Only;
-    maintainers = with maintainers; [ viric ];
+    maintainers = [ ];
     platforms = with platforms; linux;
     mainProgram = "xtrace";
   };
diff --git a/third_party/nixpkgs/pkgs/tools/X11/xwallpaper/default.nix b/third_party/nixpkgs/pkgs/tools/X11/xwallpaper/default.nix
index f30c565180..38a67622ed 100644
--- a/third_party/nixpkgs/pkgs/tools/X11/xwallpaper/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/admin/balena-cli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/balena-cli/default.nix
index e0a06ccb7f..65c20279e1 100644
--- a/third_party/nixpkgs/pkgs/tools/admin/balena-cli/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/admin/balena-cli/default.nix
@@ -8,6 +8,7 @@
 , nodePackages
 , python3
 , udev
+, cctools
 , darwin
 }:
 
@@ -38,7 +39,7 @@ in buildNpmPackage' rec {
     nodePackages.node-gyp
     python3
   ] ++ lib.optionals stdenv.isDarwin [
-    darwin.cctools
+    cctools
   ];
 
   buildInputs = lib.optionals stdenv.isLinux [
diff --git a/third_party/nixpkgs/pkgs/tools/admin/chkcrontab/default.nix b/third_party/nixpkgs/pkgs/tools/admin/chkcrontab/default.nix
index c423934bab..fa93446fa4 100644
--- a/third_party/nixpkgs/pkgs/tools/admin/chkcrontab/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/admin/cjdns-tools/default.nix b/third_party/nixpkgs/pkgs/tools/admin/cjdns-tools/default.nix
index 0d21409400..dc76ce1907 100644
--- a/third_party/nixpkgs/pkgs/tools/admin/cjdns-tools/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/admin/clair/default.nix b/third_party/nixpkgs/pkgs/tools/admin/clair/default.nix
index df3bba816f..b53e3d6f8a 100644
--- a/third_party/nixpkgs/pkgs/tools/admin/clair/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/admin/colmena/default.nix b/third_party/nixpkgs/pkgs/tools/admin/colmena/default.nix
index 57cd7e88eb..5c59a7b538 100644
--- a/third_party/nixpkgs/pkgs/tools/admin/colmena/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/admin/colmena/default.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-01bfuSY4gnshhtqA1EJCw2CMsKkAx+dHS+sEpQ2+EAQ=";
   };
 
-  cargoSha256 = "sha256-rk2atWWJIR95duUXxAiARegjeCyfAsqTDwEr5P0eIr8=";
+  cargoHash = "sha256-rk2atWWJIR95duUXxAiARegjeCyfAsqTDwEr5P0eIr8=";
 
   nativeBuildInputs = [ installShellFiles ];
 
diff --git a/third_party/nixpkgs/pkgs/tools/admin/docker-credential-helpers/default.nix b/third_party/nixpkgs/pkgs/tools/admin/docker-credential-helpers/default.nix
index ff7a50676b..f9e90afb27 100644
--- a/third_party/nixpkgs/pkgs/tools/admin/docker-credential-helpers/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/admin/google-cloud-sdk/components.json b/third_party/nixpkgs/pkgs/tools/admin/google-cloud-sdk/components.json
index dd2cfb3917..8e306436fe 100644
--- a/third_party/nixpkgs/pkgs/tools/admin/google-cloud-sdk/components.json
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/admin/google-cloud-sdk/data.nix b/third_party/nixpkgs/pkgs/tools/admin/google-cloud-sdk/data.nix
index ea4ee77e12..04713f6ae3 100644
--- a/third_party/nixpkgs/pkgs/tools/admin/google-cloud-sdk/data.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/admin/netbox2netshot/default.nix b/third_party/nixpkgs/pkgs/tools/admin/netbox2netshot/default.nix
index ccaff8f38e..82f2825bcd 100644
--- a/third_party/nixpkgs/pkgs/tools/admin/netbox2netshot/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/admin/rset/default.nix b/third_party/nixpkgs/pkgs/tools/admin/rset/default.nix
index 32e401ecc4..2d6a8da445 100644
--- a/third_party/nixpkgs/pkgs/tools/admin/rset/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/admin/stripe-cli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/stripe-cli/default.nix
index acbc464663..ac1a5cc4e2 100644
--- a/third_party/nixpkgs/pkgs/tools/admin/stripe-cli/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/admin/stripe-cli/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "stripe-cli";
-  version = "1.21.0";
+  version = "1.21.2";
 
   src = fetchFromGitHub {
     owner = "stripe";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-8r+Gu36zAmNTZb6xA5iS0+smkmJ7UrdGi9TaUXUr5aQ=";
+    hash = "sha256-uerQwznpezbNnPj5U/IjMxoqRMJQhhje8oRwJTDimFY=";
   };
   vendorHash = "sha256-TuxYJ3u4/5PJYRoRgom+M1au9XerZ+vj9X3jUWTPM58=";
 
diff --git a/third_party/nixpkgs/pkgs/tools/admin/tigervnc/default.nix b/third_party/nixpkgs/pkgs/tools/admin/tigervnc/default.nix
index 53d0fe662b..c19e7b3b4f 100644
--- a/third_party/nixpkgs/pkgs/tools/admin/tigervnc/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/admin/tigervnc/default.nix
@@ -153,7 +153,7 @@ stdenv.mkDerivation rec {
     homepage = "https://tigervnc.org/";
     license = lib.licenses.gpl2Plus;
     description = "Fork of tightVNC, made in cooperation with VirtualGL";
-    maintainers = with lib.maintainers; [viric];
+    maintainers = [ ];
     platforms = lib.platforms.unix;
     # Prevent a store collision.
     priority = 4;
diff --git a/third_party/nixpkgs/pkgs/tools/admin/tightvnc/default.nix b/third_party/nixpkgs/pkgs/tools/admin/tightvnc/default.nix
index 5bc86f94c2..418081626d 100644
--- a/third_party/nixpkgs/pkgs/tools/admin/tightvnc/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/admin/tightvnc/default.nix
@@ -106,7 +106,7 @@ stdenv.mkDerivation rec {
       GUI, many bugfixes, and more.
     '';
 
-    maintainers = [];
+    maintainers = [ ];
     platforms = lib.platforms.unix;
 
     knownVulnerabilities = [ "CVE-2021-42785" ];
diff --git a/third_party/nixpkgs/pkgs/tools/archivers/cromfs/default.nix b/third_party/nixpkgs/pkgs/tools/archivers/cromfs/default.nix
index b775eb1561..f3bacd2c40 100644
--- a/third_party/nixpkgs/pkgs/tools/archivers/cromfs/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/archivers/cromfs/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     description = "FUSE Compressed ROM filesystem with lzma";
     homepage = "https://bisqwit.iki.fi/source/cromfs.html";
     license = licenses.gpl3;
-    maintainers = [ maintainers.viric ];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/third_party/nixpkgs/pkgs/tools/archivers/fsarchiver/default.nix b/third_party/nixpkgs/pkgs/tools/archivers/fsarchiver/default.nix
index 40a16f21ab..6835a5dbb9 100644
--- a/third_party/nixpkgs/pkgs/tools/archivers/fsarchiver/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/archivers/gbl/default.nix b/third_party/nixpkgs/pkgs/tools/archivers/gbl/default.nix
index 02dbfc683e..f025a0c578 100644
--- a/third_party/nixpkgs/pkgs/tools/archivers/gbl/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/archivers/gbl/default.nix
@@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec {
     })
   ];
 
-  cargoSha256 = "sha256-CeGLSseKUe2XudRqZm5Y7o7ZLDtDBg/MFunOGqxFZGM=";
+  cargoHash = "sha256-CeGLSseKUe2XudRqZm5Y7o7ZLDtDBg/MFunOGqxFZGM=";
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ];
diff --git a/third_party/nixpkgs/pkgs/tools/archivers/quickbms/default.nix b/third_party/nixpkgs/pkgs/tools/archivers/quickbms/default.nix
index 8915dda1e2..9c3aa89774 100644
--- a/third_party/nixpkgs/pkgs/tools/archivers/quickbms/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/archivers/sharutils/default.nix b/third_party/nixpkgs/pkgs/tools/archivers/sharutils/default.nix
index 2a656a9dd3..557fdae4d2 100644
--- a/third_party/nixpkgs/pkgs/tools/archivers/sharutils/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/archivers/sharutils/default.nix
@@ -84,7 +84,7 @@ stdenv.mkDerivation rec {
       '';
     homepage = "https://www.gnu.org/software/sharutils/";
     license = licenses.gpl3Plus;
-    maintainers = [];
+    maintainers = [ ];
     platforms = platforms.all;
   };
 }
diff --git a/third_party/nixpkgs/pkgs/tools/archivers/wimlib/default.nix b/third_party/nixpkgs/pkgs/tools/archivers/wimlib/default.nix
index 8a40a6ae10..6aa2c95fa1 100644
--- a/third_party/nixpkgs/pkgs/tools/archivers/wimlib/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/audio/abcmidi/default.nix b/third_party/nixpkgs/pkgs/tools/audio/abcmidi/default.nix
index c5979437f4..52c69c1577 100644
--- a/third_party/nixpkgs/pkgs/tools/audio/abcmidi/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/audio/abcmidi/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "abcMIDI";
-  version = "2024.06.18";
+  version = "2024.07.26";
 
   src = fetchzip {
     url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip";
-    hash = "sha256-QxIbA/rQ4Sk4XFZ1XR3CAOt3L3xwxFFrDQK8B22egwY=";
+    hash = "sha256-LOCr1EwEUY+Nwr+bgxpVq2fUn+SfGTPlEYUPhzlpUEM=";
   };
 
   meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/tools/audio/accuraterip-checksum/default.nix b/third_party/nixpkgs/pkgs/tools/audio/accuraterip-checksum/default.nix
index 8658dfb5a7..df4dfef93b 100644
--- a/third_party/nixpkgs/pkgs/tools/audio/accuraterip-checksum/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/audio/dl-librescore/default.nix b/third_party/nixpkgs/pkgs/tools/audio/dl-librescore/default.nix
index 913efd645a..78a2b80a0c 100644
--- a/third_party/nixpkgs/pkgs/tools/audio/dl-librescore/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/audio/dl-librescore/default.nix
@@ -3,7 +3,7 @@
 , buildNpmPackage
 , fetchFromGitHub
 , python3
-, darwin
+, cctools
 }:
 
 buildNpmPackage rec {
@@ -31,7 +31,7 @@ buildNpmPackage rec {
   nativeBuildInputs = [
     python3
   ] ++ lib.optionals stdenv.isDarwin [
-    darwin.cctools
+    cctools
   ];
 
   meta = {
@@ -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/third_party/nixpkgs/pkgs/tools/audio/goxlr-utility/default.nix b/third_party/nixpkgs/pkgs/tools/audio/goxlr-utility/default.nix
index b8baf0266f..fc562d212d 100644
--- a/third_party/nixpkgs/pkgs/tools/audio/goxlr-utility/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/audio/goxlr-utility/default.nix
@@ -5,7 +5,7 @@
 , pkg-config
 , libpulseaudio
 , dbus
-, speechd
+, speechd-minimal
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec {
   buildInputs = [
     libpulseaudio
     dbus
-    speechd
+    speechd-minimal
   ];
 
   nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/tools/audio/isrcsubmit/default.nix b/third_party/nixpkgs/pkgs/tools/audio/isrcsubmit/default.nix
index f135cccbc6..9df6a04933 100644
--- a/third_party/nixpkgs/pkgs/tools/audio/isrcsubmit/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/audio/mpdcron/default.nix b/third_party/nixpkgs/pkgs/tools/audio/mpdcron/default.nix
index 5578acf27e..c2e93d592f 100644
--- a/third_party/nixpkgs/pkgs/tools/audio/mpdcron/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/audio/mpdcron/default.nix
@@ -56,6 +56,7 @@ in stdenv.mkDerivation {
     license     = licenses.gpl2Plus;
     platforms   = platforms.unix;
     maintainers = with maintainers; [ lovek323 manveru ];
+    broken      = stdenv.isDarwin; # fails due to old nokogiri https://github.com/sparklemotion/nokogiri/discussions/3152#discussioncomment-8806607
   };
 }
 # TODO: autoreconfHook this
diff --git a/third_party/nixpkgs/pkgs/tools/audio/mpdris2/default.nix b/third_party/nixpkgs/pkgs/tools/audio/mpdris2/default.nix
index bb050788f8..3fb6b46a42 100644
--- a/third_party/nixpkgs/pkgs/tools/audio/mpdris2/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/audio/pw-volume/default.nix b/third_party/nixpkgs/pkgs/tools/audio/pw-volume/default.nix
index 13e39484b5..290cd4ffbf 100644
--- a/third_party/nixpkgs/pkgs/tools/audio/pw-volume/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/audio/pw-volume/default.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-r/6AAZKZgPYUGic/Dag7OT5RtH+RKgEkJVWxsO5VGZ0=";
   };
 
-  cargoSha256 = "sha256-srwbrMBUJz/Xi+Hk2GY9oo4rcTfKl/r146YWSSx6dew=";
+  cargoHash = "sha256-srwbrMBUJz/Xi+Hk2GY9oo4rcTfKl/r146YWSSx6dew=";
 
   meta = with lib; {
     description = "Basic interface to PipeWire volume controls";
diff --git a/third_party/nixpkgs/pkgs/tools/backup/btar/default.nix b/third_party/nixpkgs/pkgs/tools/backup/btar/default.nix
index 7d9f257f72..f5ac2ce65d 100644
--- a/third_party/nixpkgs/pkgs/tools/backup/btar/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/backup/btar/default.nix
@@ -32,6 +32,6 @@ stdenv.mkDerivation rec {
     license = lib.licenses.gpl3Plus;
     homepage = "https://viric.name/cgi-bin/btar";
     platforms = platforms.all;
-    maintainers = with maintainers; [ viric ];
+    maintainers = [ ];
   };
 }
diff --git a/third_party/nixpkgs/pkgs/tools/backup/bupstash/default.nix b/third_party/nixpkgs/pkgs/tools/backup/bupstash/default.nix
index d9b9bc8188..c164c2ecc9 100644
--- a/third_party/nixpkgs/pkgs/tools/backup/bupstash/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/backup/bupstash/default.nix
@@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-Ekjxna3u+71s1q7jjXp7PxYUQIfbp2E+jAqKGuszU6g=";
   };
 
-  cargoSha256 = "sha256-hkGmE7WseEjMxmmPyR8C4osbdbpIt8qG9sfVGuC4d84=";
+  cargoHash = "sha256-hkGmE7WseEjMxmmPyR8C4osbdbpIt8qG9sfVGuC4d84=";
 
   nativeBuildInputs = [ ronn pkg-config installShellFiles ];
   buildInputs = [ libsodium ];
diff --git a/third_party/nixpkgs/pkgs/tools/backup/rdedup/default.nix b/third_party/nixpkgs/pkgs/tools/backup/rdedup/default.nix
index 0c8d4afb52..af62fede40 100644
--- a/third_party/nixpkgs/pkgs/tools/backup/rdedup/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/backup/rdedup/default.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-GEYP18CaCQShvCg8T7YTvlybH1LNO34KBxgmsTv2Lzs=";
   };
 
-  cargoSha256 = "sha256-I6d3IyPBcUsrvlzF7W0hFM4hcXi4wWro9bCeP4eArHI=";
+  cargoHash = "sha256-I6d3IyPBcUsrvlzF7W0hFM4hcXi4wWro9bCeP4eArHI=";
 
   nativeBuildInputs = [ pkg-config rustPlatform.bindgenHook ];
   buildInputs = [ openssl libsodium xz ]
diff --git a/third_party/nixpkgs/pkgs/tools/backup/restic/default.nix b/third_party/nixpkgs/pkgs/tools/backup/restic/default.nix
index 198a5dda05..5f802f4879 100644
--- a/third_party/nixpkgs/pkgs/tools/backup/restic/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/backup/restic/rest-server.nix b/third_party/nixpkgs/pkgs/tools/backup/restic/rest-server.nix
index 547f3775b2..8d8cedb339 100644
--- a/third_party/nixpkgs/pkgs/tools/backup/restic/rest-server.nix
+++ b/third_party/nixpkgs/pkgs/tools/backup/restic/rest-server.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "restic-rest-server";
-  version = "0.12.1";
+  version = "0.13.0";
 
   src = fetchFromGitHub {
     owner = "restic";
     repo = "rest-server";
     rev = "v${version}";
-    hash = "sha256-0zmUI7LUKVXUdPsNxY7RQxbsAraY0GrTMAS3kORIU6I=";
+    hash = "sha256-o55y+g9XklKghVK1c6MTRI8EHLplTv5YKUWGRyyvmtk=";
   };
 
-  vendorHash = "sha256-tD5ffIYULMBqu99l1xCL0RnLB9zNpwNPs1qVFqezUc8=";
+  vendorHash = "sha256-MBkh61vFogf0su/mP3b2J8t/LTtfVzLlpa9MSzAq6Tw=";
 
   passthru.tests.restic = nixosTests.restic-rest-server;
 
diff --git a/third_party/nixpkgs/pkgs/tools/backup/sigtop/default.nix b/third_party/nixpkgs/pkgs/tools/backup/sigtop/default.nix
index 765d0d0789..08043c391b 100644
--- a/third_party/nixpkgs/pkgs/tools/backup/sigtop/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/backup/wal-g/default.nix b/third_party/nixpkgs/pkgs/tools/backup/wal-g/default.nix
index 0cbcaca81f..a2f43b15a2 100644
--- a/third_party/nixpkgs/pkgs/tools/backup/wal-g/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/backup/zfs-autobackup/default.nix b/third_party/nixpkgs/pkgs/tools/backup/zfs-autobackup/default.nix
index 79d0fcd01d..fcb3bf7dce 100644
--- a/third_party/nixpkgs/pkgs/tools/backup/zfs-autobackup/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/backup/zfsbackup/default.nix b/third_party/nixpkgs/pkgs/tools/backup/zfsbackup/default.nix
index 12bc55a543..6be570fadd 100644
--- a/third_party/nixpkgs/pkgs/tools/backup/zfsbackup/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/bluetooth/blueman/default.nix b/third_party/nixpkgs/pkgs/tools/bluetooth/blueman/default.nix
index 45713d5b8e..572a73be3c 100644
--- a/third_party/nixpkgs/pkgs/tools/bluetooth/blueman/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/cd-dvd/ccd2iso/default.nix b/third_party/nixpkgs/pkgs/tools/cd-dvd/ccd2iso/default.nix
index abe0c3d81e..8606614d01 100644
--- a/third_party/nixpkgs/pkgs/tools/cd-dvd/ccd2iso/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/cd-dvd/dvdisaster/default.nix b/third_party/nixpkgs/pkgs/tools/cd-dvd/dvdisaster/default.nix
index abbda3512e..cb448ef157 100644
--- a/third_party/nixpkgs/pkgs/tools/cd-dvd/dvdisaster/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/compression/bsc/default.nix b/third_party/nixpkgs/pkgs/tools/compression/bsc/default.nix
deleted file mode 100644
index 7d2af1c489..0000000000
--- a/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/compression/bzip2/1_1.nix b/third_party/nixpkgs/pkgs/tools/compression/bzip2/1_1.nix
index 15ff3c96b2..520cc393b0 100644
--- a/third_party/nixpkgs/pkgs/tools/compression/bzip2/1_1.nix
+++ b/third_party/nixpkgs/pkgs/tools/compression/bzip2/1_1.nix
@@ -42,6 +42,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = licenses.bsdOriginal;
     pkgConfigModules = [ "bz2" ];
     platforms = platforms.all;
-    maintainers = [];
+    maintainers = [ ];
   };
 })
diff --git a/third_party/nixpkgs/pkgs/tools/compression/gzrt/default.nix b/third_party/nixpkgs/pkgs/tools/compression/gzrt/default.nix
index 9dc85fa6f9..d28b5af803 100644
--- a/third_party/nixpkgs/pkgs/tools/compression/gzrt/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/compression/hactool/default.nix b/third_party/nixpkgs/pkgs/tools/compression/hactool/default.nix
index 8848d45064..9cc3a26f6f 100644
--- a/third_party/nixpkgs/pkgs/tools/compression/hactool/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/compression/lrzip/default.nix b/third_party/nixpkgs/pkgs/tools/compression/lrzip/default.nix
index bca4bdd2a3..f485bab4a7 100644
--- a/third_party/nixpkgs/pkgs/tools/compression/lrzip/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/compression/lzfse/default.nix b/third_party/nixpkgs/pkgs/tools/compression/lzfse/default.nix
index 3f37f78104..dd2144a168 100644
--- a/third_party/nixpkgs/pkgs/tools/compression/lzfse/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/compression/lzop/default.nix b/third_party/nixpkgs/pkgs/tools/compression/lzop/default.nix
index 887ae94e5c..d2daeb51d5 100644
--- a/third_party/nixpkgs/pkgs/tools/compression/lzop/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/compression/pbzip2/default.nix b/third_party/nixpkgs/pkgs/tools/compression/pbzip2/default.nix
index 6bf83bd718..d9eecda0d6 100644
--- a/third_party/nixpkgs/pkgs/tools/compression/pbzip2/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/compression/pbzip2/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     homepage = "http://compression.ca/pbzip2/";
     description = "Parallel implementation of bzip2 for multi-core machines";
     license = licenses.bsd2;
-    maintainers = with maintainers; [viric];
+    maintainers = [ ];
     platforms = platforms.unix;
   };
 }
diff --git a/third_party/nixpkgs/pkgs/tools/compression/pigz/default.nix b/third_party/nixpkgs/pkgs/tools/compression/pigz/default.nix
index 6e9decb1b7..106b14b81b 100644
--- a/third_party/nixpkgs/pkgs/tools/compression/pigz/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/compression/rzip/default.nix b/third_party/nixpkgs/pkgs/tools/compression/rzip/default.nix
index 3d744dfa35..333f29e53a 100644
--- a/third_party/nixpkgs/pkgs/tools/compression/rzip/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/filesystems/bindfs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/bindfs/default.nix
index 310c6db9b3..a8013bd860 100644
--- a/third_party/nixpkgs/pkgs/tools/filesystems/bindfs/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/filesystems/exfatprogs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/exfatprogs/default.nix
index e8f1743106..3fdfa10907 100644
--- a/third_party/nixpkgs/pkgs/tools/filesystems/exfatprogs/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/filesystems/garage/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/garage/default.nix
index ce5ccbf696..aa073ab2d5 100644
--- a/third_party/nixpkgs/pkgs/tools/filesystems/garage/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/filesystems/garage/default.nix
@@ -11,7 +11,7 @@
 , nixosTests
 }:
 let
-  generic = { version, sha256, cargoSha256, eol ? false, broken ? false }: rustPlatform.buildRustPackage {
+  generic = { version, sha256, cargoHash, eol ? false, broken ? false }: rustPlatform.buildRustPackage {
     pname = "garage";
     inherit version;
 
@@ -29,7 +29,7 @@ let
       rm .cargo/config.toml || true
     '';
 
-    inherit cargoSha256;
+    inherit cargoHash;
 
     nativeBuildInputs = [ protobuf pkg-config ];
 
@@ -97,7 +97,7 @@ rec {
   garage_0_8_7 = generic {
     version = "0.8.7";
     sha256 = "sha256-2QGbR6YvMQeMxN3n1MMJ5qfBcEJ5hjXARUOfEn+m4Jc=";
-    cargoSha256 = "sha256-Q0QyBNPEDrlhgIHD4q7Qb1Pu3xBvzlLOSW7LSWWdoIo=";
+    cargoHash = "sha256-Q0QyBNPEDrlhgIHD4q7Qb1Pu3xBvzlLOSW7LSWWdoIo=";
     broken = stdenv.isDarwin;
   };
 
@@ -106,14 +106,14 @@ rec {
   garage_0_9_4 = generic {
     version = "0.9.4";
     sha256 = "sha256-2ZaxenwaVGYYUjUJaGgnGpZNQprQV9+Jns2sXM6cowk=";
-    cargoSha256 = "sha256-Cssls9csn6qribF+pAAagBydX9e9WTq4K/ehaLCWOOA=";
+    cargoHash = "sha256-Cssls9csn6qribF+pAAagBydX9e9WTq4K/ehaLCWOOA=";
     broken = stdenv.isDarwin;
   };
 
   garage_1_0_0 = generic {
     version = "1.0.0";
     sha256 = "sha256-5W5cXylFCrDup+HOOUVPWBJUSphOp8szgtpvRIv82b8=";
-    cargoSha256 = "sha256-tXO+Vk6bYpayNWi/y4sMtkn2EQ9wiwSAfn79Zbt28q0=";
+    cargoHash = "sha256-tXO+Vk6bYpayNWi/y4sMtkn2EQ9wiwSAfn79Zbt28q0=";
     broken = stdenv.isDarwin;
   };
 
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/gcsfuse/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/gcsfuse/default.nix
index ceefabb57e..1b52fa09c8 100644
--- a/third_party/nixpkgs/pkgs/tools/filesystems/gcsfuse/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/filesystems/go-mtpfs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/go-mtpfs/default.nix
index 3cbbf9bfb5..4a1341dce7 100644
--- a/third_party/nixpkgs/pkgs/tools/filesystems/go-mtpfs/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/filesystems/mtdutils/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/mtdutils/default.nix
index cbf8e4f192..641b50d435 100644
--- a/third_party/nixpkgs/pkgs/tools/filesystems/mtdutils/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/filesystems/mtdutils/default.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
     downloadPage = "https://git.infradead.org/mtd-utils.git";
     license = licenses.gpl2Plus;
     homepage = "http://www.linux-mtd.infradead.org/";
-    maintainers = with maintainers; [ viric ];
+    maintainers = [ ];
     platforms = with platforms; linux;
   };
 }
diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/rmfuse/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/rmfuse/default.nix
index 7ce74671e5..72e7162d98 100644
--- a/third_party/nixpkgs/pkgs/tools/filesystems/rmfuse/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/filesystems/romdirfs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/romdirfs/default.nix
index cc711e57cd..1b7e2f17a1 100644
--- a/third_party/nixpkgs/pkgs/tools/filesystems/romdirfs/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/filesystems/supertag/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/supertag/default.nix
index 9fd35935ef..9047fe1859 100644
--- a/third_party/nixpkgs/pkgs/tools/filesystems/supertag/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/filesystems/supertag/default.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
   # patches Cargo.lock to include a more up-to-date version of lexical-core
   cargoPatches = [ ./cargo-lock-update-lexical-core.patch ];
 
-  cargoSha256 = "sha256-W5Emkbe1jI9Z+irMckD/3gJO47rACa9E5k5dqAFC1yQ=";
+  cargoHash = "sha256-W5Emkbe1jI9Z+irMckD/3gJO47rACa9E5k5dqAFC1yQ=";
 
   nativeBuildInputs = [ rustPlatform.bindgenHook pkg-config ];
   buildInputs = [ dbus fuse sqlite ];
diff --git a/third_party/nixpkgs/pkgs/tools/games/mymcplus/default.nix b/third_party/nixpkgs/pkgs/tools/games/mymcplus/default.nix
index acd5a121f4..9fa3c77978 100644
--- a/third_party/nixpkgs/pkgs/tools/games/mymcplus/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/games/steam-acf/default.nix b/third_party/nixpkgs/pkgs/tools/games/steam-acf/default.nix
index ea65722161..7028ed33a3 100644
--- a/third_party/nixpkgs/pkgs/tools/games/steam-acf/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/games/steam-acf/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "16q3md7cvdz37pqm1sda81rkjf249xbsrlpdl639r06p7f4nqlc2";
   };
 
-  cargoSha256 = "0fzlvn0sl7613hpsb7ncykmcl53dgl8rzsg317nwkj2w679q4xq6";
+  cargoHash = "sha256-BneC0zFcyMntCePpnxF9bRTK6vTMnqUvHMEcqoHd9Ds=";
 
   meta = with lib; {
     description = "Tool to convert Steam .acf files to JSON";
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/argyllcms/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/argyllcms/default.nix
index efb77b89a6..f062ee261f 100644
--- a/third_party/nixpkgs/pkgs/tools/graphics/argyllcms/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/graphics/argyllcms/default.nix
@@ -148,7 +148,7 @@ stdenv.mkDerivation rec {
     homepage = "https://www.argyllcms.com/";
     description = "Color management system (compatible with ICC)";
     license = licenses.gpl3;
-    maintainers = [];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/cgif/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/cgif/default.nix
index f581a97759..7f35f42cca 100644
--- a/third_party/nixpkgs/pkgs/tools/graphics/cgif/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/graphics/deqp-runner/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/deqp-runner/default.nix
index 1018321769..cafd083de5 100644
--- a/third_party/nixpkgs/pkgs/tools/graphics/deqp-runner/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/graphics/dnglab/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/dnglab/default.nix
index 9088a1110b..6354c4f495 100644
--- a/third_party/nixpkgs/pkgs/tools/graphics/dnglab/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/graphics/dnglab/default.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-jkOkkcMFK1RLY8Hn/bMMuMZtyGwnwGdm0os8QKhcWqo=";
   };
 
-  cargoSha256 = "sha256-qwhOJxFYRJC51dKB1pi/WVJs7H955jM6KmKbxsAScDI=";
+  cargoHash = "sha256-qwhOJxFYRJC51dKB1pi/WVJs7H955jM6KmKbxsAScDI=";
 
   postInstall = ''
     rm $out/bin/benchmark $out/bin/identify
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/exiftags/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/exiftags/default.nix
index 6823f6bc20..971722ea9f 100644
--- a/third_party/nixpkgs/pkgs/tools/graphics/exiftags/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/graphics/exiftags/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     homepage = "http://johnst.org/sw/exiftags/";
     description = "Displays EXIF data from JPEG files";
     license = lib.licenses.free;
-    maintainers = with lib.maintainers; [viric];
+    maintainers = [ ];
     platforms = with lib.platforms; unix;
   };
 }
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/maim/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/maim/default.nix
index bab4395d3e..4ac98c9551 100644
--- a/third_party/nixpkgs/pkgs/tools/graphics/maim/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/graphics/mangohud/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/mangohud/default.nix
index 7ca9652baa..3e0837323a 100644
--- a/third_party/nixpkgs/pkgs/tools/graphics/mangohud/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/graphics/mangohud/default.nix
@@ -13,7 +13,7 @@
 , dbus
 , hwdata
 , mangohud32
-, addOpenGLRunpath
+, addDriverRunpath
 , appstream
 , git
 , glslang
@@ -171,7 +171,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   nativeBuildInputs = [
-    addOpenGLRunpath
+    addDriverRunpath
     git
     glslang
     mako
@@ -232,10 +232,10 @@ stdenv.mkDerivation (finalAttrs: {
         --replace "VK_LAYER_MANGOHUD_overlay" "VK_LAYER_MANGOHUD_overlay_${toString stdenv.hostPlatform.parsed.cpu.bits}"
     '' + ''
       # Add OpenGL driver and libXNVCtrl paths to RUNPATH to support NVIDIA cards
-      addOpenGLRunpath "$out/lib/mangohud/libMangoHud.so"
+      addDriverRunpath "$out/lib/mangohud/libMangoHud.so"
       patchelf --add-rpath ${libXNVCtrl}/lib "$out/lib/mangohud/libMangoHud.so"
     '' + lib.optionalString gamescopeSupport ''
-      addOpenGLRunpath "$out/bin/mangoapp"
+      addDriverRunpath "$out/bin/mangoapp"
     '' + lib.optionalString finalAttrs.finalPackage.doCheck ''
       # libcmocka.so is only used for tests
       rm "$out/lib/libcmocka.so"
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/scrot/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/scrot/default.nix
index d969024f2b..ef8a9e2958 100644
--- a/third_party/nixpkgs/pkgs/tools/graphics/scrot/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/graphics/shotgun/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/shotgun/default.nix
index eff9924f4f..e71f0d7cc9 100644
--- a/third_party/nixpkgs/pkgs/tools/graphics/shotgun/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/graphics/shotgun/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-sBstFz7cYfwVQpDZeC3wPjzbKU5zQzmnhiWNqiCda1k=";
   };
 
-  cargoSha256 = "sha256-P6riJgnEe+bNP3cUKNCfIkgKM44XGYSDADnU6w7CFDA=";
+  cargoHash = "sha256-P6riJgnEe+bNP3cUKNCfIkgKM44XGYSDADnU6w7CFDA=";
 
   meta = with lib; {
     description = "Minimal X screenshot utility";
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/svgcleaner/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/svgcleaner/default.nix
index f3db03c53f..87e7bafa2e 100644
--- a/third_party/nixpkgs/pkgs/tools/graphics/svgcleaner/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/graphics/svgcleaner/default.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-pRDRRVb8Lyna8X/PEjS9tS5dbG4g7vyMCU5AqPlpxec=";
   };
 
-  cargoSha256 = "sha256-SZWmJGiCc/FevxMWJpa8xKVz/rbll52oNbFtqPpz74g=";
+  cargoHash = "sha256-SZWmJGiCc/FevxMWJpa8xKVz/rbll52oNbFtqPpz74g=";
 
   meta = with lib; {
     description = "Clean and optimize SVG files from unnecessary data";
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/twilight/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/twilight/default.nix
index 790ef79ea0..bd900d455d 100644
--- a/third_party/nixpkgs/pkgs/tools/graphics/twilight/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/graphics/unpaper/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/unpaper/default.nix
index 0b84d61274..dc38c55397 100644
--- a/third_party/nixpkgs/pkgs/tools/graphics/unpaper/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/graphics/unpaper/default.nix
@@ -12,7 +12,7 @@
 
 # runtime
 , buildPackages
-, ffmpeg_5-headless
+, ffmpeg-headless
 
 # tests
 , nixosTests
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    ffmpeg_5-headless
+    ffmpeg-headless
   ];
 
   passthru.tests = {
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/viu/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/viu/default.nix
index 20267511fd..0200957a94 100644
--- a/third_party/nixpkgs/pkgs/tools/graphics/viu/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/graphics/viu/default.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
   # tests need an interactive terminal
   doCheck = false;
 
-  cargoSha256 = "sha256-ildtjaYGbrQacJOdGDVwFv+kod+vZHqukWN6ARtJqI4=";
+  cargoHash = "sha256-ildtjaYGbrQacJOdGDVwFv+kod+vZHqukWN6ARtJqI4=";
 
   buildFeatures = lib.optional withSixel "sixel";
   buildInputs = lib.optional withSixel libsixel;
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/vkbasalt-cli/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/vkbasalt-cli/default.nix
index 237aad77f1..855daf39cc 100644
--- a/third_party/nixpkgs/pkgs/tools/graphics/vkbasalt-cli/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/graphics/vulkan-helper/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/vulkan-helper/default.nix
index 22fb34c8f8..19e1d17349 100644
--- a/third_party/nixpkgs/pkgs/tools/graphics/vulkan-helper/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/graphics/vulkan-helper/default.nix
@@ -2,7 +2,7 @@
 , rustPlatform
 , fetchFromGitHub
 , vulkan-loader
-, addOpenGLRunpath
+, addDriverRunpath
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -16,15 +16,15 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-2pLHnTn0gJKz4gfrR6h85LHOaZPrhIGYzQeci4Dzz2E=";
   };
 
-  cargoSha256 = "sha256-OXMz1qu4/LDeQbwe7shhn2Eee15xKmBpWSsP0IbjoGM=";
+  cargoHash = "sha256-OXMz1qu4/LDeQbwe7shhn2Eee15xKmBpWSsP0IbjoGM=";
 
   nativeBuildInputs = [
-    addOpenGLRunpath
+    addDriverRunpath
   ];
 
   postFixup = ''
     patchelf --add-rpath ${vulkan-loader}/lib $out/bin/vulkan-helper
-    addOpenGLRunpath $out/bin/vulkan-helper
+    addDriverRunpath $out/bin/vulkan-helper
   '';
 
   meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/tools/graphics/xcolor/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/xcolor/default.nix
index 50aa912522..f9ba3627f7 100644
--- a/third_party/nixpkgs/pkgs/tools/graphics/xcolor/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/graphics/xcolor/default.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-NfmoBZek4hsga6RflE5EKkWarhCFIcTwEXhg2fpkxNE=";
   };
 
-  cargoSha256 = "sha256-Zh73+FJ63SkusSavCqSCLbHVnU++4ZFSMFUIM7TnOj0=";
+  cargoHash = "sha256-Zh73+FJ63SkusSavCqSCLbHVnU++4ZFSMFUIM7TnOj0=";
 
   nativeBuildInputs = [ pkg-config python3 installShellFiles copyDesktopItems ];
 
diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-libthai/default.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-libthai/default.nix
index 2e322d24a7..e72760e735 100644
--- a/third_party/nixpkgs/pkgs/tools/inputmethods/ibus-engines/ibus-libthai/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/3llo/default.nix b/third_party/nixpkgs/pkgs/tools/misc/3llo/default.nix
index 8515849f3a..b095cee4d7 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/3llo/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/aaa/default.nix b/third_party/nixpkgs/pkgs/tools/misc/aaa/default.nix
index 0988bbca7a..6511df5c99 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/aaa/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/aaa/default.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
     rev = "v${version}";
     sha256 = "sha256-gIOlPjZOcmVLi9oOn4gBv6F+3Eq6t5b/3fKzoFqxclw=";
   };
-  cargoSha256 = "sha256-ugB0r9qiGRurc30GrJH4MKM6fWZ99+f1Gy7/1lSmrwU=";
+  cargoHash = "sha256-ugB0r9qiGRurc30GrJH4MKM6fWZ99+f1Gy7/1lSmrwU=";
 
   meta = with lib; {
     description = "Terminal viewer for 3a format";
diff --git a/third_party/nixpkgs/pkgs/tools/misc/adafruit-ampy/default.nix b/third_party/nixpkgs/pkgs/tools/misc/adafruit-ampy/default.nix
index 4a87c9692c..66a7769350 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/adafruit-ampy/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/apparix/default.nix b/third_party/nixpkgs/pkgs/tools/misc/apparix/default.nix
index 7b80c2a5d9..dd0c8cf67b 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/apparix/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/as-tree/default.nix b/third_party/nixpkgs/pkgs/tools/misc/as-tree/default.nix
index f4c5eb1354..7a8ec48306 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/as-tree/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/as-tree/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-80yB89sKIuv7V68p0jEsi2hRdz+5CzE+4R0joRzO7Dk=";
   };
 
-  cargoSha256 = "sha256-BLEVPKO2YwcKuM/rUeMuyE38phOrbq0e8cjqh1qmJjM=";
+  cargoHash = "sha256-BLEVPKO2YwcKuM/rUeMuyE38phOrbq0e8cjqh1qmJjM=";
 
   meta = with lib; {
     description = "Print a list of paths as a tree of paths";
diff --git a/third_party/nixpkgs/pkgs/tools/misc/asciinema-scenario/default.nix b/third_party/nixpkgs/pkgs/tools/misc/asciinema-scenario/default.nix
index 4568f4542a..99446e2ac0 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/asciinema-scenario/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/asciinema-scenario/default.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-fnX5CIYLdFqi04PQPVIAYDGn+xXi016l8pPcIrYIhmQ=";
   };
 
-  cargoSha256 = "sha256-8I3mPSJ5aXvQ88nh0SWyuTq9JSTktS2lQPrXlcvD66c=";
+  cargoHash = "sha256-8I3mPSJ5aXvQ88nh0SWyuTq9JSTktS2lQPrXlcvD66c=";
 
   meta = with lib; {
     description = "Create asciinema videos from a text file";
diff --git a/third_party/nixpkgs/pkgs/tools/misc/bartib/default.nix b/third_party/nixpkgs/pkgs/tools/misc/bartib/default.nix
index 43921e3371..48e131262a 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/bartib/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/bartib/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-eVLacxKD8seD8mxVN1D3HhKZkIDXsEsSisZnFbmhpSk=";
   };
 
-  cargoSha256 = "sha256-s/oGv7/0LgNpdGu6dnvvbxDgFDvcvcHL01dSPxhMVWE=";
+  cargoHash = "sha256-s/oGv7/0LgNpdGu6dnvvbxDgFDvcvcHL01dSPxhMVWE=";
 
   nativeBuildInputs = [ installShellFiles ];
 
diff --git a/third_party/nixpkgs/pkgs/tools/misc/bdf2sfd/default.nix b/third_party/nixpkgs/pkgs/tools/misc/bdf2sfd/default.nix
index b5b9cd5ec7..da3375ac6d 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/bdf2sfd/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/bottom-rs/default.nix b/third_party/nixpkgs/pkgs/tools/misc/bottom-rs/default.nix
index e41c1230d9..d9d2ab079c 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/bottom-rs/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/bottom-rs/default.nix
@@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-R1zj+TFXoolonIFa1zJDd7CdrORfzAPlxJoJVYe9xdc=";
   };
 
-  cargoSha256 = "sha256-7xD65ookkK09XwCBH6fXqmWRYlmvpwAocojBg/dHzUI=";
+  cargoHash = "sha256-7xD65ookkK09XwCBH6fXqmWRYlmvpwAocojBg/dHzUI=";
 
   meta = with lib; {
     description = "Fantastic (maybe) CLI for translating between bottom and human-readable text";
diff --git a/third_party/nixpkgs/pkgs/tools/misc/ckb-next/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ckb-next/default.nix
index 6b7fc82e0d..ca0f6705b9 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/ckb-next/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/claws/default.nix b/third_party/nixpkgs/pkgs/tools/misc/claws/default.nix
index 05231d2b16..cb1a55b069 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/claws/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/clpeak/default.nix b/third_party/nixpkgs/pkgs/tools/misc/clpeak/default.nix
index 4b190acf19..6060a20781 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/clpeak/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/cmdpack/default.nix b/third_party/nixpkgs/pkgs/tools/misc/cmdpack/default.nix
index 0fe2c75d1e..22402098e6 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/cmdpack/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/cmdpack/default.nix
@@ -13,7 +13,7 @@ let
     buildPhase = ''
       runHook preBuild
 
-      gcc -o ${pname} src/${pname}.c
+      $CC -o "$pname" "src/$pname.c"
 
       runHook postBuild
     '';
@@ -21,8 +21,7 @@ let
     installPhase = ''
       runHook preInstall
 
-      mkdir -p $out/bin
-      cp ${pname} $out/bin
+      install -Dm555 -t "$out/bin" "$pname"
 
       runHook postInstall
     '';
diff --git a/third_party/nixpkgs/pkgs/tools/misc/coinlive/default.nix b/third_party/nixpkgs/pkgs/tools/misc/coinlive/default.nix
index 2d5faff98a..2db008551c 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/coinlive/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/coinlive/default.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-llw97jjfPsDd4nYi6lb9ug6sApPoD54WlzpJswvdbRs=";
   };
 
-  cargoSha256 = "sha256-T1TgwnohUDvfpn6GXNP4xJGHM3aenMK+ORxE3z3PPA4=";
+  cargoHash = "sha256-T1TgwnohUDvfpn6GXNP4xJGHM3aenMK+ORxE3z3PPA4=";
 
   nativeBuildInputs = [
     pkg-config
diff --git a/third_party/nixpkgs/pkgs/tools/misc/colorpanes/default.nix b/third_party/nixpkgs/pkgs/tools/misc/colorpanes/default.nix
index e89dc66897..72209cf217 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/colorpanes/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/colorpanes/default.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "qaOH+LXNDq+utwyI1yzHWNt25AvdAXCTAziGV9ElroU=";
   };
 
-  cargoSha256 = "eJne4OmV4xHxntTb8HE+2ghX1hZLE3WQ3QqsjVm9E4M=";
+  cargoHash = "sha256-eJne4OmV4xHxntTb8HE+2ghX1hZLE3WQ3QqsjVm9E4M=";
 
   postInstall = ''
     ln -s $out/bin/colp $out/bin/colorpanes
diff --git a/third_party/nixpkgs/pkgs/tools/misc/coreutils/default.nix b/third_party/nixpkgs/pkgs/tools/misc/coreutils/default.nix
index 8e051b798f..0e11363b82 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/coreutils/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/coreutils/default.nix
@@ -7,6 +7,8 @@
 , perl
 , texinfo
 , xz
+, binlore
+, coreutils
 , gmpSupport ? true, gmp
 , aclSupport ? stdenv.isLinux, acl
 , attrSupport ? stdenv.isLinux, attr
@@ -27,7 +29,7 @@ assert aclSupport -> acl != null;
 assert selinuxSupport -> libselinux != null && libsepol != null;
 
 let
-  inherit (lib) concatStringsSep isString optional optionals optionalString;
+  inherit (lib) concatStringsSep isString optional optionalAttrs optionals optionalString;
   isCross = (stdenv.hostPlatform != stdenv.buildPlatform);
 in
 stdenv.mkDerivation rec {
@@ -181,6 +183,26 @@ stdenv.mkDerivation rec {
     rm -r "$out/share"
   '';
 
+  passthru = {} // optionalAttrs (singleBinary != false) {
+    # everything in the single binary gets the same verdict, so we
+    # override _that case_ with verdicts from separate binaries.
+    #
+    # binlore only spots exec in runcon on some platforms (i.e., not
+    # darwin; see comment on inverse case below)
+    binlore.out = binlore.synthesize coreutils ''
+      execer can bin/{chroot,env,install,nice,nohup,runcon,sort,split,stdbuf,timeout}
+      execer cannot bin/{[,b2sum,base32,base64,basename,basenc,cat,chcon,chgrp,chmod,chown,cksum,comm,cp,csplit,cut,date,dd,df,dir,dircolors,dirname,du,echo,expand,expr,factor,false,fmt,fold,groups,head,hostid,id,join,kill,link,ln,logname,ls,md5sum,mkdir,mkfifo,mknod,mktemp,mv,nl,nproc,numfmt,od,paste,pathchk,pinky,pr,printenv,printf,ptx,pwd,readlink,realpath,rm,rmdir,seq,sha1sum,sha224sum,sha256sum,sha384sum,sha512sum,shred,shuf,sleep,stat,stty,sum,sync,tac,tail,tee,test,touch,tr,true,truncate,tsort,tty,uname,unexpand,uniq,unlink,uptime,users,vdir,wc,who,whoami,yes}
+    '';
+  } // optionalAttrs (singleBinary == false) {
+    # binlore only spots exec in runcon on some platforms (i.e., not
+    # darwin; I have a note that the behavior may need selinux?).
+    # hard-set it so people working on macOS don't miss cases of
+    # runcon until ofBorg fails.
+    binlore.out = binlore.synthesize coreutils ''
+      execer can bin/runcon
+    '';
+  };
+
   meta = with lib; {
     homepage = "https://www.gnu.org/software/coreutils/";
     description = "GNU Core Utilities";
diff --git a/third_party/nixpkgs/pkgs/tools/misc/cowsay/default.nix b/third_party/nixpkgs/pkgs/tools/misc/cowsay/default.nix
index b0910da7b0..38a7c3f398 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/cowsay/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/cowsay/default.nix
@@ -49,5 +49,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = licenses.gpl3Only;
     platforms = platforms.all;
     maintainers = with maintainers; [ rob anthonyroussel ];
+    mainProgram = "cowsay";
   };
 })
diff --git a/third_party/nixpkgs/pkgs/tools/misc/cp210x-program/default.nix b/third_party/nixpkgs/pkgs/tools/misc/cp210x-program/default.nix
index d53a406c3c..50c6daab1b 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/cp210x-program/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/cyclonedx-python/default.nix b/third_party/nixpkgs/pkgs/tools/misc/cyclonedx-python/default.nix
index ba6d137fa5..b3439723aa 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/cyclonedx-python/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/cyclonedx-python/default.nix
@@ -1,65 +1,40 @@
-{ lib
-, fetchFromGitHub
-, python3
+{
+  lib,
+  fetchFromGitHub,
+  python3Packages,
 }:
 
-let
-  py = python3.override {
-    packageOverrides = self: super: {
-
-      # Requires 'cyclonedx-python-lib = ">= 2.0.0, < 4.0.0"'
-      cyclonedx-python-lib = super.cyclonedx-python-lib.overridePythonAttrs (oldAttrs: rec {
-        version = "3.1.5";
-        src = fetchFromGitHub {
-          owner = "CycloneDX";
-          repo = "cyclonedx-python-lib";
-          rev = "refs/tags/v${version}";
-          hash = "sha256-4lA8OdmvQD94jTeDf+Iz7ZyEQ9fZzCxnXQG9Ir8FKhk=";
-        };
-      });
-    };
-  };
-in
-with py.pkgs;
-
-python3.pkgs.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "cyclonedx-python";
-  version = "3.11.7";
+  version = "4.5.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "CycloneDX";
     repo = "cyclonedx-python";
     rev = "refs/tags/v${version}";
-    sha256 = "sha256-jU/0FkQCyph59TnEE+lckJXsU9whfvWp7dkdfzprYw8=";
+    hash = "sha256-+XeMRREDX1+v+qOeYiHh7uhadfueYYOxspLY3q1NL6s=";
   };
 
-  nativeBuildInputs = with py.pkgs; [
-    poetry-core
-  ];
+  build-system = with python3Packages; [ poetry-core ];
 
-  propagatedBuildInputs = with py.pkgs; [
+  dependencies = with python3Packages; [
     chardet
     cyclonedx-python-lib
     packageurl-python
     pip-requirements-parser
-    setuptools
-    toml
-  ];
+    packaging
+    tomli
+  ] ++ cyclonedx-python-lib.optional-dependencies.validation;
 
-  # The tests want access to the cyclonedx binary
-  doCheck = false;
+  pythonImportsCheck = [ "cyclonedx" ];
 
-  pythonImportsCheck = [
-    "cyclonedx"
-  ];
-
-  meta = with lib; {
+  meta = {
     description = "Creates CycloneDX Software Bill of Materials (SBOM) from Python projects";
     homepage = "https://github.com/CycloneDX/cyclonedx-python";
     changelog = "https://github.com/CycloneDX/cyclonedx-python/releases/tag/v${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ xanderio ];
     mainProgram = "cyclonedx-py";
   };
 }
diff --git a/third_party/nixpkgs/pkgs/tools/misc/dashing/default.nix b/third_party/nixpkgs/pkgs/tools/misc/dashing/default.nix
index f2f9353f40..600dc5dd85 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/dashing/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/dbacl/default.nix b/third_party/nixpkgs/pkgs/tools/misc/dbacl/default.nix
index 6a2700f482..a7069ad92b 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/dbacl/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/dbacl/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = "https://dbacl.sourceforge.net/";
     longDescription = "a digramic Bayesian classifier for text recognition.";
-    maintainers = [];
+    maintainers = [ ];
     license = lib.licenses.gpl3;
     platforms = lib.platforms.unix;
   };
diff --git a/third_party/nixpkgs/pkgs/tools/misc/dbus-map/default.nix b/third_party/nixpkgs/pkgs/tools/misc/dbus-map/default.nix
index cdd7b840a1..de5c07041f 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/dbus-map/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/detox/default.nix b/third_party/nixpkgs/pkgs/tools/misc/detox/default.nix
index 570882d59a..aa9220da60 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/detox/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/didu/default.nix b/third_party/nixpkgs/pkgs/tools/misc/didu/default.nix
index a5a8a790e4..6db10b058a 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/didu/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/didu/default.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "szYWRN1NZbfpshipwMMJSWJw/NG4w7I+aqwtmqpT0R0=";
   };
 
-  cargoSha256 = "O1kkfrwv7xiOh3wCV/ce6cqpkMPRRzcXOFESYMAhiKA=";
+  cargoHash = "sha256-O1kkfrwv7xiOh3wCV/ce6cqpkMPRRzcXOFESYMAhiKA=";
 
   meta = with lib; {
     description = "Duration conversion between units";
diff --git a/third_party/nixpkgs/pkgs/tools/misc/didyoumean/default.nix b/third_party/nixpkgs/pkgs/tools/misc/didyoumean/default.nix
index c3a04d289d..362673a5ca 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/didyoumean/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/didyoumean/default.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-PSEoh1OMElFJ8m4er1vBMkQak3JvLjd+oWNWA46cows=";
   };
 
-  cargoSha256 = "sha256-QERnohWpkJ0LWkdxHrY6gKxdGqxDkLla7jlG44laojk=";
+  cargoHash = "sha256-QERnohWpkJ0LWkdxHrY6gKxdGqxDkLla7jlG44laojk=";
 
   nativeBuildInputs = [
     installShellFiles
diff --git a/third_party/nixpkgs/pkgs/tools/misc/dijo/default.nix b/third_party/nixpkgs/pkgs/tools/misc/dijo/default.nix
index 7e6d4c74e9..1a73a4d84f 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/dijo/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/dijo/default.nix
@@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec {
     rev = "v${version}";
     sha256 = "sha256-g+A8BJxqoAvm9LTLrLnClVGtFJCQ2gT0mDGAov/6vXE=";
   };
-  cargoSha256 = "sha256-o3+KcE7ozu6eUgwsOSr9DOoIo+/BZ3bJZe+WYQLXHpY=";
+  cargoHash = "sha256-o3+KcE7ozu6eUgwsOSr9DOoIo+/BZ3bJZe+WYQLXHpY=";
 
   meta = with lib; {
     description = "Scriptable, curses-based, digital habit tracker";
diff --git a/third_party/nixpkgs/pkgs/tools/misc/ding-libs/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ding-libs/default.nix
index db2c2f5e14..e3b6b73673 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/ding-libs/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/diskonaut/default.nix b/third_party/nixpkgs/pkgs/tools/misc/diskonaut/default.nix
index 6193e0a5e8..d9738b398b 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/diskonaut/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/diskonaut/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1pmbag3r2ka30zmy2rs9jps2qxj2zh0gy4a774v9yhf0b6qjid54";
   };
 
-  cargoSha256 = "10jrcy8m9ll4136ghq3fhmnphd9g3rw863x708vm17n44kgdxyab";
+  cargoHash = "sha256-S/ne3iTEnlA3AqcPg3geLzV4bYVuYPjMCITSVJFnWYI=";
 
   # 1 passed; 44 failed https://hydra.nixos.org/build/148943783/nixlog/1
   doCheck = !stdenv.isDarwin;
diff --git a/third_party/nixpkgs/pkgs/tools/misc/diskus/default.nix b/third_party/nixpkgs/pkgs/tools/misc/diskus/default.nix
index b63532216a..fd37b2b9c9 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/diskus/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/diskus/default.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
 
   buildInputs = lib.optionals stdenv.isDarwin [ Security ];
 
-  cargoSha256 = "sha256-qNXv6Z9sKl7rol78UTOSRFML/JCGfOJMGOdt49KHD50=";
+  cargoHash = "sha256-qNXv6Z9sKl7rol78UTOSRFML/JCGfOJMGOdt49KHD50=";
 
   meta = with lib; {
     description = "Minimal, fast alternative to 'du -sh'";
diff --git a/third_party/nixpkgs/pkgs/tools/misc/docker-ls/default.nix b/third_party/nixpkgs/pkgs/tools/misc/docker-ls/default.nix
index 6f6a322cc2..ad28d569c6 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/docker-ls/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/dutree/default.nix b/third_party/nixpkgs/pkgs/tools/misc/dutree/default.nix
index f9fc1afa18..421af51aef 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/dutree/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/dutree/default.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
     '';
   };
 
-  cargoSha256 = "0gg1w0xx36aswfm0y53nqwwz7zds25ysmklbrc8v2r91j74bhkzw";
+  cargoHash = "sha256-/E+4yJEhZbERy4vOqn0Ruv3zOcd2FA+q41qZ0Tvg4T0=";
 
   meta = with lib; {
     description = "Tool to analyze file system usage written in Rust";
diff --git a/third_party/nixpkgs/pkgs/tools/misc/dwt1-shell-color-scripts/default.nix b/third_party/nixpkgs/pkgs/tools/misc/dwt1-shell-color-scripts/default.nix
index 25e5d44752..8b0c96316c 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/dwt1-shell-color-scripts/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/enjarify/default.nix b/third_party/nixpkgs/pkgs/tools/misc/enjarify/default.nix
index 0a146dc02f..4e4f214301 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/enjarify/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/envchain/default.nix b/third_party/nixpkgs/pkgs/tools/misc/envchain/default.nix
index 643eb86cb5..984dd60082 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/envchain/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/eva/default.nix b/third_party/nixpkgs/pkgs/tools/misc/eva/default.nix
index 1615c928a3..93645a9220 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/eva/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/eva/default.nix
@@ -9,7 +9,7 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-eX2d9h6zNbheS68j3lyhJW05JZmQN2I2MdcmiZB8Mec=";
   };
 
-  cargoSha256 = "sha256-gnym2sedyzQzubOtj64Yoh+sKT+sa60w/Z72hby7Pms=";
+  cargoHash = "sha256-gnym2sedyzQzubOtj64Yoh+sKT+sa60w/Z72hby7Pms=";
 
   meta = with lib; {
     description = "Calculator REPL, similar to bc";
diff --git a/third_party/nixpkgs/pkgs/tools/misc/fasd/default.nix b/third_party/nixpkgs/pkgs/tools/misc/fasd/default.nix
index 76c7731e27..45ec3d6ddf 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/fasd/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/fcp/default.nix b/third_party/nixpkgs/pkgs/tools/misc/fcp/default.nix
index dd7035e19c..814d764a79 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/fcp/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/fcp/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0f242n8w88rikg1srimdifadhggrb2r1z0g65id60ahb4bjm8a0x";
   };
 
-  cargoSha256 = "0gw7gjfwc4r03rg6z65ml0y37sh4yf716isqs0mb4jqkp7rwfbc9";
+  cargoHash = "sha256-iS3H87kTS7Iq0FhHE47zBOozPKC1mG9eHiATxp18hz8=";
 
   nativeBuildInputs = [ expect ];
 
diff --git a/third_party/nixpkgs/pkgs/tools/misc/flowgger/default.nix b/third_party/nixpkgs/pkgs/tools/misc/flowgger/default.nix
index 83d709637b..6783e9dc80 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/flowgger/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/fntsample/default.nix b/third_party/nixpkgs/pkgs/tools/misc/fntsample/default.nix
index 6600b7fab7..6ddbace3c0 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/fntsample/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/fsrx/default.nix b/third_party/nixpkgs/pkgs/tools/misc/fsrx/default.nix
index 846b600d8e..c1a1fa9ecc 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/fsrx/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/fsrx/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-hzfpjunP20WCt3erYu7AO7A3nz+UMKdFzWUA5jASbVA=";
   };
 
-  cargoSha256 = "sha256-bRStmz2sJnhCKpvoQfc/ZP9B2ZdNHYNEHd+wZErdS1Y=";
+  cargoHash = "sha256-bRStmz2sJnhCKpvoQfc/ZP9B2ZdNHYNEHd+wZErdS1Y=";
 
   passthru = {
     tests.version = testers.testVersion {
diff --git a/third_party/nixpkgs/pkgs/tools/misc/fx-cast-bridge/default.nix b/third_party/nixpkgs/pkgs/tools/misc/fx-cast-bridge/default.nix
index 11402d8f45..8ea1c785b0 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/fx-cast-bridge/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/fxlinuxprintutil/default.nix b/third_party/nixpkgs/pkgs/tools/misc/fxlinuxprintutil/default.nix
index e041202576..e5285cba64 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/fxlinuxprintutil/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/g933-utils/default.nix b/third_party/nixpkgs/pkgs/tools/misc/g933-utils/default.nix
index c4532419f1..7817f0b416 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/g933-utils/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/g933-utils/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-kGLMRqZHzRuXQNTjIuLz8JPC1c/ZK38msfkTIVnaomg=";
   };
 
-  cargoSha256 = "sha256-FBX5hrS8tNWN83XX+x+s/mYyvO1h6V63bXCx7y0R8bY=";
+  cargoHash = "sha256-FBX5hrS8tNWN83XX+x+s/mYyvO1h6V63bXCx7y0R8bY=";
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ udev ];
diff --git a/third_party/nixpkgs/pkgs/tools/misc/geekbench/4.nix b/third_party/nixpkgs/pkgs/tools/misc/geekbench/4.nix
index 789f92babf..bd60ee701a 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/geekbench/4.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/geekbench/4.nix
@@ -2,7 +2,7 @@
 , stdenv
 , fetchurl
 , autoPatchelfHook
-, addOpenGLRunpath
+, addDriverRunpath
 , makeWrapper
 , ocl-icd
 , vulkan-loader
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     for f in geekbench4 geekbench_x86_64 ; do
       wrapProgram $out/bin/$f \
         --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [
-          addOpenGLRunpath.driverLink
+          addDriverRunpath.driverLink
           ocl-icd
           vulkan-loader
        ]}"
diff --git a/third_party/nixpkgs/pkgs/tools/misc/geekbench/5.nix b/third_party/nixpkgs/pkgs/tools/misc/geekbench/5.nix
index 49efe2ea0b..0c23877ee8 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/geekbench/5.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/geekbench/5.nix
@@ -2,7 +2,7 @@
 , stdenv
 , fetchurl
 , autoPatchelfHook
-, addOpenGLRunpath
+, addDriverRunpath
 , makeWrapper
 , ocl-icd
 , vulkan-loader
@@ -44,7 +44,7 @@ stdenv.mkDerivation {
     for f in geekbench5 geekbench_${processor} ; do
       wrapProgram $out/bin/$f \
         --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [
-          addOpenGLRunpath.driverLink
+          addDriverRunpath.driverLink
           ocl-icd
           vulkan-loader
        ]}"
diff --git a/third_party/nixpkgs/pkgs/tools/misc/geekbench/6.nix b/third_party/nixpkgs/pkgs/tools/misc/geekbench/6.nix
index d7dd0ad715..2aca571e2c 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/geekbench/6.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/geekbench/6.nix
@@ -2,7 +2,7 @@
 , stdenv
 , fetchurl
 , autoPatchelfHook
-, addOpenGLRunpath
+, addDriverRunpath
 , makeWrapper
 , ocl-icd
 , vulkan-loader
@@ -45,7 +45,7 @@ stdenv.mkDerivation {
     for f in geekbench6 geekbench_${processor} ${geekbench_avx2} ; do
       wrapProgram $out/bin/$f \
         --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [
-          addOpenGLRunpath.driverLink
+          addDriverRunpath.driverLink
           ocl-icd
           vulkan-loader
         ]}"
diff --git a/third_party/nixpkgs/pkgs/tools/misc/gh-cal/default.nix b/third_party/nixpkgs/pkgs/tools/misc/gh-cal/default.nix
index 60bd0e0f78..e14acf372a 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/gh-cal/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/gh-cal/default.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-x9DekflZoXxH964isWCi6YuV3v/iIyYOuRYVgKaUBx0=";
   };
 
-  cargoSha256 = "sha256-73gqk0DjhaLGIEP5VQQlubPomxHQyg4RnY5XTgE7msQ=";
+  cargoHash = "sha256-73gqk0DjhaLGIEP5VQQlubPomxHQyg4RnY5XTgE7msQ=";
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ];
diff --git a/third_party/nixpkgs/pkgs/tools/misc/gigalixir/default.nix b/third_party/nixpkgs/pkgs/tools/misc/gigalixir/default.nix
index d03d353a08..101b5f6a93 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/gigalixir/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/goose/default.nix b/third_party/nixpkgs/pkgs/tools/misc/goose/default.nix
index e6505129b5..c2c91f0574 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/goose/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/gosu/default.nix b/third_party/nixpkgs/pkgs/tools/misc/gosu/default.nix
index 8b5a5fb88d..0768b551fe 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/gosu/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/gotify-cli/default.nix b/third_party/nixpkgs/pkgs/tools/misc/gotify-cli/default.nix
index c5901a6cd6..cedd2ae95b 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/gotify-cli/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/gummy/default.nix b/third_party/nixpkgs/pkgs/tools/misc/gummy/default.nix
index 489c688880..8e75d2ab1a 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/gummy/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/hacksaw/default.nix b/third_party/nixpkgs/pkgs/tools/misc/hacksaw/default.nix
index 2240eceea0..1f98355a64 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/hacksaw/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/hacksaw/default.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-HRYTiccXU8DboAwZAr2gfzXUs8igSiFDpOEGtHpI0dA=";
   };
 
-  cargoSha256 = "1rykc06lq3bkblsrj68rbil63yqdnvxkxlppq1w74wf0d6cwjc08";
+  cargoHash = "sha256-CDDJmWnAcXJ4wPfSPvu2DfthaFwZGZk1XXMNTA1g0+c=";
 
   meta = with lib; {
     description = "Lightweight selection tool for usage in screenshot scripts etc";
diff --git a/third_party/nixpkgs/pkgs/tools/misc/handlr/default.nix b/third_party/nixpkgs/pkgs/tools/misc/handlr/default.nix
index 1022763b75..e2aa411f6c 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/handlr/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/handlr/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-wENhlUBwfNg/r7yMKa1cQI1fbFw+qowwK8EdO912Yys=";
   };
 
-  cargoSha256 = "sha256-30fSOzWq1CoIabPWGWndi/SaCN/ckxjlbtzuwV8rk6M=";
+  cargoHash = "sha256-30fSOzWq1CoIabPWGWndi/SaCN/ckxjlbtzuwV8rk6M=";
 
   nativeBuildInputs = [ installShellFiles shared-mime-info ];
   buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
diff --git a/third_party/nixpkgs/pkgs/tools/misc/heatseeker/default.nix b/third_party/nixpkgs/pkgs/tools/misc/heatseeker/default.nix
index 388a40f283..79377f0f22 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/heatseeker/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/heatseeker/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-SU5HLAFA7IHnVhsmVtxskteeKKIEvvVSqHIeEk5BkfA=";
   };
 
-  cargoSha256 = "sha256-RHD2/Uvj8NWpZ+xK16xTN5K/hDWYhwHnu2E5NslGFQI=";
+  cargoHash = "sha256-RHD2/Uvj8NWpZ+xK16xTN5K/hDWYhwHnu2E5NslGFQI=";
 
   # https://github.com/rschmitt/heatseeker/issues/42
   # I've suggested using `/usr/bin/env stty`, but doing that isn't quite as simple
diff --git a/third_party/nixpkgs/pkgs/tools/misc/hex/default.nix b/third_party/nixpkgs/pkgs/tools/misc/hex/default.nix
index f3413e766f..f7f8300807 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/hex/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/hiksink/default.nix b/third_party/nixpkgs/pkgs/tools/misc/hiksink/default.nix
index 05d7e1c9f4..def3f47769 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/hiksink/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/hiksink/default.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-k/cBCc7DywyBbAzCRCHdrOVmo+QVCsSgDn8hcyTIUI8=";
   };
 
-  cargoSha256 = "sha256-vqzXpSPBwY7m/Fdob0mHH0OXnzyQwFk7x2kk9Tgez3M=";
+  cargoHash = "sha256-vqzXpSPBwY7m/Fdob0mHH0OXnzyQwFk7x2kk9Tgez3M=";
 
   nativeBuildInputs = [
     pkg-config
diff --git a/third_party/nixpkgs/pkgs/tools/misc/hsd/default.nix b/third_party/nixpkgs/pkgs/tools/misc/hsd/default.nix
index a1e82076cc..44100e1528 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/hsd/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/hsd/default.nix
@@ -4,7 +4,7 @@
 , fetchFromGitHub
 , python3
 , unbound
-, darwin
+, cctools
 }:
 
 buildNpmPackage rec {
@@ -23,7 +23,7 @@ buildNpmPackage rec {
   nativeBuildInputs = [
     python3
   ] ++ lib.optionals stdenv.isDarwin [
-    darwin.cctools
+    cctools
   ];
 
   buildInputs = [
diff --git a/third_party/nixpkgs/pkgs/tools/misc/html-proofer/default.nix b/third_party/nixpkgs/pkgs/tools/misc/html-proofer/default.nix
index e15476cca0..2eeb467211 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/html-proofer/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/hyperledger-fabric/default.nix b/third_party/nixpkgs/pkgs/tools/misc/hyperledger-fabric/default.nix
index d1646f92c7..2647b65687 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/hyperledger-fabric/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/i3nator/default.nix b/third_party/nixpkgs/pkgs/tools/misc/i3nator/default.nix
index 4c62e4ca80..ede7168817 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/i3nator/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/i3nator/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "10rxvxq48dhzlw5p9fsj6x0ci4pap85s9b192zakgvk4h97ifp2p";
   };
 
-  cargoSha256 = "04sx1dsznvh60s2yd9bzbvj6fgjvj37vv33qpww13fyph832i37g";
+  cargoHash = "sha256-74woBoLXuxE4v3iMvc+QWz5n5F5/peaFBgZu+3ULXRM=";
 
   meta = with lib; {
     description = "Tmuxinator for the i3 window manager";
diff --git a/third_party/nixpkgs/pkgs/tools/misc/ikill/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ikill/default.nix
index b5c18e5dfd..7b6ac685c5 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/ikill/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/ikill/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-hOQBBwxkVnTkAZJi84qArwAo54fMC0zS+IeYMV04kUs=";
   };
 
-  cargoSha256 = "sha256-zKa2FP0lBS2XjgPWfyPZ60aHyeAe0uNIFbmuX4Uo1rA=";
+  cargoHash = "sha256-zKa2FP0lBS2XjgPWfyPZ60aHyeAe0uNIFbmuX4Uo1rA=";
 
   meta = with lib; {
     description = "Interactively kill running processes";
diff --git a/third_party/nixpkgs/pkgs/tools/misc/immich-cli/default.nix b/third_party/nixpkgs/pkgs/tools/misc/immich-cli/default.nix
index 21d0600d92..b02e581329 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/immich-cli/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/jdupes/default.nix b/third_party/nixpkgs/pkgs/tools/misc/jdupes/default.nix
index 9d311a30d0..049b69fa76 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/jdupes/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/journaldriver/default.nix b/third_party/nixpkgs/pkgs/tools/misc/journaldriver/default.nix
index a5174c4b30..89806e5443 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/journaldriver/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/journaldriver/default.nix
@@ -3,7 +3,7 @@
 rustPlatform.buildRustPackage rec {
   pname = "journaldriver";
   version = "5656.0.0";
-  cargoSha256 = "0jxv7skqgkk2j28jzs0gqnic0pqbdpgy8ryhz613pn0cslgy1p5q";
+  cargoHash = "sha256-uNzgH9UM2DuC+dBn5N9tC1/AosUP6C+RkGLOh6c+u0s=";
 
   src = fetchgit {
     url = "https://code.tvl.fyi/depot.git:/ops/journaldriver.git";
diff --git a/third_party/nixpkgs/pkgs/tools/misc/jsonwatch/default.nix b/third_party/nixpkgs/pkgs/tools/misc/jsonwatch/default.nix
index 2f0e3b8914..451089dc18 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/jsonwatch/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/jsonwatch/default.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-TGW04P8t0mAXza7I7qp6QRXA/MDE3m1dlRC7bMf2dSk=";
   };
 
-  cargoSha256 = "sha256-Gjb7v3kz11iOml3Ykxhy43KNxzaprgMbb5DpPNChLTc=";
+  cargoHash = "sha256-Gjb7v3kz11iOml3Ykxhy43KNxzaprgMbb5DpPNChLTc=";
 
   buildInputs = lib.optionals stdenv.isDarwin [
     Security
diff --git a/third_party/nixpkgs/pkgs/tools/misc/kargo/default.nix b/third_party/nixpkgs/pkgs/tools/misc/kargo/default.nix
index 5945ce4d4f..15310fb935 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/kargo/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/lazycli/default.nix b/third_party/nixpkgs/pkgs/tools/misc/lazycli/default.nix
index 1522a937ff..77596b6630 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/lazycli/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/lazycli/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1qq167hc7pp9l0m40ysphfljakmm8hjjnhpldvb0kbc825h0z8z5";
   };
 
-  cargoSha256 = "sha256-1BIUXepR7ppEkTLDOCZz9RBv+RazNMXnCnH1rvzVFgs=";
+  cargoHash = "sha256-1BIUXepR7ppEkTLDOCZz9RBv+RazNMXnCnH1rvzVFgs=";
 
   checkFlags = [
     # currently broken: https://github.com/jesseduffield/lazycli/pull/20
diff --git a/third_party/nixpkgs/pkgs/tools/misc/ldapvi/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ldapvi/default.nix
index 03a01da3e5..d30f8465ff 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/ldapvi/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/lemmy-help/default.nix b/third_party/nixpkgs/pkgs/tools/misc/lemmy-help/default.nix
index 2e4126db38..6138d331b0 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/lemmy-help/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/lemmy-help/default.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
 
   buildFeatures = [ "cli" ];
 
-  cargoSha256 = "sha256-BCwpiBPvnLgbpOaXgUK2EDXnT8d4jo7aqgM6uwl80eg=";
+  cargoHash = "sha256-BCwpiBPvnLgbpOaXgUK2EDXnT8d4jo7aqgM6uwl80eg=";
 
   meta = with lib; {
     description = "CLI for generating vim help docs from emmylua comments";
diff --git a/third_party/nixpkgs/pkgs/tools/misc/lerpn/default.nix b/third_party/nixpkgs/pkgs/tools/misc/lerpn/default.nix
index f6714310f2..fcbd6e9513 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/lerpn/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix b/third_party/nixpkgs/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix
index 4e997c6556..baaba91647 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/libbitcoin/libbitcoin-client.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/libbitcoin/libbitcoin.nix b/third_party/nixpkgs/pkgs/tools/misc/libbitcoin/libbitcoin.nix
index cebd5090bf..b7162ede7e 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/libbitcoin/libbitcoin.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/licensor/default.nix b/third_party/nixpkgs/pkgs/tools/misc/licensor/default.nix
index 2972eb8bbb..c171691153 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/licensor/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/licensor/default.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0x0lkfrj7jka0p6nx6i9syz0bnzya5z9np9cw09zm1c9njv9mm32";
   };
 
-  cargoSha256 = "1h66d1brx441bg7vzbqdish4avgmc6h7rrkw2qf1siwmplwqqhw0";
+  cargoHash = "sha256-gEOMOb2VRx0cFnzmfKBh9W1FoI4Nr7/PW4GQnldoxsA=";
 
   # https://github.com/raftario/licensor/issues/67
   postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/tools/misc/linuxquota/default.nix b/third_party/nixpkgs/pkgs/tools/misc/linuxquota/default.nix
index 65e5646e6a..d9aa6492b5 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/linuxquota/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/linuxquota/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, e2fsprogs, openldap, pkg-config }:
+{ lib, stdenv, fetchurl, e2fsprogs, openldap, pkg-config, binlore, linuxquota }:
 
 stdenv.mkDerivation rec {
   version = "4.09";
@@ -14,6 +14,10 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ e2fsprogs openldap ];
 
+  passthru.binlore.out = binlore.synthesize linuxquota ''
+    execer cannot bin/quota
+  '';
+
   meta = with lib; {
     description = "Tools to manage kernel-level quotas in Linux";
     homepage = "https://sourceforge.net/projects/linuxquota/";
diff --git a/third_party/nixpkgs/pkgs/tools/misc/logstash/contrib.nix b/third_party/nixpkgs/pkgs/tools/misc/logstash/contrib.nix
index 2d2f6272fd..64c0c9b9b3 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/logstash/contrib.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/loop/default.nix b/third_party/nixpkgs/pkgs/tools/misc/loop/default.nix
index 6fa819cd83..c8fbb1845b 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/loop/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/loop/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage {
     sha256 = "0v61kahwk1kdy8pb40rjnzcxby42nh02nyg9jqqpx3vgdrpxlnix";
   };
 
-  cargoSha256 = "0pk6hwmzs58vgbkvmlpa4s4cd29izp6xq17zaix5v2didbzr5ixi";
+  cargoHash = "sha256-sceS/2qxiV16VP8E3M39MYnGiCbq0rrnehsV/SuHZl4=";
 
   meta = with lib; {
     description = "UNIX's missing `loop` command";
diff --git a/third_party/nixpkgs/pkgs/tools/misc/lorri/default.nix b/third_party/nixpkgs/pkgs/tools/misc/lorri/default.nix
index c20c1c5aee..39a6f9efa1 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/lorri/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/lorri/default.nix
@@ -16,7 +16,7 @@ let
   # Also don’t forget to run `nix-build -A lorri.tests`
   version = "1.7.0";
   sha256 = "sha256-pGNhhEBHyWhTaW24dHrxAvpb/qr5RPbHXRwDZx6Rf74=";
-  cargoSha256 = "sha256-ENZATiBhoO+N6NpSknOWpvsatkaYb4mS/E63XNRXfMU=";
+  cargoHash = "sha256-ENZATiBhoO+N6NpSknOWpvsatkaYb4mS/E63XNRXfMU=";
 
 in (rustPlatform.buildRustPackage rec {
   pname = "lorri";
@@ -31,7 +31,7 @@ in (rustPlatform.buildRustPackage rec {
 
   outputs = [ "out" "man" "doc" ];
 
-  inherit cargoSha256;
+  inherit cargoHash;
   doCheck = false;
 
   BUILD_REV_COUNT = src.revCount or 1;
diff --git a/third_party/nixpkgs/pkgs/tools/misc/maker-panel/default.nix b/third_party/nixpkgs/pkgs/tools/misc/maker-panel/default.nix
index 7fc5ec9f3c..87aab302f2 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/maker-panel/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/mandoc/default.nix b/third_party/nixpkgs/pkgs/tools/misc/mandoc/default.nix
index af5ca9ac87..b61ea7f3e9 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/mandoc/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/mandoc/default.nix
@@ -77,5 +77,6 @@ stdenv.mkDerivation rec {
     license = licenses.bsd3;
     platforms = platforms.all;
     maintainers = with maintainers; [ ramkromberg sternenseemann ];
+    mainProgram = "man";
   };
 }
diff --git a/third_party/nixpkgs/pkgs/tools/misc/mandown/default.nix b/third_party/nixpkgs/pkgs/tools/misc/mandown/default.nix
index fa9bb1695f..ae70a319e6 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/mandown/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/markdown-anki-decks/default.nix b/third_party/nixpkgs/pkgs/tools/misc/markdown-anki-decks/default.nix
index 3632bc2ff6..178e78bee6 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/markdown-anki-decks/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/markdown-anki-decks/default.nix
@@ -28,7 +28,7 @@ python3.pkgs.buildPythonApplication rec {
     markdown
     python-frontmatter
     typer
-  ] ++ typer.optional-dependencies.all;
+  ];
 
   # No tests available on Pypi and there is only a failing version assertion test in the repo.
   doCheck = false;
@@ -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/third_party/nixpkgs/pkgs/tools/misc/massren/default.nix b/third_party/nixpkgs/pkgs/tools/misc/massren/default.nix
index a1f1e70270..0c33de89ee 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/massren/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/mbuffer/default.nix b/third_party/nixpkgs/pkgs/tools/misc/mbuffer/default.nix
index a4c934e9a6..66707a492f 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/mbuffer/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/mdbtools/default.nix b/third_party/nixpkgs/pkgs/tools/misc/mdbtools/default.nix
index 05299e6084..c543a77205 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/mdbtools/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/me_cleaner/default.nix b/third_party/nixpkgs/pkgs/tools/misc/me_cleaner/default.nix
index ec742b11c9..cd9ebe5816 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/me_cleaner/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/mloader/default.nix b/third_party/nixpkgs/pkgs/tools/misc/mloader/default.nix
index 3a06da1e85..c4fa482032 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/mloader/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/mlocate/default.nix b/third_party/nixpkgs/pkgs/tools/misc/mlocate/default.nix
index bf8899b400..4ae61095ff 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/mlocate/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/mmv-go/default.nix b/third_party/nixpkgs/pkgs/tools/misc/mmv-go/default.nix
index da1f443c67..2a4c74ddea 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/mmv-go/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/moar/default.nix b/third_party/nixpkgs/pkgs/tools/misc/moar/default.nix
index 8d184d4fe1..cd6872235c 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/moar/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/moar/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "moar";
-  version = "1.24.6";
+  version = "1.25.1";
 
   src = fetchFromGitHub {
     owner = "walles";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-LD1jekBKNOc8mQbr+E98JdZBracsS+QAN2T9neOV3NM=";
+    hash = "sha256-ZwrAduIKQkjjL0dOHitdOLCuWa1WAZ1UvXayU9lOrfo=";
   };
 
   vendorHash = "sha256-1u/2OlMX2FuZaxWnpU4n5r/4xKe+rK++GoCJiSq/BdE=";
diff --git a/third_party/nixpkgs/pkgs/tools/misc/moon-phases/default.nix b/third_party/nixpkgs/pkgs/tools/misc/moon-phases/default.nix
index f4d5a850ef..e1c4155682 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/moon-phases/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/moon-phases/default.nix
@@ -9,7 +9,7 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-8ZdtM246aqc49Q3ygMGk51LIzRA8RIdlaistbKUj3yY=";
   };
 
-  cargoSha256 = "sha256-5JKM+GnigkpuX4qeGQAjDz/X48ZxXtCfYVwGco13YRM=";
+  cargoHash = "sha256-5JKM+GnigkpuX4qeGQAjDz/X48ZxXtCfYVwGco13YRM=";
 
   meta = with lib; {
     description = "Command-line/WM bar tool to display the moon phase at a certain date";
diff --git a/third_party/nixpkgs/pkgs/tools/misc/moreutils/default.nix b/third_party/nixpkgs/pkgs/tools/misc/moreutils/default.nix
index 5d334cf0b8..694e9ac93e 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/moreutils/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/moreutils/default.nix
@@ -8,7 +8,7 @@
 , perlPackages
 , makeWrapper
 , perl # for pod2man
-, darwin
+, cctools
 , gitUpdater
 }:
 
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     (perl.withPackages (p: [ p.IPCRun p.TimeDate p.TimeDuration ]))
   ] ++ lib.optionals stdenv.isDarwin [
-    darwin.cctools
+    cctools
   ];
 
   makeFlags = [
diff --git a/third_party/nixpkgs/pkgs/tools/misc/natls/default.nix b/third_party/nixpkgs/pkgs/tools/misc/natls/default.nix
index 1398f271a5..195ef79942 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/natls/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/natls/default.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-4x92r6V9AvEO88gFofPTUt+mS7ZhmptDn/8O4pizSRg=";
   };
 
-  cargoSha256 = "sha256-Am4HmfmhskKxcp1iWod5z3caHwsdo31qCaVi0UxTXAg=";
+  cargoHash = "sha256-Am4HmfmhskKxcp1iWod5z3caHwsdo31qCaVi0UxTXAg=";
 
   meta = with lib; {
     description = "'ls' replacement you never knew you needed";
diff --git a/third_party/nixpkgs/pkgs/tools/misc/ncdu/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ncdu/default.nix
index d4bdbeacc9..5209522d25 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/ncdu/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/ncdu/default.nix
@@ -10,11 +10,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ncdu";
-  version = "2.4";
+  version = "2.5";
 
   src = fetchurl {
     url = "https://dev.yorhel.nl/download/ncdu-${finalAttrs.version}.tar.gz";
-    hash = "sha256-Sj0AAjCc9qfOp5GTjayb7N7OTVKdDW3I2RtztOaFVQk=";
+    hash = "sha256-f0neJQJKurGvH/IrO4VCwNFY4Bj+DpYHT9lLDh5tMaU=";
   };
 
   nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/tools/misc/netbootxyz-efi/default.nix b/third_party/nixpkgs/pkgs/tools/misc/netbootxyz-efi/default.nix
index 89ffb70944..f09a86fd76 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/netbootxyz-efi/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/node-glob/default.nix b/third_party/nixpkgs/pkgs/tools/misc/node-glob/default.nix
index 4b3cde4edd..74013b27b3 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/node-glob/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/ntfy/webpush.nix b/third_party/nixpkgs/pkgs/tools/misc/ntfy/webpush.nix
index cd58c5208e..a9c87d8738 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/ntfy/webpush.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/nux/default.nix b/third_party/nixpkgs/pkgs/tools/misc/nux/default.nix
index d1d44a35c2..45bb183626 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/nux/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/nvfancontrol/default.nix b/third_party/nixpkgs/pkgs/tools/misc/nvfancontrol/default.nix
index 1b2bebfce8..98d3633a7b 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/nvfancontrol/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/nvfancontrol/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-0WBQSnTYVc3sNmZf/KFzznMg9AVsyaBgdx/IvG1dZAw=";
   };
 
-  cargoSha256 = "sha256-fEzdghGQSSeyeyiHjw1ggQ38gsETJFl9bq/tizGxIis=";
+  cargoHash = "sha256-fEzdghGQSSeyeyiHjw1ggQ38gsETJFl9bq/tizGxIis=";
 
   nativeBuildInputs = [ libXNVCtrl libX11 libXext ];
 
diff --git a/third_party/nixpkgs/pkgs/tools/misc/octofetch/default.nix b/third_party/nixpkgs/pkgs/tools/misc/octofetch/default.nix
index 4c4083d955..db73ba805f 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/octofetch/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/octofetch/default.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-/AXE1e02NfxQzJZd0QX6gJDjmFFmuUTOndulZElgIMI=";
   };
 
-  cargoSha256 = "sha256-iuhJYibyQ7hdeXzqCW2PLq7FiKnZp2VHyKT4qO/6vrU=";
+  cargoHash = "sha256-iuhJYibyQ7hdeXzqCW2PLq7FiKnZp2VHyKT4qO/6vrU=";
 
   nativeBuildInputs = [ pkg-config ];
 
diff --git a/third_party/nixpkgs/pkgs/tools/misc/oggvideotools/default.nix b/third_party/nixpkgs/pkgs/tools/misc/oggvideotools/default.nix
index 144c89f802..13c13f086a 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/oggvideotools/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/oppai-ng/default.nix b/third_party/nixpkgs/pkgs/tools/misc/oppai-ng/default.nix
index f09a6b45cb..54b9e11b74 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/oppai-ng/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/owofetch/default.nix b/third_party/nixpkgs/pkgs/tools/misc/owofetch/default.nix
index b623721ec9..22bbc4ba72 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/owofetch/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/owofetch/default.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-I8mzOUvm72KLLBumpgn9gNyx9FKvUrB4ze1iM1+OA18=";
   };
 
-  cargoSha256 = "sha256-rfN4QERs1H1G7ZZim//78vlxbYfU4Cx7SYYUz/QLKeU=";
+  cargoHash = "sha256-rfN4QERs1H1G7ZZim//78vlxbYfU4Cx7SYYUz/QLKeU=";
 
   buildInputs = lib.optionals stdenvNoCC.isDarwin [
     Foundation
diff --git a/third_party/nixpkgs/pkgs/tools/misc/pal/default.nix b/third_party/nixpkgs/pkgs/tools/misc/pal/default.nix
index c3778ba3bc..69d8bde9a7 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/pal/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/pal/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     homepage = "https://palcal.sourceforge.net/";
     description = "Command-line calendar program that can keep track of events";
     license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [viric];
+    maintainers = [ ];
     platforms = with lib.platforms; linux;
   };
 }
diff --git a/third_party/nixpkgs/pkgs/tools/misc/panicparse/default.nix b/third_party/nixpkgs/pkgs/tools/misc/panicparse/default.nix
index 6cf97eca5a..7059864791 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/panicparse/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/paps/default.nix b/third_party/nixpkgs/pkgs/tools/misc/paps/default.nix
index ab9c9e433c..964f08ac27 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/paps/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/pazi/default.nix b/third_party/nixpkgs/pkgs/tools/misc/pazi/default.nix
index 43ea65c54d..4b9a9bdf04 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/pazi/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/pazi/default.nix
@@ -13,13 +13,13 @@ rustPlatform.buildRustPackage rec {
 
   buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
 
-  cargoSha256 = "1iamlp5519h8mmgd4964cvyp7mmnqdg2d3qj5v7yzilyp4nz15jc";
+  cargoHash = "sha256-TJbwLbmexu/PLhKPJl7DttZz/WbEJNJerQimUMqlVcU=";
 
   meta = with lib; {
     description = "Autojump \"zap to directory\" helper";
     homepage = "https://github.com/euank/pazi";
     license = licenses.gpl3;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
     mainProgram = "pazi";
   };
 }
diff --git a/third_party/nixpkgs/pkgs/tools/misc/pgmetrics/default.nix b/third_party/nixpkgs/pkgs/tools/misc/pgmetrics/default.nix
index b068c8303a..bc5ac22b4f 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/pgmetrics/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/pgmetrics/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "pgmetrics";
-  version = "1.16.0";
+  version = "1.17.0";
 
   src = fetchFromGitHub {
     owner = "rapidloop";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-8pF3E0Zh/SsH6+5iXt1KFwud2ijoisYfcu+QHRM9x9s=";
+    sha256 = "sha256-P0IUMYALCy1upd+JLnNqDlNKMAEccfwjc3s8Rn7xI4k=";
   };
 
-  vendorHash = "sha256-KIMnvGMIipuIFPTSeERtCfvlPuvHvEHdjBJ1TbT2d1s=";
+  vendorHash = "sha256-GOKgGONoM2q4doMoQwCLnHQjnB2QpPS3cxNnwzzz9ZU=";
 
   doCheck = false;
 
diff --git a/third_party/nixpkgs/pkgs/tools/misc/pipelight/default.nix b/third_party/nixpkgs/pkgs/tools/misc/pipelight/default.nix
index 1ffeaede33..1117c0cae8 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/pipelight/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/powerline-rs/default.nix b/third_party/nixpkgs/pkgs/tools/misc/powerline-rs/default.nix
index 5edde7b365..90aed233e9 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/powerline-rs/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/powerline-rs/default.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0rqlxxl58dpfvm2idhi0vzinraf4bgiapmawiih9wxs599fnhm3y";
   };
 
-  cargoSha256 = "1i29wps7wz6b0qarqqg8rplq7ak1zz83k6m182sjk17cni74n21l";
+  cargoHash = "sha256-NAhLTrTshCm1QKGaOdD/YaqD6c3oYZwVBst8fvTlScQ=";
 
   nativeBuildInputs = [ pkg-config file perl cmake curl ];
   buildInputs = [ openssl libssh2 libgit2 libzip ] ++ lib.optional stdenv.isDarwin Security;
@@ -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/third_party/nixpkgs/pkgs/tools/misc/present-cli/default.nix b/third_party/nixpkgs/pkgs/tools/misc/present-cli/default.nix
index 4c0ac78b6c..0f425accb6 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/present-cli/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/present-cli/default.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "+kCHe84ikdCLd7j5YwP2j3xz+XTzzo/kLy+b9YUFDnI=";
   };
 
-  cargoSha256 = "VKY/FQUrFWtLxKoK6LP6qPMqNN4absZvnAbH9mha1fI=";
+  cargoHash = "sha256-VKY/FQUrFWtLxKoK6LP6qPMqNN4absZvnAbH9mha1fI=";
 
   # required for tests
   postPatch = ''
diff --git a/third_party/nixpkgs/pkgs/tools/misc/procyon/default.nix b/third_party/nixpkgs/pkgs/tools/misc/procyon/default.nix
index 7026ce6feb..984459f2a4 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/procyon/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/qmk_hid/default.nix b/third_party/nixpkgs/pkgs/tools/misc/qmk_hid/default.nix
index b0835dbcb5..f838f1b8ec 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/qmk_hid/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/rargs/default.nix b/third_party/nixpkgs/pkgs/tools/misc/rargs/default.nix
index 54c7e393d2..7d97a9ecac 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/rargs/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/rargs/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "188gj05rbivci1z4z29vwdwxlj2w01v5i4avwrxjnj1dd6mmlbxd";
   };
 
-  cargoSha256 = "18yd4dpzjyw6w1ms74pzxqyn5fkh8q4rsg6rqsp6bsz7300fxxvh";
+  cargoHash = "sha256-cPfuABjn62Wuxtk8nQlGcLpiPe7/kqNr4IZ7+W8jzaM=";
 
   doCheck=false;  # `rargs`'s test depends on the deprecated `assert_cli` crate, which in turn is not in Nixpkgs
 
diff --git a/third_party/nixpkgs/pkgs/tools/misc/rates/default.nix b/third_party/nixpkgs/pkgs/tools/misc/rates/default.nix
index 3989074d24..d121453bd7 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/rates/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/rates/default.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-zw2YLTrvqbGKR8Dg5W+kJTDKIfro+MNyjHXfZMXZhaw=";
   };
 
-  cargoSha256 = "sha256-5EcTeMfa1GNp1q60qSgEi/I3298hXUD1Vc1K55XGW4I=";
+  cargoHash = "sha256-5EcTeMfa1GNp1q60qSgEi/I3298hXUD1Vc1K55XGW4I=";
 
   buildInputs = lib.optional stdenv.isDarwin Security;
 
diff --git a/third_party/nixpkgs/pkgs/tools/misc/remote-exec/default.nix b/third_party/nixpkgs/pkgs/tools/misc/remote-exec/default.nix
index 84b8026c0a..edf581b183 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/remote-exec/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/remote-exec/default.nix
@@ -8,6 +8,7 @@
 , toml
 , watchdog
 , pytestCheckHook
+, pytest-cov-stub
 , rsync
 }:
 
@@ -44,11 +45,6 @@ buildPythonApplication rec {
     watchdog
   ];
 
-  # disable pytest --cov
-  preCheck = ''
-    rm setup.cfg
-  '';
-
   doCheck = true;
 
   nativeCheckInputs = [
@@ -57,6 +53,7 @@ buildPythonApplication rec {
 
   checkInputs = [
     pytestCheckHook
+    pytest-cov-stub
   ];
 
   disabledTestPaths = lib.optionals stdenv.isDarwin [
diff --git a/third_party/nixpkgs/pkgs/tools/misc/ristate/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ristate/default.nix
index f15731ab04..9a0541d03f 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/ristate/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/ristate/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-CH9DZ/7Bhbe6qKg1Nbj1rA9SzIsqVlBJg51XxAh0XnY=";
   };
 
-  cargoSha256 = "sha256-HTfRWvE3m7XZhZDj5bEkrQI3pD6GNiKd2gJtMjRQ8Rw=";
+  cargoHash = "sha256-HTfRWvE3m7XZhZDj5bEkrQI3pD6GNiKd2gJtMjRQ8Rw=";
 
   meta = with lib; {
     description = "River-status client written in Rust";
diff --git a/third_party/nixpkgs/pkgs/tools/misc/rkflashtool/default.nix b/third_party/nixpkgs/pkgs/tools/misc/rkflashtool/default.nix
index fa37c98966..95c5351b7a 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/rkflashtool/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/rkflashtool/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     homepage = "https://sourceforge.net/projects/rkflashtool/";
     description = "Tools for flashing Rockchip devices";
     platforms = platforms.linux;
-    maintainers = [ maintainers.viric ];
+    maintainers = [ ];
     license = licenses.bsd2;
   };
 }
diff --git a/third_party/nixpkgs/pkgs/tools/misc/rkvm/default.nix b/third_party/nixpkgs/pkgs/tools/misc/rkvm/default.nix
index 1e5376273c..4dee842343 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/rkvm/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/sanctity/default.nix b/third_party/nixpkgs/pkgs/tools/misc/sanctity/default.nix
index eebe0616bb..05e6a5ed46 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/sanctity/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/sanctity/default.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-y6xj4A5SHcW747aFE9TfuurNnuUxjTUeKJmzxeiWqVc=";
   };
 
-  cargoSha256 = "sha256-co58YBeFjP9DKzxDegQI7txuJ1smqJxdlRLae+Ppwh0=";
+  cargoHash = "sha256-co58YBeFjP9DKzxDegQI7txuJ1smqJxdlRLae+Ppwh0=";
 
   meta = with lib; {
     description = "Test the 16 terminal colors in all combinations";
diff --git a/third_party/nixpkgs/pkgs/tools/misc/scdl/default.nix b/third_party/nixpkgs/pkgs/tools/misc/scdl/default.nix
index 4c5cf6ebdf..e79117c1fa 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/scdl/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/scdl/default.nix
@@ -2,12 +2,12 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "scdl";
-  version = "2.11.2";
+  version = "2.11.3";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-5fko7WV1r0uP7//29tcmhO4Heu8QBNdhHv4afUs6W7E=";
+    hash = "sha256-3GmmGZ2uTE2T0GagWzBdbtFsTU3pcRxh0uh6/V16cUw=";
   };
 
   build-system = [ python3Packages.setuptools ];
@@ -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/third_party/nixpkgs/pkgs/tools/misc/screen/default.nix b/third_party/nixpkgs/pkgs/tools/misc/screen/default.nix
index b79d006748..df5035639b 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/screen/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/screen/default.nix
@@ -64,6 +64,6 @@ stdenv.mkDerivation rec {
       '';
 
     platforms = platforms.unix;
-    maintainers = with maintainers; [ ];
+    maintainers = [ ];
   };
 }
diff --git a/third_party/nixpkgs/pkgs/tools/misc/script-directory/default.nix b/third_party/nixpkgs/pkgs/tools/misc/script-directory/default.nix
index 55be6b327f..1cd0218c30 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/script-directory/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/sfz/default.nix b/third_party/nixpkgs/pkgs/tools/misc/sfz/default.nix
index 41841d2ef2..768afed667 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/sfz/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/sfz/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-mKH1vgk+3tZEnjJRkfa0dDR383VN1VLNd3HEzC7f8YI=";
   };
 
-  cargoSha256 = "sha256-MgbK39xAr8g9F+1MXZiw5rE/PsgQPcLZ2ZV6LiQbA24=";
+  cargoHash = "sha256-MgbK39xAr8g9F+1MXZiw5rE/PsgQPcLZ2ZV6LiQbA24=";
 
   # error: Found argument '--test-threads' which wasn't expected, or isn't valid in this context
   doCheck = false;
diff --git a/third_party/nixpkgs/pkgs/tools/misc/sheldon/default.nix b/third_party/nixpkgs/pkgs/tools/misc/sheldon/default.nix
index 4f0c22344a..39c6f20822 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/sheldon/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/sheldon/default.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-vGFR8NL3bOCUuNr0KQuAbjQMxvFbN/T9aVmf7Wxt9JU=";
   };
 
-  cargoSha256 = "sha256-wVB+yL+h90f7NnASDaX5gxT5z45M8I1rxIJwY8uyB4k=";
+  cargoHash = "sha256-wVB+yL+h90f7NnASDaX5gxT5z45M8I1rxIJwY8uyB4k=";
 
   buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security curl ];
   nativeBuildInputs = [ installShellFiles pkg-config ];
diff --git a/third_party/nixpkgs/pkgs/tools/misc/shell-hist/default.nix b/third_party/nixpkgs/pkgs/tools/misc/shell-hist/default.nix
index 438b687c73..ee5d2da6e5 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/shell-hist/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/shell-hist/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage {
     sha256 = "0kc128xnnp1d56if70vfv0w3qnwhljhbnvzwwb7hfm3x2m0vqrqf";
   };
 
-  cargoSha256 = "1b2cfs03vlaz7jnr67ilgjfi7cm59izpcdi6pyvbzv8s46z2dysp";
+  cargoHash = "sha256-V/smviEa7b+2vyY2dn9MpbITnXw0HpOtPF/RPYB2TKw=";
 
   meta = with lib; {
     description = "Inspect your shell history";
diff --git a/third_party/nixpkgs/pkgs/tools/misc/slop/default.nix b/third_party/nixpkgs/pkgs/tools/misc/slop/default.nix
index b3903bd951..f993d25943 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/slop/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/snapper/default.nix b/third_party/nixpkgs/pkgs/tools/misc/snapper/default.nix
index be6d4f793c..d80bf5312a 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/snapper/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/snapper/default.nix
@@ -2,7 +2,7 @@
 , autoreconfHook, pkg-config, docbook_xsl, libxslt, docbook_xml_dtd_45
 , acl, attr, boost, btrfs-progs, coreutils, dbus, diffutils, e2fsprogs, libxml2
 , lvm2, pam, util-linux, json_c, nixosTests
-, ncurses }:
+, ncurses, zlib }:
 
 stdenv.mkDerivation rec {
   pname = "snapper";
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   ];
   buildInputs = [
     acl attr boost btrfs-progs dbus diffutils e2fsprogs libxml2
-    lvm2 pam util-linux json_c ncurses
+    lvm2 pam util-linux json_c ncurses zlib
   ];
 
   passthru.tests.snapper = nixosTests.snapper;
diff --git a/third_party/nixpkgs/pkgs/tools/misc/sqlite3-to-mysql/default.nix b/third_party/nixpkgs/pkgs/tools/misc/sqlite3-to-mysql/default.nix
index f2bc903d3d..71ebdcad69 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/sqlite3-to-mysql/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/sqlite3-to-mysql/default.nix
@@ -9,23 +9,23 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "sqlite3-to-mysql";
-  version = "2.2.0";
+  version = "2.3.0";
   format = "pyproject";
 
   disabled = python3Packages.pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "techouse";
-    repo = pname;
+    repo = "sqlite3-to-mysql";
     rev = "refs/tags/v${version}";
-    hash = "sha256-oav5HJdTmSAKk1b0wpzU2UOoY53zh5BrQ3Q0N360NeQ=";
+    hash = "sha256-XmjPGY8+WiuWkfWvzHsLbgopV0qBtqC2jjMeBU/XtFw=";
   };
 
-  nativeBuildInputs = with python3Packages; [
+  build-system = with python3Packages; [
     hatchling
   ];
 
-  propagatedBuildInputs = with python3Packages; [
+  dependencies = with python3Packages; [
     click
     mysql-connector
     pytimeparse2
@@ -39,6 +39,8 @@ python3Packages.buildPythonApplication rec {
     unidecode
     packaging
     mysql80
+    python-dateutil
+    types-python-dateutil
   ];
 
   pythonRelaxDeps = [
@@ -57,11 +59,11 @@ python3Packages.buildPythonApplication rec {
     };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Simple Python tool to transfer data from SQLite 3 to MySQL";
     homepage = "https://github.com/techouse/sqlite3-to-mysql";
-    license = licenses.mit;
-    maintainers = with maintainers; [ gador ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ gador ];
     mainProgram = "sqlite3mysql";
   };
 }
diff --git a/third_party/nixpkgs/pkgs/tools/misc/starship/default.nix b/third_party/nixpkgs/pkgs/tools/misc/starship/default.nix
index f7abf34490..e322e03ed3 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/starship/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/starship/default.nix
@@ -13,13 +13,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "starship";
-  version = "1.20.0";
+  version = "1.20.1";
 
   src = fetchFromGitHub {
     owner = "starship";
     repo = "starship";
     rev = "v${version}";
-    hash = "sha256-TJU/pojUE+uwyZlqzJ4ULt9r+3bZpetwfaXK8kBtEG8=";
+    hash = "sha256-Y7jX0XXrSMEex1HG0o69Q1rTtnFL0UuIEgfa1e7D1Nc=";
   };
 
   nativeBuildInputs = [ installShellFiles cmake ];
@@ -44,7 +44,7 @@ rustPlatform.buildRustPackage rec {
     cp docs/public/presets/toml/*.toml $presetdir
   '';
 
-  cargoHash = "sha256-A4SipsaMjVkG7ImN1aK34ZGJxlPld9NE9IjffI0+eDA=";
+  cargoHash = "sha256-yJ32HFaRpujJ9mQa+07b5cQcl1ATO/56dpm1IeKcbzs=";
 
   nativeCheckInputs = [ git ];
 
diff --git a/third_party/nixpkgs/pkgs/tools/misc/staruml/default.nix b/third_party/nixpkgs/pkgs/tools/misc/staruml/default.nix
index b30d66825c..634bdf0eb4 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/staruml/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/staruml/default.nix
@@ -24,12 +24,12 @@ let
   ];
 in
 stdenv.mkDerivation (finalAttrs: {
-  version = "6.2.1";
+  version = "6.2.2";
   pname = "staruml";
 
   src = fetchurl {
       url = "https://files.staruml.io/releases-v6/StarUML_${finalAttrs.version}_amd64.deb";
-      sha256 = "sha256-azfh27klczMK8m5jeVmJFkwJgN/qh6lzMUyYqkBNca8=";
+      sha256 = "sha256-1zxrT7phXeQYNbWHWMyPuHiUglrPSMPP0bfAcfvt8dM=";
     };
 
   nativeBuildInputs = [ wrapGAppsHook3 dpkg ];
diff --git a/third_party/nixpkgs/pkgs/tools/misc/synth/default.nix b/third_party/nixpkgs/pkgs/tools/misc/synth/default.nix
index 1d2eddbd54..688454c8de 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/synth/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/synth/default.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-/z2VEfeCCuffxlMh4WOpYkMSAgmh+sbx3ajcD5d4DdE=";
   };
 
-  cargoSha256 = "sha256-i2Pp9sfTBth3DtrQ99Vw+KLnGECrkqtlRNAKiwSWf48=";
+  cargoHash = "sha256-i2Pp9sfTBth3DtrQ99Vw+KLnGECrkqtlRNAKiwSWf48=";
 
   buildInputs = lib.optionals stdenv.isDarwin [
     AppKit
diff --git a/third_party/nixpkgs/pkgs/tools/misc/tab-rs/default.nix b/third_party/nixpkgs/pkgs/tools/misc/tab-rs/default.nix
index 26b4fa724b..6298d84c41 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/tab-rs/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/tab-rs/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1crj0caimin667f9kz34c0sm77892dmqaf1kxryqakqm75az5wfr";
   };
 
-  cargoSha256 = "0v5vkxr2sncw4r4pwvk0jbk4as7zwwfvjk2cpj9872zp07s35a77";
+  cargoHash = "sha256-56gy9AH3i4OSvExMuR3n/2hF5pJgbn5JJpxZLXKfu2w=";
 
   buildInputs = lib.optionals stdenv.isDarwin [ IOKit ];
 
@@ -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/third_party/nixpkgs/pkgs/tools/misc/tealdeer/default.nix b/third_party/nixpkgs/pkgs/tools/misc/tealdeer/default.nix
index dfe57f5fef..9ca82d8f1b 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/tealdeer/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/tealdeer/default.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-zQzYukhruVUVP1v76/5522ag7wjN9QoE9BtfMNYQ7UY=";
   };
 
-  cargoSha256 = "sha256-VeJsCWU7sJy88uvGGjpuGRzsAgBRvzOYU1FwpImpiLk=";
+  cargoHash = "sha256-VeJsCWU7sJy88uvGGjpuGRzsAgBRvzOYU1FwpImpiLk=";
 
   buildInputs = lib.optional stdenv.isDarwin Security;
 
diff --git a/third_party/nixpkgs/pkgs/tools/misc/termplay/default.nix b/third_party/nixpkgs/pkgs/tools/misc/termplay/default.nix
index aa35e24da0..dccf9d38fe 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/termplay/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/termplay/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1w7hdqgqr1jgxid3k7f2j52wz31gv8bzr9rsm6xzp7nnihp6i45p";
   };
 
-  cargoSha256 = "08ip6x4kink244majlk595yh551c2ap3ry58wly994mh8wf6ifwb";
+  cargoHash = "sha256-i7toHEewkpQ85aj4PK4SLJQCfUllUqkqIWLaOEk3NyI=";
 
   nativeBuildInputs = [ makeWrapper ];
   buildInputs = [
@@ -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/third_party/nixpkgs/pkgs/tools/misc/termtosvg/default.nix b/third_party/nixpkgs/pkgs/tools/misc/termtosvg/default.nix
index 86217693a5..2de15e155c 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/termtosvg/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/thin-provisioning-tools/default.nix b/third_party/nixpkgs/pkgs/tools/misc/thin-provisioning-tools/default.nix
index 4352c20f83..a386a46c40 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/thin-provisioning-tools/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/thumbs/default.nix b/third_party/nixpkgs/pkgs/tools/misc/thumbs/default.nix
index f170375afb..b4c795bc8c 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/thumbs/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/thumbs/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-XMz1ZOTz2q1Dt4QdxG83re9PIsgvxTTkytESkgKxhGM=";
   };
 
-  cargoSha256 = "sha256-PfTx6PcW5DESShfr9Ekhbq1asZ0xUGM4Vi9EwmoDv+s";
+  cargoHash = "sha256-PfTx6PcW5DESShfr9Ekhbq1asZ0xUGM4Vi9EwmoDv+s";
 
   patches = [ ./fix.patch ];
 
diff --git a/third_party/nixpkgs/pkgs/tools/misc/todo/default.nix b/third_party/nixpkgs/pkgs/tools/misc/todo/default.nix
index 6b6c858490..4f5789527a 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/todo/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/todo/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "oyRdXvVnCfdFM8lI1eCDHHYNWcJc0Qg0TKxQXUqNo40=";
   };
 
-  cargoSha256 = "B0tecuBx/FFQokhfI6+xpppyG5DD8WS2+MkmPaZfMhI=";
+  cargoHash = "sha256-B0tecuBx/FFQokhfI6+xpppyG5DD8WS2+MkmPaZfMhI=";
 
   nativeBuildInputs = [ pkg-config ];
 
diff --git a/third_party/nixpkgs/pkgs/tools/misc/trackma/default.nix b/third_party/nixpkgs/pkgs/tools/misc/trackma/default.nix
index c57d5ac1d7..6ecf2723f0 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/trackma/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/tremor-rs/ls.nix b/third_party/nixpkgs/pkgs/tools/misc/tremor-rs/ls.nix
index ea1b30b07e..a379c9294d 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/tremor-rs/ls.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/tremor-rs/ls.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
 
   nativeBuildInputs = [ rustPlatform.bindgenHook ];
 
-  cargoSha256 = "sha256-/RKwmslhMm30QxviVV7HthDHSmTmaGZn1hdt6bNF3d4=";
+  cargoHash = "sha256-/RKwmslhMm30QxviVV7HthDHSmTmaGZn1hdt6bNF3d4=";
 
   meta = with lib; {
     description = "Tremor Language Server (Trill)";
diff --git a/third_party/nixpkgs/pkgs/tools/misc/twspace-dl/default.nix b/third_party/nixpkgs/pkgs/tools/misc/twspace-dl/default.nix
index 1345a25eb1..3e22188f5d 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/twspace-dl/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/urlencode/default.nix b/third_party/nixpkgs/pkgs/tools/misc/urlencode/default.nix
index b61b8a37c2..da7066adc8 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/urlencode/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/urlencode/default.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-LvLUbtMPVbYZMUb9vWhTscYfZPtEM5GrZme3azvVlPE=";
   };
 
-  cargoSha256 = "sha256-UPw+/wVOEM+kciOr70P+gdMCxtCKQ/SXsNAWA44v4v8=";
+  cargoHash = "sha256-UPw+/wVOEM+kciOr70P+gdMCxtCKQ/SXsNAWA44v4v8=";
 
   meta = with lib; {
     description = "CLI utility for URL-encoding or -decoding strings";
diff --git a/third_party/nixpkgs/pkgs/tools/misc/uwuify/default.nix b/third_party/nixpkgs/pkgs/tools/misc/uwuify/default.nix
index abcf5e9b23..4a3411d05a 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/uwuify/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/uwuify/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-MzXObbxccwEG7egmQMCdhUukGqZS+NgbYwZjTaqME7I=";
   };
 
-  cargoSha256 = "sha256-1BoB7K/dWy3AbogvHIDLrdPD7K54EISvn4RVU5RLTi4=";
+  cargoHash = "sha256-1BoB7K/dWy3AbogvHIDLrdPD7K54EISvn4RVU5RLTi4=";
   buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
 
   meta = with lib; {
diff --git a/third_party/nixpkgs/pkgs/tools/misc/vector/Cargo.lock b/third_party/nixpkgs/pkgs/tools/misc/vector/Cargo.lock
index dfccefda9e..717a59c9ad 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/vector/Cargo.lock
+++ b/third_party/nixpkgs/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",
 ]
@@ -5575,10 +5428,22 @@ dependencies = [
 ]
 
 [[package]]
-name = "mlua"
-version = "0.9.8"
+name = "mio"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e340c022072f3208a4105458286f4985ba5355bfe243c3073afe45cbe9ecf491"
+checksum = "4569e456d394deccd22ce1c1913e6ea0e54519f577285001215d33557431afe4"
+dependencies = [
+ "hermit-abi",
+ "libc",
+ "wasi 0.11.0+wasi-snapshot-preview1",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "mlua"
+version = "0.9.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+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"
+version = "4.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1e1c390732d15f1d48471625cd92d154e66db2c56645e29a9cd26f4699f72dc"
-dependencies = [
- "num-traits",
-]
-
-[[package]]
-name = "ordered-float"
-version = "4.2.0"
-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/third_party/nixpkgs/pkgs/tools/misc/vector/default.nix b/third_party/nixpkgs/pkgs/tools/misc/vector/default.nix
index 9ed2bc9c6e..129afebe34 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/vector/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/void/default.nix b/third_party/nixpkgs/pkgs/tools/misc/void/default.nix
index 1204206d34..8ead979eed 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/void/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/void/default.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
   # The tests are long-running and not that useful
   doCheck = false;
 
-  cargoSha256 = "1wh1yb02w5afghd19i2s0v8mq4lq20djsljrr44xciq68bqfdcp0";
+  cargoHash = "sha256-4LLm8EIGR9YJyVlSLRsQmBJc0QZaxBQafE4VLsDyAfI=";
 
   meta = with lib; {
     description = "Terminal-based personal organizer";
diff --git a/third_party/nixpkgs/pkgs/tools/misc/writedisk/default.nix b/third_party/nixpkgs/pkgs/tools/misc/writedisk/default.nix
index dd12674671..6cc8e03fd5 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/writedisk/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/writedisk/default.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-MZFnNb8rJMu/nlH8rfnD//bhqPSkhyXucbTrwsRM9OY=";
   };
 
-  cargoSha256 = "sha256-DGroBBozAViibbIYbtqH2SxIGLqdtyJ9XKyz7O1L05g=";
+  cargoHash = "sha256-DGroBBozAViibbIYbtqH2SxIGLqdtyJ9XKyz7O1L05g=";
 
   nativeBuildInputs = [ pkg-config ];
 
diff --git a/third_party/nixpkgs/pkgs/tools/misc/xburst-tools/default.nix b/third_party/nixpkgs/pkgs/tools/misc/xburst-tools/default.nix
index e850e347b2..093e7152bb 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/xburst-tools/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/xburst-tools/default.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation {
     description = "Qi tools to access the Ben Nanonote USB_BOOT mode";
     license = lib.licenses.gpl3;
     homepage = "http://www.linux-mtd.infradead.org/";
-    maintainers = with lib.maintainers; [viric];
+    maintainers = [ ];
     platforms = lib.platforms.x86_64;
   };
 }
diff --git a/third_party/nixpkgs/pkgs/tools/misc/xmlbeans/default.nix b/third_party/nixpkgs/pkgs/tools/misc/xmlbeans/default.nix
index f3702d0302..040205753c 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/xmlbeans/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/xprite-editor/default.nix b/third_party/nixpkgs/pkgs/tools/misc/xprite-editor/default.nix
index b6a0a9b470..f5581bd354 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/xprite-editor/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/xprite-editor/default.nix
@@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec {
 
   nativeBuildInputs = lib.optionals stdenv.isLinux [ pkg-config python3 ];
 
-  cargoSha256 = "0z1ip667d1qwvm9md3zg8ib9jixpg7qj5ypwib7r2928h14yg7ck";
+  cargoHash = "sha256-k53nSYBIJJHPivz6IvF5t0eZVkTvj1ZT3RyHdoy5MXw=";
 
   cargoBuildFlags = [ "--bin" "xprite-native" ];
 
diff --git a/third_party/nixpkgs/pkgs/tools/misc/xxv/default.nix b/third_party/nixpkgs/pkgs/tools/misc/xxv/default.nix
index 1cb13709bb..3973f8d096 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/xxv/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/misc/xxv/default.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0ppfsgdigza2jppbkg4qanjhlkpnq7p115c4471vc6vpikpfrlk3";
   };
 
-  cargoSha256 = "0pmpvlmy4pw252is34r9af1ysrp78xs8pz8cw4rys9s4fh2hmhjb";
+  cargoHash = "sha256-S8IKBXREJ+0z4Qz9i3RH52btg1Mpk6GjKIJf4ivdt14=";
 
   buildInputs = lib.optionals useNcurses [ ncurses ]
   ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security ])
@@ -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/third_party/nixpkgs/pkgs/tools/misc/z-lua/default.nix b/third_party/nixpkgs/pkgs/tools/misc/z-lua/default.nix
index f095a4260b..7ff660e824 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/z-lua/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/misc/zitadel-tools/default.nix b/third_party/nixpkgs/pkgs/tools/misc/zitadel-tools/default.nix
index 0ef9b34432..83d4cc1472 100644
--- a/third_party/nixpkgs/pkgs/tools/misc/zitadel-tools/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/networking/airgeddon/default.nix b/third_party/nixpkgs/pkgs/tools/networking/airgeddon/default.nix
index 2bfe38203e..a79cf2f70a 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/airgeddon/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/networking/anevicon/default.nix b/third_party/nixpkgs/pkgs/tools/networking/anevicon/default.nix
index 346c79dd6f..9611275805 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/anevicon/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/networking/anevicon/default.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1m3ci7g7nn28p6x5m85av3ljgszwlg55f1hmgjnarc6bas5bapl7";
   };
 
-  cargoSha256 = "1g15v13ysx09fy0b8qddw5fwql2pvwzc2g2h1ndhzpxvfy7fzpr1";
+  cargoHash = "sha256-Id/vjne73w+bDVA8wT7fV1DMXeGtYbSAdwl07UfYJbw=";
 
   buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ];
 
diff --git a/third_party/nixpkgs/pkgs/tools/networking/biosdevname/default.nix b/third_party/nixpkgs/pkgs/tools/networking/biosdevname/default.nix
index c9d2f4bbd6..ce8265520d 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/biosdevname/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/networking/bore/default.nix b/third_party/nixpkgs/pkgs/tools/networking/bore/default.nix
index 1ffbe6a603..9af98878b8 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/bore/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/networking/bore/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1fdnnx7d18gj4rkv1dc6q379dqabl66zks9i0rjarjwcci8m30d9";
   };
 
-  cargoSha256 = "1xlbfzmy0wjyz3jpr17r4ma4i79d9b32yqwwi10vrcjzr7vsyhmx";
+  cargoHash = "sha256-vUKv98lfsrxBiJxjL8ZKLZ1IVCX5hHzl+F5y4Ot3i/Y=";
   cargoBuildFlags = [ "-p" pname ];
 
   # error[E0793]: reference to packed field is unaligned
diff --git a/third_party/nixpkgs/pkgs/tools/networking/boringtun/default.nix b/third_party/nixpkgs/pkgs/tools/networking/boringtun/default.nix
index 11fd60aa1e..e2a6a7a3b6 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/boringtun/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/networking/boringtun/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-PY7yqBNR4CYh8Y/vk4TYxxJnnv0eig8sjXp4dR4CX04=";
   };
 
-  cargoSha256 = "sha256-WFKlfuZGVU5KA57ZYjsIrIwE4B5TeaU5IKt9BNEnWyY=";
+  cargoHash = "sha256-WFKlfuZGVU5KA57ZYjsIrIwE4B5TeaU5IKt9BNEnWyY=";
 
   buildInputs = lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security;
 
diff --git a/third_party/nixpkgs/pkgs/tools/networking/bsd-finger/default.nix b/third_party/nixpkgs/pkgs/tools/networking/bsd-finger/default.nix
deleted file mode 100644
index b8eda1bc21..0000000000
--- a/third_party/nixpkgs/pkgs/tools/networking/bsd-finger/default.nix
+++ /dev/null
@@ -1,177 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  fetchDebianPatch,
-  buildClient ? true,
-}:
-
-stdenv.mkDerivation rec {
-  srcName = "bsd-finger";
-  pname = srcName + lib.optionalString (!buildClient) "d";
-  version = "0.17";
-
-  src = fetchurl {
-    url = "http://ftp.de.debian.org/debian/pool/main/b/bsd-finger/bsd-finger_${version}.orig.tar.bz2";
-    hash = "sha256-KLNNYF0j6mh9eeD8SMA1q+gPiNnBVH56pGeW0QgcA2M=";
-  };
-
-  debianRevision = "17";
-
-  # outputs = [ "out" "man" ];
-
-  env.NIX_CFLAGS_COMPILE = "-D_GNU_SOURCE";
-
-  patches = [
-    # Patches original finger sources to make the programs more robust and compatible
-    (fetchDebianPatch {
-      pname = srcName;
-      inherit version debianRevision;
-      patch = "01-legacy.patch";
-      hash = "sha256-84znJLXez4w6WB2nOW+PHK/0srE0iG9nGAjO1/AGczw=";
-    })
-
-    # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=518559
-    #
-    # Doesn't work with a non-iterable nsswitch source
-    #
-    # Currently, "finger tabbott" works by iterating through the list of users
-    # on the system using getpwent and checking if any of them match "tabbott".
-    #
-    # Some nsswitch backends (including Hesiod and LDAP[1]) do not support
-    # iterating through the complete list of users.  These nsswitch backends
-    # instead only fully support looking up a user's information by username or
-    # uid.
-    #
-    # So, if tabbott is a user whose nsswitch information comes from LDAP, then
-    # "finger tabbott" will incorrectly report "finger: tabbott: no such user."
-    # "finger -m tabbott" does work correctly, however, because it looks up the
-    # matching username using getpwnam.
-    #
-    # A fix for this is to always look up an argument to finger for a username
-    # match, and having -m only control whether finger searches the entire user
-    # database for real name matches.  Patch attached.
-    #
-    # This patch has the advantageous side effect that if there are some real
-    # name matches and a username match, finger will always display the username
-    # match first (rather than in some random place in the list).
-    #
-    #     -Tim Abbott
-    #
-    # [1] with LDAP, it is typically the case that one can iterate through only
-    # the first 100 results from a query.
-    (fetchDebianPatch {
-      pname = srcName;
-      inherit version debianRevision;
-      patch = "02-518559-nsswitch-sources.patch";
-      hash = "sha256-oBXJ/kr/czevWk0TcsutGINNwCoHnEStRT8Jfgp/lbM=";
-    })
-
-    # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=468454
-    # Implement IPv6 capacity for the server Fingerd.
-    (fetchDebianPatch {
-      pname = srcName;
-      inherit version debianRevision;
-      patch = "03-468454-fingerd-ipv6.patch";
-      hash = "sha256-a5+qoy2UKa2nCJrwrfJ5VPZoACFXFQ1j/rweoMYW1Z0=";
-    })
-
-    # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=468454
-    # Implement IPv6 capability for the client Finger.
-    (fetchDebianPatch {
-      pname = srcName;
-      inherit version debianRevision;
-      patch = "04-468454-finger-ipv6.patch";
-      hash = "sha256-cg93NL02lJm/5Freegb3EbjDAQVkurLEEJifcyQRRfk=";
-    })
-
-    # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=547014
-    # From: "Matthew A. Dunford" <mdunford@lbl.gov>
-    #
-    # finger segfaults when it comes across a netgroup entry in /etc/passwd.
-    # A netgroup entry doesn't include many of the fields in a normal passwd
-    # entry, so pw->pw_gecos is set to NULL, which causes finger to core
-    # dump.
-    #
-    # Here is part of a /etc/passwd file with a netgroup entry:
-    #
-    # nobody:x:65534:65534:nobody:/nonexistent:/bin/sh
-    # +@operator
-    #
-    # This patch sidesteps what finger considers a malformed passwd entry:
-    (fetchDebianPatch {
-      pname = srcName;
-      inherit version debianRevision;
-      patch = "05-547014-netgroup.patch";
-      hash = "sha256-d+ufp7nPZwW+t+EWASzHrXT/O6zSzt6OOV12cKVo3P0=";
-    })
-
-    # Decrease timeout length during connect().
-    # In cases where a name server is answering with A as well as AAAA records,
-    # but the system to be queried has lost a corresponding address, the TCP
-    # handshake timeout will cause a long delay before allowing the query of
-    # the next address family, or the next address in general.
-    #  .
-    # The use of a trivial signal handler for SIGALRM allows the reduction
-    # of this timeout, thus producing better responsiveness for the interactive
-    # user of the Finger service.
-    # Author: Mats Erik Andersson <debian@gisladisker.se>
-    (fetchDebianPatch {
-      pname = srcName;
-      inherit version debianRevision;
-      patch = "06-572211-decrease-timeout.patch";
-      hash = "sha256-KtNGU5mmX1nnxQc7XnYoUuVW4We2cF81+x6EQrHF7g0=";
-    })
-
-    # Use cmake as build system
-    (fetchDebianPatch {
-      pname = srcName;
-      inherit version debianRevision;
-      patch = "use-cmake-as-buildsystem.patch";
-      hash = "sha256-YOmkF6Oxowy15mCE1pCvHKnLEXglijWFG6eydnZJFhM=";
-    })
-
-    # Debian-specific changes to the cmake build system (that NixOS will also benefit from)
-    # Adds -D_GNU_SOURCE, which will enable many C extensions that finger benefits from
-    (fetchDebianPatch {
-      pname = srcName;
-      inherit version debianRevision;
-      patch = "use-cmake-as-buildsystem-debian-extras.patch";
-      hash = "sha256-T3DWpyyz15JCiVJ41RrJEhsmicei8G3OaKpxvzOCcBU=";
-    })
-
-    # Fix typo at fingerd man page (Josue Ortega <josue@debian.org>)
-    (fetchDebianPatch {
-      pname = srcName;
-      inherit version debianRevision;
-      patch = "fix-fingerd-man-typo.patch";
-      hash = "sha256-f59osGi0a8Tkm2Vxg2+H2brH8WproCDvbPf4jXwi6ag=";
-    })
-  ];
-
-  preBuild =
-    let
-      srcdir = if buildClient then "finger" else "fingerd";
-    in
-    ''
-      cd ${srcdir}
-    '';
-
-  preInstall =
-    let
-      bindir = if buildClient then "bin" else "sbin";
-      mandir = if buildClient then "man/man1" else "man/man8";
-    in
-    ''
-      mkdir -p $out/${bindir} $out/${mandir}
-    '';
-
-  meta = with lib; {
-    description =
-      if buildClient then "User information lookup program" else "Remote user information server";
-    platforms = platforms.linux;
-    license = licenses.bsdOriginal;
-    mainProgram = "finger";
-  };
-}
-# TODO: multiple outputs (manpage)
diff --git a/third_party/nixpkgs/pkgs/tools/networking/bukubrow/default.nix b/third_party/nixpkgs/pkgs/tools/networking/bukubrow/default.nix
index db14b24799..ee40cb0f10 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/bukubrow/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/networking/bukubrow/default.nix
@@ -18,7 +18,7 @@ in rustPlatform.buildRustPackage rec {
     sha256 = "sha256-xz5Agsm+ATQXXgpPGN4EQ00i1t8qUlrviNHauVdCu4U=";
   };
 
-  cargoSha256 = "sha256-mH76ODPKlKDEK9ckThPnL5Ar7p1l1gNd7zXfesLZlBM=";
+  cargoHash = "sha256-mH76ODPKlKDEK9ckThPnL5Ar7p1l1gNd7zXfesLZlBM=";
 
   buildInputs = [ sqlite ];
 
diff --git a/third_party/nixpkgs/pkgs/tools/networking/bwm-ng/default.nix b/third_party/nixpkgs/pkgs/tools/networking/bwm-ng/default.nix
index d10ecadc4e..e6e1907a25 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/bwm-ng/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/networking/castnow/default.nix b/third_party/nixpkgs/pkgs/tools/networking/castnow/default.nix
index 095a2e8541..1c00ab22c0 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/castnow/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/networking/cksfv/default.nix b/third_party/nixpkgs/pkgs/tools/networking/cksfv/default.nix
index 7fe184b1ef..aae8f227dd 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/cksfv/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/networking/cnping/default.nix b/third_party/nixpkgs/pkgs/tools/networking/cnping/default.nix
index ba22730a3e..02273d1436 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/cnping/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/networking/cocom/default.nix b/third_party/nixpkgs/pkgs/tools/networking/cocom/default.nix
index 6ae004de9b..7281583b17 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/cocom/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/networking/cocom/default.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "0sl4ivn95sr5pgw2z877gmhyfc4mk9xr457i5g2i4wqnf2jmy14j";
   };
 
-  cargoSha256 = "04kj1yj6hhnis3ss0xs4zq8rl71rzn577g8i0wmapkjqzqwg37yb";
+  cargoHash = "sha256-y5/xOP5YzqsqBxG9c4r9ORyaEf5Ed6D10NFCaKQPchI=";
 
   buildInputs = lib.optional stdenv.isDarwin Security;
 
diff --git a/third_party/nixpkgs/pkgs/tools/networking/curl-impersonate/default.nix b/third_party/nixpkgs/pkgs/tools/networking/curl-impersonate/default.nix
index 431824163c..4b23e55028 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/curl-impersonate/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/networking/curl-impersonate/default.nix
@@ -16,7 +16,7 @@
 , autoconf
 , automake
 , libtool
-, darwin
+, cctools
 , cacert
 , unzip
 , go
@@ -63,7 +63,7 @@ let
 
     nativeBuildInputs = lib.optionals stdenv.isDarwin [
       # Must come first so that it shadows the 'libtool' command but leaves 'libtoolize'
-      darwin.cctools
+      cctools
     ] ++ [
       installShellFiles
       cmake
diff --git a/third_party/nixpkgs/pkgs/tools/networking/curl/default.nix b/third_party/nixpkgs/pkgs/tools/networking/curl/default.nix
index 154156e894..32600da19d 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/curl/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/networking/curl/default.nix
@@ -155,6 +155,8 @@ stdenv.mkDerivation (finalAttrs: {
       "--without-ca-path"
     ] ++ lib.optionals (!gnutlsSupport && !opensslSupport && !wolfsslSupport && !rustlsSupport) [
       "--without-ssl"
+    ] ++ lib.optionals (gnutlsSupport && !stdenv.isDarwin) [
+      "--with-ca-path=/etc/ssl/certs"
     ];
 
   CXX = "${stdenv.cc.targetPrefix}c++";
diff --git a/third_party/nixpkgs/pkgs/tools/networking/decode-spam-headers/default.nix b/third_party/nixpkgs/pkgs/tools/networking/decode-spam-headers/default.nix
index 738a6f8314..2ccab2956a 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/decode-spam-headers/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/networking/dhcpcd/default.nix b/third_party/nixpkgs/pkgs/tools/networking/dhcpcd/default.nix
index 077d2f4164..0c95684286 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/dhcpcd/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/networking/dhcpcd/default.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation rec {
   pname = "dhcpcd";
-  version = "10.0.6";
+  version = "10.0.8";
 
   src = fetchFromGitHub {
     owner = "NetworkConfiguration";
     repo = "dhcpcd";
     rev = "v${version}";
-    sha256 = "sha256-tNC5XCA8dShaTIff15mQz8v+YK9sZkRNLCX5qnlpxx4=";
+    sha256 = "sha256-kM+mdB7ul9NYHOEAJtp3M57M2MellrCoY/SaPWFLEpQ=";
   };
 
   nativeBuildInputs = [ pkg-config ];
diff --git a/third_party/nixpkgs/pkgs/tools/networking/dnstracer/default.nix b/third_party/nixpkgs/pkgs/tools/networking/dnstracer/default.nix
index c4e5fc18e6..30017b2b76 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/dnstracer/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/networking/filegive/default.nix b/third_party/nixpkgs/pkgs/tools/networking/filegive/default.nix
index 9d85c168c5..6933404567 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/filegive/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/networking/filegive/default.nix
@@ -18,7 +18,7 @@ buildGoModule rec {
     homepage = "https://viric.name/cgi-bin/filegive";
     description = "Easy p2p file sending program";
     license = licenses.agpl3Plus;
-    maintainers = with maintainers; [ viric ];
+    maintainers = [ ];
     mainProgram = "filegive";
   };
 }
diff --git a/third_party/nixpkgs/pkgs/tools/networking/freebind/default.nix b/third_party/nixpkgs/pkgs/tools/networking/freebind/default.nix
index 57d5f1136a..661bfd8e26 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/freebind/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/networking/gandi-cli/default.nix b/third_party/nixpkgs/pkgs/tools/networking/gandi-cli/default.nix
index 8f703320f2..5d50f56604 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/gandi-cli/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/networking/grpc_cli/default.nix b/third_party/nixpkgs/pkgs/tools/networking/grpc_cli/default.nix
index cc22396922..fc5c996a3a 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/grpc_cli/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/networking/grpc_cli/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   pname = "grpc_cli";
-  version = "1.65.1";
+  version = "1.65.2";
   src = fetchFromGitHub {
     owner = "grpc";
     repo = "grpc";
     rev = "v${version}";
-    hash = "sha256-6/QmOnLDNTSHS0+hBe1LblHMfcpxNwzVPd0iBu1WiGs=";
+    hash = "sha256-G9Wo5ySqexxn/Od8qPvmHOhW+X/U6/MMZqtZ6uFKifY=";
     fetchSubmodules = true;
   };
   nativeBuildInputs = [ automake cmake autoconf ];
diff --git a/third_party/nixpkgs/pkgs/tools/networking/httperf/default.nix b/third_party/nixpkgs/pkgs/tools/networking/httperf/default.nix
index bc5f17a242..90cda6d78a 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/httperf/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/networking/inadyn/default.nix b/third_party/nixpkgs/pkgs/tools/networking/inadyn/default.nix
index 68e1483e7a..fa064fbd16 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/inadyn/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/networking/ipv6calc/default.nix b/third_party/nixpkgs/pkgs/tools/networking/ipv6calc/default.nix
index c30c19b49b..3c252de4fe 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/ipv6calc/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/networking/kapp/default.nix b/third_party/nixpkgs/pkgs/tools/networking/kapp/default.nix
index 1ad9960b35..f424afdfec 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/kapp/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/networking/kapp/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "kapp";
-  version = "0.63.1";
+  version = "0.63.2";
 
   src = fetchFromGitHub {
     owner = "carvel-dev";
     repo = "kapp";
     rev = "v${version}";
-    hash = "sha256-6i09V4Y2rFoChXo5roxVUFf84qCu2X9i5NtlYtw4RhE=";
+    hash = "sha256-YmaIGC/4+yhb9D9QNqT3EW6RHbsbSebbImuJZdRhvJ0=";
   };
 
   vendorHash = null;
diff --git a/third_party/nixpkgs/pkgs/tools/networking/labctl/default.nix b/third_party/nixpkgs/pkgs/tools/networking/labctl/default.nix
index 71593411e8..89c84e4f18 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/labctl/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/networking/magic-wormhole-rs/default.nix b/third_party/nixpkgs/pkgs/tools/networking/magic-wormhole-rs/default.nix
index f1937e5ddc..77bb8e117e 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/magic-wormhole-rs/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/networking/magic-wormhole-rs/default.nix
@@ -9,16 +9,16 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "magic-wormhole-rs";
-  version = "0.7.0";
+  version = "0.7.1";
 
   src = fetchFromGitHub {
     owner = "magic-wormhole";
     repo = "magic-wormhole.rs";
     rev = version;
-    sha256 = "sha256-YFbBOjJK3+Zyy6pKQwGzYlva63PLhBhgMPEdQljNerE=";
+    sha256 = "sha256-u0prkwAWFTTIsAhi2ZV5Ozwcb6QOu0uaqZdORmAxxcY=";
   };
 
-  cargoHash = "sha256-qwrNj8M6ZDCqu7529DnhgiCaxYwsOlABTEEDBmkSL2U=";
+  cargoHash = "sha256-x6aEas3vmdI24nOys+Y+vuwY7k5cYRAj9oOH73zyV+A=";
 
   buildInputs = [ libxcb ]
     ++ lib.optionals stdenv.isDarwin [ Security AppKit ];
diff --git a/third_party/nixpkgs/pkgs/tools/networking/mmsd/default.nix b/third_party/nixpkgs/pkgs/tools/networking/mmsd/default.nix
index 474fa046bf..b156b4f125 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/mmsd/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/networking/mosh/default.nix b/third_party/nixpkgs/pkgs/tools/networking/mosh/default.nix
index 7a19275e4e..92894e5ddf 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/mosh/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/networking/mosh/default.nix
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
       especially over Wi-Fi, cellular, and long-distance links.
     '';
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ viric ];
+    maintainers = [ ];
     platforms = platforms.unix;
   };
 }
diff --git a/third_party/nixpkgs/pkgs/tools/networking/mu/default.nix b/third_party/nixpkgs/pkgs/tools/networking/mu/default.nix
index b54c07eae9..f58851df6a 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/mu/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/networking/netkit/tftp/default.nix b/third_party/nixpkgs/pkgs/tools/networking/netkit/tftp/default.nix
index 3ebfa3b96b..807aa62601 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/netkit/tftp/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/networking/netkit/tftp/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     description = "Netkit TFTP client and server";
     homepage = "ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/";
     license = lib.licenses.bsdOriginal;
-    maintainers = with lib.maintainers; [viric];
+    maintainers = [ ];
     platforms = with lib.platforms; linux;
   };
 }
diff --git a/third_party/nixpkgs/pkgs/tools/networking/networkmanager/applet/default.nix b/third_party/nixpkgs/pkgs/tools/networking/networkmanager/applet/default.nix
index 9d58389bae..e7234cc172 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/networkmanager/applet/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/networking/nexttrace/default.nix b/third_party/nixpkgs/pkgs/tools/networking/nexttrace/default.nix
index 6ed2055d54..8e39737532 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/nexttrace/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/networking/ntttcp/default.nix b/third_party/nixpkgs/pkgs/tools/networking/ntttcp/default.nix
index 5246d2cc49..abf0acf8a8 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/ntttcp/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/networking/nuttcp/default.nix b/third_party/nixpkgs/pkgs/tools/networking/nuttcp/default.nix
index 467159e8c2..7bee729c4e 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/nuttcp/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/networking/octodns/default.nix b/third_party/nixpkgs/pkgs/tools/networking/octodns/default.nix
index 6b354f3b33..f298e7f4f7 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/octodns/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/networking/octodns/providers/bind/default.nix b/third_party/nixpkgs/pkgs/tools/networking/octodns/providers/bind/default.nix
index 18cd54f0f0..dfecb36a62 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/octodns/providers/bind/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/networking/octodns/providers/hetzner/default.nix b/third_party/nixpkgs/pkgs/tools/networking/octodns/providers/hetzner/default.nix
index 688f1c90e2..830678391d 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/octodns/providers/hetzner/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/networking/octodns/providers/powerdns/default.nix b/third_party/nixpkgs/pkgs/tools/networking/octodns/providers/powerdns/default.nix
index 25d5291a55..d1c39b628d 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/octodns/providers/powerdns/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/networking/offlineimap/default.nix b/third_party/nixpkgs/pkgs/tools/networking/offlineimap/default.nix
index 9ddc2164b4..b3743e74fe 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/offlineimap/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/networking/ofono/default.nix b/third_party/nixpkgs/pkgs/tools/networking/ofono/default.nix
index e87f8a7073..c7aa844b7b 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/ofono/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/networking/olsrd/default.nix b/third_party/nixpkgs/pkgs/tools/networking/olsrd/default.nix
index 8e0dec4b48..5f8985b66c 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/olsrd/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/networking/olsrd/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
     description = "Adhoc wireless mesh routing daemon";
     license = lib.licenses.bsd3;
     homepage = "http://olsr.org/";
-    maintainers = with lib.maintainers; [viric];
+    maintainers = [ ];
     platforms = with lib.platforms; linux;
   };
 }
diff --git a/third_party/nixpkgs/pkgs/tools/networking/openconnect/common.nix b/third_party/nixpkgs/pkgs/tools/networking/openconnect/common.nix
index 42a8851d25..0dccb0e92f 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/openconnect/common.nix
+++ b/third_party/nixpkgs/pkgs/tools/networking/openconnect/common.nix
@@ -21,7 +21,7 @@
 , autoreconfHook
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "openconnect";
   inherit version src;
 
@@ -33,9 +33,9 @@ stdenv.mkDerivation rec {
     "--without-openssl-version-check"
   ];
 
-  buildInputs = [ gmp libxml2 stoken zlib pcsclite (if useOpenSSL then openssl else gnutls) ]
+  buildInputs = [ gmp libxml2 stoken zlib (if useOpenSSL then openssl else gnutls) ]
     ++ lib.optional stdenv.isDarwin PCSC
-    ++ lib.optional stdenv.isLinux p11-kit
+    ++ lib.optionals stdenv.isLinux [ p11-kit pcsclite ]
     ++ lib.optional useDefaultExternalBrowser xdg-utils;
   nativeBuildInputs = [ pkg-config autoreconfHook ];
 
diff --git a/third_party/nixpkgs/pkgs/tools/networking/openssh/default.nix b/third_party/nixpkgs/pkgs/tools/networking/openssh/default.nix
index 1c60f8f304..2ec09d6139 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/openssh/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/networking/openssh/default.nix
@@ -18,19 +18,17 @@ in
 
   openssh_hpn = common rec {
     pname = "openssh-with-hpn";
-    version = "9.7p1";
+    version = "9.8p1";
     extraDesc = " with high performance networking patches";
 
     src = fetchurl {
       url = "mirror://openbsd/OpenSSH/portable/openssh-${version}.tar.gz";
-      hash = "sha256-SQQm92bYKidj/KzY2D6j1weYdQx70q/y5X3FZg93P/0=";
+      hash = "sha256-3YvQAqN5tdSZ37BQ3R+pr4Ap6ARh9LtsUjxJlz9aOfM=";
     };
 
-    extraPatches = let url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/b3f86656fc67aa397f60747c85f7f7b967c3279d/security/openssh-portable/files/extra-patch-hpn"; in
+    extraPatches = let url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/402562e2559e198c6660171dec58e7a25cc14ec2/security/openssh-portable/files/extra-patch-hpn"; in
     [
       ./ssh-keysign-8.5.patch
-      ./openssh-9.6_p1-CVE-2024-6387.patch
-      ./openssh-9.6_p1-chaff-logic.patch
 
       # HPN Patch from FreeBSD ports
       (fetchpatch {
@@ -38,7 +36,7 @@ in
         inherit url;
         stripLen = 1;
         excludes = [ "channels.c" ];
-        hash = "sha256-MydulQvz8sDVQ6Up9U1yrsiyI5EGmyKl/stUk7DvVOU=";
+        hash = "sha256-CZ35dQpanzt0Uoo/2sDET5J/hYRF8ofiAz60HlAsCV8=";
       })
 
       (fetchpatch {
diff --git a/third_party/nixpkgs/pkgs/tools/networking/openvpn/default.nix b/third_party/nixpkgs/pkgs/tools/networking/openvpn/default.nix
index 03e663229b..b3d100ecae 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/openvpn/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/networking/openvpn/default.nix
@@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: {
     downloadPage = "https://openvpn.net/community-downloads/";
     homepage = "https://openvpn.net/";
     license = licenses.gpl2Only;
-    maintainers = with maintainers; [ viric peterhoeg ];
+    maintainers = with maintainers; [ peterhoeg ];
     platforms = platforms.unix;
     mainProgram = "openvpn";
   };
diff --git a/third_party/nixpkgs/pkgs/tools/networking/p2p/amule/default.nix b/third_party/nixpkgs/pkgs/tools/networking/p2p/amule/default.nix
index 6d4950b40f..d5446fedb5 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/p2p/amule/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/networking/pdnsd/default.nix b/third_party/nixpkgs/pkgs/tools/networking/pdnsd/default.nix
index 605168493e..26001c37e9 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/pdnsd/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/networking/pdnsd/default.nix
@@ -32,6 +32,6 @@ stdenv.mkDerivation rec {
     homepage = "http://members.home.nl/p.a.rombouts/pdnsd";
     license = licenses.gpl3Plus;
     platforms = platforms.unix;
-    maintainers = with maintainers; [viric];
+    maintainers = [ ];
   };
 }
diff --git a/third_party/nixpkgs/pkgs/tools/networking/photon/default.nix b/third_party/nixpkgs/pkgs/tools/networking/photon/default.nix
index acd0d1c817..5a60e145ae 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/photon/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/networking/pwnat/default.nix b/third_party/nixpkgs/pkgs/tools/networking/pwnat/default.nix
index c0ead5468b..d95608d5b6 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/pwnat/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/networking/pwnat/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     homepage    = "http://samy.pl/pwnat/";
     description = "ICMP NAT to NAT client-server communication";
     license     = lib.licenses.gpl3Plus;
-    maintainers = with maintainers; [viric];
+    maintainers = [ ];
     platforms   = with platforms; linux;
     mainProgram = "pwnat";
   };
diff --git a/third_party/nixpkgs/pkgs/tools/networking/ratman/default.nix b/third_party/nixpkgs/pkgs/tools/networking/ratman/default.nix
index cccf50206d..ebadc2a41c 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/ratman/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/networking/ratman/default.nix
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-ZZ7idZ67xvQFmQJqIFU/l77YU+yDQOqNthX5NR/l4k8=";
   };
 
-  cargoSha256 = "Nsux0QblBtzlhLEgfKYvkQrOz8+oVd2pqT3CL8TnQEc=";
+  cargoHash = "sha256-Nsux0QblBtzlhLEgfKYvkQrOz8+oVd2pqT3CL8TnQEc=";
 
   nativeBuildInputs = [ protobuf pkg-config installShellFiles ];
 
diff --git a/third_party/nixpkgs/pkgs/tools/networking/rconc/default.nix b/third_party/nixpkgs/pkgs/tools/networking/rconc/default.nix
index 5934dd7e88..d8af7fb6e9 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/rconc/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/networking/rconc/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-6Bff9NnG1ZEQhntzH5Iq0XEbJBKdwcb0BOn8nCkeWTY=";
   };
 
-  cargoSha256 = "sha256-rSN/wm52ZhJ8JUEUC51Xv5eIpwvOR3LvTdFjGl64VVk=";
+  cargoHash = "sha256-rSN/wm52ZhJ8JUEUC51Xv5eIpwvOR3LvTdFjGl64VVk=";
 
   meta = with lib; {
     description = "Simple cross-platform RCON client written in rust";
diff --git a/third_party/nixpkgs/pkgs/tools/networking/redir/default.nix b/third_party/nixpkgs/pkgs/tools/networking/redir/default.nix
index 87ea83f5a4..e92401c90f 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/redir/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/networking/rustcat/default.nix b/third_party/nixpkgs/pkgs/tools/networking/rustcat/default.nix
index 4a71aea6df..9848dbdd17 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/rustcat/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/networking/rustcat/default.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-/6vNFh7n6WvYerrL8m9sgUKsO2KKj7/f8xc4rzHy9Io=";
   };
 
-  cargoSha256 = "sha256-wqoU9UfXDmf7KIHgFif5rZfZY8Zu0SsaMVfwTtXLzHg=";
+  cargoHash = "sha256-wqoU9UfXDmf7KIHgFif5rZfZY8Zu0SsaMVfwTtXLzHg=";
 
   buildInputs = lib.optional stdenv.isDarwin Security;
 
diff --git a/third_party/nixpkgs/pkgs/tools/networking/speedtest-rs/default.nix b/third_party/nixpkgs/pkgs/tools/networking/speedtest-rs/default.nix
index 22f4fba0c0..b70aaa95aa 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/speedtest-rs/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/networking/speedtest-rs/default.nix
@@ -5,17 +5,20 @@
 , pkg-config
 , stdenv
 , darwin
+, nix-update-script
+, testers
+, speedtest-rs
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "speedtest-rs";
-  version = "0.1.5";
+  version = "0.2.0";
 
   src = fetchFromGitHub {
     owner = "nelsonjchen";
-    repo = pname;
+    repo = "speedtest-rs";
     rev = "refs/tags/v${version}";
-    hash = "sha256-JKthXrosqDZh6CWEqT08h3ySPZulitDol7lX3Eo7orM=";
+    hash = "sha256-1FAFYiWDD/KG/7/UTv/EW6Nj2GnU0GZFFq6ouMc0URA=";
   };
 
   buildInputs = [ openssl ] ++
@@ -26,14 +29,25 @@ rustPlatform.buildRustPackage rec {
 
   nativeBuildInputs = [ pkg-config ];
 
-  cargoHash = "sha256-kUXHC/qXgukaUqaBykXB2ZWmfQEjzJuIyemr1ogVX1U=";
+  cargoHash = "sha256-0YPCBzidE1+LgIYk457eSoerLvQuuZs9cTd7uUt1Lr8=";
 
-  meta = with lib; {
+  # Fail for unclear reasons (only on darwin)
+  checkFlags = lib.optionals stdenv.isDarwin [
+    "--skip=speedtest::tests::test_get_configuration"
+    "--skip=speedtest::tests::test_get_server_list_with_config"
+  ];
+
+  passthru = {
+    updateScript = nix-update-script { };
+    tests.version = testers.testVersion { package = speedtest-rs; };
+  };
+
+  meta = {
     description = "Command line internet speedtest tool written in rust";
     homepage = "https://github.com/nelsonjchen/speedtest-rs";
     changelog = "https://github.com/nelsonjchen/speedtest-rs/blob/v${version}/CHANGELOG.md";
-    license = with licenses; [ mit asl20 ];
-    maintainers = with maintainers; [ GaetanLepage ];
+    license = with lib.licenses; [ mit asl20 ];
+    maintainers = with lib.maintainers; [ GaetanLepage ];
     mainProgram = "speedtest-rs";
   };
 }
diff --git a/third_party/nixpkgs/pkgs/tools/networking/sstp/default.nix b/third_party/nixpkgs/pkgs/tools/networking/sstp/default.nix
index 72745114a2..e6ae2fa0f5 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/sstp/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/networking/suckit/default.nix b/third_party/nixpkgs/pkgs/tools/networking/suckit/default.nix
index 3bd9f82546..c62ad29e01 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/suckit/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/networking/suckit/default.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-M4/vD1sVny7hAf4h56Z2xy7yuCqH/H3qHYod6haZOs0=";
   };
 
-  cargoSha256 = "sha256-JsH7TL9iITawuECm1hzs5oXFtnoUqLT4ug2CafoO2ao=";
+  cargoHash = "sha256-JsH7TL9iITawuECm1hzs5oXFtnoUqLT4ug2CafoO2ao=";
 
   nativeBuildInputs = [ pkg-config ];
 
diff --git a/third_party/nixpkgs/pkgs/tools/networking/surfraw/default.nix b/third_party/nixpkgs/pkgs/tools/networking/surfraw/default.nix
index 44e8877eb5..a2c714f3b6 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/surfraw/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/networking/surfraw/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Provides a fast unix command line interface to a variety of popular WWW search engines and other artifacts of power";
     homepage = "https://gitlab.com/surfraw/Surfraw";
-    maintainers = [];
+    maintainers = [ ];
     platforms = lib.platforms.all;
     license = lib.licenses.publicDomain;
   };
diff --git a/third_party/nixpkgs/pkgs/tools/networking/swaks/default.nix b/third_party/nixpkgs/pkgs/tools/networking/swaks/default.nix
index d4308b6037..a42d6773fc 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/swaks/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/networking/tinyfecvpn/default.nix b/third_party/nixpkgs/pkgs/tools/networking/tinyfecvpn/default.nix
index 896fbfc749..68e7e31af3 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/tinyfecvpn/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/networking/tox-node/default.nix b/third_party/nixpkgs/pkgs/tools/networking/tox-node/default.nix
index 5ff731ca2d..3f8857fff5 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/tox-node/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/networking/tox-node/default.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
 
   buildAndTestSubdir = "tox_node";
 
-  cargoSha256 = "sha256-L5IvYA32W8cTnuWjeljge5X+LZ912ugtcvEKXLqYZ+k=";
+  cargoHash = "sha256-L5IvYA32W8cTnuWjeljge5X+LZ912ugtcvEKXLqYZ+k=";
 
   passthru.updateScript = nix-update-script { };
 
diff --git a/third_party/nixpkgs/pkgs/tools/networking/transmission-rss/default.nix b/third_party/nixpkgs/pkgs/tools/networking/transmission-rss/default.nix
index 0367434613..3d6d80ef47 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/transmission-rss/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/networking/transmission-rss/default.nix
@@ -13,7 +13,7 @@ rustPlatform.buildRustPackage rec {
 
   cargoPatches = [ ./update-cargo-lock-version.patch ];
 
-  cargoSha256 = "sha256-QNMdqoxxY8ao2O44hJxZNgLrPwzu9+ieweTPc7pfFY4=";
+  cargoHash = "sha256-QNMdqoxxY8ao2O44hJxZNgLrPwzu9+ieweTPc7pfFY4=";
 
   nativeBuildInputs = [pkg-config];
   buildInputs = [openssl]
diff --git a/third_party/nixpkgs/pkgs/tools/networking/trurl/default.nix b/third_party/nixpkgs/pkgs/tools/networking/trurl/default.nix
index fe330172af..eb05a666b4 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/trurl/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/networking/trurl/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "trurl";
-  version = "0.13";
+  version = "0.14";
 
   src = fetchFromGitHub {
     owner = "curl";
     repo = pname;
     rev = "${pname}-${version}";
-    hash = "sha256-TkYZk4SoGAc0dxtxil4FjEhA53M+/dRmhc2kJfxWze8=";
+    hash = "sha256-BzsDvEsUntVwTPY/+kIKOhznDIabfioT2y4cofD+eTg=";
   };
 
   outputs = [ "out" "dev" "man" ];
diff --git a/third_party/nixpkgs/pkgs/tools/networking/udptunnel/default.nix b/third_party/nixpkgs/pkgs/tools/networking/udptunnel/default.nix
index 396d105ca2..e7b2832b40 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/udptunnel/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/networking/udptunnel/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     homepage = "https://code.google.com/archive/p/udptunnel/";
     description = "Tunnels TCP over UDP packets";
     license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [viric];
+    maintainers = [ ];
     platforms = with lib.platforms; linux;
     mainProgram = "udptunnel";
   };
diff --git a/third_party/nixpkgs/pkgs/tools/networking/wakelan/default.nix b/third_party/nixpkgs/pkgs/tools/networking/wakelan/default.nix
index 2b18d5fd60..a0c4f832fc 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/wakelan/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/networking/wakelan/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
       power on.
    '';
     license = lib.licenses.gpl2Plus;
-    maintainers = [ lib.maintainers.viric ];
+    maintainers = [ ];
     platforms = lib.platforms.unix;
     mainProgram = "wakelan";
   };
diff --git a/third_party/nixpkgs/pkgs/tools/networking/wg-netmanager/default.nix b/third_party/nixpkgs/pkgs/tools/networking/wg-netmanager/default.nix
index ed86813153..b4a34ba22a 100644
--- a/third_party/nixpkgs/pkgs/tools/networking/wg-netmanager/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/networking/wg-netmanager/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-Mr4+TW1yOePEHa7puz6mTRJ514LGQeiEwPW3NKupV/M=";
   };
 
-  cargoSha256 = "sha256-cOxkWMFPVmi+/BQWIvExzX5LDyC7C8kaTf5dGwfXj+s=";
+  cargoHash = "sha256-cOxkWMFPVmi+/BQWIvExzX5LDyC7C8kaTf5dGwfXj+s=";
 
   buildInputs = lib.optional stdenv.isDarwin Security;
 
diff --git a/third_party/nixpkgs/pkgs/tools/nix/nix-output-monitor/generated-package.nix b/third_party/nixpkgs/pkgs/tools/nix/nix-output-monitor/generated-package.nix
index 35b1f473cb..4e76a51941 100644
--- a/third_party/nixpkgs/pkgs/tools/nix/nix-output-monitor/generated-package.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/nix/nix-query-tree-viewer/default.nix b/third_party/nixpkgs/pkgs/tools/nix/nix-query-tree-viewer/default.nix
index f5c8a46131..8cd6c141cc 100644
--- a/third_party/nixpkgs/pkgs/tools/nix/nix-query-tree-viewer/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/nix/nix-query-tree-viewer/default.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
     gtk3
   ];
 
-  cargoSha256 = "sha256-NSLBIvgo5EdCvZq52d+UbAa7K4uOST++2zbhO9DW38E=";
+  cargoHash = "sha256-NSLBIvgo5EdCvZq52d+UbAa7K4uOST++2zbhO9DW38E=";
 
   meta = with lib; {
     description = "GTK viewer for the output of `nix store --query --tree`";
diff --git a/third_party/nixpkgs/pkgs/tools/nix/nixel/default.nix b/third_party/nixpkgs/pkgs/tools/nix/nixel/default.nix
index 70a0d92101..7f9fb9e723 100644
--- a/third_party/nixpkgs/pkgs/tools/nix/nixel/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/nix/nixel/default.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-dQ3wzBTjteqk9rju+FMAO+ydimnGu24Y2DEDLX/P+1A=";
   };
 
-  cargoSha256 = "sha256-1OsHs0W3ji9Kgpv7nGY9XyGxJ4c0faN2VuFLsdwkgKY=";
+  cargoHash = "sha256-1OsHs0W3ji9Kgpv7nGY9XyGxJ4c0faN2VuFLsdwkgKY=";
 
   # Package requires a non reproducible submodule
   # https://github.com/kamadorueda/nixel/blob/2873bd84bf4fc540d0ae8af062e109cc9ad40454/.gitmodules#L7
diff --git a/third_party/nixpkgs/pkgs/tools/nix/nixos-install-tools/default.nix b/third_party/nixpkgs/pkgs/tools/nix/nixos-install-tools/default.nix
index e0b24a4e70..6e98df7890 100644
--- a/third_party/nixpkgs/pkgs/tools/nix/nixos-install-tools/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/nix/nixos-install-tools/default.nix
@@ -8,6 +8,7 @@
   nixos-install-tools,
   runCommand,
   nixosTests,
+  binlore,
 }:
 let
   inherit (nixos {}) config;
@@ -62,6 +63,12 @@ in
       touch $out
     '';
   };
+
+  # no documented flags show signs of exec; skim of source suggests
+  # it's just --help execing man
+  passthru.binlore.out = binlore.synthesize nixos-install-tools ''
+    execer cannot bin/nixos-generate-config
+  '';
 }).overrideAttrs {
   inherit version;
   pname = "nixos-install-tools";
diff --git a/third_party/nixpkgs/pkgs/tools/nix/nixos-option/default.nix b/third_party/nixpkgs/pkgs/tools/nix/nixos-option/default.nix
index 8c8b26e9ad..b01ee13817 100644
--- a/third_party/nixpkgs/pkgs/tools/nix/nixos-option/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/nix/npins/default.nix b/third_party/nixpkgs/pkgs/tools/nix/npins/default.nix
index 06024fe789..7ea75baab1 100644
--- a/third_party/nixpkgs/pkgs/tools/nix/npins/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/nix/npins/default.nix
@@ -19,7 +19,7 @@ in rustPlatform.buildRustPackage rec {
   version = src.version;
   src = passthru.mkSource sources.npins;
 
-  cargoSha256 = "sha256-YwMypBl+P1ygf4zUbkZlq4zPrOzf+lPOz2FLg2/xI3k=";
+  cargoHash = "sha256-YwMypBl+P1ygf4zUbkZlq4zPrOzf+lPOz2FLg2/xI3k=";
 
   buildInputs = lib.optional stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security SystemConfiguration ]);
   nativeBuildInputs = [ makeWrapper ];
diff --git a/third_party/nixpkgs/pkgs/tools/nix/rnix-hashes/default.nix b/third_party/nixpkgs/pkgs/tools/nix/rnix-hashes/default.nix
index b9a98b184f..d69c7e6ef9 100644
--- a/third_party/nixpkgs/pkgs/tools/nix/rnix-hashes/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/nix/rnix-hashes/default.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
     })
   ];
 
-  cargoSha256 = "sha256-p6W9NtOKzVViyFq5SQvnIsik7S3mqUqxI/05OiC+P+Q=";
+  cargoHash = "sha256-p6W9NtOKzVViyFq5SQvnIsik7S3mqUqxI/05OiC+P+Q=";
 
   meta = with lib; {
     description = "Nix Hash Converter";
diff --git a/third_party/nixpkgs/pkgs/tools/nix/statix/default.nix b/third_party/nixpkgs/pkgs/tools/nix/statix/default.nix
index 8b2b26420e..9cc48659d4 100644
--- a/third_party/nixpkgs/pkgs/tools/nix/statix/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/nix/statix/default.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-bMs3XMiGP6sXCqdjna4xoV6CANOIWuISSzCaL5LYY4c=";
   };
 
-  cargoSha256 = "sha256-QF7P0CWlKfBzVQC//eKhf/u1qV9AfLIJDxWDDWzMG8g=";
+  cargoHash = "sha256-QF7P0CWlKfBzVQC//eKhf/u1qV9AfLIJDxWDDWzMG8g=";
 
   buildFeatures = lib.optional withJson "json";
 
diff --git a/third_party/nixpkgs/pkgs/tools/package-management/dnf5/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/dnf5/default.nix
index 81c4a10c08..b0cbba31bf 100644
--- a/third_party/nixpkgs/pkgs/tools/package-management/dnf5/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/package-management/dnf5/default.nix
@@ -1,59 +1,66 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, cmake
-, createrepo_c
-, doxygen
-, gettext
-, help2man
-, pkg-config
-, python3Packages
-, cppunit
-, fmt
-, json_c
-, libmodulemd
-, librepo
-, libsmartcols
-, libsolv
-, libxml2
-, libyaml
-, pcre2
-, rpm
-, sdbus-cpp
-, sphinx
-, sqlite
-, systemd
-, testers
-, toml11
-, zchunk
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  createrepo_c,
+  doxygen,
+  gettext,
+  help2man,
+  pkg-config,
+  python3Packages,
+  cppunit,
+  fmt,
+  json_c,
+  libmodulemd,
+  librepo,
+  libsmartcols,
+  libsolv,
+  libxml2,
+  libyaml,
+  pcre2,
+  rpm,
+  sdbus-cpp,
+  sphinx,
+  sqlite,
+  systemd,
+  testers,
+  toml11,
+  zchunk,
+  nix-update-script,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "dnf5";
-  version = "5.1.15";
+  version = "5.2.5.0";
 
-  outputs = [ "out" "man" ];
+  outputs = [
+    "out"
+    "man"
+  ];
 
   src = fetchFromGitHub {
     owner = "rpm-software-management";
     repo = "dnf5";
     rev = finalAttrs.version;
-    hash = "sha256-IDF/jRnPpGbHk5bY7plkCO1x/i10H+HCcU88JI4EHvs=";
+    hash = "sha256-zH+TDtVMEsgKZR0EA+G8SB1PZyiTfhnG7n6lupeoWyI=";
   };
 
-  nativeBuildInputs = [
-    cmake
-    createrepo_c
-    doxygen
-    gettext
-    help2man
-    pkg-config
-    sphinx
-  ] ++ (with python3Packages; [
-    breathe
-    sphinx-autoapi
-    sphinx-rtd-theme
-  ]);
+  nativeBuildInputs =
+    [
+      cmake
+      createrepo_c
+      doxygen
+      gettext
+      help2man
+      pkg-config
+      sphinx
+    ]
+    ++ (with python3Packages; [
+      breathe
+      sphinx-autoapi
+      sphinx-rtd-theme
+    ]);
 
   buildInputs = [
     cppunit
@@ -81,6 +88,7 @@ stdenv.mkDerivation (finalAttrs: {
     "-DWITH_PERL5=OFF"
     "-DWITH_PYTHON3=OFF"
     "-DWITH_RUBY=OFF"
+    "-DWITH_SYSTEMD=OFF"
     "-DWITH_PLUGIN_RHSM=OFF" # Red Hat Subscription Manager plugin
     # the cmake package does not handle absolute CMAKE_INSTALL_INCLUDEDIR correctly
     # (setting it to an absolute path causes include files to go to $out/$out/include,
@@ -105,8 +113,9 @@ stdenv.mkDerivation (finalAttrs: {
 
   dontFixCmake = true;
 
-  passthru.tests = {
-    version = testers.testVersion { package = finalAttrs.finalPackage; };
+  passthru = {
+    tests.version = testers.testVersion { package = finalAttrs.finalPackage; };
+    updateScript = nix-update-script { };
   };
 
   meta = with lib; {
@@ -114,7 +123,10 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/rpm-software-management/dnf5";
     changelog = "https://github.com/rpm-software-management/dnf5/releases/tag/${finalAttrs.version}";
     license = licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [ malt3 katexochen ];
+    maintainers = with lib.maintainers; [
+      malt3
+      katexochen
+    ];
     mainProgram = "dnf5";
     platforms = platforms.linux ++ platforms.darwin;
   };
diff --git a/third_party/nixpkgs/pkgs/tools/package-management/holo-build/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/holo-build/default.nix
index 41444e8533..cef9c6c5fb 100644
--- a/third_party/nixpkgs/pkgs/tools/package-management/holo-build/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/package-management/librepo/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/librepo/default.nix
index 1d43efe3f8..4d263e3e1d 100644
--- a/third_party/nixpkgs/pkgs/tools/package-management/librepo/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/package-management/librepo/default.nix
@@ -1,33 +1,43 @@
-{ lib, stdenv
-, fetchFromGitHub
-, cmake
-, python
-, pkg-config
-, libxml2
-, glib
-, openssl
-, zchunk
-, curl
-, check
-, gpgme
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  python,
+  pkg-config,
+  libxml2,
+  glib,
+  openssl,
+  zchunk,
+  curl,
+  check,
+  gpgme,
+  libselinux,
+  nix-update-script,
+  doxygen,
 }:
 
 stdenv.mkDerivation rec {
-  version = "1.15.1";
+  version = "1.18.0";
   pname = "librepo";
 
-  outputs = [ "out" "dev" "py" ];
+  outputs = [
+    "out"
+    "dev"
+    "py"
+  ];
 
   src = fetchFromGitHub {
     owner = "rpm-software-management";
     repo = "librepo";
     rev = version;
-    sha256 = "sha256-XVjVu+UTIDbrKHmfJ2zZBLp/h0cLCZFxv/XZ0Iy8VPI=";
+    sha256 = "sha256-u9dE1TqqZp/cHIgqnRDgOT4gU7XNLnSnmAFJxLKnDSQ=";
   };
 
   nativeBuildInputs = [
     cmake
     pkg-config
+    doxygen
   ];
 
   buildInputs = [
@@ -39,6 +49,7 @@ stdenv.mkDerivation rec {
     check
     gpgme
     zchunk
+    libselinux
   ];
 
   # librepo/fastestmirror.h includes curl/curl.h, and pkg-config specfile refers to others in here
@@ -54,6 +65,8 @@ stdenv.mkDerivation rec {
     moveToOutput "lib/${python.libPrefix}" "$py"
   '';
 
+  passthru.updateScript = nix-update-script { };
+
   meta = with lib; {
     description = "Library providing C and Python (libcURL like) API for downloading linux repository metadata and packages";
     homepage = "https://rpm-software-management.github.io/librepo/";
diff --git a/third_party/nixpkgs/pkgs/tools/package-management/lix/common.nix b/third_party/nixpkgs/pkgs/tools/package-management/lix/common.nix
index 8c89cf9fef..f349e06f54 100644
--- a/third_party/nixpkgs/pkgs/tools/package-management/lix/common.nix
+++ b/third_party/nixpkgs/pkgs/tools/package-management/lix/common.nix
@@ -188,7 +188,6 @@ stdenv.mkDerivation {
   mesonFlags =
     [
       # LTO optimization
-      (lib.mesonBool "b_lto" (!stdenv.isDarwin))
       (lib.mesonEnable "gc" true)
       (lib.mesonBool "enable-tests" true)
       (lib.mesonBool "enable-docs" enableDocumentation)
@@ -203,13 +202,6 @@ stdenv.mkDerivation {
       (lib.mesonOption "sandbox-shell" "${busybox-sandbox-shell}/bin/busybox")
     ];
 
-  # Needed for Meson to find Boost.
-  # https://github.com/NixOS/nixpkgs/issues/86131.
-  env = {
-    BOOST_INCLUDEDIR = "${lib.getDev boost}/include";
-    BOOST_LIBRARYDIR = "${lib.getLib boost}/lib";
-  };
-
   postInstall =
     ''
       mkdir -p $doc/nix-support
diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nix-doc/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/nix-doc/default.nix
index cea3fb099d..53b05bccf3 100644
--- a/third_party/nixpkgs/pkgs/tools/package-management/nix-doc/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/package-management/nix-doc/default.nix
@@ -35,23 +35,21 @@ 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";
   };
 
-  cargoSha256 = "sha256-CHagzXTG9AfrFd3WmHanQ+YddMgmVxSuB8vK98A1Mlw=";
+  cargoHash = "sha256-CHagzXTG9AfrFd3WmHanQ+YddMgmVxSuB8vK98A1Mlw=";
 
   meta = with lib; {
     description = "Interactive Nix documentation tool";
     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/third_party/nixpkgs/pkgs/tools/package-management/nix-du/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/nix-du/default.nix
index 5ef86d033f..bfa6959cf3 100644
--- a/third_party/nixpkgs/pkgs/tools/package-management/nix-du/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/package-management/nix-du/default.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-HfmMZVlsdg9hTWGUihl6OlQAp/n1XRvPLfAKJ8as8Ew=";
   };
 
-  cargoSha256 = "sha256-oUxxuBqec4aI2h8BAn1WSA44UU7f5APkv0DIwuSun0M=";
+  cargoHash = "sha256-oUxxuBqec4aI2h8BAn1WSA44UU7f5APkv0DIwuSun0M=";
 
   doCheck = true;
   nativeCheckInputs = [ nix graphviz ];
diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nix-simple-deploy/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/nix-simple-deploy/default.nix
index 647a11b01f..3e119f9488 100644
--- a/third_party/nixpkgs/pkgs/tools/package-management/nix-simple-deploy/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/package-management/nix-simple-deploy/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1qq4fbsd2mvxblsggwbnh88mj18f3vrfzv1kgc7a92pfiwxznq8r";
   };
 
-  cargoSha256 = "1r6dl7qipbyyvjcd3l9ynawjln1g1qzvw5za6nyjcf41dzv48m8x";
+  cargoHash = "sha256-HVVE9m+BOCa9NeoXvj8OL1gqubI+0dGY3N6vG/GhzeQ=";
 
   nativeBuildInputs = [ makeWrapper ];
 
diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nix-template/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/nix-template/default.nix
index c98bae7e44..60f08b8db6 100644
--- a/third_party/nixpkgs/pkgs/tools/package-management/nix-template/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/package-management/nix-template/default.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-42u5FmTIKHpfQ2zZQXIrFkAN2/XvU0wWnCRrQkQzcNI=";
   };
 
-  cargoSha256 = "sha256-f8Th6SbV66Uukqh1Cb5uQVa844qw1PmBB9W7EMXMU4E=";
+  cargoHash = "sha256-f8Th6SbV66Uukqh1Cb5uQVa844qw1PmBB9W7EMXMU4E=";
 
   nativeBuildInputs = [
     installShellFiles
@@ -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/third_party/nixpkgs/pkgs/tools/package-management/packagekit/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/packagekit/default.nix
index 2e150f692a..d0a4ef21d3 100644
--- a/third_party/nixpkgs/pkgs/tools/package-management/packagekit/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/package-management/packagekit/default.nix
@@ -29,7 +29,7 @@
 
 stdenv.mkDerivation rec {
   pname = "packagekit";
-  version = "1.2.8";
+  version = "1.3.0";
 
   outputs = [ "out" "dev" "devdoc" ];
 
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
     owner = "PackageKit";
     repo = "PackageKit";
     rev = "v${version}";
-    hash = "sha256-k51uQHar/uvdTDj/Ud60Oh6H7rfjEc9bfQnH5cvg8hc=";
+    hash = "sha256-MYZFI1Q90F/AXVSJJBhmw+E7IMLXrdwmSuFJwv5D/z4=";
   };
 
   buildInputs = [
diff --git a/third_party/nixpkgs/pkgs/tools/package-management/packagekit/qt.nix b/third_party/nixpkgs/pkgs/tools/package-management/packagekit/qt.nix
index 897f8d9e7b..79350e340f 100644
--- a/third_party/nixpkgs/pkgs/tools/package-management/packagekit/qt.nix
+++ b/third_party/nixpkgs/pkgs/tools/package-management/packagekit/qt.nix
@@ -5,13 +5,13 @@ let
   isQt6 = lib.versions.major qttools.version == "6";
 in stdenv.mkDerivation rec {
   pname = "packagekit-qt";
-  version = "1.1.1";
+  version = "1.1.2";
 
   src = fetchFromGitHub {
     owner  = "hughsie";
     repo   = "PackageKit-Qt";
     rev    = "v${version}";
-    sha256 = "sha256-pwDMLd+Gpl0P2ImPjGeZpKAOJ4dH5+P1se0l1qm5Ui0=";
+    sha256 = "sha256-rLNeVjzIT18qUZgj6Qcf7E59CL4gx/ArYJfs9KHrqNs=";
   };
 
   buildInputs = [ packagekit ];
diff --git a/third_party/nixpkgs/pkgs/tools/package-management/poetry/plugins/poetry-plugin-export.nix b/third_party/nixpkgs/pkgs/tools/package-management/poetry/plugins/poetry-plugin-export.nix
index 08b94a0fd2..aa365ebb36 100644
--- a/third_party/nixpkgs/pkgs/tools/package-management/poetry/plugins/poetry-plugin-export.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/security/acsccid/default.nix b/third_party/nixpkgs/pkgs/tools/security/acsccid/default.nix
index dea5c14fc3..74a0c39cb2 100644
--- a/third_party/nixpkgs/pkgs/tools/security/acsccid/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/security/aide/default.nix b/third_party/nixpkgs/pkgs/tools/security/aide/default.nix
index a0cbd7da0f..a2b5d31c85 100644
--- a/third_party/nixpkgs/pkgs/tools/security/aide/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/security/arti/default.nix b/third_party/nixpkgs/pkgs/tools/security/arti/default.nix
index e9a4680a0b..321ab52cce 100644
--- a/third_party/nixpkgs/pkgs/tools/security/arti/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/security/authoscope/default.nix b/third_party/nixpkgs/pkgs/tools/security/authoscope/default.nix
index f21df67035..b44f8bec2f 100644
--- a/third_party/nixpkgs/pkgs/tools/security/authoscope/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/authoscope/default.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-SKgb/N249s0+Rb59moBT/MeFb4zAAElCMQJto0diyUk=";
   };
 
-  cargoSha256 = "sha256-rSHuKy86iJNLAKSVcb7fn7A/cc75EOc97jGI14EaC6k=";
+  cargoHash = "sha256-rSHuKy86iJNLAKSVcb7fn7A/cc75EOc97jGI14EaC6k=";
 
   nativeBuildInputs = [
     installShellFiles
diff --git a/third_party/nixpkgs/pkgs/tools/security/brutespray/default.nix b/third_party/nixpkgs/pkgs/tools/security/brutespray/default.nix
index 74f49fbab4..f954f666de 100644
--- a/third_party/nixpkgs/pkgs/tools/security/brutespray/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/security/ccrypt/default.nix b/third_party/nixpkgs/pkgs/tools/security/ccrypt/default.nix
index 9da5a6d42c..d8fb667532 100644
--- a/third_party/nixpkgs/pkgs/tools/security/ccrypt/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/ccrypt/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     homepage = "https://ccrypt.sourceforge.net/";
     description = "Utility for encrypting and decrypting files and streams with AES-256";
     license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [viric];
+    maintainers = [ ];
     platforms = with lib.platforms; all;
   };
 }
diff --git a/third_party/nixpkgs/pkgs/tools/security/certstrap/default.nix b/third_party/nixpkgs/pkgs/tools/security/certstrap/default.nix
index 5761763553..2537d1ecbb 100644
--- a/third_party/nixpkgs/pkgs/tools/security/certstrap/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/security/ecdsautils/default.nix b/third_party/nixpkgs/pkgs/tools/security/ecdsautils/default.nix
index 0a43260eb8..69ce4aa511 100644
--- a/third_party/nixpkgs/pkgs/tools/security/ecdsautils/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/security/exploitdb/default.nix b/third_party/nixpkgs/pkgs/tools/security/exploitdb/default.nix
index 8c6601ef9a..d3ea9aaf46 100644
--- a/third_party/nixpkgs/pkgs/tools/security/exploitdb/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/exploitdb/default.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "exploitdb";
-  version = "2024-07-17";
+  version = "2024-07-27";
 
   src = fetchFromGitLab {
     owner = "exploit-database";
     repo = "exploitdb";
     rev = "refs/tags/${version}";
-    hash = "sha256-PTBLoFuNU3ZcuvJa22iYWeX5m/SjH/389bxTrKmD+c0=";
+    hash = "sha256-V0J/Pt1K1jC+ig8ofCrGb7lbQrRah80l1rHeRLXY0+A=";
   };
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/third_party/nixpkgs/pkgs/tools/security/genpass/default.nix b/third_party/nixpkgs/pkgs/tools/security/genpass/default.nix
index da6b5c5bda..0c326c2dac 100644
--- a/third_party/nixpkgs/pkgs/tools/security/genpass/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/genpass/default.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "UyEgOlKtDyneRteN3jHA2BJlu5U1HFL8HA2MTQz5rns=";
   };
 
-  cargoSha256 = "ls3tzZ+gtZQlObmbtwJDq6N/f5nY+Ps7RL5R/fR5Vgg=";
+  cargoHash = "sha256-ls3tzZ+gtZQlObmbtwJDq6N/f5nY+Ps7RL5R/fR5Vgg=";
 
   buildInputs = lib.optionals stdenv.isDarwin [ CoreFoundation libiconv Security ];
 
diff --git a/third_party/nixpkgs/pkgs/tools/security/gitleaks/default.nix b/third_party/nixpkgs/pkgs/tools/security/gitleaks/default.nix
index 47908e95c5..4a866efca1 100644
--- a/third_party/nixpkgs/pkgs/tools/security/gitleaks/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/gitleaks/default.nix
@@ -29,7 +29,7 @@ buildGoModule rec {
 
   nativeBuildInputs = [ installShellFiles ];
 
-  # With v8 the config tests are are blocking
+  # With v8 the config tests are blocking
   doCheck = false;
 
   postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
diff --git a/third_party/nixpkgs/pkgs/tools/security/grap/default.nix b/third_party/nixpkgs/pkgs/tools/security/grap/default.nix
index 1d77e9bf99..4d8f347e04 100644
--- a/third_party/nixpkgs/pkgs/tools/security/grap/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/grap/default.nix
@@ -16,12 +16,12 @@ stdenv.mkDerivation rec {
     cmake
     flex
     python3
+    swig4
   ];
 
   buildInputs = [
     boost.all
     libseccomp
-    swig4
   ];
 
   strictDeps = true;
diff --git a/third_party/nixpkgs/pkgs/tools/security/hashcat/default.nix b/third_party/nixpkgs/pkgs/tools/security/hashcat/default.nix
index 56399e6163..dc3a5390da 100644
--- a/third_party/nixpkgs/pkgs/tools/security/hashcat/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/hashcat/default.nix
@@ -1,5 +1,5 @@
 { lib, stdenv
-, addOpenGLRunpath
+, addDriverRunpath
 , config
 , cudaPackages ? {}
 , cudaSupport ? config.cudaSupport
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     makeWrapper
   ] ++ lib.optionals cudaSupport [
-    addOpenGLRunpath
+    addDriverRunpath
   ];
 
   buildInputs = [ opencl-headers xxHash ]
@@ -71,7 +71,7 @@ stdenv.mkDerivation rec {
   '' + lib.optionalString cudaSupport ''
     for program in $out/bin/hashcat $out/bin/.hashcat-wrapped; do
       isELF "$program" || continue
-      addOpenGLRunpath "$program"
+      addDriverRunpath "$program"
     done
   '';
 
diff --git a/third_party/nixpkgs/pkgs/tools/security/hologram/default.nix b/third_party/nixpkgs/pkgs/tools/security/hologram/default.nix
index 86bc429374..139f8fa18b 100644
--- a/third_party/nixpkgs/pkgs/tools/security/hologram/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/security/jwx/default.nix b/third_party/nixpkgs/pkgs/tools/security/jwx/default.nix
index b1dbc25b08..addd3f15bc 100644
--- a/third_party/nixpkgs/pkgs/tools/security/jwx/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/jwx/default.nix
@@ -5,13 +5,13 @@
 
 buildGoModule rec {
   pname = "jwx";
-  version = "2.1.0";
+  version = "2.1.1";
 
   src = fetchFromGitHub {
     owner = "lestrrat-go";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-In9/RmcqiOFT1QceWls8gzgzgkBoKeUE05j0cHCecTU=";
+    hash = "sha256-cYNqe5BZJSYWD7XegVEm5prQjC6uX+JZtJ7AZdFbPu4=";
   };
 
   vendorHash = "sha256-ZS7xliFymXTE8hlc3GEMNonP5sJTZGirw5YQNzPCl3Y=";
diff --git a/third_party/nixpkgs/pkgs/tools/security/keyscope/default.nix b/third_party/nixpkgs/pkgs/tools/security/keyscope/default.nix
index 7601f22445..ae5bd80e29 100644
--- a/third_party/nixpkgs/pkgs/tools/security/keyscope/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/keyscope/default.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-SrBtgirg52q7gM3GZsJsV8ASACvb4sYv5HDbyItpjbk=";
   };
 
-  cargoSha256 = "sha256-MFP3AqlfaclmZxRwaWFw6hsZwCQMRKJEyFEyUN+QLqo=";
+  cargoHash = "sha256-MFP3AqlfaclmZxRwaWFw6hsZwCQMRKJEyFEyUN+QLqo=";
 
   nativeBuildInputs = [ pkg-config ];
 
diff --git a/third_party/nixpkgs/pkgs/tools/security/lastpass-cli/default.nix b/third_party/nixpkgs/pkgs/tools/security/lastpass-cli/default.nix
index c20157cb41..9da88fc622 100644
--- a/third_party/nixpkgs/pkgs/tools/security/lastpass-cli/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/security/lethe/default.nix b/third_party/nixpkgs/pkgs/tools/security/lethe/default.nix
index eb34742938..ff9b297d53 100644
--- a/third_party/nixpkgs/pkgs/tools/security/lethe/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/lethe/default.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-y2D/80pnpYpTl+q9COTQkvtj9lzBlOWuMcnn5WFnX8E=";
   };
 
-  cargoSha256 = "sha256-SFNNpbHZdDJvH95f+VWyVKnQp3OJwQmCOqHtLAhhkOk=";
+  cargoHash = "sha256-SFNNpbHZdDJvH95f+VWyVKnQp3OJwQmCOqHtLAhhkOk=";
 
   buildInputs = lib.optional stdenv.isDarwin Security;
 
diff --git a/third_party/nixpkgs/pkgs/tools/security/medusa/default.nix b/third_party/nixpkgs/pkgs/tools/security/medusa/default.nix
index b33f36bd30..63e56bb5a9 100644
--- a/third_party/nixpkgs/pkgs/tools/security/medusa/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/security/metasploit/shell.nix b/third_party/nixpkgs/pkgs/tools/security/metasploit/shell.nix
index ccd510f63a..4076205815 100644
--- a/third_party/nixpkgs/pkgs/tools/security/metasploit/shell.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/security/mkp224o/default.nix b/third_party/nixpkgs/pkgs/tools/security/mkp224o/default.nix
index d6ee40e6f5..53b0e38a0d 100644
--- a/third_party/nixpkgs/pkgs/tools/security/mkp224o/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/security/nitrokey-app2/default.nix b/third_party/nixpkgs/pkgs/tools/security/nitrokey-app2/default.nix
index 791bf7cf30..c675bcc982 100644
--- a/third_party/nixpkgs/pkgs/tools/security/nitrokey-app2/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/security/onlykey/onlykey.nix b/third_party/nixpkgs/pkgs/tools/security/onlykey/onlykey.nix
index 22e8b62607..b154efb747 100644
--- a/third_party/nixpkgs/pkgs/tools/security/onlykey/onlykey.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/onlykey/onlykey.nix
@@ -8,7 +8,7 @@ let
   nodeEnv = import ../../../development/node-packages/node-env.nix {
     inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript;
     inherit pkgs nodejs;
-    libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null;
+    libtool = if pkgs.stdenv.isDarwin then pkgs.cctools or pkgs.darwin.cctools else null;
   };
 in
 import ./node-packages.nix {
diff --git a/third_party/nixpkgs/pkgs/tools/security/pass/rofi-pass.nix b/third_party/nixpkgs/pkgs/tools/security/pass/rofi-pass.nix
index 4e2ad4b53c..e204c14a23 100644
--- a/third_party/nixpkgs/pkgs/tools/security/pass/rofi-pass.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/security/passff-host/default.nix b/third_party/nixpkgs/pkgs/tools/security/passff-host/default.nix
index 3ec277ce27..d5cf2f8267 100644
--- a/third_party/nixpkgs/pkgs/tools/security/passff-host/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/security/pcsclite/default.nix b/third_party/nixpkgs/pkgs/tools/security/pcsclite/default.nix
index e75be683a6..eedec6b239 100644
--- a/third_party/nixpkgs/pkgs/tools/security/pcsclite/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/pcsclite/default.nix
@@ -1,8 +1,9 @@
 { stdenv
 , lib
 , fetchFromGitLab
-, autoreconfHook
-, autoconf-archive
+, fetchpatch
+, meson
+, ninja
 , flex
 , pkg-config
 , perl
@@ -15,6 +16,7 @@
 , systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemdLibs
 , udevSupport ? dbusSupport
 , libusb1
+, Foundation
 , IOKit
 , testers
 , nix-update-script
@@ -27,7 +29,7 @@ assert systemdSupport -> dbusSupport;
 
 stdenv.mkDerivation (finalAttrs: {
   inherit pname;
-  version = "2.1.0";
+  version = "2.2.3";
 
   outputs = [ "out" "lib" "dev" "doc" "man" ];
 
@@ -36,35 +38,46 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "rousseau";
     repo = "PCSC";
     rev = "refs/tags/${finalAttrs.version}";
-    hash = "sha256-aJKI6pWrZJFmiTxZ9wgCuxKRWRMFVRAkzlo+tSqV8B4=";
+    hash = "sha256-hKyxXqZaqg8KGFoBWhRHV1/50uoxqiG0RsYtgw2BuQ4=";
   };
 
-  configureFlags = [
-    "--enable-confdir=/etc"
-    # The OS should care on preparing the drivers into this location
-    "--enable-usbdropdir=/var/lib/pcsc/drivers"
-    (lib.enableFeature systemdSupport "libsystemd")
-    (lib.enableFeature polkitSupport "polkit")
-    "--enable-ipcdir=/run/pcscd"
-  ] ++ lib.optionals systemdSupport [
-    "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system"
-  ] ++ lib.optionals (!udevSupport) [
-    "--disable-libudev"
+  # fix build with macOS 11 SDK
+  patches = [
+    (fetchpatch {
+      url = "https://salsa.debian.org/rousseau/PCSC/-/commit/f41fdaaf7c82bc270af6d7439c6da037bf149be8.patch";
+      revert = true;
+      hash = "sha256-8A76JfYqcILi52X9l/uIpJXeRJDf2dkrNEToOsxGZXk=";
+    })
   ];
 
-  makeFlags = [
-    "POLICY_DIR=$(out)/share/polkit-1/actions"
+  mesonFlags = [
+    (lib.mesonOption "sysconfdir" "/etc")
+    # The OS should care on preparing the drivers into this location
+    (lib.mesonOption "usbdropdir" "/var/lib/pcsc/drivers")
+    (lib.mesonBool "libsystemd" systemdSupport)
+    (lib.mesonBool "polkit" polkitSupport)
+    (lib.mesonOption "ipcdir" "/run/pcscd")
+  ] ++ lib.optionals systemdSupport [
+    (lib.mesonOption "systemdunit" "system")
+  ] ++ lib.optionals (!udevSupport) [
+    (lib.mesonBool "libudev" false)
   ];
 
   # disable building pcsc-wirecheck{,-gen} when cross compiling
   # see also: https://github.com/LudovicRousseau/PCSC/issues/25
-  postPatch = lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
-    substituteInPlace src/Makefile.am \
-      --replace-fail "noinst_PROGRAMS = testpcsc pcsc-wirecheck pcsc-wirecheck-gen" \
-                     "noinst_PROGRAMS = testpcsc"
-  '' + ''
+  postPatch = ''
     substituteInPlace src/libredirect.c src/spy/libpcscspy.c \
       --replace-fail "libpcsclite_real.so.1" "$lib/lib/libpcsclite_real.so.1"
+  '' + lib.optionalString systemdSupport ''
+    substituteInPlace meson.build \
+      --replace-fail \
+        "systemdsystemunitdir = systemd.get_variable(pkgconfig : 'systemd' + unit + 'unitdir')" \
+        "systemdsystemunitdir = '${placeholder "out"}/lib/systemd/system'"
+  '' + lib.optionalString polkitSupport ''
+    substituteInPlace meson.build \
+      --replace-fail \
+        "install_dir : polkit_dep.get_variable('policydir')" \
+        "install_dir : '${placeholder "out"}/share/polkit-1/actions'"
   '';
 
   postInstall = ''
@@ -72,11 +85,9 @@ stdenv.mkDerivation (finalAttrs: {
     moveToOutput bin/pcsc-spy "$dev"
   '';
 
-  enableParallelBuilding = true;
-
   nativeBuildInputs = [
-    autoreconfHook
-    autoconf-archive
+    meson
+    ninja
     flex
     pkg-config
     perl
@@ -85,7 +96,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [ python3 ]
     ++ lib.optionals systemdSupport [ systemdLibs ]
     ++ lib.optionals (!systemdSupport && udevSupport) [ udev ]
-    ++ lib.optionals stdenv.isDarwin [ IOKit ]
+    ++ lib.optionals stdenv.isDarwin [ Foundation IOKit ]
     ++ lib.optionals dbusSupport [ dbus ]
     ++ lib.optionals polkitSupport [ polkit ]
     ++ lib.optionals (!udevSupport) [ libusb1 ];
diff --git a/third_party/nixpkgs/pkgs/tools/security/secp256k1/default.nix b/third_party/nixpkgs/pkgs/tools/security/secp256k1/default.nix
index 335d9c5c18..193a5433b5 100644
--- a/third_party/nixpkgs/pkgs/tools/security/secp256k1/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/security/sheesy-cli/default.nix b/third_party/nixpkgs/pkgs/tools/security/sheesy-cli/default.nix
index dfa26c0399..bbe43cb697 100644
--- a/third_party/nixpkgs/pkgs/tools/security/sheesy-cli/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/sheesy-cli/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-rJ/V9pJgmqERgjD0FQ/oqhZQlIeN4/3ECx15/FOUQdA=";
   };
 
-  cargoSha256 = "159a5ph1gxwcgahyr8885lq3c1w76nxzfrfdpyqixqrr7jzx2rd3";
+  cargoHash = "sha256-o2XRvzw54x6xv81l97s1hwc2MC0Ioeyheoz3F+AtKpU=";
   cargoDepsName = pname;
 
   nativeBuildInputs = [ libgpg-error gpgme gettext installShellFiles ];
diff --git a/third_party/nixpkgs/pkgs/tools/security/shisho/default.nix b/third_party/nixpkgs/pkgs/tools/security/shisho/default.nix
index 6cfbb8552b..a4635b0363 100644
--- a/third_party/nixpkgs/pkgs/tools/security/shisho/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/shisho/default.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-G7sHaDq+F5lXNaF1sSLUecdjZbCejJE79P4AQifKdFY=";
     fetchSubmodules = true;
   };
-  cargoSha256 = "sha256-xd4andytmDMOIT+3DkmUC9fkxxGJ6yRY2WSdnGB6ZwY=";
+  cargoHash = "sha256-xd4andytmDMOIT+3DkmUC9fkxxGJ6yRY2WSdnGB6ZwY=";
 
   nativeBuildInputs = [
     installShellFiles
diff --git a/third_party/nixpkgs/pkgs/tools/security/simple-tpm-pk11/default.nix b/third_party/nixpkgs/pkgs/tools/security/simple-tpm-pk11/default.nix
index 7d879aa497..842eb342c2 100644
--- a/third_party/nixpkgs/pkgs/tools/security/simple-tpm-pk11/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/security/snallygaster/default.nix b/third_party/nixpkgs/pkgs/tools/security/snallygaster/default.nix
index 2f9ad98743..9045f82a42 100644
--- a/third_party/nixpkgs/pkgs/tools/security/snallygaster/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/security/ssss/default.nix b/third_party/nixpkgs/pkgs/tools/security/ssss/default.nix
index 61d1011112..9d7b1a894b 100644
--- a/third_party/nixpkgs/pkgs/tools/security/ssss/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/security/step-ca/default.nix b/third_party/nixpkgs/pkgs/tools/security/step-ca/default.nix
index e918fd989e..549cfa6a52 100644
--- a/third_party/nixpkgs/pkgs/tools/security/step-ca/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/step-ca/default.nix
@@ -19,7 +19,7 @@ buildGoModule rec {
     owner = "smallstep";
     repo = "certificates";
     rev = "refs/tags/v${version}";
-    hash = "sha256-G+oahvBbMW8vs1DublFAC1rREmQ7Q1r7rNNS0+gnfPE=";
+    hash = "sha256-byVWNab6Q3yryluhMomzLkRNfXQ/68pAq+YGFjbvX1o=";
   };
 
   vendorHash = "sha256-gQEGCbVgtKIaUgBkfpVwLXoUg1EUhaQFn9JZvV5Rjhc=";
diff --git a/third_party/nixpkgs/pkgs/tools/security/sudo-rs/default.nix b/third_party/nixpkgs/pkgs/tools/security/sudo-rs/default.nix
index f4ea401e7e..155d23dbad 100644
--- a/third_party/nixpkgs/pkgs/tools/security/sudo-rs/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/sudo-rs/default.nix
@@ -11,15 +11,15 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "sudo-rs";
-  version = "0.2.2";
+  version = "0.2.3";
 
   src = fetchFromGitHub {
-    owner = "memorysafety";
+    owner = "trifectatechfoundation";
     repo = "sudo-rs";
     rev = "v${version}";
-    hash = "sha256-Fc9NgKo8Be8AqB1YcH/oH514f3pOjFtqNBIC+3xwagY=";
+    hash = "sha256-aXKkEdg44AJTcaGyllQmyUON3Z+irIatz06/l0cbi+E=";
   };
-  cargoHash = "sha256-1XhdMHGZZOmSFuVW3Oa1Xwjy3dzkgJOE7h24Ly2F3ps=";
+  cargoHash = "sha256-laTcGi2pwc9uWjum03PviyakVMmjijKgxfIPjIpoRy8=";
 
   nativeBuildInputs = [ installShellFiles pandoc ];
 
@@ -71,7 +71,7 @@ rustPlatform.buildRustPackage rec {
 
   meta = with lib; {
     description = "Memory safe implementation of sudo and su";
-    homepage = "https://github.com/memorysafety/sudo-rs";
+    homepage = "https://github.com/trifectatechfoundation/sudo-rs";
     changelog = "${meta.homepage}/blob/v${version}/CHANGELOG.md";
     license = with licenses; [ asl20 mit ];
     maintainers = with maintainers; [ nicoo ];
diff --git a/third_party/nixpkgs/pkgs/tools/security/trufflehog/default.nix b/third_party/nixpkgs/pkgs/tools/security/trufflehog/default.nix
index d7aa4577fb..2e7f754cf3 100644
--- a/third_party/nixpkgs/pkgs/tools/security/trufflehog/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/trufflehog/default.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "trufflehog";
-  version = "3.80.0";
+  version = "3.80.2";
 
   src = fetchFromGitHub {
     owner = "trufflesecurity";
     repo = "trufflehog";
     rev = "refs/tags/v${version}";
-    hash = "sha256-ato5U/fmnOHuToGSXUNi1cbaWHNak7+3rpOZoQrAOfc=";
+    hash = "sha256-FiwUkBKh1g4NifF0O4hhZSnZExOw99R9ZX8ANaG9Ym8=";
   };
 
-  vendorHash = "sha256-Gw/xgfGa2992F0whtioaiKJN0MG+NExat1LIgXo/ec8=";
+  vendorHash = "sha256-uZ57v1yYH955zDKE7nfXkmroAzUPbO/7MVn9u9M5DKU=";
 
   proxyVendor = true;
 
diff --git a/third_party/nixpkgs/pkgs/tools/security/vault-ssh-plus/default.nix b/third_party/nixpkgs/pkgs/tools/security/vault-ssh-plus/default.nix
index a3a92f7c6a..908d5abb8e 100644
--- a/third_party/nixpkgs/pkgs/tools/security/vault-ssh-plus/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/vault-ssh-plus/default.nix
@@ -8,16 +8,16 @@
 }:
 buildGoModule rec {
   pname = "vault-ssh-plus";
-  version = "0.7.4";
+  version = "0.7.5";
 
   src = fetchFromGitHub {
     owner = "isometry";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-djS50SBR8HTyEd5Ya2I9w5irBrLTqzekEi5ASmkl6yk=";
+    hash = "sha256-A6kgMQOGtrRf5lSbheyJ41fc5l9VkiPDVDYGHVh9Hic=";
   };
 
-  vendorHash = "sha256-NndIBvW1/EZJ2KwP6HZ6wvhrgtmhTe97l3VxprtWq30=";
+  vendorHash = "sha256-FBOmRXD6dW3B9LRKfCa1kzWmds71ndi9go8Lp7lOJlU=";
 
   nativeBuildInputs = [ makeWrapper ];
 
diff --git a/third_party/nixpkgs/pkgs/tools/security/weggli/default.nix b/third_party/nixpkgs/pkgs/tools/security/weggli/default.nix
index 85083e2cf2..63f9ddd0f2 100644
--- a/third_party/nixpkgs/pkgs/tools/security/weggli/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/security/weggli/default.nix
@@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-6XSedsTUjcZzFXaNitsXlUBpxC6TYVMCB+AfH3x7c5E=";
   };
 
-  cargoSha256 = "sha256-Cj/m4GRaqI/lHYFruj047B7FdGoVl/wC8I2o1dzhOTs=";
+  cargoHash = "sha256-Cj/m4GRaqI/lHYFruj047B7FdGoVl/wC8I2o1dzhOTs=";
 
   passthru.tests.version = testers.testVersion {
     package = weggli;
diff --git a/third_party/nixpkgs/pkgs/tools/system/bfs/default.nix b/third_party/nixpkgs/pkgs/tools/system/bfs/default.nix
index 3469060c74..2b714b56de 100644
--- a/third_party/nixpkgs/pkgs/tools/system/bfs/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/system/bfs/default.nix
@@ -13,11 +13,6 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ oniguruma ] ++ lib.optionals stdenv.isLinux [ libcap acl liburing ];
 
-  # Disable LTO on darwin. See https://github.com/NixOS/nixpkgs/issues/19098
-  preConfigure = lib.optionalString stdenv.isDarwin ''
-    substituteInPlace GNUMakefile --replace "-flto=auto" ""
-  '';
-
   makeFlags = [ "PREFIX=$(out)" ];
   buildFlags = [ "release" ]; # "release" enables compiler optimizations
 
diff --git a/third_party/nixpkgs/pkgs/tools/system/cm-rgb/default.nix b/third_party/nixpkgs/pkgs/tools/system/cm-rgb/default.nix
index 03cf76b538..392f955fe7 100644
--- a/third_party/nixpkgs/pkgs/tools/system/cm-rgb/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/system/ddh/default.nix b/third_party/nixpkgs/pkgs/tools/system/ddh/default.nix
index 14afcec4c4..b042f5549a 100644
--- a/third_party/nixpkgs/pkgs/tools/system/ddh/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/system/ddh/default.nix
@@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "XFfTpX4c821pcTAJZFUjdqM940fRoBwkJC6KTknXtCw=";
   };
 
-  cargoSha256 = "6yPDkbag81TZ4k72rbmGT6HWKdGK4yfKxjGNFKEWXPI=";
+  cargoHash = "sha256-6yPDkbag81TZ4k72rbmGT6HWKdGK4yfKxjGNFKEWXPI=";
 
   meta = with lib; {
     description = "Fast duplicate file finder";
diff --git a/third_party/nixpkgs/pkgs/tools/system/dfrs/default.nix b/third_party/nixpkgs/pkgs/tools/system/dfrs/default.nix
index 002e421900..abef6bb05d 100644
--- a/third_party/nixpkgs/pkgs/tools/system/dfrs/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/system/dfrs/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "01h00328kbw83q11yrsvcly69p0hql3kw49b4jx6gwkrdm8c2amk";
   };
 
-  cargoSha256 = "1dgmn4g35yc7hwnxznkrpwnikn329nc0z8y7bxlcd308k1v83919";
+  cargoHash = "sha256-KaSBdpgIjMZoX8ejD5hNYtgZLb952t8th4f5Mh6x9bU=";
 
   meta = with lib; {
     description = "Display file system space usage using graphs and colors";
diff --git a/third_party/nixpkgs/pkgs/tools/system/fakeroot/default.nix b/third_party/nixpkgs/pkgs/tools/system/fakeroot/default.nix
index 9a24f59099..f4402a8765 100644
--- a/third_party/nixpkgs/pkgs/tools/system/fakeroot/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/system/fakeroot/default.nix
@@ -1,31 +1,31 @@
 { lib
 , coreutils
 , stdenv
-, fetchurl
+, fetchFromGitLab
 , fetchpatch
 , getopt
 , libcap
 , gnused
 , nixosTests
 , testers
+, autoreconfHook
+, po4a
 }:
 
 stdenv.mkDerivation (finalAttrs: {
-  version = "1.29";
+  version = "1.32.2";
   pname = "fakeroot";
 
-  src = fetchurl {
-    url = "http://http.debian.net/debian/pool/main/f/fakeroot/fakeroot_${finalAttrs.version}.orig.tar.gz";
-    sha256 = "sha256-j7uvt4DJFz46zkoEr7wdkA8zfzIWiDk59cfbNDG+fCA=";
+  src = fetchFromGitLab {
+    owner = "clint";
+    repo = "fakeroot";
+    rev = "upstream/${finalAttrs.version}";
+    domain = "salsa.debian.org";
+    hash = "sha256-j1qSMPNCtAxClqYqWkRNQmtxkitYi7g/9KtQ5XqcX3w=";
   };
 
   patches = lib.optionals stdenv.isLinux [
     ./einval.patch
-    (fetchpatch {
-      name = "also-wrap-stat-library-call.patch";
-      url = "https://sources.debian.org/data/main/f/fakeroot/1.29-1/debian/patches/also-wrap-stat-library-call.patch";
-      sha256 = "0p7lq6m31k3rqsnjbi06a8ykdqa3cp4y5ngsjyk3q1269gx59x8b";
-    })
 
     # patches needed for musl libc, borrowed from alpine packaging.
     # it is applied regardless of the environment to prevent patchrot
@@ -39,8 +39,14 @@ stdenv.mkDerivation (finalAttrs: {
       url = "https://git.alpinelinux.org/aports/plain/main/fakeroot/fakeroot-no64.patch?id=f68c541324ad07cc5b7f5228501b5f2ce4b36158";
       sha256 = "sha256-NCDaB4nK71gvz8iQxlfaQTazsG0SBUQ/RAnN+FqwKkY=";
     })
+    (fetchpatch {
+      name = "addendum-charset-conversion.patch";
+      url = "https://salsa.debian.org/clint/fakeroot/-/commit/b769fb19fd89d696a5e0fd70b974f833f6a0655a.patch";
+      hash = "sha256-3z1g+xzlyTpa055kpsoumP/E8srDlZss6B7Fv5A0QkU=";
+    })
   ];
 
+  nativeBuildInputs = [ autoreconfHook po4a ];
   buildInputs = lib.optional (!stdenv.isDarwin) libcap;
 
   postUnpack = ''
@@ -50,7 +56,13 @@ stdenv.mkDerivation (finalAttrs: {
       -e 's@kill@${coreutils}/bin/kill@g' \
       -e 's@/bin/ls@${coreutils}/bin/ls@g' \
       -e 's@cut@${coreutils}/bin/cut@g' \
-      fakeroot-${finalAttrs.version}/scripts/fakeroot.in
+      source/scripts/fakeroot.in
+  '';
+
+  postConfigure = ''
+    pushd doc
+    po4a -k 0 --variable "srcdir=../doc/" po4a/po4a.cfg
+    popd
   '';
 
   passthru = {
@@ -67,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://salsa.debian.org/clint/fakeroot";
     description = "Give a fake root environment through LD_PRELOAD";
     license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [viric];
+    maintainers = [ ];
     platforms = lib.platforms.unix;
   };
 })
diff --git a/third_party/nixpkgs/pkgs/tools/system/gt5/default.nix b/third_party/nixpkgs/pkgs/tools/system/gt5/default.nix
index c62ff2c3a8..68b0e31971 100644
--- a/third_party/nixpkgs/pkgs/tools/system/gt5/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/system/gt5/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     description = "Diff-capable 'du' browser";
     homepage = "https://gt5.sourceforge.net/";
     license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [viric];
+    maintainers = [ ];
     platforms = with lib.platforms; all;
     mainProgram = "gt5";
   };
diff --git a/third_party/nixpkgs/pkgs/tools/system/idle3tools/default.nix b/third_party/nixpkgs/pkgs/tools/system/idle3tools/default.nix
index d66a7f9b66..9c87450e31 100644
--- a/third_party/nixpkgs/pkgs/tools/system/idle3tools/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/system/idle3tools/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     homepage = "https://idle3-tools.sourceforge.net/";
     description = "Tool to get/set the infamous idle3 timer in WD HDDs";
     license = lib.licenses.gpl3;
-    maintainers = with lib.maintainers; [viric];
+    maintainers = [ ];
     platforms = with lib.platforms; linux;
     mainProgram = "idle3ctl";
   };
diff --git a/third_party/nixpkgs/pkgs/tools/system/inxi/default.nix b/third_party/nixpkgs/pkgs/tools/system/inxi/default.nix
index c00df8611e..18a4f88bf5 100644
--- a/third_party/nixpkgs/pkgs/tools/system/inxi/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/system/jump/default.nix b/third_party/nixpkgs/pkgs/tools/system/jump/default.nix
index 483ea356f0..c16d1e7382 100644
--- a/third_party/nixpkgs/pkgs/tools/system/jump/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/system/mq-cli/default.nix b/third_party/nixpkgs/pkgs/tools/system/mq-cli/default.nix
index 81adc7daa2..6da2fbefab 100644
--- a/third_party/nixpkgs/pkgs/tools/system/mq-cli/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/system/mq-cli/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "02z85waj5jc312biv2qhbgplsggxgjmfmyv9v8b1ky0iq1mpxjw7";
   };
 
-  cargoSha256 = "19mk0hl7cr5qb3r64zi0hcsn4yqbg8c3g2f9jywm0g2c13ak36li";
+  cargoHash = "sha256-kZox1QhMPFC5l8mJNxh6C3tiNYMgfmLyWLhkdigEs6Y=";
 
   meta = with lib; {
     description      = "CLI tool to manage POSIX message queues";
diff --git a/third_party/nixpkgs/pkgs/tools/system/natscli/default.nix b/third_party/nixpkgs/pkgs/tools/system/natscli/default.nix
index ed4d09454d..613976bcbd 100644
--- a/third_party/nixpkgs/pkgs/tools/system/natscli/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/system/nq/default.nix b/third_party/nixpkgs/pkgs/tools/system/nq/default.nix
index 46db1c612f..967547e2d8 100644
--- a/third_party/nixpkgs/pkgs/tools/system/nq/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/system/nvtop/build-nvtop.nix b/third_party/nixpkgs/pkgs/tools/system/nvtop/build-nvtop.nix
index cfc13f14c4..0feada287d 100644
--- a/third_party/nixpkgs/pkgs/tools/system/nvtop/build-nvtop.nix
+++ b/third_party/nixpkgs/pkgs/tools/system/nvtop/build-nvtop.nix
@@ -8,7 +8,7 @@
 , ncurses
 , testers
 , udev
-, addOpenGLRunpath
+, addDriverRunpath
 , amd ? false
 , intel ? false
 , msm ? false
@@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: {
     (cmakeBool "PANTHOR_SUPPORT" panthor)
     (cmakeBool "ASCEND_SUPPORT" ascend)
   ];
-  nativeBuildInputs = [ cmake gtest ] ++ lib.optional nvidia addOpenGLRunpath;
+  nativeBuildInputs = [ cmake gtest ] ++ lib.optional nvidia addDriverRunpath;
 
   buildInputs = with lib; [ ncurses udev ]
     ++ optional nvidia cudatoolkit
@@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: {
   env.NIX_CFLAGS_COMPILE = lib.optionalString needDrm "-isystem ${lib.getDev libdrm}/include/libdrm";
 
   # ordering of fixups is important
-  postFixup = (lib.optionalString needDrm drm-postFixup) + (lib.optionalString nvidia "addOpenGLRunpath $out/bin/nvtop");
+  postFixup = (lib.optionalString needDrm drm-postFixup) + (lib.optionalString nvidia "addDriverRunpath $out/bin/nvtop");
 
   doCheck = true;
 
diff --git a/third_party/nixpkgs/pkgs/tools/system/psensor/default.nix b/third_party/nixpkgs/pkgs/tools/system/psensor/default.nix
index 6cd1f6858e..3d0fa0d62a 100644
--- a/third_party/nixpkgs/pkgs/tools/system/psensor/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/system/rowhammer-test/default.nix b/third_party/nixpkgs/pkgs/tools/system/rowhammer-test/default.nix
index f360697efb..c19f7a54f0 100644
--- a/third_party/nixpkgs/pkgs/tools/system/rowhammer-test/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/system/rowhammer-test/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
     description = "Test DRAM for bit flips caused by the rowhammer problem";
     homepage = "https://github.com/google/rowhammer-test";
     license = licenses.asl20;
-    maintainers = [ maintainers.viric ];
+    maintainers = [ ];
     platforms = [ "x86_64-linux" "i686-linux" ];
   };
 }
diff --git a/third_party/nixpkgs/pkgs/tools/system/rsyslog/default.nix b/third_party/nixpkgs/pkgs/tools/system/rsyslog/default.nix
index d1dcca9159..8479e6840a 100644
--- a/third_party/nixpkgs/pkgs/tools/system/rsyslog/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/system/safe-rm/default.nix b/third_party/nixpkgs/pkgs/tools/system/safe-rm/default.nix
index 26b0aba988..d3802098de 100644
--- a/third_party/nixpkgs/pkgs/tools/system/safe-rm/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/system/safe-rm/default.nix
@@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-7+4XwsjzLBCQmHDYNwhlN4Yg3eL43GUEbq8ROtuP2Kw=";
   };
 
-  cargoSha256 = "sha256-durb4RTzEun7HPeYfvDJpvO+6L7tNFmAxdIwINbwZrg=";
+  cargoHash = "sha256-durb4RTzEun7HPeYfvDJpvO+6L7tNFmAxdIwINbwZrg=";
 
   postPatch = ''
     substituteInPlace src/main.rs \
diff --git a/third_party/nixpkgs/pkgs/tools/system/throttled/default.nix b/third_party/nixpkgs/pkgs/tools/system/throttled/default.nix
index 076cd1c020..1aa4c5ea1a 100644
--- a/third_party/nixpkgs/pkgs/tools/system/throttled/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/system/tm/default.nix b/third_party/nixpkgs/pkgs/tools/system/tm/default.nix
index 1296305963..e7a08510ca 100644
--- a/third_party/nixpkgs/pkgs/tools/system/tm/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/system/tm/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     description = "Terminal mixer - multiplexer for the i/o of terminal applications";
     homepage = "http://vicerveza.homeunix.net/~viric/soft/tm";
     license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ viric ];
+    maintainers = [ ];
     platforms = platforms.all;
     mainProgram = "tm";
   };
diff --git a/third_party/nixpkgs/pkgs/tools/system/tre-command/default.nix b/third_party/nixpkgs/pkgs/tools/system/tre-command/default.nix
index 971aa29b96..59cb00e709 100644
--- a/third_party/nixpkgs/pkgs/tools/system/tre-command/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/system/tre-command/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-JlkONhXMWLzxAf3SYoLkSvXw4bFYBnsCyyj0TUsezwg=";
   };
 
-  cargoSha256 = "sha256-b3fScJMG/CIkMrahbELLQp1otmT5En+p8kQsip05SOc=";
+  cargoHash = "sha256-b3fScJMG/CIkMrahbELLQp1otmT5En+p8kQsip05SOc=";
 
   nativeBuildInputs = [ installShellFiles ];
 
diff --git a/third_party/nixpkgs/pkgs/tools/system/ts/default.nix b/third_party/nixpkgs/pkgs/tools/system/ts/default.nix
index 26a8afa951..2fa2c90800 100644
--- a/third_party/nixpkgs/pkgs/tools/system/ts/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/system/ts/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     homepage = "http://vicerveza.homeunix.net/~viric/soft/ts";
     description = "Task spooler - batch queue";
     license = licenses.gpl2Only;
-    maintainers = with maintainers; [ viric ];
+    maintainers = [ ];
     platforms = platforms.all;
     mainProgram = "ts";
   };
diff --git a/third_party/nixpkgs/pkgs/tools/system/uefitool/common.nix b/third_party/nixpkgs/pkgs/tools/system/uefitool/common.nix
index 43d7480fc7..353cec91be 100644
--- a/third_party/nixpkgs/pkgs/tools/system/uefitool/common.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/system/uptimed/default.nix b/third_party/nixpkgs/pkgs/tools/system/uptimed/default.nix
index 93dcca90a2..26e536618d 100644
--- a/third_party/nixpkgs/pkgs/tools/system/uptimed/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/system/vboot_reference/default.nix b/third_party/nixpkgs/pkgs/tools/system/vboot_reference/default.nix
index 6e5be5db44..e790048ebc 100644
--- a/third_party/nixpkgs/pkgs/tools/system/vboot_reference/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/system/xe/default.nix b/third_party/nixpkgs/pkgs/tools/system/xe/default.nix
index 2a8231b7fb..2d8fb2e98a 100644
--- a/third_party/nixpkgs/pkgs/tools/system/xe/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/text/anewer/default.nix b/third_party/nixpkgs/pkgs/tools/text/anewer/default.nix
index 69c4eb39b3..009a6264fd 100644
--- a/third_party/nixpkgs/pkgs/tools/text/anewer/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/text/anewer/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "181mi674354bddnq894yyq587w7skjh35vn61i41vfi6lqz5dy3d";
   };
 
-  cargoSha256 = "sha256-LJ0l5CZM5NqdbCZe4ELkYf9EkKyBxL/LrNmFy+JS6gM=";
+  cargoHash = "sha256-LJ0l5CZM5NqdbCZe4ELkYf9EkKyBxL/LrNmFy+JS6gM=";
 
   meta = with lib; {
     description = "Append lines from stdin to a file if they don't already exist in the file";
diff --git a/third_party/nixpkgs/pkgs/tools/text/autocorrect/default.nix b/third_party/nixpkgs/pkgs/tools/text/autocorrect/default.nix
index 19e69a468f..60e5608274 100644
--- a/third_party/nixpkgs/pkgs/tools/text/autocorrect/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/text/autocorrect/default.nix
@@ -32,6 +32,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://huacnlee.github.io/autocorrect";
     changelog = "https://github.com/huacnlee/autocorrect/releases/tag/v${version}";
     license = licenses.mit;
-    maintainers = [];
+    maintainers = [ ];
   };
 }
diff --git a/third_party/nixpkgs/pkgs/tools/text/catdoc/default.nix b/third_party/nixpkgs/pkgs/tools/text/catdoc/default.nix
index 38d1ba5e06..1fdaf78a67 100644
--- a/third_party/nixpkgs/pkgs/tools/text/catdoc/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/text/choose/default.nix b/third_party/nixpkgs/pkgs/tools/text/choose/default.nix
index c3afeb4922..da333cd6c3 100644
--- a/third_party/nixpkgs/pkgs/tools/text/choose/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/text/choose/default.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-yW1quDyQn2xhrlhhPj9DKq7g8LlYKvEKDFj3xSagRTU=";
   };
 
-  cargoSha256 = "sha256-0INC0LFzlnFnt5pCiU4xePxU8a6GiU1L8bg7zcuFl2k=";
+  cargoHash = "sha256-0INC0LFzlnFnt5pCiU4xePxU8a6GiU1L8bg7zcuFl2k=";
 
   meta = with lib; {
     description = "Human-friendly and fast alternative to cut and (sometimes) awk";
diff --git a/third_party/nixpkgs/pkgs/tools/text/each/default.nix b/third_party/nixpkgs/pkgs/tools/text/each/default.nix
index 6f24ee66fe..688a9adf88 100644
--- a/third_party/nixpkgs/pkgs/tools/text/each/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/text/each/default.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-5Aa/uHWrU4bpWd28Uddnuhmi6guHy09W9AU8sAfea6I=";
   };
 
-  cargoSha256 = "sha256-sH9rraPNAIlW2KQVaZfYa10c1HHQpDgedY1+9e94RLE=";
+  cargoHash = "sha256-sH9rraPNAIlW2KQVaZfYa10c1HHQpDgedY1+9e94RLE=";
 
   meta = with lib; {
     description = " A better way of working with structured data on the command line";
diff --git a/third_party/nixpkgs/pkgs/tools/text/esh/default.nix b/third_party/nixpkgs/pkgs/tools/text/esh/default.nix
index abbeb29234..2b7b2a427f 100644
--- a/third_party/nixpkgs/pkgs/tools/text/esh/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/text/esh/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, asciidoctor, gawk, gnused, runtimeShell }:
+{ lib, stdenv, fetchFromGitHub, asciidoctor, gawk, gnused, runtimeShell, binlore, esh }:
 
 stdenv.mkDerivation rec {
   pname = "esh";
@@ -30,6 +30,14 @@ stdenv.mkDerivation rec {
   doCheck = true;
   checkTarget = "test";
 
+  # working around a bug in file. Was fixed in
+  # file 5.41-5.43 but regressed in 5.44+
+  # see https://bugs.astron.com/view.php?id=276
+  # "can" verdict because of `-s SHELL` arg
+  passthru.binlore.out = binlore.synthesize esh ''
+    execer can bin/esh
+  '';
+
   meta = with lib; {
     description = "Simple templating engine based on shell";
     mainProgram = "esh";
diff --git a/third_party/nixpkgs/pkgs/tools/text/frawk/default.nix b/third_party/nixpkgs/pkgs/tools/text/frawk/default.nix
index d0365e046f..bec04f7db3 100644
--- a/third_party/nixpkgs/pkgs/tools/text/frawk/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/text/frawk/default.nix
@@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-wPnMJDx3aF1Slx5pjLfii366pgNU3FJBdznQLuUboYA=";
   };
 
-  cargoSha256 = "sha256-Xk+iH90Nb2koCdGmVSiRl8Nq26LlFdJBuKmvcbgnkgs=";
+  cargoHash = "sha256-Xk+iH90Nb2koCdGmVSiRl8Nq26LlFdJBuKmvcbgnkgs=";
 
   buildInputs = [ libxml2 ncurses zlib ];
 
diff --git a/third_party/nixpkgs/pkgs/tools/text/hck/default.nix b/third_party/nixpkgs/pkgs/tools/text/hck/default.nix
index 1a8238059e..00adbdc628 100644
--- a/third_party/nixpkgs/pkgs/tools/text/hck/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/text/hck/default.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "hck";
-  version = "0.10.0";
+  version = "0.10.1";
 
   src = fetchFromGitHub {
     owner = "sstadick";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-L/jad3T89VFub0JBC/o/xc4RI+/tF0hbhZdSxmSs+lo=";
+    hash = "sha256-7a+gNnxr/OiM5MynOxOQ3hAprog7eAAZnMvi+5/gMzg=";
   };
 
-  cargoHash = "sha256-9v3yZNKBZ0XQkA7J50GH/Z4JQUQ48HnjNXr90ZBHXgI=";
+  cargoHash = "sha256-rGKD09YV+QqzZ1n6gYerjbpTr+4KJ5UzynDDRw5rnP0=";
 
   nativeBuildInputs = [ cmake ];
 
diff --git a/third_party/nixpkgs/pkgs/tools/text/huniq/default.nix b/third_party/nixpkgs/pkgs/tools/text/huniq/default.nix
index bb4d50173e..857bbb77e3 100644
--- a/third_party/nixpkgs/pkgs/tools/text/huniq/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/text/huniq/default.nix
@@ -9,7 +9,7 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-5GvHM05qY/Jj1mPYwn88Zybn6Nn5nJIaw0XP8iCcrwE=";
   };
 
-  cargoSha256 = "sha256-pwDaLHJbVpZe7dAtd5/ytyHZkUHjCcNjtw3q7HF1qVQ=";
+  cargoHash = "sha256-pwDaLHJbVpZe7dAtd5/ytyHZkUHjCcNjtw3q7HF1qVQ=";
 
   meta = with lib; {
     description = "Command line utility to remove duplicates from the given input";
diff --git a/third_party/nixpkgs/pkgs/tools/text/icdiff/default.nix b/third_party/nixpkgs/pkgs/tools/text/icdiff/default.nix
index 1ab884b12d..0b35b5779a 100644
--- a/third_party/nixpkgs/pkgs/tools/text/icdiff/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/text/mairix/default.nix b/third_party/nixpkgs/pkgs/tools/text/mairix/default.nix
index 3528a054b2..459cc77243 100644
--- a/third_party/nixpkgs/pkgs/tools/text/mairix/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/text/mairix/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     license = lib.licenses.gpl2Plus;
     description = "Program for indexing and searching email messages stored in maildir, MH or mbox";
     mainProgram = "mairix";
-    maintainers = with lib.maintainers; [viric];
+    maintainers = [ ];
     platforms = with lib.platforms; all;
   };
 }
diff --git a/third_party/nixpkgs/pkgs/tools/text/markdownlint-cli2/default.nix b/third_party/nixpkgs/pkgs/tools/text/markdownlint-cli2/default.nix
index 90a4b871cb..d98d3a9f29 100644
--- a/third_party/nixpkgs/pkgs/tools/text/markdownlint-cli2/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/text/mdbook-footnote/default.nix b/third_party/nixpkgs/pkgs/tools/text/mdbook-footnote/default.nix
index 7beeb3e33c..1b3ad02e5c 100644
--- a/third_party/nixpkgs/pkgs/tools/text/mdbook-footnote/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/text/mdbook-footnote/default.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-WUMgm1hwsU9BeheLfb8Di0AfvVQ6j92kXxH2SyG3ses=";
   };
 
-  cargoSha256 = "sha256-Ig+uVCO5oHIkkvFsKiBiUFzjUgH/Pydn4MVJHb2wKGc=";
+  cargoHash = "sha256-Ig+uVCO5oHIkkvFsKiBiUFzjUgH/Pydn4MVJHb2wKGc=";
 
   buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ];
 
diff --git a/third_party/nixpkgs/pkgs/tools/text/mdbook-linkcheck/default.nix b/third_party/nixpkgs/pkgs/tools/text/mdbook-linkcheck/default.nix
index 878b93b055..7129cdd044 100644
--- a/third_party/nixpkgs/pkgs/tools/text/mdbook-linkcheck/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/text/mdbook-linkcheck/default.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-ZbraChBHuKAcUA62EVHZ1RygIotNEEGv24nhSPAEj00=";
   };
 
-  cargoSha256 = "sha256-AwixlCL5ZcLgj9wYeBvkSy2U6J8alXf488l8DMn73w4=";
+  cargoHash = "sha256-AwixlCL5ZcLgj9wYeBvkSy2U6J8alXf488l8DMn73w4=";
 
   buildInputs = if stdenv.isDarwin then [ Security ] else [ openssl ];
 
diff --git a/third_party/nixpkgs/pkgs/tools/text/multitran/mtutils/default.nix b/third_party/nixpkgs/pkgs/tools/text/multitran/mtutils/default.nix
index f37a8f1bd3..658daf9ce2 100644
--- a/third_party/nixpkgs/pkgs/tools/text/multitran/mtutils/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/text/multitran/mtutils/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     description = "Multitran: simple command line utilities for dictionary maintenance";
     mainProgram = "mtquery";
     license = lib.licenses.gpl2Only;
-    maintainers = with lib.maintainers; [viric];
+    maintainers = [ ];
     platforms = with lib.platforms; linux;
   };
 }
diff --git a/third_party/nixpkgs/pkgs/tools/text/numdiff/default.nix b/third_party/nixpkgs/pkgs/tools/text/numdiff/default.nix
index 317d29003c..f12c0fdea5 100644
--- a/third_party/nixpkgs/pkgs/tools/text/numdiff/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/text/ov/default.nix b/third_party/nixpkgs/pkgs/tools/text/ov/default.nix
index 1556eeabe3..3d900ea7d9 100644
--- a/third_party/nixpkgs/pkgs/tools/text/ov/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/text/ov/default.nix
@@ -11,16 +11,16 @@
 
 buildGoModule rec {
   pname = "ov";
-  version = "0.35.0";
+  version = "0.36.0";
 
   src = fetchFromGitHub {
     owner = "noborus";
     repo = "ov";
     rev = "refs/tags/v${version}";
-    hash = "sha256-P/GkroAyE2mDEqLIyOqUGvauhPHVvaVRxpDkGv+BCqw=";
+    hash = "sha256-0dnaZZmciKnN+rVKitqAf3Bt2vtWP+/fB1tuCuMRvio=";
   };
 
-  vendorHash = "sha256-PDyqscKzL2tGVrUckbedt0offgsCpDjxtnSeqggTM+A=";
+  vendorHash = "sha256-Ktusm7NldO5dTiLBIZ7fzsQ69kyTmKs9OJXZPP1oSws=";
 
   ldflags = [
     "-s"
diff --git a/third_party/nixpkgs/pkgs/tools/text/paperoni/default.nix b/third_party/nixpkgs/pkgs/tools/text/paperoni/default.nix
index 1ceb29f126..5378598da7 100644
--- a/third_party/nixpkgs/pkgs/tools/text/paperoni/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/text/pinyin-tool/default.nix b/third_party/nixpkgs/pkgs/tools/text/pinyin-tool/default.nix
index 9d434d1aa9..b2427e4f5f 100644
--- a/third_party/nixpkgs/pkgs/tools/text/pinyin-tool/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/text/pinyin-tool/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "1gwqwxlvdrm4sdyqkvpvvfi6jh6qqn6qybn0z66wm06k62f8zj5b";
   };
 
-  cargoSha256 = "1ixl4bsb8c8dmz9s28a2v5l5f2hi3g9xjy6ribmhybpwmfs4mr4d";
+  cargoHash = "sha256-jeRKtKv8Lg/ritl42dMbEQpXaNlCIaHTrw0xtPQitMc=";
 
   buildInputs = lib.optionals stdenv.isDarwin [ Security ];
 
diff --git a/third_party/nixpkgs/pkgs/tools/text/rnr/default.nix b/third_party/nixpkgs/pkgs/tools/text/rnr/default.nix
index fbc4f1b382..31f627d4ba 100644
--- a/third_party/nixpkgs/pkgs/tools/text/rnr/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/text/rnr/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-g/PnvOZzlWzEHf3vvYANeJ2ogQ/6duNzhlKpKMBoBFU=";
   };
 
-  cargoSha256 = "sha256-+oDRNBQ03MknhcTpZFKt0ipJY43LPOKbGF014rrs6dw=";
+  cargoHash = "sha256-+oDRNBQ03MknhcTpZFKt0ipJY43LPOKbGF014rrs6dw=";
 
   meta = with lib; {
     description = "Command-line tool to batch rename files and directories";
diff --git a/third_party/nixpkgs/pkgs/tools/text/seehecht/default.nix b/third_party/nixpkgs/pkgs/tools/text/seehecht/default.nix
index eafcf6e1b7..0b1fb3bcef 100644
--- a/third_party/nixpkgs/pkgs/tools/text/seehecht/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/text/seehecht/default.nix
@@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-KIxK0JYfq/1Bn4LOn+LzWPBUvGYMvOEuqS7GMpDRvW0=";
   };
 
-  cargoSha256 = "sha256-AeVUVF4SBS9FG0iezLBKUm4Uk1PPRXPTON93evgL9IA=";
+  cargoHash = "sha256-AeVUVF4SBS9FG0iezLBKUm4Uk1PPRXPTON93evgL9IA=";
 
   postInstall = ''
     ln -s $out/bin/seh $out/bin/seehecht
diff --git a/third_party/nixpkgs/pkgs/tools/text/sgml/jade/default.nix b/third_party/nixpkgs/pkgs/tools/text/sgml/jade/default.nix
index a744300bfd..f455d0f97c 100644
--- a/third_party/nixpkgs/pkgs/tools/text/sgml/jade/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/text/sgml/opensp/default.nix b/third_party/nixpkgs/pkgs/tools/text/sgml/opensp/default.nix
index a51bd79251..a3915a2d66 100644
--- a/third_party/nixpkgs/pkgs/tools/text/sgml/opensp/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/text/tidy-viewer/default.nix b/third_party/nixpkgs/pkgs/tools/text/tidy-viewer/default.nix
index b2d55ee276..a88960739a 100644
--- a/third_party/nixpkgs/pkgs/tools/text/tidy-viewer/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/text/tidy-viewer/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-OnvRiQ5H/Vsmfu+F1i68TowjrDwQLQtV1sC6Jrp4xA4=";
   };
 
-  cargoSha256 = "sha256-pIGuBP0a4jWFzkQfqvxQUrBmqYjhERVyEbZvL7g5hRM=";
+  cargoHash = "sha256-pIGuBP0a4jWFzkQfqvxQUrBmqYjhERVyEbZvL7g5hRM=";
 
   # this test parses command line arguments
   # error: Found argument '--test-threads' which wasn't expected, or isn't valid in this context
diff --git a/third_party/nixpkgs/pkgs/tools/text/tv/default.nix b/third_party/nixpkgs/pkgs/tools/text/tv/default.nix
index 9cf6e2e243..154d98b4c5 100644
--- a/third_party/nixpkgs/pkgs/tools/text/tv/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/text/tv/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-qODv45smZ6jHCJBaa6EEvFLG+7g+FWrRf6BiHRFLzqM=";
   };
 
-  cargoSha256 = "sha256-nI4n4KMPLaIF978b5VvW3mb02vKW+r39nllrhukJilI=";
+  cargoHash = "sha256-nI4n4KMPLaIF978b5VvW3mb02vKW+r39nllrhukJilI=";
 
   meta = with lib; {
     description = "Format json into table view";
diff --git a/third_party/nixpkgs/pkgs/tools/text/write-good/default.nix b/third_party/nixpkgs/pkgs/tools/text/write-good/default.nix
index db3e16c23d..99105ce649 100644
--- a/third_party/nixpkgs/pkgs/tools/text/write-good/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/text/xsv/default.nix b/third_party/nixpkgs/pkgs/tools/text/xsv/default.nix
index bf5a7ed6b8..b779a6c962 100644
--- a/third_party/nixpkgs/pkgs/tools/text/xsv/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/text/xsv/default.nix
@@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "17v1nw36mrarrd5yv4xd3mpc1d7lvhd5786mqkzyyraf78pjg045";
   };
 
-  cargoSha256 = "1bh60zgflaa5n914irkr4bpq3m4h2ngcj6bp5xx1qj112dwgvmyb";
+  cargoHash = "sha256-y9f9eBMhSBx6L3cZyZ4VkNSB7yJ55khCskUp6t4HBq4=";
 
   buildInputs = lib.optional stdenv.isDarwin Security;
 
diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/asciidoc/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/asciidoc/default.nix
index 69b0ccff68..1a7fde588c 100644
--- a/third_party/nixpkgs/pkgs/tools/typesetting/asciidoc/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/typesetting/asciidoc/default.nix
@@ -121,13 +121,14 @@ in python3.pkgs.buildPythonApplication rec {
   pname = "asciidoc"
     + lib.optionalString enableStandardFeatures "-full"
     + lib.optionalString enableExtraPlugins "-with-plugins";
-  version = "10.2.0";
+  version = "10.2.1";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "asciidoc-py";
     repo = "asciidoc-py";
     rev = version;
-    hash = "sha256-TqC0x9xB6e2d6Wc9bgnlqgZVOmYHmUUKfE/CKAiEtag=";
+    hash = "sha256-td3C7xTWfSzdo9Bbz0dHW2oPaCQYmUE9H2sUFfg5HH0=";
   };
 
   nativeBuildInputs = [
@@ -250,6 +251,8 @@ in python3.pkgs.buildPythonApplication rec {
       --replace "python3 -m asciidoc.a2x" "${buildPackages.asciidoc}/bin/a2x"
   '';
 
+  build-system = with python3.pythonOnBuildForHost.pkgs; [ setuptools ];
+
   postBuild = ''
     make manpages
   '';
diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/htmldoc/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/htmldoc/default.nix
index 63b6e406ae..f47c9dac0f 100644
--- a/third_party/nixpkgs/pkgs/tools/typesetting/htmldoc/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/typesetting/kramdown-asciidoc/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/kramdown-asciidoc/default.nix
index 750ed6396d..90949bb968 100644
--- a/third_party/nixpkgs/pkgs/tools/typesetting/kramdown-asciidoc/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/typesetting/tex/tex-match/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/tex/tex-match/default.nix
index c7d961d21f..18dffb657c 100644
--- a/third_party/nixpkgs/pkgs/tools/typesetting/tex/tex-match/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/typesetting/tex/tex-match/default.nix
@@ -15,7 +15,7 @@ rustPlatform.buildRustPackage rec {
 
   buildInputs = [ gtk3 ];
 
-  cargoSha256 = "13ihwrckpsb4j1ai923vh151frw0yriwg9yylj9lk0ycps51y1sn";
+  cargoHash = "sha256-Vgcfir7Mg0mTpN6nx2P2gGcXSoB7iBRVkGTpO1nmMI4=";
 
   meta = with lib; {
     description = "Search through over 1000 different LaTeX symbols by sketching. A desktop version of detexify";
diff --git a/third_party/nixpkgs/pkgs/tools/video/gopro/default.nix b/third_party/nixpkgs/pkgs/tools/video/gopro/default.nix
index 292f571611..2876e9aa18 100644
--- a/third_party/nixpkgs/pkgs/tools/video/gopro/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/video/rwedid/default.nix b/third_party/nixpkgs/pkgs/tools/video/rwedid/default.nix
index eea8a86c8c..3b7870fdc9 100644
--- a/third_party/nixpkgs/pkgs/tools/video/rwedid/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/video/svt-av1/default.nix b/third_party/nixpkgs/pkgs/tools/video/svt-av1/default.nix
index d84200c384..4ffa289219 100644
--- a/third_party/nixpkgs/pkgs/tools/video/svt-av1/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/video/svt-av1/default.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "svt-av1";
-  version = "2.0.0";
+  version = "2.1.2";
 
   src = fetchFromGitLab {
     owner = "AOMediaCodec";
     repo = "SVT-AV1";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-yfKnkO8GPmMpTWTVYDliERouSFgQPe3CfJmVussxfHY=";
+    hash = "sha256-jrfnUcDTbrf3wWs0D57ueeLmndhpOQChM7gBB14MzcQ=";
   };
 
   nativeBuildInputs = [
diff --git a/third_party/nixpkgs/pkgs/tools/video/yaydl/default.nix b/third_party/nixpkgs/pkgs/tools/video/yaydl/default.nix
index 39e085931d..e54d37b157 100644
--- a/third_party/nixpkgs/pkgs/tools/video/yaydl/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/video/yaydl/default.nix
@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "yaydl";
-  version = "0.14.0";
+  version = "0.14.1";
 
   src = fetchFromGitHub {
     owner = "dertuxmalwieder";
     repo = pname;
     rev = "release-${version}";
-    sha256 = "sha256-r0Z/dihDaiW/lBLMftLtzLELpKT2twqru1xxI9LnjU8=";
+    sha256 = "sha256-BH+SRr+RYfKsXrzpqggQDJSs+aWJRSi/5tDX5mjpDkk=";
   };
 
-  cargoHash = "sha256-FkOiMeNwYj++gZ1Kl4RZHmsRDVMZQBEYtRpogK6XSFE=";
+  cargoHash = "sha256-q4gwa4KoWiQWKKI3sp00koiH9Ndj23a8F07e72xSF1M=";
 
   nativeBuildInputs = [
     pkg-config
@@ -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/third_party/nixpkgs/pkgs/tools/virtualization/cri-tools/default.nix b/third_party/nixpkgs/pkgs/tools/virtualization/cri-tools/default.nix
index de0e562366..b04305c907 100644
--- a/third_party/nixpkgs/pkgs/tools/virtualization/cri-tools/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/virtualization/cri-tools/default.nix
@@ -1,4 +1,5 @@
 { lib
+, stdenv
 , buildGoModule
 , fetchFromGitHub
 , installShellFiles
@@ -30,11 +31,12 @@ buildGoModule rec {
   installPhase = ''
     runHook preInstall
     make install BINDIR=$out/bin
-
+  '' + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
     for shell in bash fish zsh; do
-      $out/bin/crictl completion $shell > crictl.$shell
-      installShellCompletion crictl.$shell
+      installShellCompletion --cmd crictl \
+        --$shell <($out/bin/crictl completion $shell)
     done
+  '' + ''
     runHook postInstall
   '';
 
diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/guestfs-tools/default.nix b/third_party/nixpkgs/pkgs/tools/virtualization/guestfs-tools/default.nix
index 6a94e251a7..fab60f9832 100644
--- a/third_party/nixpkgs/pkgs/tools/virtualization/guestfs-tools/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/virtualization/onmetal-image/default.nix b/third_party/nixpkgs/pkgs/tools/virtualization/onmetal-image/default.nix
index 2b535dfb6d..3780bc398b 100644
--- a/third_party/nixpkgs/pkgs/tools/virtualization/onmetal-image/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/virtualization/uefi-run/default.nix b/third_party/nixpkgs/pkgs/tools/virtualization/uefi-run/default.nix
index 9d954d9ed0..e2e00c513e 100644
--- a/third_party/nixpkgs/pkgs/tools/virtualization/uefi-run/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/virtualization/xe-guest-utilities/default.nix b/third_party/nixpkgs/pkgs/tools/virtualization/xe-guest-utilities/default.nix
index e1b89a562a..9ed390bc44 100644
--- a/third_party/nixpkgs/pkgs/tools/virtualization/xe-guest-utilities/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/wayland/gnome-randr/default.nix b/third_party/nixpkgs/pkgs/tools/wayland/gnome-randr/default.nix
index 65265f4522..ca136adb24 100644
--- a/third_party/nixpkgs/pkgs/tools/wayland/gnome-randr/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/wayland/gnome-randr/default.nix
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage {
     sha256 = "sha256-mciHgBEOCFjRA4MSoEdP7bIag0KE+zRbk4wOkB2PAn0=";
   };
 
-  cargoSha256 = "sha256-rk8/sg5rSNS741QOWoAGIloqph+ZdBjl/xUaFl0A3Bs=";
+  cargoHash = "sha256-rk8/sg5rSNS741QOWoAGIloqph+ZdBjl/xUaFl0A3Bs=";
 
   buildInputs = [ dbus ];
 
diff --git a/third_party/nixpkgs/pkgs/tools/wayland/sirula/default.nix b/third_party/nixpkgs/pkgs/tools/wayland/sirula/default.nix
index 40e6e5939c..27b7b55ba1 100644
--- a/third_party/nixpkgs/pkgs/tools/wayland/sirula/default.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/tools/wayland/wayout/default.nix b/third_party/nixpkgs/pkgs/tools/wayland/wayout/default.nix
index b548279d40..7bd9f3a644 100644
--- a/third_party/nixpkgs/pkgs/tools/wayland/wayout/default.nix
+++ b/third_party/nixpkgs/pkgs/tools/wayland/wayout/default.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
     sha256 = "sha256-EzRetxx0NojhBlBPwhQ7p9rGXDUBlocVqxcEVGIF3+0=";
   };
 
-  cargoSha256 = "sha256-QlxXbfeWJdCythYRRLSpJbTzKkwrL4kmAfyL3tRt194=";
+  cargoHash = "sha256-QlxXbfeWJdCythYRRLSpJbTzKkwrL4kmAfyL3tRt194=";
 
   meta = with lib; {
     description = "Simple output management tool for wlroots based compositors implementing";
diff --git a/third_party/nixpkgs/pkgs/top-level/aliases.nix b/third_party/nixpkgs/pkgs/top-level/aliases.nix
index b1f936e5ff..4aeafb8575 100644
--- a/third_party/nixpkgs/pkgs/top-level/aliases.nix
+++ b/third_party/nixpkgs/pkgs/top-level/aliases.nix
@@ -68,7 +68,29 @@ mapAliases ({
   acousticbrainz-client = throw "acousticbrainz-client has been removed since the AcousticBrainz project has been shut down"; # Added 2024-06-04
   adtool = throw "'adtool' has been removed, as it was broken and unmaintained";
   adom = throw "'adom' has been removed, as it was broken and unmaintained"; # added 2024-05-09
+  adoptopenjdk-bin = throw "adoptopenjdk has been removed as the upstream project is deprecated. Consider using `temurin-bin`"; # Added 2024-05-09
+  adoptopenjdk-bin-17-packages-darwin = throw "adoptopenjdk has been removed as the upstream project is deprecated. Consider using `temurin-bin-17`."; # Added 2024-05-09
+  adoptopenjdk-bin-17-packages-linux = throw "adoptopenjdk has been removed as the upstream project is deprecated. Consider using `temurin-bin-17`."; # Added 2024-05-09
+  adoptopenjdk-hotspot-bin-11 = throw "adoptopenjdk has been removed as the upstream project is deprecated. Consider using `temurin-bin-11`."; # Added 2024-05-09
+  adoptopenjdk-hotspot-bin-15 = throw "adoptopenjdk has been removed as the upstream project is deprecated. JDK 15 is also EOL. Consider using `temurin-bin-17`."; # Added 2024-05-09
+  adoptopenjdk-hotspot-bin-16 = throw "adoptopenjdk has been removed as the upstream project is deprecated. JDK 16 is also EOL. Consider using `temurin-bin-17` or `temurin-bin-16`."; # Added 2024-05-09
+  adoptopenjdk-hotspot-bin-8 = throw "adoptopenjdk has been removed as the upstream project is deprecated. Consider using `temurin-bin-8`."; # Added 2024-05-09
+  adoptopenjdk-jre-bin = throw "adoptopenjdk has been removed as the upstream project is deprecated. Consider using `temurin-jre-bin`."; # Added 2024-05-09
+  adoptopenjdk-jre-hotspot-bin-11 = throw "adoptopenjdk has been removed as the upstream project is deprecated. Consider using `temurin-jre-bin-11`."; # Added 2024-05-09
+  adoptopenjdk-jre-hotspot-bin-15 = throw "adoptopenjdk has been removed as the upstream project is deprecated. JDK 15 is also EOL. Consider using `temurin-jre-bin-17`."; # Added 2024-05-09
+  adoptopenjdk-jre-hotspot-bin-16 = throw "adoptopenjdk has been removed as the upstream project is deprecated. JDK 16 is also EOL. Consider using `temurin-jre-bin-17` or `temurin-jre-bin-16`."; # Added 2024-05-09
+  adoptopenjdk-jre-hotspot-bin-8 = throw "adoptopenjdk has been removed as the upstream project is deprecated. Consider using `temurin-jre-bin-8`."; # Added 2024-05-09
+  adoptopenjdk-jre-openj9-bin-11 = throw "adoptopenjdk has been removed as the upstream project is deprecated. Consider using `semeru-jre-bin-11`."; # Added 2024-05-09
+  adoptopenjdk-jre-openj9-bin-15 = throw "adoptopenjdk has been removed as the upstream project is deprecated. JDK 15 is also EOL. Consider using `semeru-jre-bin-17`."; # Added 2024-05-09
+  adoptopenjdk-jre-openj9-bin-16 = throw "adoptopenjdk has been removed as the upstream project is deprecated. JDK 16 is also EOL. Consider using `semeru-jre-bin-17` or `semeru-jre-bin-16`."; # Added 2024-05-09
+  adoptopenjdk-jre-openj9-bin-8 = throw "adoptopenjdk has been removed as the upstream project is deprecated. Consider using `semeru-jre-bin-8`."; # Added 2024-05-09
+  adoptopenjdk-openj9-bin-11 = throw "adoptopenjdk has been removed as the upstream project is deprecated. Consider using `semeru-bin-11`."; # Added 2024-05-09
+  adoptopenjdk-openj9-bin-15 = throw "adoptopenjdk has been removed as the upstream project is deprecated. JDK 15 is also EOL. Consider using `semeru-bin-17`."; # Added 2024-05-09
+  adoptopenjdk-openj9-bin-16 = throw "adoptopenjdk has been removed as the upstream project is deprecated. JDK 16 is also EOL. Consider using `semeru-bin-17` or `semeru-bin-16`"; # Added 2024-05-09
+  adoptopenjdk-openj9-bin-8 = throw "adoptopenjdk has been removed as the upstream project is deprecated. Consider using `semeru-bin-8`."; # Added 2024-05-09
   advcpmv = throw "'advcpmv' has been removed, as it is not being actively maintained and break recent coreutils."; # Added 2024-03-29
+  # Post 24.11 branch-off, this should throw an error
+  addOpenGLRunpath = addDriverRunpath; # Added 2024-05-25
   aether = throw "aether has been removed from nixpkgs; upstream unmaintained, security issues"; # Added 2023-10-03
   aeon = throw "aeon has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2024-07-15
   afl = throw "afl has been removed as the upstream project was archived. Consider using 'aflplusplus'"; # Added 2024-04-21
@@ -162,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
@@ -303,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
@@ -333,6 +357,7 @@ mapAliases ({
   ec2_api_tools = ec2-api-tools; # Added 2021-10-08
   ec2-utils = amazon-ec2-utils; # Added 2022-02-01
 
+  edUnstable = throw "edUnstable was removed; use ed instead"; # Added 2024-07-01
   elasticsearch7Plugins = elasticsearchPlugins;
 
   # Electron
@@ -418,6 +443,9 @@ mapAliases ({
   fcitx5-catppuccin = catppuccin-fcitx5; # Added 2024-06-19
   inherit (luaPackages) fennel; # Added 2022-09-24
   fetchFromGithub = throw "You meant fetchFromGitHub, with a capital H"; # preserve
+  ffmpeg_5 = throw "ffmpeg_5 has been removed, please use a newer version or ffmpeg_4 for compatibility"; # Added 2024-07-12
+  ffmpeg_5-headless = throw "ffmpeg_5-headless has been removed, please use a newer version or ffmpeg_4-headless for compatibility"; # Added 2024-07-12
+  ffmpeg_5-full = throw "ffmpeg_5-full has been removed, please use a newer version or ffmpeg_4-full for compatibility"; # Added 2024-07-12
   FIL-plugins = fil-plugins; # Added 2024-06-12
   findimagedupes = throw "findimagedupes has been removed because the perl bindings are no longer compatible"; # Added 2023-07-10
   finger_bsd = bsd-finger;
@@ -460,6 +488,7 @@ mapAliases ({
 
   ### G ###
 
+  g4music = gapless; # Added 2024-07-26
   g4py = python3Packages.geant4; # Added 2020-06-06
   garage_0_7 = throw "garage 0.7.x has been removed as it is EOL. Please upgrade to 0.8 series."; # Added 2023-10-10
   garage_0_7_3 = throw "garage 0.7.x has been removed as it is EOL. Please upgrade to 0.8 series."; # Added 2023-10-10
@@ -1205,6 +1234,7 @@ mapAliases ({
   radicle-upstream = throw "'radicle-upstream' was sunset, see <https://community.radworks.org/t/2962>"; # Added 2024-05-04
   railway-travel = diebahn; # Added 2024-04-01
   rambox-pro = rambox; # Added 2022-12-12
+  rapidjson-unstable = lib.warn "'rapidjson-unstable' has been renamed to 'rapidjson'" rapidjson; # Added 2024-07-28
   rarian = throw "rarian has been removed as unused"; # Added 2023-07-05
   rccl = throw "'rccl' has been replaced with 'rocmPackages.rccl'"; # Added 2023-10-08
   rdc = throw "'rdc' has been replaced with 'rocmPackages.rdc'"; # Added 2023-10-08
@@ -1493,6 +1523,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/third_party/nixpkgs/pkgs/top-level/all-packages.nix b/third_party/nixpkgs/pkgs/top-level/all-packages.nix
index b60fa52161..ed2192dd8e 100644
--- a/third_party/nixpkgs/pkgs/top-level/all-packages.nix
+++ b/third_party/nixpkgs/pkgs/top-level/all-packages.nix
@@ -217,7 +217,11 @@ with pkgs;
   } (writeScript "ensure-newer-sources-hook.sh" ''
       postUnpackHooks+=(_ensureNewerSources)
       _ensureNewerSources() {
-        '${findutils}/bin/find' "$sourceRoot" \
+        local r=$sourceRoot
+        # Avoid passing option-looking directory to find. The example is diffoscope-269:
+        #   https://salsa.debian.org/reproducible-builds/diffoscope/-/issues/378
+        [[ $r == -* ]] && r="./$r"
+        '${findutils}/bin/find' "$r" \
           '!' -newermt '${year}-01-01' -exec touch -h -d '${year}-01-02' '{}' '+'
       }
     '');
@@ -226,10 +230,6 @@ with pkgs;
   # many more scenarios than just opengl now.
   addDriverRunpath = callPackage ../build-support/add-driver-runpath { };
 
-  # addOpenGLRunpath should be added to aliases.nix after the 24.05 branch-off.
-  # Post 24.11 branch-off, this should throw an error in aliases.nix.
-  addOpenGLRunpath = callPackage ../build-support/add-opengl-runpath { };
-
   quickgui = callPackage ../applications/virtualization/quickgui { };
 
   adcli = callPackage ../os-specific/linux/adcli { };
@@ -407,6 +407,10 @@ with pkgs;
 
   c64-debugger = callPackage ../applications/emulators/c64-debugger { };
 
+  cameractrls-gtk4 = cameractrls.override { withGtk = 4; };
+
+  cameractrls-gtk3 = cameractrls.override { withGtk = 3; };
+
   camunda-modeler = callPackage ../applications/misc/camunda-modeler { };
 
   checkpointBuildTools = callPackage ../build-support/checkpoint-build.nix {};
@@ -911,8 +915,6 @@ with pkgs;
 
   dippi = callPackage ../tools/graphics/dippi { };
 
-  dispad = callPackage ../tools/X11/dispad { };
-
   diswall = callPackage ../applications/networking/diswall { };
 
   dupeguru = callPackage ../applications/misc/dupeguru {
@@ -1013,8 +1015,6 @@ with pkgs;
 
   packcc = callPackage ../development/tools/packcc { };
 
-  packer = callPackage ../development/tools/packer { };
-
   packr = callPackage ../development/libraries/packr { };
 
   pacup = callPackage ../tools/package-management/pacup { };
@@ -1051,7 +1051,7 @@ with pkgs;
 
   inherit ({
     mysql-shell_8 = callPackage ../development/tools/mysql-shell/8.nix {
-      inherit (darwin) cctools DarwinTools;
+      inherit (darwin) DarwinTools;
       inherit (darwin.apple_sdk.frameworks) CoreServices;
       antlr = antlr4_10;
       icu =  icu73;
@@ -1062,7 +1062,7 @@ with pkgs;
   ;
 
   mysql-shell-innovation = callPackage ../development/tools/mysql-shell/innovation.nix {
-    inherit (darwin) cctools DarwinTools;
+    inherit (darwin) DarwinTools;
     inherit (darwin.apple_sdk.frameworks) CoreServices;
     antlr = antlr4_10;
     icu =  icu73;
@@ -2278,8 +2278,6 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
   };
 
-  git-codeowners = callPackage ../applications/version-management/git-codeowners { };
-
   git-codereview = callPackage ../applications/version-management/git-codereview { };
 
   git-cola = callPackage ../applications/version-management/git-cola { };
@@ -2551,6 +2549,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 { };
@@ -3167,8 +3183,6 @@ with pkgs;
 
   arduino-ci = callPackage ../development/embedded/arduino/arduino-ci { };
 
-  arduino-cli = callPackage ../development/embedded/arduino/arduino-cli { };
-
   arduino-core = callPackage ../development/embedded/arduino/arduino-core/chrootenv.nix { };
   arduino-core-unwrapped = callPackage ../development/embedded/arduino/arduino-core { };
 
@@ -3288,8 +3302,6 @@ with pkgs;
 
   aws-sso-creds = callPackage ../tools/admin/aws-sso-creds { };
 
-  aws-vault = callPackage ../tools/admin/aws-vault { };
-
   iamy = callPackage ../tools/admin/iamy { };
 
   iam-policy-json-to-terraform = callPackage ../tools/misc/iam-policy-json-to-terraform { };
@@ -3794,9 +3806,7 @@ with pkgs;
 
   glyr = callPackage ../tools/audio/glyr { };
 
-  google-amber = callPackage ../tools/graphics/amber {
-    inherit (darwin) cctools;
-  };
+  google-amber = callPackage ../tools/graphics/amber { };
 
   hakrawler = callPackage ../tools/security/hakrawler { };
 
@@ -4360,8 +4370,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 +4552,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 { };
 
@@ -4647,7 +4655,7 @@ with pkgs;
   wl-mirror = callPackage ../tools/wayland/wl-mirror { };
 
   wl-screenrec = callPackage ../tools/wayland/wl-screenrec {
-    ffmpeg = ffmpeg_5;
+    ffmpeg = ffmpeg_6;
   };
 
   wleave = callPackage ../tools/wayland/wleave { };
@@ -4853,8 +4861,6 @@ with pkgs;
 
   dirb = callPackage ../tools/networking/dirb { };
 
-  direnv = callPackage ../tools/misc/direnv { };
-
   dirstalk = callPackage ../tools/security/dirstalk { };
 
   h = callPackage ../tools/misc/h { };
@@ -5315,8 +5321,6 @@ with pkgs;
 
   girsh = callPackage ../tools/networking/girsh { };
 
-  gist = callPackage ../tools/text/gist { };
-
   gitjacker = callPackage ../tools/security/gitjacker { };
 
   gixy = callPackage ../tools/admin/gixy { };
@@ -5423,7 +5427,6 @@ with pkgs;
   hocr-tools = with python3Packages; toPythonApplication hocr-tools;
 
   homepage-dashboard = callPackage ../servers/homepage-dashboard {
-    inherit (darwin) cctools;
     inherit (darwin.apple_sdk.frameworks) IOKit;
   };
 
@@ -6073,8 +6076,6 @@ with pkgs;
 
   sgp4 = callPackage ../development/libraries/sgp4 { };
 
-  shab = callPackage ../tools/text/shab { };
-
   sheldon = callPackage ../tools/misc/sheldon {
     inherit (darwin.apple_sdk.frameworks) Security;
   };
@@ -6336,8 +6337,6 @@ with pkgs;
     usePoppler = true;
   };
 
-  beanstalkd = callPackage ../servers/beanstalkd { };
-
   beetsPackages = lib.recurseIntoAttrs (callPackage ../tools/audio/beets { });
   inherit (beetsPackages) beets beets-unstable;
 
@@ -6414,10 +6413,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 { };
@@ -7597,7 +7592,7 @@ with pkgs;
   easeprobe = callPackage ../tools/misc/easeprobe { };
 
   emscripten = callPackage ../development/compilers/emscripten {
-    llvmPackages = llvmPackages_18;
+    llvmPackages = llvmPackages_git;
   };
 
   emscriptenPackages = recurseIntoAttrs (callPackage ./emscripten-packages.nix { });
@@ -7844,8 +7839,9 @@ with pkgs;
 
   fingerprintx = callPackage ../tools/security/fingerprintx { };
 
-  bsd-finger = callPackage ../tools/networking/bsd-finger { };
-  bsd-fingerd = bsd-finger.override({ buildClient = false; });
+  bsd-fingerd = bsd-finger.override({
+    buildProduct = "daemon";
+  });
 
   iprange = callPackage ../applications/networking/firehol/iprange.nix { };
 
@@ -7884,7 +7880,7 @@ with pkgs;
   lpd8editor = libsForQt5.callPackage ../applications/audio/lpd8editor {};
 
   lp_solve = callPackage ../applications/science/math/lp_solve {
-    inherit (darwin) cctools autoSignDarwinBinariesHook;
+    inherit (darwin) autoSignDarwinBinariesHook;
   };
 
   fabric-installer = callPackage ../tools/games/minecraft/fabric-installer { };
@@ -8143,8 +8139,6 @@ with pkgs;
 
   geonkick = callPackage ../applications/audio/geonkick { };
 
-  gerrit = callPackage ../applications/version-management/gerrit { };
-
   geteltorito = callPackage ../tools/misc/geteltorito { };
 
   getopt = callPackage ../tools/misc/getopt { };
@@ -8177,10 +8171,8 @@ with pkgs;
 
   gibo = callPackage ../tools/misc/gibo { };
 
-  gifsicle = callPackage ../tools/graphics/gifsicle { };
-
   gifski = callPackage ../tools/graphics/gifski {
-    ffmpeg = ffmpeg_5;
+    ffmpeg = ffmpeg_6;
   };
 
   github-backup = callPackage ../tools/misc/github-backup { };
@@ -8202,8 +8194,6 @@ with pkgs;
 
   gitlab-pages = callPackage ../applications/version-management/gitlab/gitlab-pages { };
 
-  gitlab-runner = callPackage ../development/tools/continuous-integration/gitlab-runner { };
-
   gitlab-shell = callPackage ../applications/version-management/gitlab/gitlab-shell { };
 
   gitlab-triage = callPackage ../applications/version-management/gitlab-triage { };
@@ -9143,8 +9133,8 @@ with pkgs;
 
   jadx = callPackage ../tools/security/jadx { };
 
-  jamesdsp = libsForQt5.callPackage ../applications/audio/jamesdsp { };
-  jamesdsp-pulse = libsForQt5.callPackage ../applications/audio/jamesdsp {
+  jamesdsp = qt6Packages.callPackage ../applications/audio/jamesdsp { };
+  jamesdsp-pulse = qt6Packages.callPackage ../applications/audio/jamesdsp {
     usePipewire = false;
     usePulseaudio = true;
   };
@@ -10286,7 +10276,7 @@ with pkgs;
   bubblemail = callPackage ../applications/networking/mailreaders/bubblemail { };
 
   mailpit = callPackage ../servers/mail/mailpit {
-    libtool = if stdenv.isDarwin then darwin.cctools else libtool;
+    libtool = if stdenv.isDarwin then cctools else libtool;
   };
 
   mailsend = callPackage ../tools/networking/mailsend { };
@@ -11306,8 +11296,6 @@ with pkgs;
 
   oxlint = callPackage ../development/tools/oxlint { };
 
-  ovh-ttyrec = callPackage ../tools/misc/ovh-ttyrec { };
-
   ovito = libsForQt5.callPackage ../applications/graphics/ovito {
     inherit (darwin.apple_sdk.frameworks) VideoDecodeAcceleration;
   };
@@ -11475,7 +11463,7 @@ with pkgs;
   otpauth = callPackage ../tools/security/otpauth { };
 
   pcsclite = callPackage ../tools/security/pcsclite {
-    inherit (darwin.apple_sdk.frameworks) IOKit;
+    inherit (darwin.apple_sdk.frameworks) Foundation IOKit;
   };
 
   pcscliteWithPolkit = pcsclite.override {
@@ -12211,8 +12199,6 @@ with pkgs;
 
   relic = callPackage ../development/tools/relic { };
 
-  remind = callPackage ../tools/misc/remind { };
-
   remmina = darwin.apple_sdk_11_0.callPackage ../applications/networking/remote/remmina { };
 
   rename = callPackage ../tools/misc/rename { };
@@ -12295,11 +12281,6 @@ with pkgs;
     inherit (darwin.apple_sdk_11_0.libs) simd;
   };
 
-  rnote = callPackage ../applications/graphics/rnote {
-    inherit (gst_all_1) gstreamer;
-    inherit (darwin.apple_sdk.frameworks) AudioUnit;
-  };
-
   rnp = callPackage ../tools/security/rnp { };
 
   rnr = callPackage ../tools/text/rnr { };
@@ -12577,9 +12558,7 @@ with pkgs;
 
   selectdefaultapplication = libsForQt5.callPackage ../applications/misc/selectdefaultapplication { };
 
-  semantic-release = callPackage ../development/tools/semantic-release {
-    inherit (darwin) cctools;
-  };
+  semantic-release = callPackage ../development/tools/semantic-release { };
 
   semgrep = python3.pkgs.callPackage ../tools/security/semgrep { };
   semgrep-core = callPackage ../tools/security/semgrep/semgrep-core.nix { };
@@ -13000,8 +12979,6 @@ with pkgs;
 
   structorizer = callPackage ../applications/graphics/structorizer { };
 
-  su-exec = callPackage ../tools/security/su-exec { };
-
   subberthehut = callPackage ../tools/misc/subberthehut { };
 
   subedit = callPackage ../tools/text/subedit { };
@@ -13393,8 +13370,6 @@ with pkgs;
 
   tmux = callPackage ../tools/misc/tmux { };
 
-  tmux-cssh = callPackage ../tools/misc/tmux-cssh { };
-
   tmuxp = callPackage ../tools/misc/tmuxp { };
 
   tmuxinator = callPackage ../tools/misc/tmuxinator { };
@@ -14184,7 +14159,6 @@ with pkgs;
 
   unicorn = callPackage ../development/libraries/unicorn {
     inherit (darwin.apple_sdk.frameworks) IOKit;
-    inherit (darwin) cctools;
   };
 
   unittest-cpp = callPackage ../development/libraries/unittest-cpp { };
@@ -14603,8 +14577,6 @@ with pkgs;
     nvidiaSupport = true;
   };
 
-  zerotierone = callPackage ../tools/networking/zerotierone { };
-
   zerofree = callPackage ../tools/filesystems/zerofree { };
 
   zet = callPackage ../tools/text/zet { };
@@ -14866,32 +14838,6 @@ with pkgs;
   semeru-bin = semeru-bin-21;
   semeru-jre-bin = semeru-jre-bin-21;
 
-  adoptopenjdk-bin-17-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk17-linux.nix { inherit stdenv lib; };
-  adoptopenjdk-bin-17-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk17-darwin.nix { inherit lib; };
-
-  adoptopenjdk-hotspot-bin-16 = javaPackages.compiler.adoptopenjdk-16.jdk-hotspot;
-  adoptopenjdk-jre-hotspot-bin-16 = javaPackages.compiler.adoptopenjdk-16.jre-hotspot;
-  adoptopenjdk-openj9-bin-16 = javaPackages.compiler.adoptopenjdk-16.jdk-openj9;
-  adoptopenjdk-jre-openj9-bin-16 = javaPackages.compiler.adoptopenjdk-16.jre-openj9;
-
-  adoptopenjdk-hotspot-bin-15 = javaPackages.compiler.adoptopenjdk-15.jdk-hotspot;
-  adoptopenjdk-jre-hotspot-bin-15 = javaPackages.compiler.adoptopenjdk-15.jre-hotspot;
-  adoptopenjdk-openj9-bin-15 = javaPackages.compiler.adoptopenjdk-15.jdk-openj9;
-  adoptopenjdk-jre-openj9-bin-15 = javaPackages.compiler.adoptopenjdk-15.jre-openj9;
-
-  adoptopenjdk-hotspot-bin-11 = javaPackages.compiler.adoptopenjdk-11.jdk-hotspot;
-  adoptopenjdk-jre-hotspot-bin-11 = javaPackages.compiler.adoptopenjdk-11.jre-hotspot;
-  adoptopenjdk-openj9-bin-11 = javaPackages.compiler.adoptopenjdk-11.jdk-openj9;
-  adoptopenjdk-jre-openj9-bin-11 = javaPackages.compiler.adoptopenjdk-11.jre-openj9;
-
-  adoptopenjdk-hotspot-bin-8 = javaPackages.compiler.adoptopenjdk-8.jdk-hotspot;
-  adoptopenjdk-jre-hotspot-bin-8 = javaPackages.compiler.adoptopenjdk-8.jre-hotspot;
-  adoptopenjdk-openj9-bin-8 = javaPackages.compiler.adoptopenjdk-8.jdk-openj9;
-  adoptopenjdk-jre-openj9-bin-8 = javaPackages.compiler.adoptopenjdk-8.jre-openj9;
-
-  adoptopenjdk-bin = adoptopenjdk-hotspot-bin-11;
-  adoptopenjdk-jre-bin = adoptopenjdk-jre-hotspot-bin-11;
-
   adoptopenjdk-icedtea-web = callPackage ../development/compilers/adoptopenjdk-icedtea-web {
     jdk = jdk8;
   };
@@ -14985,9 +14931,7 @@ with pkgs;
     stdenv = gccStdenv;
   };
 
-  chez = callPackage ../development/compilers/chez {
-    inherit (darwin) cctools;
-  };
+  chez = callPackage ../development/compilers/chez { };
 
   chez-racket = callPackage ../development/compilers/chez-racket { };
 
@@ -15806,7 +15750,7 @@ with pkgs;
 
   hugs = callPackage ../development/interpreters/hugs { };
 
-  inherit (javaPackages) openjfx11 openjfx15 openjfx17 openjfx19 openjfx20 openjfx21 openjfx22;
+  inherit (javaPackages) openjfx11 openjfx17 openjfx19 openjfx20 openjfx21 openjfx22;
   openjfx = openjfx17;
 
   openjdk8-bootstrap = javaPackages.compiler.openjdk8-bootstrap;
@@ -16017,10 +15961,10 @@ 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 17
+      else if platform.isLinux then 18
       else if platform.isWasm then 16
       # For unknown systems, assume the latest version is required.
       else 18;
@@ -16256,11 +16200,11 @@ with pkgs;
   wrapRustcWith = { rustc-unwrapped, ... } @ args: callPackage ../build-support/rust/rustc-wrapper args;
   wrapRustc = rustc-unwrapped: wrapRustcWith { inherit rustc-unwrapped; };
 
-  rust_1_78 = callPackage ../development/compilers/rust/1_78.nix {
+  rust_1_79 = callPackage ../development/compilers/rust/1_79.nix {
     inherit (darwin.apple_sdk.frameworks) CoreFoundation Security SystemConfiguration;
     llvm_18 = llvmPackages_18.libllvm;
   };
-  rust = rust_1_78;
+  rust = rust_1_79;
 
   mrustc = callPackage ../development/compilers/mrustc { };
   mrustc-minicargo = callPackage ../development/compilers/mrustc/minicargo.nix { };
@@ -16268,8 +16212,8 @@ with pkgs;
     openssl = openssl_1_1;
   };
 
-  rustPackages_1_78 = rust_1_78.packages.stable;
-  rustPackages = rustPackages_1_78;
+  rustPackages_1_79 = rust_1_79.packages.stable;
+  rustPackages = rustPackages_1_79;
 
   inherit (rustPackages) cargo cargo-auditable cargo-auditable-cargo-wrapper clippy rustc rustPlatform;
 
@@ -16640,8 +16584,6 @@ with pkgs;
 
   typescript = callPackage ../development/compilers/typescript { };
 
-  bupc = callPackage ../development/compilers/bupc { };
-
   ubports-click = python3Packages.callPackage ../development/tools/click { };
 
   uasm = callPackage ../development/compilers/uasm { };
@@ -16721,7 +16663,6 @@ with pkgs;
     noLibc = (self.libc == null);
 
     inherit bintools libc;
-    inherit (darwin) postLinkSignHook signingUtils;
   } // extraArgs; in self);
 
   yaml-language-server = callPackage  ../development/tools/language-servers/yaml-language-server { };
@@ -17278,10 +17219,9 @@ with pkgs;
     inherit (darwin) libobjc;
   };
   defaultGemConfig = callPackage ../development/ruby-modules/gem-config {
-    inherit (darwin) DarwinTools cctools autoSignDarwinBinariesHook;
+    inherit (darwin) DarwinTools autoSignDarwinBinariesHook;
     inherit (darwin.apple_sdk.frameworks) CoreServices;
   };
-  bundix = callPackage ../development/ruby-modules/bundix { };
   bundler = callPackage ../development/ruby-modules/bundler { };
   bundlerEnv = callPackage ../development/ruby-modules/bundler-env { };
   bundlerApp = callPackage ../development/ruby-modules/bundler-app { };
@@ -17499,8 +17439,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 { };
@@ -17604,8 +17542,6 @@ with pkgs;
 
   glslls = callPackage ../development/tools/language-servers/glslls { };
 
-  gopls = callPackage ../development/tools/language-servers/gopls { };
-
   helm-ls = callPackage ../development/tools/language-servers/helm-ls { };
 
   javascript-typescript-langserver = callPackage ../development/tools/language-servers/javascript-typescript-langserver { };
@@ -17772,7 +17708,7 @@ with pkgs;
   bazel = bazel_6;
 
   bazel_5 = callPackage ../development/tools/build-managers/bazel/bazel_5 {
-    inherit (darwin) cctools sigtool;
+    inherit (darwin) sigtool;
     inherit (darwin.apple_sdk.frameworks) CoreFoundation CoreServices Foundation;
     buildJdk = jdk11_headless;
     runJdk = jdk11_headless;
@@ -17783,7 +17719,7 @@ with pkgs;
   };
 
   bazel_6 = darwin.apple_sdk_11_0.callPackage ../development/tools/build-managers/bazel/bazel_6 {
-    inherit (darwin) cctools sigtool;
+    inherit (darwin) sigtool;
     inherit (darwin.apple_sdk_11_0.frameworks) CoreFoundation CoreServices Foundation;
     buildJdk = jdk11_headless;
     runJdk = jdk11_headless;
@@ -17795,7 +17731,7 @@ with pkgs;
   };
 
   bazel_7 = darwin.apple_sdk_11_0.callPackage ../development/tools/build-managers/bazel/bazel_7 {
-    inherit (darwin) cctools sigtool;
+    inherit (darwin) sigtool;
     inherit (darwin.apple_sdk_11_0.frameworks) CoreFoundation CoreServices Foundation IOKit;
     buildJdk = jdk17_headless;
     runJdk = jdk17_headless;
@@ -17961,8 +17897,6 @@ with pkgs;
 
   bpkg = callPackage ../development/tools/build-managers/build2/bpkg.nix { };
 
-  buildkite-agent = callPackage ../development/tools/continuous-integration/buildkite-agent { };
-
   buildkite-agent-metrics = callPackage ../servers/monitoring/buildkite-agent-metrics { };
 
   buildkite-cli = callPackage ../development/tools/continuous-integration/buildkite-cli { };
@@ -18384,9 +18318,6 @@ with pkgs;
 
   fly = callPackage ../development/tools/continuous-integration/fly { };
 
-  foreman = callPackage ../tools/system/foreman { };
-  goreman = callPackage ../tools/system/goreman { };
-
   fprettify = callPackage ../development/tools/fprettify { };
 
   framac = callPackage ../development/tools/analysis/frama-c { };
@@ -18552,8 +18483,6 @@ with pkgs;
 
   hcloud = callPackage ../development/tools/hcloud { };
 
-  hclfmt = callPackage ../development/tools/hclfmt { };
-
   help2man = callPackage ../development/tools/misc/help2man { };
 
   heroku = callPackage ../development/tools/heroku { };
@@ -18839,6 +18768,8 @@ with pkgs;
 
   moon = callPackage ../development/tools/build-managers/moon/default.nix { };
 
+  mopsa = ocamlPackages.mopsa.bin;
+
   msgpack-tools = callPackage ../development/tools/msgpack-tools { };
 
   msgpuck = callPackage ../development/libraries/msgpuck { };
@@ -19173,11 +19104,6 @@ with pkgs;
 
   sca2d = callPackage ../development/tools/sca2d {  };
 
-  scons = scons_4_5_2;
-  scons_3_1_2 = callPackage ../development/tools/build-managers/scons/3.1.2.nix { };
-  scons_4_1_0 = callPackage ../development/tools/build-managers/scons/4.1.0.nix { };
-  scons_4_5_2 = callPackage ../development/tools/build-managers/scons/4.5.2.nix { };
-
   mill = callPackage ../development/tools/build-managers/mill { };
 
   sbt = callPackage ../development/tools/build-managers/sbt { };
@@ -19403,13 +19329,16 @@ with pkgs;
 
   tesh = callPackage ../tools/text/tesh {};
 
-  texinfo413 = callPackage ../development/tools/misc/texinfo/4.13a.nix { };
-  texinfo4 = texinfo413;
-  texinfo5 = callPackage ../development/tools/misc/texinfo/5.2.nix { };
-  texinfo6_5 = callPackage ../development/tools/misc/texinfo/6.5.nix { }; # needed for allegro
-  texinfo6_7 = callPackage ../development/tools/misc/texinfo/6.7.nix { }; # needed for gpm, iksemel and fwknop
-  texinfo6 = callPackage ../development/tools/misc/texinfo/6.8.nix { };
-  texinfo7 = callPackage ../development/tools/misc/texinfo/7.0.nix { };
+  texinfoPackages = callPackages ../development/tools/misc/texinfo/packages.nix { };
+  inherit (texinfoPackages)
+    texinfo413
+    texinfo5 # needed for gcc48
+    texinfo6_5 # needed for allegro
+    texinfo6_7 # needed for gpm, iksemel and fwknop
+    texinfo6
+    texinfo7
+    ;
+  texinfo4= texinfo413; # needed for eukleides and singular
   texinfo = texinfo7;
   texinfoInteractive = texinfo.override { interactive = true; };
 
@@ -19464,7 +19393,7 @@ with pkgs;
       # tests fail on old version
       doCheck = false;
       meta = libgit2.meta // {
-        maintainers = [];
+        maintainers = [ ];
         knownVulnerabilities = [ "CVE-2024-24575" "CVE-2024-24577" "CVE-2022-29187" "CVE 2022-24765" ];
       };
     };
@@ -19517,7 +19446,7 @@ with pkgs;
   jhiccup = callPackage ../development/tools/java/jhiccup { };
 
   valgrind = callPackage ../development/tools/analysis/valgrind {
-    inherit (buildPackages.darwin) xnu bootstrap_cmds cctools;
+    inherit (buildPackages.darwin) xnu bootstrap_cmds;
   };
   valgrind-light = res.valgrind.override { gdb = null; };
 
@@ -20346,9 +20275,6 @@ with pkgs;
     ffmpeg_4
     ffmpeg_4-headless
     ffmpeg_4-full
-    ffmpeg_5
-    ffmpeg_5-headless
-    ffmpeg_5-full
     ffmpeg_6
     ffmpeg_6-headless
     ffmpeg_6-full
@@ -20798,7 +20724,6 @@ with pkgs;
 
   gobject-introspection-unwrapped = callPackage ../development/libraries/gobject-introspection {
     nixStoreDir = config.nix.storeDir or builtins.storeDir;
-    inherit (darwin) cctools;
   };
 
   goocanvas = callPackage ../development/libraries/goocanvas { };
@@ -20846,7 +20771,6 @@ with pkgs;
   };
 
   gpac = callPackage ../applications/video/gpac {
-    inherit (darwin) cctools;
     inherit (darwin.apple_sdk.frameworks) Carbon;
   };
 
@@ -21273,8 +21197,6 @@ with pkgs;
 
   jama = callPackage ../development/libraries/jama { };
 
-  jansson = callPackage ../development/libraries/jansson { };
-
   jarowinkler-cpp = callPackage ../development/libraries/jarowinkler-cpp { };
 
   jbig2dec = callPackage ../development/libraries/jbig2dec { };
@@ -22276,11 +22198,13 @@ with pkgs;
   inherit
     ({
       libmicrohttpd_0_9_77 = callPackage ../development/libraries/libmicrohttpd/0.9.77.nix { };
+      libmicrohttpd_1_0 = callPackage ../development/libraries/libmicrohttpd/1.0.nix { };
     })
     libmicrohttpd_0_9_77
+    libmicrohttpd_1_0
     ;
 
-  libmicrohttpd = libmicrohttpd_0_9_77;
+  libmicrohttpd = libmicrohttpd_1_0;
 
   libmikmod = callPackage ../development/libraries/libmikmod {
     inherit (darwin.apple_sdk.frameworks) CoreAudio;
@@ -22846,7 +22770,7 @@ with pkgs;
   lirc = callPackage ../development/libraries/lirc { };
 
   liquid-dsp = callPackage ../development/libraries/liquid-dsp {
-    inherit (darwin) autoSignDarwinBinariesHook cctools;
+    inherit (darwin) autoSignDarwinBinariesHook;
   };
 
   liquidfun = callPackage ../development/libraries/liquidfun { };
@@ -23388,6 +23312,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;
@@ -23605,6 +23532,7 @@ with pkgs;
   protozero = callPackage ../development/libraries/protozero { };
 
   flatbuffers = callPackage ../development/libraries/flatbuffers { };
+  flatbuffers_23 = callPackage ../development/libraries/flatbuffers/23.nix { };
 
   nanopbMalloc = callPackage ../by-name/na/nanopb/package.nix { enableMalloc = true; };
 
@@ -23709,8 +23637,6 @@ with pkgs;
 
   rapidjson = callPackage ../development/libraries/rapidjson { };
 
-  rapidjson-unstable = callPackage ../development/libraries/rapidjson/unstable.nix { };
-
   rapidxml = callPackage ../development/libraries/rapidxml { };
 
   rapidyaml = callPackage ../development/libraries/rapidyaml {};
@@ -23854,8 +23780,6 @@ with pkgs;
 
   round = callPackage ../applications/graphics/round { };
 
-  ronn = callPackage ../development/tools/ronn { };
-
   router = callPackage ../servers/http/router { };
 
   rover = callPackage ../development/tools/rover { };
@@ -24112,6 +24036,17 @@ with pkgs;
 
   speechd = callPackage ../development/libraries/speechd { };
 
+  speechd-minimal = speechd.override {
+    withLibao = false;
+    withPulse = false;
+    withAlsa = false;
+    withOss = false;
+    withFlite = false;
+    withEspeak = false;
+    withPico = false;
+    libsOnly = true;
+  };
+
   speech-tools = callPackage ../development/libraries/speech-tools {
     inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit Cocoa;
   };
@@ -24976,17 +24911,17 @@ with pkgs;
   };
 
   # Steel Bank Common Lisp
-  sbcl_2_4_5 = wrapLisp {
-    pkg = callPackage ../development/compilers/sbcl { version = "2.4.5"; };
-    faslExt = "fasl";
-    flags = [ "--dynamic-space-size" "3000" ];
-  };
   sbcl_2_4_6 = wrapLisp {
     pkg = callPackage ../development/compilers/sbcl { version = "2.4.6"; };
     faslExt = "fasl";
     flags = [ "--dynamic-space-size" "3000" ];
   };
-  sbcl = sbcl_2_4_6;
+  sbcl_2_4_7 = wrapLisp {
+    pkg = callPackage ../development/compilers/sbcl { version = "2.4.7"; };
+    faslExt = "fasl";
+    flags = [ "--dynamic-space-size" "3000" ];
+  };
+  sbcl = sbcl_2_4_7;
 
   sbclPackages = recurseIntoAttrs sbcl.pkgs;
 
@@ -25808,14 +25743,12 @@ with pkgs;
   mongodb-5_0 = callPackage ../servers/nosql/mongodb/5.0.nix {
     sasl = cyrus_sasl;
     boost = boost179.override { enableShared = false; };
-    inherit (darwin) cctools;
     inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
   };
 
   mongodb-6_0 = darwin.apple_sdk_11_0.callPackage ../servers/nosql/mongodb/6.0.nix {
     sasl = cyrus_sasl;
     boost = boost178.override { enableShared = false; };
-    inherit (darwin) cctools;
     inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
     stdenv = if stdenv.isDarwin then
       darwin.apple_sdk_11_0.stdenv.override (old: {
@@ -25839,7 +25772,7 @@ with pkgs;
   influxdb2 = callPackage ../servers/nosql/influxdb2/combined.nix { };
 
   mysql80 = callPackage ../servers/sql/mysql/8.0.x.nix {
-    inherit (darwin) cctools developer_cmds DarwinTools;
+    inherit (darwin) developer_cmds DarwinTools;
     inherit (darwin.apple_sdk.frameworks) CoreServices;
     boost = boost177; # Configure checks for specific version.
     icu = icu69;
@@ -26120,7 +26053,7 @@ with pkgs;
 
   rethinkdb = callPackage ../servers/nosql/rethinkdb {
     stdenv = clangStdenv;
-    libtool = darwin.cctools;
+    libtool = cctools;
     protobuf = protobuf_21;
   };
 
@@ -26398,8 +26331,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 { };
@@ -26663,7 +26594,8 @@ with pkgs;
 
   fatrace = callPackage ../os-specific/linux/fatrace { };
 
-  ffado = libsForQt5.callPackage ../os-specific/linux/ffado { };
+  ffado = callPackage ../os-specific/linux/ffado { };
+  ffado-mixer = callPackage ../os-specific/linux/ffado { withMixer = true; };
   libffado = ffado;
 
   fbterm = callPackage ../os-specific/linux/fbterm { };
@@ -27293,8 +27225,6 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  openpam = callPackage ../development/libraries/openpam { };
-
   openbsm = callPackage ../development/libraries/openbsm { };
 
   pagemon = callPackage ../os-specific/linux/pagemon { };
@@ -27576,6 +27506,7 @@ with pkgs;
     withPasswordQuality = false;
     withVmspawn = false;
     withQrencode = false;
+    withLibarchive = false;
   };
   systemdLibs = systemdMinimal.override {
     pname = "systemd-minimal-libs";
@@ -27763,10 +27694,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 { };
@@ -27775,8 +27702,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 { };
@@ -28704,7 +28629,7 @@ with pkgs;
   session-desktop = callPackage ../applications/networking/instant-messengers/session-desktop { };
 
   shaderc = callPackage ../development/compilers/shaderc {
-    inherit (darwin) autoSignDarwinBinariesHook cctools;
+    inherit (darwin) autoSignDarwinBinariesHook;
   };
 
   shades-of-gray-theme = callPackage ../data/themes/shades-of-gray { };
@@ -29891,7 +29816,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 { };
@@ -29904,7 +29829,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 { };
 
 
@@ -29973,7 +29897,7 @@ with pkgs;
 
   dyff = callPackage ../development/tools/dyff { };
 
-  dwl = callPackage ../applications/window-managers/dwl {
+  dwl = callPackage ../by-name/dw/dwl/package.nix {
     wlroots = wlroots_0_17;
   };
 
@@ -30015,9 +29939,6 @@ with pkgs;
 
   ecs-agent = callPackage ../applications/virtualization/ecs-agent { };
 
-  inherit (recurseIntoAttrs (callPackage ../applications/editors/ed { }))
-    ed edUnstable;
-
   edlin = callPackage ../applications/editors/edlin { };
 
   oed = callPackage ../applications/editors/oed { };
@@ -30753,10 +30674,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 { };
@@ -30897,8 +30814,6 @@ with pkgs;
 
   svox = callPackage ../applications/audio/svox { };
 
-  g4music = callPackage ../applications/audio/g4music { };
-
   genesys = callPackage ../applications/misc/genesys { };
 
   giada = callPackage ../applications/audio/giada { };
@@ -31280,6 +31195,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 { });
@@ -31780,8 +31696,6 @@ with pkgs;
 
   kubectl-cnpg = callPackage ../applications/networking/cluster/kubectl-cnpg { };
 
-  kubectl-doctor = callPackage ../applications/networking/cluster/kubectl-doctor { };
-
   kubectl-example = callPackage ../applications/networking/cluster/kubectl-example { };
 
   kubectl-explore = callPackage ../applications/networking/cluster/kubectl-explore { };
@@ -32068,7 +31982,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 { };
 
@@ -32134,7 +32048,7 @@ with pkgs;
 
   mac = callPackage ../development/libraries/mac { };
 
-  macdylibbundler = callPackage ../development/tools/misc/macdylibbundler { inherit (darwin) cctools; };
+  macdylibbundler = callPackage ../development/tools/misc/macdylibbundler { };
 
   magic-wormhole = with python3Packages; toPythonApplication magic-wormhole;
 
@@ -32185,6 +32099,8 @@ with pkgs;
 
   mbrola = callPackage ../applications/audio/mbrola { };
 
+  mbrola-voices = callPackage ../applications/audio/mbrola/voices.nix { };
+
   mcpp = callPackage ../development/compilers/mcpp { };
 
   mda_lv2 = callPackage ../applications/audio/mda-lv2 { };
@@ -34780,14 +34696,12 @@ with pkgs;
   openvscode-server = callPackage ../servers/openvscode-server {
     nodejs = nodejs_18;
     inherit (darwin.apple_sdk.frameworks) AppKit Cocoa Security;
-    inherit (darwin) cctools;
     inherit (nodePackages) node-gyp;
   };
 
   code-server = callPackage ../servers/code-server {
     nodejs = nodejs_20;
     inherit (darwin.apple_sdk.frameworks) AppKit Cocoa CoreServices Security;
-    inherit (darwin) cctools;
     inherit (nodePackages) node-gyp;
   };
 
@@ -35641,8 +35555,6 @@ with pkgs;
 
   conceal = callPackage ../applications/misc/conceal { };
 
-  confd = callPackage ../tools/system/confd { };
-
   conmon = callPackage ../applications/virtualization/conmon { };
 
   conmon-rs = callPackage ../applications/virtualization/conmon-rs { };
@@ -35653,8 +35565,6 @@ with pkgs;
     inherit (darwin.apple_sdk.frameworks) Security;
   };
 
-  fava = callPackage ../applications/office/fava { };
-
   nux = callPackage ../tools/misc/nux { };
 
   phonemizer = with python3Packages; toPythonApplication phonemizer;
@@ -36168,9 +36078,7 @@ with pkgs;
 
   garden-of-coloured-lights = callPackage ../games/garden-of-coloured-lights { allegro = allegro4; };
 
-  gargoyle = callPackage ../games/gargoyle {
-    inherit (darwin) cctools;
-  };
+  gargoyle = callPackage ../games/gargoyle { };
 
   gav = callPackage ../games/gav { };
 
@@ -36636,7 +36544,6 @@ with pkgs;
   scid-vs-pc = callPackage ../games/scid-vs-pc { };
 
   scummvm = callPackage ../games/scummvm {
-    inherit (darwin) cctools;
     inherit (darwin.apple_sdk.frameworks) Cocoa AudioToolbox Carbon CoreMIDI AudioUnit;
   };
 
@@ -38914,8 +38821,6 @@ with pkgs;
 
   narrowlink = callPackage ../tools/networking/narrowlink { };
 
-  nar-serve = callPackage ../tools/nix/nar-serve { };
-
   neo = callPackage ../applications/misc/neo { };
 
   networkd-dispatcher = callPackage ../tools/networking/networkd-dispatcher { };
@@ -39130,8 +39035,6 @@ with pkgs;
 
   nixfmt-classic = haskellPackages.nixfmt.bin;
 
-  nixpkgs-fmt = callPackage ../tools/nix/nixpkgs-fmt { };
-
   nixpkgs-hammering = callPackage ../tools/nix/nixpkgs-hammering { };
 
   nixpkgs-lint-community = callPackage ../tools/nix/nixpkgs-lint { };
@@ -39528,8 +39431,6 @@ with pkgs;
 
   terraform-backend-git = callPackage ../applications/networking/cluster/terraform-backend-git { };
 
-  terraform-docs = callPackage ../applications/networking/cluster/terraform-docs { };
-
   terraform-inventory = callPackage ../applications/networking/cluster/terraform-inventory { };
 
   terraform-landscape = callPackage ../applications/networking/cluster/terraform-landscape { };
@@ -39707,8 +39608,6 @@ with pkgs;
 
   wcalc = callPackage ../applications/misc/wcalc { };
 
-  webfs = callPackage ../servers/http/webfs { };
-
   webkit2-sharp = callPackage ../development/libraries/webkit2-sharp {  };
 
   websocketd = callPackage ../applications/networking/websocketd { };
@@ -40017,7 +39916,7 @@ with pkgs;
 
   check-uptime = callPackage ../servers/monitoring/plugins/uptime.nix { };
 
-  ghc-standalone-archive = callPackage ../os-specific/darwin/ghc-standalone-archive { inherit (darwin) cctools; };
+  ghc-standalone-archive = callPackage ../os-specific/darwin/ghc-standalone-archive { };
 
   vdr = callPackage ../applications/video/vdr { };
   vdrPlugins = recurseIntoAttrs (callPackage ../applications/video/vdr/plugins.nix { });
@@ -40186,12 +40085,6 @@ with pkgs;
 
   _3proxy = callPackage ../applications/networking/3proxy { };
 
-  pigeon = callPackage ../development/tools/pigeon { };
-
-  verifpal = callPackage ../tools/security/verifpal { };
-
-  nix-store-gcs-proxy = callPackage ../tools/nix/nix-store-gcs-proxy { };
-
   weasis = callPackage ../by-name/we/weasis/package.nix {
     jre = jdk21;
   };
@@ -40204,10 +40097,6 @@ with pkgs;
 
   qubes-core-vchan-xen = callPackage ../applications/qubes/qubes-core-vchan-xen { };
 
-  coz = callPackage ../development/tools/analysis/coz { };
-
-  keycard-cli = callPackage ../tools/security/keycard-cli { };
-
   sieveshell = with python3.pkgs; toPythonApplication managesieve;
 
   gortr = callPackage ../servers/gortr { };
@@ -40254,8 +40143,6 @@ with pkgs;
 
   ryzenadj = callPackage ../os-specific/linux/ryzenadj { };
 
-  vpsfree-client = callPackage ../tools/virtualization/vpsfree-client { };
-
   gpio-utils = callPackage ../os-specific/linux/kernel/gpio-utils.nix { };
 
   zalgo = callPackage ../tools/misc/zalgo { };
diff --git a/third_party/nixpkgs/pkgs/top-level/coq-packages.nix b/third_party/nixpkgs/pkgs/top-level/coq-packages.nix
index ef32cb6852..78f5cd2bb1 100644
--- a/third_party/nixpkgs/pkgs/top-level/coq-packages.nix
+++ b/third_party/nixpkgs/pkgs/top-level/coq-packages.nix
@@ -68,6 +68,7 @@ let
       graph-theory = callPackage ../development/coq-modules/graph-theory {};
       heq = callPackage ../development/coq-modules/heq {};
       hierarchy-builder = callPackage ../development/coq-modules/hierarchy-builder {};
+      high-school-geometry = callPackage ../development/coq-modules/high-school-geometry {};
       HoTT = callPackage ../development/coq-modules/HoTT {};
       hydra-battles = callPackage ../development/coq-modules/hydra-battles {};
       interval = callPackage ../development/coq-modules/interval {};
diff --git a/third_party/nixpkgs/pkgs/top-level/darwin-aliases.nix b/third_party/nixpkgs/pkgs/top-level/darwin-aliases.nix
index c9799351f4..e64bb25684 100644
--- a/third_party/nixpkgs/pkgs/top-level/darwin-aliases.nix
+++ b/third_party/nixpkgs/pkgs/top-level/darwin-aliases.nix
@@ -51,6 +51,12 @@ mapAliases ({
 
   builder = throw "'darwin.builder' has been changed and renamed to 'darwin.linux-builder'. The default ssh port is now 31022. Please update your configuration or override the port back to 22. See https://nixos.org/manual/nixpkgs/unstable/#sec-darwin-builder"; # added 2023-07-06
 
+  ### C ###
+  cctools = pkgs.cctools; # added 2024-07-17
+  cctools-apple = pkgs.cctools; # added 2024-07-01
+  cctools-llvm = pkgs.cctools; # added 2024-07-01
+  cctools-port = pkgs.cctools; # added 2024-07-17
+
   ### I ###
 
   insert_dylib = throw "'darwin.insert_dylib' has been renamed to 'insert-dylib'"; # added 2024-04-04
diff --git a/third_party/nixpkgs/pkgs/top-level/darwin-packages.nix b/third_party/nixpkgs/pkgs/top-level/darwin-packages.nix
index 486d3964fd..9de9f56674 100644
--- a/third_party/nixpkgs/pkgs/top-level/darwin-packages.nix
+++ b/third_party/nixpkgs/pkgs/top-level/darwin-packages.nix
@@ -90,7 +90,7 @@ impure-cmds // appleSourcePackages // chooseLibs // {
   };
 
   binutils-unwrapped = callPackage ../os-specific/darwin/binutils {
-    inherit (self) cctools;
+    inherit (pkgs) cctools;
     inherit (pkgs.llvmPackages) clang-unwrapped llvm llvm-manpages;
   };
 
@@ -120,7 +120,7 @@ impure-cmds // appleSourcePackages // chooseLibs // {
     name = "${lib.getName self.binutils-unwrapped}-dualas-${lib.getVersion self.binutils-unwrapped}";
     paths = [
       self.binutils-unwrapped
-      (lib.getOutput "gas" self.cctools)
+      (lib.getOutput "gas" pkgs.cctools)
     ];
   };
 
@@ -133,20 +133,6 @@ impure-cmds // appleSourcePackages // chooseLibs // {
     bintools = self.binutils-unwrapped;
   };
 
-  cctools = self.cctools-port;
-
-  cctools-apple = callPackage ../os-specific/darwin/cctools/apple.nix {
-    stdenv = if stdenv.isDarwin then stdenv else pkgs.libcxxStdenv;
-  };
-
-  cctools-llvm = callPackage ../os-specific/darwin/cctools/llvm.nix {
-    stdenv = if stdenv.isDarwin then stdenv else pkgs.libcxxStdenv;
-  };
-
-  cctools-port = callPackage ../os-specific/darwin/cctools/port.nix {
-    stdenv = if stdenv.isDarwin then stdenv else pkgs.libcxxStdenv;
-  };
-
   # TODO(@connorbaker): See https://github.com/NixOS/nixpkgs/issues/229389.
   cf-private = self.apple_sdk.frameworks.CoreFoundation;
 
@@ -245,7 +231,7 @@ impure-cmds // appleSourcePackages // chooseLibs // {
   # As the name says, this is broken, but I don't want to lose it since it's a direction we want to go in
   # libdispatch-broken = callPackage ../os-specific/darwin/swift-corelibs/libdispatch.nix { };
 
-  libtapi = callPackage ../os-specific/darwin/libtapi {};
+  libtapi = pkgs.libtapi;
 
   ios-deploy = callPackage ../os-specific/darwin/ios-deploy {};
 
diff --git a/third_party/nixpkgs/pkgs/top-level/emacs-packages.nix b/third_party/nixpkgs/pkgs/top-level/emacs-packages.nix
index 383ba5d730..837155a554 100644
--- a/third_party/nixpkgs/pkgs/top-level/emacs-packages.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/top-level/haskell-packages.nix b/third_party/nixpkgs/pkgs/top-level/haskell-packages.nix
index 24a8e979b0..a457559bc8 100644
--- a/third_party/nixpkgs/pkgs/top-level/haskell-packages.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/top-level/java-packages.nix b/third_party/nixpkgs/pkgs/top-level/java-packages.nix
index 3b197719d2..16b7d61b54 100644
--- a/third_party/nixpkgs/pkgs/top-level/java-packages.nix
+++ b/third_party/nixpkgs/pkgs/top-level/java-packages.nix
@@ -4,7 +4,6 @@ with pkgs;
 
 let
   openjfx11 = callPackage ../development/compilers/openjdk/openjfx/11 { };
-  openjfx15 = callPackage ../development/compilers/openjdk/openjfx/15 { };
   openjfx17 = callPackage ../development/compilers/openjdk/openjfx/17 { };
   openjfx19 = callPackage ../development/compilers/openjdk/openjfx/19 { };
   openjfx20 = callPackage ../development/compilers/openjdk/openjfx/20 { };
@@ -12,47 +11,9 @@ let
   openjfx22 = callPackage ../development/compilers/openjdk/openjfx/22 { };
 
 in {
-  inherit openjfx11 openjfx15 openjfx17 openjfx19 openjfx20 openjfx21 openjfx22;
+  inherit openjfx11 openjfx17 openjfx19 openjfx20 openjfx21 openjfx22;
 
   compiler = let
-
-    gnomeArgs = {
-      inherit (gnome2) GConf gnome_vfs;
-    };
-
-    bootstrapArgs = gnomeArgs // {
-      openjfx = openjfx11; /* need this despite next line :-( */
-      enableJavaFX = false;
-      headless = true;
-    };
-
-    mkAdoptopenjdk = path-linux: path-darwin: let
-      package-linux  = import path-linux { inherit stdenv lib; };
-      package-darwin = import path-darwin { inherit lib; };
-      package = if stdenv.isLinux
-        then package-linux
-        else package-darwin;
-    in {
-      inherit package-linux package-darwin;
-
-      jdk-hotspot = callPackage package.jdk-hotspot {};
-      jre-hotspot = callPackage package.jre-hotspot {};
-    } // lib.optionalAttrs (package?jdk-openj9) {
-      jdk-openj9  = callPackage package.jdk-openj9  {};
-    } // lib.optionalAttrs (package?jre-openj9) {
-      jre-openj9  = callPackage package.jre-openj9  {};
-    };
-
-    mkBootstrap = adoptopenjdk: path: args:
-      /* adoptopenjdk not available for i686, so fall back to our old builds for bootstrapping */
-      if   !stdenv.hostPlatform.isi686
-      then
-        # only linux has the gtkSupport option
-        if stdenv.isLinux
-        then adoptopenjdk.jdk-hotspot.override { gtkSupport = false; }
-        else adoptopenjdk.jdk-hotspot
-      else callPackage path args;
-
     mkOpenjdk = path-linux: path-darwin: args:
       if stdenv.isLinux
       then mkOpenjdkLinuxOnly path-linux args
@@ -61,90 +22,22 @@ in {
       in openjdk // { headless = openjdk; };
 
     mkOpenjdkLinuxOnly = path-linux: args: let
-      openjdk = callPackage path-linux  (gnomeArgs // args);
+      openjdk = callPackage path-linux (args);
     in assert stdenv.isLinux; openjdk // {
       headless = openjdk.override { headless = true; };
     };
 
   in rec {
-    adoptopenjdk-8 = mkAdoptopenjdk
-      ../development/compilers/adoptopenjdk-bin/jdk8-linux.nix
-      ../development/compilers/adoptopenjdk-bin/jdk8-darwin.nix;
-
-    adoptopenjdk-11 = mkAdoptopenjdk
-      ../development/compilers/adoptopenjdk-bin/jdk11-linux.nix
-      ../development/compilers/adoptopenjdk-bin/jdk11-darwin.nix;
-
-    adoptopenjdk-13 = mkAdoptopenjdk
-      ../development/compilers/adoptopenjdk-bin/jdk13-linux.nix
-      ../development/compilers/adoptopenjdk-bin/jdk13-darwin.nix;
-
-    adoptopenjdk-14 = mkAdoptopenjdk
-      ../development/compilers/adoptopenjdk-bin/jdk14-linux.nix
-      ../development/compilers/adoptopenjdk-bin/jdk14-darwin.nix;
-
-    adoptopenjdk-15 = mkAdoptopenjdk
-      ../development/compilers/adoptopenjdk-bin/jdk15-linux.nix
-      ../development/compilers/adoptopenjdk-bin/jdk15-darwin.nix;
-
-    adoptopenjdk-16 = mkAdoptopenjdk
-      ../development/compilers/adoptopenjdk-bin/jdk16-linux.nix
-      ../development/compilers/adoptopenjdk-bin/jdk16-darwin.nix;
-
-    adoptopenjdk-17 = mkAdoptopenjdk
-      ../development/compilers/adoptopenjdk-bin/jdk17-linux.nix
-      ../development/compilers/adoptopenjdk-bin/jdk17-darwin.nix;
-
     corretto11 = callPackage ../development/compilers/corretto/11.nix { };
     corretto17 = callPackage ../development/compilers/corretto/17.nix { };
     corretto19 = callPackage ../development/compilers/corretto/19.nix { };
     corretto21 = callPackage ../development/compilers/corretto/21.nix { };
 
-    openjdk8-bootstrap = mkBootstrap adoptopenjdk-8
-      ../development/compilers/openjdk/bootstrap.nix
-      { version = "8"; };
+    openjdk8-bootstrap = temurin-bin.jdk-8;
 
-    openjdk11-bootstrap = mkBootstrap adoptopenjdk-11
-      ../development/compilers/openjdk/bootstrap.nix
-      { version = "10"; };
+    openjdk11-bootstrap = temurin-bin.jdk-11;
 
-    openjdk13-bootstrap = mkBootstrap adoptopenjdk-13
-      ../development/compilers/openjdk/12.nix
-      (bootstrapArgs // {
-        inherit openjdk11-bootstrap;
-        /* build segfaults with gcc9 or newer, so use gcc8 like Debian does */
-        stdenv = gcc8Stdenv;
-      });
-
-    openjdk14-bootstrap = mkBootstrap adoptopenjdk-14
-      ../development/compilers/openjdk/13.nix
-      (bootstrapArgs // {
-        inherit openjdk13-bootstrap;
-      });
-
-    openjdk15-bootstrap = mkBootstrap adoptopenjdk-15
-      ../development/compilers/openjdk/14.nix
-      (bootstrapArgs // {
-        inherit openjdk14-bootstrap;
-      });
-
-    openjdk16-bootstrap = mkBootstrap adoptopenjdk-16
-      ../development/compilers/openjdk/15.nix
-      (bootstrapArgs // {
-        inherit openjdk15-bootstrap;
-      });
-
-    openjdk17-bootstrap = mkBootstrap adoptopenjdk-17
-      ../development/compilers/openjdk/16.nix
-      (bootstrapArgs // {
-        inherit openjdk16-bootstrap;
-      });
-
-    openjdk18-bootstrap = mkBootstrap adoptopenjdk-17
-      ../development/compilers/openjdk/17.nix
-      (bootstrapArgs // {
-        inherit openjdk17-bootstrap;
-      });
+    openjdk17-bootstrap = temurin-bin.jdk-17;
 
     openjdk8 = mkOpenjdk
       ../development/compilers/openjdk/8.nix
@@ -156,32 +49,6 @@ in {
       ../development/compilers/zulu/11.nix
       { openjfx = openjfx11; };
 
-    openjdk12 = mkOpenjdkLinuxOnly ../development/compilers/openjdk/12.nix {
-        /* build segfaults with gcc9 or newer, so use gcc8 like Debian does */
-        stdenv = gcc8Stdenv;
-        openjfx = openjfx11;
-    };
-
-    openjdk13 = mkOpenjdkLinuxOnly ../development/compilers/openjdk/13.nix {
-      inherit openjdk13-bootstrap;
-      openjfx = openjfx11;
-    };
-
-    openjdk14 = mkOpenjdkLinuxOnly ../development/compilers/openjdk/14.nix {
-      inherit openjdk14-bootstrap;
-      openjfx = openjfx11;
-    };
-
-    openjdk15 = mkOpenjdkLinuxOnly ../development/compilers/openjdk/15.nix {
-      inherit openjdk15-bootstrap;
-      openjfx = openjfx15;
-    };
-
-    openjdk16 = mkOpenjdkLinuxOnly ../development/compilers/openjdk/16.nix {
-      inherit openjdk16-bootstrap;
-      openjfx = openjfx15;
-    };
-
     openjdk17 = mkOpenjdk
       ../development/compilers/openjdk/17.nix
       ../development/compilers/zulu/17.nix
@@ -194,7 +61,7 @@ in {
       ../development/compilers/openjdk/18.nix
       ../development/compilers/zulu/18.nix
       {
-        inherit openjdk18-bootstrap;
+        openjdk18-bootstrap = temurin-bin.jdk-18;
         openjfx = openjfx17;
       };
 
diff --git a/third_party/nixpkgs/pkgs/top-level/lua-packages.nix b/third_party/nixpkgs/pkgs/top-level/lua-packages.nix
index 4b47c2d974..3eafa2fa78 100644
--- a/third_party/nixpkgs/pkgs/top-level/lua-packages.nix
+++ b/third_party/nixpkgs/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/third_party/nixpkgs/pkgs/top-level/nixpkgs-basic-release-checks.nix b/third_party/nixpkgs/pkgs/top-level/nixpkgs-basic-release-checks.nix
index 8d746001c5..3cbb581734 100644
--- a/third_party/nixpkgs/pkgs/top-level/nixpkgs-basic-release-checks.nix
+++ b/third_party/nixpkgs/pkgs/top-level/nixpkgs-basic-release-checks.nix
@@ -44,6 +44,9 @@ pkgs.runCommand "nixpkgs-release-checks"
         # Relies on impure eval
         export NIX_ABORT_ON_WARN=true
 
+        # Suppress GC warnings
+        export GC_LARGE_ALLOC_WARN_INTERVAL=100000
+
         set +e
         (
           set -x
@@ -62,7 +65,6 @@ pkgs.runCommand "nixpkgs-release-checks"
         fi
 
         s1=$(sha1sum packages1 | cut -c1-40)
-        echo $s1
 
         nix-env -f $src2 \
             --show-trace --argstr system "$platform" \
@@ -82,9 +84,10 @@ pkgs.runCommand "nixpkgs-release-checks"
         # Catch any trace calls not caught by NIX_ABORT_ON_WARN (lib.warn)
         if [ -s eval-warnings.log ]; then
             echo "Nixpkgs on $platform evaluated with warnings, aborting"
+            echo "Warnings logged:"
+            cat eval-warnings.log
             exit 1
         fi
-        rm eval-warnings.log
 
         nix-env -f $src \
             --show-trace --argstr system "$platform" \
diff --git a/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix b/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix
index 0939db097e..b8072a5ef5 100644
--- a/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix
+++ b/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix
@@ -1181,6 +1181,8 @@ let
 
     mmap =  callPackage ../development/ocaml-modules/mmap { };
 
+    mopsa = callPackage ../development/ocaml-modules/mopsa { };
+
     morbig = callPackage ../development/ocaml-modules/morbig { };
 
     mparser =  callPackage ../development/ocaml-modules/mparser { };
@@ -1379,22 +1381,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 +1712,8 @@ let
       inherit (pkgs) soundtouch;
     };
 
+    spdx_licenses = callPackage ../development/ocaml-modules/spdx_licenses { };
+
     speex = callPackage ../development/ocaml-modules/speex {
       inherit (pkgs) speex;
     };
@@ -1746,6 +1744,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/third_party/nixpkgs/pkgs/top-level/perl-packages.nix b/third_party/nixpkgs/pkgs/top-level/perl-packages.nix
index 76a44d4ec4..c38a205173 100644
--- a/third_party/nixpkgs/pkgs/top-level/perl-packages.nix
+++ b/third_party/nixpkgs/pkgs/top-level/perl-packages.nix
@@ -28572,21 +28572,18 @@ with self; {
 
   XMLLibXML = buildPerlPackage {
     pname = "XML-LibXML";
-    version = "2.0209";
+    version = "2.0210";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/S/SH/SHLOMIF/XML-LibXML-2.0209.tar.gz";
-      hash = "sha256-tKWrvNaJqi+7yLe0UznpYcSYTkgQhJTrbCgrR0giJCU=";
+      url = "mirror://cpan/authors/id/S/SH/SHLOMIF/XML-LibXML-2.0210.tar.gz";
+      hash = "sha256-opvz8Aq5ye4EIYFU4K/I95m/I2dOuZwantTeH0BZpI0=";
     };
     SKIP_SAX_INSTALL = 1;
     buildInputs = [ AlienBuild AlienLibxml2 ]
       ++ lib.optionals stdenv.isDarwin (with pkgs; [ libiconv zlib ]);
     patches = [
-      ../development/perl-modules/XML-LibXML-clang16.patch
+      # https://github.com/shlomif/perl-XML-LibXML/pull/87
+      ../development/perl-modules/XML-LibXML-fix-tests-libxml-2.13.0.patch
     ];
-    # Remove test that fails after LibXML 2.11 upgrade
-    postPatch = ''
-      rm t/35huge_mode.t
-    '';
     propagatedBuildInputs = [ XMLSAX ];
     meta = {
       description = "Perl Binding for libxml2";
diff --git a/third_party/nixpkgs/pkgs/top-level/php-packages.nix b/third_party/nixpkgs/pkgs/top-level/php-packages.nix
index 23adb1c18d..de9b83df97 100644
--- a/third_party/nixpkgs/pkgs/top-level/php-packages.nix
+++ b/third_party/nixpkgs/pkgs/top-level/php-packages.nix
@@ -393,6 +393,18 @@ in {
                 "NEWS"
               ];
             })
+          ] ++ lib.optionals (lib.versions.majorMinor php.version == "8.2" && lib.versionOlder php.version "8.2.22") [
+            # Fixes compatibility with libxml2 2.13. Part of 8.3.10RC1+, 8.2.22RC1+
+            (fetchpatch {
+              url = "https://github.com/php/php-src/commit/4fe821311cafb18ca8bdf20b9d796c48a13ba552.diff?full_index=1";
+              hash = "sha256-YC3I0BQi3o3+VmRu/UqpqPpaSC+ekPqzbORTHftbPvY=";
+            })
+          ] ++ lib.optionals (lib.versions.majorMinor php.version == "8.3" && lib.versionOlder php.version "8.3.10") [
+            (fetchpatch {
+              url = "https://github.com/php/php-src/commit/ecf0bb0fd12132d853969c5e9a212e5f627f2da2.diff?full_index=1";
+              hash = "sha256-sodGODHb4l04P0srn3L8l3K+DjZzCsCNbamfkmIyF+k=";
+              excludes = [ "NEWS" ];
+            })
           ];
         }
         {
@@ -605,6 +617,19 @@ in {
           configureFlags = [
             "--enable-simplexml"
           ];
+          patches = lib.optionals (lib.versions.majorMinor php.version == "8.2" && lib.versionOlder php.version "8.2.22") [
+            # Fixes compatibility with libxml2 2.13. Part of 8.3.10RC1+, 8.2.22RC1+
+            (fetchpatch {
+              url = "https://github.com/php/php-src/commit/4fe821311cafb18ca8bdf20b9d796c48a13ba552.diff?full_index=1";
+              hash = "sha256-YC3I0BQi3o3+VmRu/UqpqPpaSC+ekPqzbORTHftbPvY=";
+            })
+          ] ++ lib.optionals (lib.versions.majorMinor php.version == "8.3" && lib.versionOlder php.version "8.3.10") [
+            (fetchpatch {
+              url = "https://github.com/php/php-src/commit/ecf0bb0fd12132d853969c5e9a212e5f627f2da2.diff?full_index=1";
+              hash = "sha256-sodGODHb4l04P0srn3L8l3K+DjZzCsCNbamfkmIyF+k=";
+              excludes = [ "NEWS" ];
+            })
+          ];
         }
         {
           name = "snmp";
@@ -620,8 +645,21 @@ in {
           configureFlags = [
             "--enable-soap"
           ];
-          doCheck = false;
+          doCheck = stdenv.isDarwin;  # TODO: a couple tests still fail on *-linux
           internalDeps = [ php.extensions.session ];
+          patches = lib.optionals (lib.versions.majorMinor php.version == "8.2" && lib.versionOlder php.version "8.2.22") [
+            # Fixes compatibility with libxml2 2.13. Part of 8.3.10RC1+, 8.2.22RC1+
+            (fetchpatch {
+              url = "https://github.com/php/php-src/commit/4fe821311cafb18ca8bdf20b9d796c48a13ba552.diff?full_index=1";
+              hash = "sha256-YC3I0BQi3o3+VmRu/UqpqPpaSC+ekPqzbORTHftbPvY=";
+            })
+          ] ++ lib.optionals (lib.versions.majorMinor php.version == "8.3" && lib.versionOlder php.version "8.3.10") [
+            (fetchpatch {
+              url = "https://github.com/php/php-src/commit/ecf0bb0fd12132d853969c5e9a212e5f627f2da2.diff?full_index=1";
+              hash = "sha256-sodGODHb4l04P0srn3L8l3K+DjZzCsCNbamfkmIyF+k=";
+              excludes = [ "NEWS" ];
+            })
+          ];
         }
         {
           name = "sockets";
@@ -654,6 +692,19 @@ in {
             "--enable-xml"
           ];
           doCheck = false;
+          patches = lib.optionals (lib.versions.majorMinor php.version == "8.2" && lib.versionOlder php.version "8.2.22") [
+            # Fixes compatibility with libxml2 2.13. Part of 8.3.10RC1+, 8.2.22RC1+
+            (fetchpatch {
+              url = "https://github.com/php/php-src/commit/4fe821311cafb18ca8bdf20b9d796c48a13ba552.diff?full_index=1";
+              hash = "sha256-YC3I0BQi3o3+VmRu/UqpqPpaSC+ekPqzbORTHftbPvY=";
+            })
+          ] ++ lib.optionals (lib.versions.majorMinor php.version == "8.3" && lib.versionOlder php.version "8.3.10") [
+            (fetchpatch {
+              url = "https://github.com/php/php-src/commit/ecf0bb0fd12132d853969c5e9a212e5f627f2da2.diff?full_index=1";
+              hash = "sha256-sodGODHb4l04P0srn3L8l3K+DjZzCsCNbamfkmIyF+k=";
+              excludes = [ "NEWS" ];
+            })
+          ];
         }
         {
           name = "xmlreader";
@@ -671,6 +722,19 @@ in {
           configureFlags = [
             "--enable-xmlwriter"
           ];
+          patches = lib.optionals (lib.versions.majorMinor php.version == "8.2" && lib.versionOlder php.version "8.2.22") [
+            # Fixes compatibility with libxml2 2.13. Part of 8.3.10RC1+, 8.2.22RC1+
+            (fetchpatch {
+              url = "https://github.com/php/php-src/commit/4fe821311cafb18ca8bdf20b9d796c48a13ba552.diff?full_index=1";
+              hash = "sha256-YC3I0BQi3o3+VmRu/UqpqPpaSC+ekPqzbORTHftbPvY=";
+            })
+          ] ++ lib.optionals (lib.versions.majorMinor php.version == "8.3" && lib.versionOlder php.version "8.3.10") [
+            (fetchpatch {
+              url = "https://github.com/php/php-src/commit/ecf0bb0fd12132d853969c5e9a212e5f627f2da2.diff?full_index=1";
+              hash = "sha256-sodGODHb4l04P0srn3L8l3K+DjZzCsCNbamfkmIyF+k=";
+              excludes = [ "NEWS" ];
+            })
+          ];
         }
         {
           name = "xsl";
diff --git a/third_party/nixpkgs/pkgs/top-level/pkg-config/pkg-config-data.json b/third_party/nixpkgs/pkgs/top-level/pkg-config/pkg-config-data.json
index 9480888491..96561fc7b7 100644
--- a/third_party/nixpkgs/pkgs/top-level/pkg-config/pkg-config-data.json
+++ b/third_party/nixpkgs/pkgs/top-level/pkg-config/pkg-config-data.json
@@ -279,18 +279,6 @@
         "libgnome-keyring"
       ]
     },
-    "gnome-vfs-2.0": {
-      "attrPath": [
-        "gnome2",
-        "gnome_vfs"
-      ]
-    },
-    "gnome-vfs-module-2.0": {
-      "attrPath": [
-        "gnome2",
-        "gnome_vfs"
-      ]
-    },
     "gobject-2.0": {
       "attrPath": [
         "glib"
diff --git a/third_party/nixpkgs/pkgs/top-level/python-aliases.nix b/third_party/nixpkgs/pkgs/top-level/python-aliases.nix
index 3932083c98..b6745c61c6 100644
--- a/third_party/nixpkgs/pkgs/top-level/python-aliases.nix
+++ b/third_party/nixpkgs/pkgs/top-level/python-aliases.nix
@@ -334,8 +334,12 @@ mapAliases ({
   nose-cprof = throw "nose-cprof has been removed since it has not been maintained for 7 years and there are no dependent packages"; # added 2024-05-21
   nose-exclude = throw "nose-exclude has been removed since it has not been maintained since 2016"; # added 2024-05-21
   nose-randomly = throw "nose-randomly has been removed, it was archived and unmaintained since 2019"; # added 2024-05-22
+  nose-pattern-exclude = throw "nose-pattern-exclude has been removed as it has been unmaintained since 2014"; # added 2024-07-27
   nose_progressive = throw "nose_progressive has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; #added 2023-02-21
+  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.";
@@ -477,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
@@ -492,6 +497,7 @@ mapAliases ({
   radicale_infcloud = radicale-infcloud; # added 2024-01-07
   radio_beam = radio-beam; # added 2023-11-04
   ratelimiter = throw "ratelimiter has been removed, since it is unmaintained and broken"; # added 2023-10-21
+  rauth = throw "rauth has beed removed, since it is unmaintained upstream"; # added 2024-07-27
   rdflib-jsonld = throw "rdflib-jsonld is not compatible with rdflib 6"; # added 2021-11-05
   readme_renderer = readme-renderer; # added 2024-01-07
   recaptcha_client = throw "recaptcha_client has been removed since it is no longer maintained"; # added 2023-10-20
@@ -558,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
@@ -573,6 +580,7 @@ mapAliases ({
   theanoWithoutCuda = throw "theano has been removed because it is no longer maintained"; # added 2024-05-20
   theano-pymc = throw "theano-pymc has been removed because it is no longer maintained"; # added 2024-05-20
   thumborPexif = throw "thumborPexif has been removed, because it was unused."; # added 2024-01-07
+  tissue = throw "tissue has been removed, because it is archived since October 2022"; # added 2024-07-27
   torchgpipe = throw "torchgpipe has been removed, because it appears unmaintained and Pytorch now includes pipeline parallelism support"; # added 2024-05-18
   torrent_parser = torrent-parser; # added 2023-11-04
   transip = throw "transip has been removed because it is no longer maintained. TransIP SOAP V5 API was marked as deprecated"; # added 2023-02-27
@@ -595,6 +603,7 @@ mapAliases ({
   update_checker = update-checker; # added 2024-01-07
   uproot3 = throw "uproot3 has been removed, use uproot instead"; # added 2022-12-13
   uproot3-methods = throw "uproot3-methods has been removed"; # added 2022-12-13
+  urwid-mitmproxy-mitmproxy = throw "urwid-mitmproxy has been removed because mitmproxy no longer uses it"; # Added 2024-07-26
   uuid = throw "uuid is a Python standard module"; # added 2024-04-18
   validictory = throw "validictory has been removed, since it abandoned"; # added 2023-07-07
   vega_datasets = vega-datasets; # added 2023-11-04
@@ -605,6 +614,8 @@ mapAliases ({
   WazeRouteCalculator = wazeroutecalculator; # added 2021-09-29
   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/third_party/nixpkgs/pkgs/top-level/python-packages.nix b/third_party/nixpkgs/pkgs/top-level/python-packages.nix
index 96a75019df..38da5adbca 100644
--- a/third_party/nixpkgs/pkgs/top-level/python-packages.nix
+++ b/third_party/nixpkgs/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 { };
@@ -4161,10 +4167,12 @@ self: super: with self; {
 
   fairseq = callPackage ../development/python-modules/fairseq { };
 
-  faiss = toPythonModule (pkgs.faiss.override {
-    pythonSupport = true;
-    pythonPackages = self;
-  });
+  faiss = callPackage ../development/python-modules/faiss {
+    faiss-build = pkgs.faiss.override {
+      pythonSupport = true;
+      pythonPackages = self;
+    };
+  };
 
   fake-useragent = callPackage ../development/python-modules/fake-useragent { };
 
@@ -4308,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 { };
@@ -5331,6 +5341,8 @@ self: super: with self; {
     inherit (pkgs.buildPackages) meson;
   };
 
+  gstools = callPackage ../development/python-modules/gstools { };
+
   gtfs-realtime-bindings = callPackage ../development/python-modules/gtfs-realtime-bindings { };
 
   gto = callPackage ../development/python-modules/gto { };
@@ -5421,6 +5433,8 @@ self: super: with self; {
 
   handout = callPackage ../development/python-modules/handout { };
 
+  hankel = callPackage ../development/python-modules/hankel { };
+
   hap-python = callPackage ../development/python-modules/hap-python { };
 
   hass-nabucasa = callPackage ../development/python-modules/hass-nabucasa { };
@@ -5630,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 { };
@@ -6183,7 +6199,6 @@ self: super: with self; {
   };
 
   jaxlib-build = callPackage ../development/python-modules/jaxlib rec {
-    inherit (pkgs.darwin) cctools;
     # Some platforms don't have `cudaSupport` defined, hence the need for 'or false'.
     inherit (pkgs.config) cudaSupport;
     IOKit = pkgs.darwin.apple_sdk_11_0.IOKit;
@@ -6772,6 +6787,8 @@ self: super: with self; {
     inherit (pkgs.darwin.apple_sdk.frameworks) AppKit;
   };
 
+  legacy-cgi = callPackage ../development/python-modules/legacy-cgi { };
+
   leidenalg = callPackage ../development/python-modules/leidenalg {
     igraph-c = pkgs.igraph;
   };
@@ -7235,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 { };
@@ -7704,9 +7723,7 @@ self: super: with self; {
 
   minio = callPackage ../development/python-modules/minio { };
 
-  miniupnpc = callPackage ../development/python-modules/miniupnpc {
-    inherit (pkgs.darwin) cctools;
-  };
+  miniupnpc = callPackage ../development/python-modules/miniupnpc { };
 
   mip = callPackage ../development/python-modules/mip { };
 
@@ -7935,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 { };
@@ -9115,14 +9134,6 @@ self: super: with self; {
 
   nose3 = callPackage ../development/python-modules/nose3 { };
 
-  nose-timer = callPackage ../development/python-modules/nose-timer { };
-
-  nose-pattern-exclude = callPackage ../development/python-modules/nose-pattern-exclude { };
-
-  nose-warnings-filters = callPackage ../development/python-modules/nose-warnings-filters { };
-
-  nose-xunitmp = callPackage ../development/python-modules/nose-xunitmp { };
-
   notebook = callPackage ../development/python-modules/notebook { };
 
   notebook-shim = callPackage ../development/python-modules/notebook-shim { };
@@ -9165,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 { };
@@ -9233,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 { };
@@ -10690,17 +10705,22 @@ self: super: with self; {
 
   proto-plus = callPackage ../development/python-modules/proto-plus { };
 
-  # Protobuf 4.x
-  protobuf = callPackage ../development/python-modules/protobuf {
-    # If a protobuf upgrade causes many Python packages to fail, please pin it here to the previous version.
-    protobuf = pkgs.protobuf;
-  };
-
   # Protobuf 3.x
   protobuf3 = callPackage ../development/python-modules/protobuf/3.nix {
     protobuf = pkgs.protobuf3_20;
   };
 
+  # Protobuf 4.x
+  protobuf4 = callPackage ../development/python-modules/protobuf/4.nix {
+    protobuf = pkgs.protobuf;
+  };
+
+  # Protobuf 5.x
+  protobuf5 = callPackage ../development/python-modules/protobuf/default.nix { };
+
+  # If a protobuf upgrade causes many Python packages to fail, please pin it here to the previous version.
+  protobuf = protobuf4;
+
   protobuf3-to-dict = callPackage ../development/python-modules/protobuf3-to-dict { };
 
   proton-client = callPackage ../development/python-modules/proton-client { };
@@ -11268,6 +11288,8 @@ self: super: with self; {
 
   pyevilgenius = callPackage ../development/python-modules/pyevilgenius { };
 
+  pyevtk = callPackage ../development/python-modules/pyevtk { };
+
   pyexcel = callPackage ../development/python-modules/pyexcel { };
 
   pyexcel-io = callPackage ../development/python-modules/pyexcel-io { };
@@ -12384,6 +12406,8 @@ self: super: with self; {
 
   pytest-cov = callPackage ../development/python-modules/pytest-cov { };
 
+  pytest-cov-stub = callPackage ../development/python-modules/pytest-cov-stub { };
+
   pytest-cram = callPackage ../development/python-modules/pytest-cram { };
 
   pytest-datadir = callPackage ../development/python-modules/pytest-datadir { };
@@ -13020,8 +13044,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 { };
@@ -13353,8 +13375,6 @@ self: super: with self; {
 
   ratelimit = callPackage ../development/python-modules/ratelimit { };
 
-  rauth = callPackage ../development/python-modules/rauth { };
-
   raven = callPackage ../development/python-modules/raven { };
 
   rawkit = callPackage ../development/python-modules/rawkit { };
@@ -14198,6 +14218,8 @@ self: super: with self; {
 
   shimmy = callPackage ../development/python-modules/shimmy { };
 
+  shiny = callPackage ../development/python-modules/shiny { };
+
   shippai = callPackage ../development/python-modules/shippai { };
 
   shiv = callPackage ../development/python-modules/shiv { };
@@ -15097,8 +15119,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 { };
@@ -15289,7 +15309,6 @@ self: super: with self; {
     };
   in
   callPackage ../development/python-modules/tensorflow {
-    inherit (pkgs.darwin) cctools;
     inherit (pkgs.config) cudaSupport;
     inherit (pkgs.darwin.apple_sdk.frameworks) Foundation Security;
     flatbuffers-core = pkgs.flatbuffers;
@@ -15316,9 +15335,7 @@ self: super: with self; {
 
   tensorflow-metadata = callPackage ../development/python-modules/tensorflow-metadata { };
 
-  tensorflow-probability = callPackage ../development/python-modules/tensorflow-probability {
-    inherit (pkgs.darwin) cctools;
-  };
+  tensorflow-probability = callPackage ../development/python-modules/tensorflow-probability { };
 
   tensorflow = self.tensorflow-build;
 
@@ -15542,8 +15559,6 @@ self: super: with self; {
 
   tinytuya = callPackage ../development/python-modules/tinytuya { };
 
-  tissue = callPackage ../development/python-modules/tissue { };
-
   titlecase = callPackage ../development/python-modules/titlecase { };
 
   tld = callPackage ../development/python-modules/tld { };
@@ -16929,8 +16944,6 @@ self: super: with self; {
 
   urwid-readline = callPackage ../development/python-modules/urwid-readline { };
 
-  urwid-mitmproxy = callPackage ../development/python-modules/urwid-mitmproxy { };
-
   usb-devices = callPackage ../development/python-modules/usb-devices { };
 
   usbrelay-py = callPackage ../os-specific/linux/usbrelay/python.nix { };
@@ -17195,6 +17208,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;
   };
@@ -17261,12 +17276,8 @@ self: super: with self; {
 
   webexteamssdk = callPackage ../development/python-modules/webexteamssdk { };
 
-  webhelpers = callPackage ../development/python-modules/webhelpers { };
-
   webob = callPackage ../development/python-modules/webob { };
 
-  weboob = callPackage ../development/python-modules/weboob { };
-
   webrtc-noise-gain = callPackage ../development/python-modules/webrtc-noise-gain { };
 
   webrtcvad = callPackage ../development/python-modules/webrtcvad { };
@@ -17331,6 +17342,8 @@ self: super: with self; {
 
   whoisdomain = callPackage ../development/python-modules/whoisdomain { };
 
+  whool = callPackage ../development/python-modules/whool { };
+
   whoosh = callPackage ../development/python-modules/whoosh { };
 
   widgetsnbextension = callPackage ../development/python-modules/widgetsnbextension { };
diff --git a/third_party/nixpkgs/pkgs/top-level/release-lib.nix b/third_party/nixpkgs/pkgs/top-level/release-lib.nix
index a1dcc3e9f3..e34cf4be25 100644
--- a/third_party/nixpkgs/pkgs/top-level/release-lib.nix
+++ b/third_party/nixpkgs/pkgs/top-level/release-lib.nix
@@ -119,7 +119,7 @@ let
   /* The working or failing mails for cross builds will be sent only to
      the following maintainers, as most package maintainers will not be
      interested in the result of cross building a package. */
-  crossMaintainers = [ maintainers.viric ];
+  crossMaintainers = [ ];
 
 
   # Generate attributes for all supported systems.
diff --git a/third_party/nixpkgs/pkgs/top-level/ruby-packages.nix b/third_party/nixpkgs/pkgs/top-level/ruby-packages.nix
index 386b8506c7..101dd8cf8c 100644
--- a/third_party/nixpkgs/pkgs/top-level/ruby-packages.nix
+++ b/third_party/nixpkgs/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 = {
diff --git a/third_party/nixpkgs/pkgs/top-level/stage.nix b/third_party/nixpkgs/pkgs/top-level/stage.nix
index b0c7ec0382..dcf177df43 100644
--- a/third_party/nixpkgs/pkgs/top-level/stage.nix
+++ b/third_party/nixpkgs/pkgs/top-level/stage.nix
@@ -197,7 +197,7 @@ let
       # Bootstrap a cross stdenv using the LLVM toolchain.
       # This is currently not possible when compiling natively,
       # so we don't need to check hostPlatform != buildPlatform.
-      crossSystem = stdenv.hostPlatform // {
+      crossSystem = stdenv.targetPlatform // {
         useLLVM = true;
         linker = "lld";
       };
diff --git a/third_party/nixpkgs/pkgs/top-level/unixtools.nix b/third_party/nixpkgs/pkgs/top-level/unixtools.nix
index 428a37363d..959d87d586 100644
--- a/third_party/nixpkgs/pkgs/top-level/unixtools.nix
+++ b/third_party/nixpkgs/pkgs/top-level/unixtools.nix
@@ -1,4 +1,4 @@
-{ pkgs, buildEnv, runCommand, lib, stdenv, freebsd }:
+{ pkgs, buildEnv, runCommand, lib, stdenv, freebsd, binlore }:
 
 # These are some unix tools that are commonly included in the /usr/bin
 # and /usr/sbin directory under more normal distributions. Along with
@@ -30,7 +30,9 @@ let
         priority = 10;
         platforms = platforms.${stdenv.hostPlatform.parsed.kernel.name} or platforms.all;
       };
-      passthru = { inherit provider; };
+      passthru = { inherit provider; } // lib.optionalAttrs (builtins.hasAttr "binlore" providers) {
+        binlore.out = (binlore.synthesize (getBin bins.${cmd}) providers.binlore);
+      };
       preferLocalBuild = true;
     } ''
       if ! [ -x ${bin} ]; then
@@ -76,6 +78,10 @@ let
       linux = if stdenv.hostPlatform.libc == "glibc" then pkgs.stdenv.cc.libc
               else pkgs.netbsd.getconf;
       darwin = pkgs.darwin.system_cmds;
+      # I don't see any obvious arg exec in the doc/manpage
+      binlore = ''
+        execer cannot bin/getconf
+      '';
     };
     getent = {
       linux = if stdenv.hostPlatform.libc == "glibc" then pkgs.stdenv.cc.libc.getent
@@ -118,6 +124,11 @@ let
       linux = pkgs.glibc;
       darwin = pkgs.darwin.adv_cmds;
       freebsd = pkgs.freebsd.locale;
+      # technically just targeting glibc version
+      # no obvious exec in manpage
+      binlore = ''
+        execer cannot bin/locale
+      '';
     };
     logger = {
       linux = pkgs.util-linux;
@@ -130,6 +141,13 @@ let
       linux = pkgs.util-linux;
       darwin = pkgs.darwin.diskdev_cmds;
       freebsd = freebsd.mount;
+      # technically just targeting the darwin version; binlore already
+      # ids the util-linux copy as 'cannot'
+      # no obvious exec in manpage args; I think binlore flags 'can'
+      # on the code to run `mount_<filesystem>` variants
+      binlore = ''
+        execer cannot bin/mount
+      '';
     };
     netstat = {
       linux = pkgs.nettools;
@@ -145,6 +163,12 @@ let
       linux = pkgs.procps;
       darwin = pkgs.darwin.ps;
       freebsd = pkgs.freebsd.bin;
+      # technically just targeting procps ps (which ids as can)
+      # but I don't see obvious exec in args; have yet to look
+      # for underlying cause in source
+      binlore = ''
+        execer cannot bin/ps
+      '';
     };
     quota = {
       linux = pkgs.linuxquota;
@@ -168,6 +192,13 @@ let
       linux = pkgs.procps;
       darwin = pkgs.darwin.top;
       freebsd = pkgs.freebsd.top;
+      # technically just targeting procps top; haven't needed this in
+      # any scripts so far, but overriding it for consistency with ps
+      # override above and in procps. (procps also overrides 'free',
+      # but it isn't included here.)
+      binlore = ''
+        execer cannot bin/top
+      '';
     };
     umount = {
       linux = pkgs.util-linux;